Skip to content

Commit 2158b2c

Browse files
authored
Client: Fix cue imports (#1061)
1 parent 09d94a3 commit 2158b2c

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

internal/codegen/cue.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ func (input *CueInput) packageName() string {
8585

8686
func (input *CueInput) schemaRootValue(cuePkgName string) (cue.Value, []simplecue.LibraryInclude, error) {
8787
if input.Value != nil {
88-
return *input.Value, nil, nil
88+
libraries, err := simplecue.ParseImports(input.CueImports)
89+
if err != nil {
90+
return cue.Value{}, nil, err
91+
}
92+
return *input.Value, libraries, nil
8993
}
9094

9195
if input.Entrypoint == "" && input.URL == "" {

internal/jennies/typescript/rawtypes.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,9 @@ func (jenny RawTypes) defaultValuesForReference(typeDef ast.Type, packageMapper
288288
pkg := packageMapper(ref.ReferredPkg)
289289
referredType, _ := jenny.schemas.LocateObject(ref.ReferredPkg, ref.ReferredType)
290290
referredTypeName := formatObjectName(referredType.Name)
291+
if referredTypeName == "" {
292+
referredTypeName = formatObjectName(ref.ReferredType)
293+
}
291294

292295
// is the reference to a constant?
293296
if referredType.Type.IsConcreteScalar() {

testdata/jennies/rawtypes/refs/TypescriptRawTypes/src/refs/types.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ export const defaultRefToSomeStruct = (): RefToSomeStruct => (defaultSomeStruct(
1515

1616
export type RefToSomeStructFromOtherPackage = otherpkg.SomeDistantStruct;
1717

18-
export const defaultRefToSomeStructFromOtherPackage = (): RefToSomeStructFromOtherPackage => (otherpkg.default());
18+
export const defaultRefToSomeStructFromOtherPackage = (): RefToSomeStructFromOtherPackage => (otherpkg.defaultSomeDistantStruct());
1919

0 commit comments

Comments
 (0)