New "executables" directory

puccini-clout/commands/common.go → executables/puccini-clout/commands/common.go

@@ -13,9 +13,11 @@ import (
 
 const toolName = "puccini-clout"
 
-var log = commonlog.GetLogger(toolName)
+var (
+	log = commonlog.GetLogger(toolName)
 
-var output string
+	output string
+)
 
 func Transcriber() *transcribe.Transcriber {
 	return &transcribe.Transcriber{

puccini-clout/commands/root.go → executables/puccini-clout/commands/root.go

@@ -7,15 +7,17 @@ import (
 	"github.com/tliron/kutil/util"
 )
 
-var logTo string
-var verbose int
-var format string
-var inputFormat string
-var colorize string
-var strict bool
-var pretty bool
-var base64 bool
-var cpuProfilePath string
+var (
+	logTo          string
+	verbose        int
+	format         string
+	inputFormat    string
+	colorize       string
+	strict         bool
+	pretty         bool
+	base64         bool
+	cpuProfilePath string
+)
 
 func init() {
 	rootCommand.PersistentFlags().BoolVarP(&terminal.Quiet, "quiet", "q", false, "suppress output")

puccini-tosca/main.go → executables/puccini-clout/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/tliron/kutil/util"
-	"github.com/tliron/puccini/puccini-tosca/commands"
+	"github.com/tliron/puccini/executables/puccini-clout/commands"
 
 	_ "github.com/tliron/commonlog/simple"
 )

puccini-csar/commands/common.go → executables/puccini-csar/commands/common.go

@@ -9,9 +9,11 @@ import (
 
 const toolName = "puccini-csar"
 
-var log = commonlog.GetLogger(toolName)
+var (
+	log = commonlog.GetLogger(toolName)
 
-var archiveFormat string
+	archiveFormat string
+)
 
 func Transcriber() *transcribe.Transcriber {
 	return &transcribe.Transcriber{

puccini-csar/commands/create.go → executables/puccini-csar/commands/create.go

@@ -17,12 +17,14 @@ import (
 	"github.com/tliron/puccini/tosca/csar"
 )
 
-var compressionLevel int
-var toscaMetaFileVersion string
-var csarVersion string
-var createdBy string
-var entryDefinitions string
-var otherDefinitions []string
+var (
+	compressionLevel     int
+	toscaMetaFileVersion string
+	csarVersion          string
+	createdBy            string
+	entryDefinitions     string
+	otherDefinitions     []string
+)
 
 func init() {
 	rootCommand.AddCommand(createCommand)

puccini-csar/commands/meta.go → executables/puccini-csar/commands/meta.go

@@ -10,12 +10,14 @@ import (
 	"github.com/tliron/puccini/tosca/csar"
 )
 
-var output string
-var format string
-var colorize string
-var strict bool
-var pretty bool
-var base64 bool
+var (
+	output   string
+	format   string
+	colorize string
+	strict   bool
+	pretty   bool
+	base64   bool
+)
 
 func init() {
 	rootCommand.AddCommand(metaCommand)

puccini-csar/commands/root.go → executables/puccini-csar/commands/root.go

@@ -7,9 +7,11 @@ import (
 	"github.com/tliron/kutil/util"
 )
 
-var logTo string
-var verbose int
-var cpuProfilePath string
+var (
+	logTo          string
+	verbose        int
+	cpuProfilePath string
+)
 
 func init() {
 	rootCommand.PersistentFlags().BoolVarP(&terminal.Quiet, "quiet", "q", false, "suppress output")

puccini-csar/main.go → executables/puccini-csar/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/tliron/kutil/util"
-	"github.com/tliron/puccini/puccini-csar/commands"
+	"github.com/tliron/puccini/executables/puccini-csar/commands"
 
 	_ "github.com/tliron/commonlog/simple"
 )

puccini-tosca/commands/common.go → executables/puccini-tosca/commands/common.go

@@ -13,16 +13,18 @@ import (
 
 const toolName = "puccini-tosca"
 
-var log = commonlog.GetLogger(toolName)
+var (
+	log = commonlog.GetLogger(toolName)
 
-var importPaths []string
-var template string
-var inputs map[string]string
-var inputsUrl string
-var inputValues = make(map[string]any)
-var problemsFormat string
-var quirks []string
-var urlMappings map[string]string
+	importPaths    []string
+	template       string
+	inputs         map[string]string
+	inputsUrl      string
+	inputValues    = make(map[string]any)
+	problemsFormat string
+	quirks         []string
+	urlMappings    map[string]string
+)
 
 func Transcriber() *transcribe.Transcriber {
 	return &transcribe.Transcriber{

puccini-tosca/commands/compile.go → executables/puccini-tosca/commands/compile.go

@@ -11,11 +11,13 @@ import (
 	"github.com/tliron/puccini/clout/js"
 )
 
-var output string
-var resolve bool
-var coerce bool
-var exec string
-var arguments map[string]string
+var (
+	output    string
+	resolve   bool
+	coerce    bool
+	exec      string
+	arguments map[string]string
+)
 
 func init() {
 	rootCommand.AddCommand(compileCommand)

puccini-tosca/commands/parse.go → executables/puccini-tosca/commands/parse.go

@@ -16,9 +16,11 @@ import (
 	"github.com/tliron/yamlkeys"
 )
 
-var stopAtPhase uint32
-var dumpPhases []uint
-var filter string
+var (
+	stopAtPhase uint32
+	dumpPhases  []uint
+	filter      string
+)
 
 func init() {
 	rootCommand.AddCommand(parseCommand)

puccini-tosca/commands/root.go → executables/puccini-tosca/commands/root.go

@@ -7,14 +7,16 @@ import (
 	"github.com/tliron/kutil/util"
 )
 
-var logTo string
-var verbose int
-var format string
-var colorize string
-var strict bool
-var pretty bool
-var base64 bool
-var cpuProfilePath string
+var (
+	logTo          string
+	verbose        int
+	format         string
+	colorize       string
+	strict         bool
+	pretty         bool
+	base64         bool
+	cpuProfilePath string
+)
 
 func init() {
 	rootCommand.PersistentFlags().BoolVarP(&terminal.Quiet, "quiet", "q", false, "suppress output")

puccini-clout/main.go → executables/puccini-tosca/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/tliron/kutil/util"
-	"github.com/tliron/puccini/puccini-clout/commands"
+	"github.com/tliron/puccini/executables/puccini-tosca/commands"
 
 	_ "github.com/tliron/commonlog/simple"
 )

go.mod

@@ -1,20 +1,20 @@
 module github.com/tliron/puccini
 
-go 1.21
+go 1.22
 
 require (
-	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
-	github.com/fxamacker/cbor/v2 v2.5.0
-	github.com/klauspost/compress v1.17.4
+	github.com/dop251/goja v0.0.0-20240220182346-e401ed450204
+	github.com/fxamacker/cbor/v2 v2.6.0
+	github.com/klauspost/compress v1.17.7
 	github.com/klauspost/pgzip v1.2.6
 	github.com/segmentio/ksuid v1.0.4
 	github.com/spf13/cobra v1.8.0
 	github.com/tliron/commonjs-goja v0.2.4
-	github.com/tliron/commonlog v0.2.10
+	github.com/tliron/commonlog v0.2.16
 	github.com/tliron/exturl v0.4.3
 	github.com/tliron/go-ard v0.2.16
 	github.com/tliron/go-transcribe v0.3.4
-	github.com/tliron/kutil v0.3.14
+	github.com/tliron/kutil v0.3.23
 	github.com/tliron/yamlkeys v1.3.6
 	github.com/vmihailenco/msgpack/v5 v5.4.1
 )
@@ -23,22 +23,23 @@ require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
+	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beevik/etree v1.3.0 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/dlclark/regexp2 v1.7.0 // indirect
-	github.com/docker/cli v24.0.7+incompatible // indirect
+	github.com/docker/cli v24.0.0+incompatible // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v24.0.7+incompatible // indirect
+	github.com/docker/docker v24.0.0+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-git/go-git/v5 v5.11.0 // indirect
+	github.com/go-git/go-git/v5 v5.10.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/goccy/go-yaml v1.11.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -66,18 +67,18 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.1 // indirect
-	github.com/skeema/knownhosts v1.2.1 // indirect
+	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/vbatts/tar-split v0.11.3 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.16.1 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect