diff --git a/analyze.go b/analyze.go index 9d43181..064652f 100644 --- a/analyze.go +++ b/analyze.go @@ -6,6 +6,7 @@ import ( "cuelang.org/go/cue" "cuelang.org/go/cue/ast" + "cuelang.org/go/cue/build" "cuelang.org/go/cue/format" ) @@ -13,7 +14,37 @@ func tpv(v cue.Value) { fmt.Printf("%s:\n%s\n", v.Path(), exprTree(v)) } +func findInstance(raw cue.Value) *build.Instance { + // Search, recursively, for cue.Value.BuildInstance() on: + // - the provided raw node + // - the first direct conjunct of the raw node, if any + // - the ReferencePath() result, if different, of either of the above + + bi := raw.BuildInstance() + if bi != nil { + return bi + } + + if ref, path := raw.ReferencePath(); len(path.Selectors()) != 0 && ref != raw { + if bi = findInstance(ref); bi != nil { + return bi + } + } + + // No instance on anything reachable from the value itself. Try again with any + // immediate conjuncts. + if op, dvals := raw.Expr(); op == cue.AndOp { + // Only try the first value, which will represent the package. Additional values + // will be constraints specified on the whole package instance. + bi = findInstance(dvals[0]) + } + + return bi +} + func isReference(v cue.Value) bool { + // return cue.Dereference(v) == v + // FIXME the below impl is just wrong, but current behavior somehow relies on it. Above is correct, it's a pointer comparison _, path := v.ReferencePath() return len(path.Selectors()) > 0 } diff --git a/generate_test.go b/generate_test.go index bf36887..9129ee6 100644 --- a/generate_test.go +++ b/generate_test.go @@ -48,6 +48,15 @@ func TestGenerateWithImports(t *testing.T) { }, } + importMappers := map[string]func(s string) (string, error){ + "imports/imports": func(s string) (string, error) { + if s == "example.com/dep" { + return "@example/deps", nil + } + return s, nil + }, + } + ctx := cuecontext.New() test.Run(t, func(t *cuetxtar.Test) { @@ -56,8 +65,16 @@ func TestGenerateWithImports(t *testing.T) { t.Fatal(v.Err()) } + im := func(s string) (string, error) { + return "", nil + } + if i, ok := importMappers[t.Name]; ok { + im = i + } + b, err := cuetsy.Generate(v, cuetsy.Config{ - Export: true, + Export: true, + ImportMapper: im, }) if err != nil { errors.Print(t, err, nil) diff --git a/generator.go b/generator.go index 7077dfb..765aeab 100644 --- a/generator.go +++ b/generator.go @@ -47,24 +47,16 @@ var allKinds = [...]TSType{ TypeEnum, } -// An ImportMapper takes an ImportDecl and returns a string indicating the -// import statement that should be used in the corresponding typescript, or -// an error if no mapping can be made. -type ImportMapper func(*ast.ImportDecl) (string, error) - -// NoImportMappingErr returns a standard error indicating that no mapping can be -// made for the provided import statement. -func NoImportMappingErr(d *ast.ImportDecl) error { - return errors.Newf(d.Pos(), "a corresponding typescript import is not available for %q", d.Import.String()) -} - -func nilImportMapper(d *ast.ImportDecl) (string, error) { return "", NoImportMappingErr(d) } - // Config governs certain variable behaviors when converting CUE to Typescript. type Config struct { - // ImportMapper determines how CUE imports are mapped to Typescript imports. - // If nil, any non-stdlib import in the CUE source will result in a fatal + // ImportMapper determines how CUE imports are mapped to Typescript imports. If + // nil, any non-stdlib import in the input CUE source will result in a fatal // error. + // + // Import conversions are only run if the input [cue.Value] or its top-level + // conjuncts if [cue.Value.Source] returns an [*ast.File]. This eliminates + // computed values, and values representing nodes other than a root file + // node. ImportMapper // Export determines whether generated TypeScript symbols are exported. @@ -97,6 +89,14 @@ func GenerateAST(val cue.Value, c Config) (*ts.File, error) { val: &val, } + var file ts.File + var err error + + file.Imports, err = mapImports(val, c.ImportMapper) + if err != nil { + return nil, err + } + iter, err := val.Fields( cue.Definitions(true), cue.Optional(true), @@ -105,7 +105,6 @@ func GenerateAST(val cue.Value, c Config) (*ts.File, error) { return nil, err } - var file ts.File for iter.Next() { n := g.decl(iter.Selector().String(), iter.Value()) file.Nodes = append(file.Nodes, n...) diff --git a/go.mod b/go.mod index 4e3fc0f..7857542 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/cuetsy -go 1.16 +go 1.19 require ( cuelang.org/go v0.5.0 @@ -8,9 +8,26 @@ require ( github.com/kr/text v0.2.0 github.com/matryer/is v1.4.0 github.com/rogpeppe/go-internal v1.9.0 - github.com/stretchr/testify v1.7.1 // indirect - github.com/urfave/cli/v2 v2.24.4 + github.com/urfave/cli/v2 v2.25.0 github.com/xlab/treeprint v1.1.0 golang.org/x/tools v0.1.12 gotest.tools v2.2.0+incompatible ) + +require ( + github.com/cockroachdb/apd/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/emicklei/proto v1.10.0 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/google/uuid v1.2.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect + github.com/pkg/errors v0.8.1 // indirect + github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/stretchr/testify v1.7.1 // indirect + github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect + golang.org/x/text v0.3.8 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum index 9573ffe..7f8a8b9 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,12 @@ cuelang.org/go v0.5.0 h1:D6N0UgTGJCOxFKU8RU+qYvavKNsVc/+ZobmifStVJzU= cuelang.org/go v0.5.0/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw= github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -17,27 +14,20 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -49,52 +39,25 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU= -github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/urfave/cli/v2 v2.25.0 h1:ykdZKuQey2zq0yin/l7JOm9Mh+pg72ngYMeB0ABn6q8= +github.com/urfave/cli/v2 v2.25.0/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/import_mapper.go b/import_mapper.go new file mode 100644 index 0000000..5bf668f --- /dev/null +++ b/import_mapper.go @@ -0,0 +1,73 @@ +package cuetsy + +import ( + "fmt" + "strings" + + "cuelang.org/go/cue" + "cuelang.org/go/cue/ast" + tsast "github.com/grafana/cuetsy/ts/ast" +) + +// An ImportMapper takes a string containing a CUE import path (e.g. +// "github.com/grafana/cuetsy") and returns a string indicating the import path +// that should be used in the corresponding generated typescript, or an error if +// no mapping can be made. +// +// An empty string return indicates no TS import statements +// should be generated for that CUE import path. +type ImportMapper func(string) (string, error) + +func nilImportMapper(path string) (string, error) { + return "", fmt.Errorf("a corresponding typescript import is not available for %q", path) +} + +// IgnoreImportMapper ignores all import paths cuetsy encounters, resulting in no +// import statements in generated TS output. +func IgnoreImportMapper(path string) (string, error) { + return "", nil +} + +// mapImports converts CUE import statements, represented in their AST form, +// to the corresponding TS import, if the CUE import is allowed. +// +// Some CUE imports are allowed but have no corresponding TS import - the CUE +// types from that package are expected to be inlined. +func mapImports(raw cue.Value, fn ImportMapper) ([]tsast.ImportSpec, error) { + bi := findInstance(raw) + if bi == nil { + return nil, nil + } + + var ims []*ast.ImportSpec + for _, src := range bi.Files { + ims = append(ims, src.Imports...) + } + + var specs []tsast.ImportSpec + for _, im := range ims { + pkg, err := fn(strings.Trim(im.Path.Value, "\"")) + if err != nil || pkg == "" { + // Empty string mapping means skip it + return nil, err + } + + tsim := tsast.ImportSpec{ + From: tsast.Str{Value: pkg}, + } + + if im.Name != nil && im.Name.String() != "" { + tsim.AsName = im.Name.String() + } else { + sl := strings.Split(strings.Trim(im.Path.Value, "\""), "/") + final := sl[len(sl)-1] + if idx := strings.Index(final, ":"); idx != -1 { + tsim.AsName = final[idx:] + } else { + tsim.AsName = final + } + } + specs = append(specs, tsim) + } + return specs, nil +} diff --git a/internal/cuetxtar/cuetxtar.go b/internal/cuetxtar/cuetxtar.go index 0325bc9..b126b97 100644 --- a/internal/cuetxtar/cuetxtar.go +++ b/internal/cuetxtar/cuetxtar.go @@ -83,6 +83,8 @@ type Test struct { Dir string hasGold bool + + Name string } func (t *Test) Write(b []byte) (n int, err error) { @@ -266,6 +268,7 @@ func (x *TxTarTest) Run(t *testing.T, f func(tc *Test)) { T: t, Archive: a, Dir: filepath.Dir(filepath.Join(dir, fullpath)), + Name: testName, prefix: path.Join("out", x.Name), } diff --git a/testdata/imports/imports.txtar b/testdata/imports/imports.txtar new file mode 100644 index 0000000..50c7e11 --- /dev/null +++ b/testdata/imports/imports.txtar @@ -0,0 +1,59 @@ +-- cue.mod/module.cue -- +module: "example.com" + +-- in.cue -- +package test + +import ( + "example.com/dep" + "example.com/other" + ui "example.com/alias" +) + +#Foo: { + w: dep.#Test + x: dep.#Test2 + y: other.#Test + z: ui.#Test +} @cuetsy(kind="interface") + +-- dep/file.cue -- +package dep + +#Test: { + a: string +} @cuetsy(kind="interface") + +-- dep/file2.cue -- +package dep + +#Test2: { + a: string +} @cuetsy(kind="interface") + +-- other/file.cue -- +package other + +#Test: { + a: string +} @cuetsy(kind="interface") + +-- alias/file.cue -- +package alias + +#Test: { + a: string +} @cuetsy(kind="interface") + +-- out/gen -- + +import * as dep from '@example/deps'; +import * as other from 'example.com/other'; +import * as ui from 'example.com/alias'; + +export interface Foo { + w: dep.Test; + x: dep.Test2; + y: other.Test; + z: ui.Test; +} diff --git a/ts/ast/ast.go b/ts/ast/ast.go index 619971f..d0f61d7 100644 --- a/ts/ast/ast.go +++ b/ts/ast/ast.go @@ -49,7 +49,11 @@ func (f File) String() string { for _, i := range f.Imports { b.WriteString(formatInner(EOLNone, 0, i)) - b.WriteString("\n\n") + b.WriteString("\n") + } + + if len(f.Imports) > 0 { + b.WriteString("\n") } for i, n := range f.Nodes {