wips: datamodel, structural; bugfixes

.hof/shadow/Cli/cmd/hof/cmd/datamodel.go

@@ -5,11 +5,20 @@ import (
 
 	"github.com/hofstadter-io/hof/cmd/hof/cmd/datamodel"
 
+	"github.com/hofstadter-io/hof/cmd/hof/flags"
+
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
 )
 
 var datamodelLong = `create, view, diff, calculate / migrate, and manage your data models`
 
+func init() {
+
+	DatamodelCmd.PersistentFlags().StringSliceVarP(&(flags.DatamodelPflags.Datamodels), "datamodel", "D", nil, "Datamodels for the datamodel commands")
+	DatamodelCmd.PersistentFlags().StringSliceVarP(&(flags.DatamodelPflags.Modelsets), "modelset", "M", nil, "Modelsets for the datamodel commands")
+	DatamodelCmd.PersistentFlags().StringSliceVarP(&(flags.DatamodelPflags.Models), "model", "m", nil, "Models for the datamodel commands")
+}
+
 var DatamodelCmd = &cobra.Command{
 
 	Use: "datamodel",

.hof/shadow/Cli/cmd/hof/cmd/update.go

@@ -15,6 +15,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
+
 	"github.com/hofstadter-io/hof/cmd/hof/verinfo"
 )
 
@@ -55,6 +56,7 @@ var UpdateCmd = &cobra.Command{
 	Long: UpdateLong,
 
 	PreRun: func(cmd *cobra.Command, args []string) {
+
 		ga.SendCommandPath("update")
 
 	},

.hof/shadow/Cli/cmd/hof/cmd/version.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
+
 	"github.com/hofstadter-io/hof/cmd/hof/verinfo"
 )
 

.hof/shadow/Cli/cmd/hof/flags/datamodel.go

@@ -0,0 +1,9 @@
+package flags
+
+type DatamodelPflagpole struct {
+	Datamodels []string
+	Modelsets  []string
+	Models     []string
+}
+
+var DatamodelPflags DatamodelPflagpole

cmd/hof/cmd/datamodel.go

@@ -5,11 +5,20 @@ import (
 
 	"github.com/hofstadter-io/hof/cmd/hof/cmd/datamodel"
 
+	"github.com/hofstadter-io/hof/cmd/hof/flags"
+
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
 )
 
 var datamodelLong = `create, view, diff, calculate / migrate, and manage your data models`
 
+func init() {
+
+	DatamodelCmd.PersistentFlags().StringSliceVarP(&(flags.DatamodelPflags.Datamodels), "datamodel", "D", nil, "Datamodels for the datamodel commands")
+	DatamodelCmd.PersistentFlags().StringSliceVarP(&(flags.DatamodelPflags.Modelsets), "modelset", "M", nil, "Modelsets for the datamodel commands")
+	DatamodelCmd.PersistentFlags().StringSliceVarP(&(flags.DatamodelPflags.Models), "model", "m", nil, "Models for the datamodel commands")
+}
+
 var DatamodelCmd = &cobra.Command{
 
 	Use: "datamodel",

cmd/hof/cmd/datamodel/get.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/hofstadter-io/hof/cmd/hof/flags"
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
 
 	"github.com/hofstadter-io/hof/lib/datamodel"
@@ -18,7 +19,7 @@ func GetRun(args []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	err = datamodel.RunGetFromArgs(args)
+	err = datamodel.RunGetFromArgs(args, flags.DatamodelPflags)
 
 	return err
 }
@@ -86,4 +87,4 @@ func init() {
 	GetCmd.SetHelpFunc(thelp)
 	GetCmd.SetUsageFunc(tusage)
 
-}
+}

cmd/hof/cmd/update.go

@@ -15,6 +15,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
+
 	"github.com/hofstadter-io/hof/cmd/hof/verinfo"
 )
 
@@ -55,6 +56,7 @@ var UpdateCmd = &cobra.Command{
 	Long: UpdateLong,
 
 	PreRun: func(cmd *cobra.Command, args []string) {
+
 		ga.SendCommandPath("update")
 
 	},

cmd/hof/cmd/version.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
+
 	"github.com/hofstadter-io/hof/cmd/hof/verinfo"
 )
 

cmd/hof/flags/datamodel.go

@@ -0,0 +1,9 @@
+package flags
+
+type DatamodelPflagpole struct {
+	Datamodels []string
+	Modelsets  []string
+	Models     []string
+}
+
+var DatamodelPflags DatamodelPflagpole

design/cli/cmds/datamodel.cue

@@ -14,6 +14,34 @@ import (
 
 	OmitRun: true
 
+	Pflags: [...schema.#Flag] & [
+		{
+			Name:    "Datamodels"
+			Long:    "datamodel"
+			Short:   "D"
+			Type:    "[]string"
+			Default: "nil"
+			Help:    "Datamodels for the datamodel commands"
+		},
+		{
+			Name:    "modelsets"
+			Long:    "modelset"
+			Short:   "M"
+			Type:    "[]string"
+			Default: "nil"
+			Help:    "Modelsets for the datamodel commands"
+		},
+		{
+			Name:    "models"
+			Long:    "model"
+			Short:   "m"
+			Type:    "[]string"
+			Default: "nil"
+
+			Help:    "Models for the datamodel commands"
+		},
+	]
+
 	Commands: [{
 		TBD:   "α"
 		Name:  "create"

design/cli/pflags.cue

@@ -8,7 +8,7 @@ import (
 
 #CliPflags: [...schema.#Flag] & [
 		// Labels will be core
-		{
+	{
 		Name:    "labels"
 		Long:    "label"
 		Short:   "l"

go.mod

@@ -1,6 +1,6 @@
 module github.com/hofstadter-io/hof
 
-go 1.14
+go 1.15
 
 require (
 	cuelang.org/go v0.2.1

lib/cuetils/print.go

@@ -26,8 +26,7 @@ func CueSyntax(val cue.Value, opts []cue.Option) (ast.Node) {
 		cue.Definitions(true),
 		cue.Docs(true),
 		cue.Hidden(true),
-		cue.Final(),
-		cue.Optional(false),
+		cue.Optional(true),
 		cue.ResolveReferences(true),
 	)
 }

lib/datamodel/get.go

@@ -2,10 +2,31 @@ package datamodel
 
 import (
 	"fmt"
+
+	"github.com/hofstadter-io/hof/cmd/hof/flags"
+	"github.com/hofstadter-io/hof/lib/cuetils"
 )
 
-func RunGetFromArgs(args []string) error {
-	fmt.Println("lib/datamodel.Get", args)
+func RunGetFromArgs(args []string, cmdpflags flags.DatamodelPflagpole) error {
+	fmt.Println("lib/datamodel.Get", args, cmdpflags)
+
+	cueFiles := args
+
+	// Loadup our Cue files
+	crt, err := cuetils.CueRuntimeFromEntrypointsAndFlags(cueFiles)
+	if err != nil {
+		return err
+	}
+
+	// TODO: find values from flags / attributes
+	val := crt.CueValue
+
+	syn, err := cuetils.PrintCueValue(val)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(syn)
 
 	return nil
 }