From 96a3049842a72dd6b4ac80141f435af439bd18c1 Mon Sep 17 00:00:00 2001 From: Pasquale Toscano Date: Thu, 24 Nov 2022 16:07:12 +0100 Subject: [PATCH] Fix properties declaration in NodeJS SDK when the token isn't from an external module --- ...nother-component-from-the-same-schema-as-a-property.yaml | 4 ++++ pkg/codegen/nodejs/gen.go | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog/pending/20221125--sdkgen-nodejs--fix-nodejs-sdk-when-a-component-is-using-another-component-from-the-same-schema-as-a-property.yaml diff --git a/changelog/pending/20221125--sdkgen-nodejs--fix-nodejs-sdk-when-a-component-is-using-another-component-from-the-same-schema-as-a-property.yaml b/changelog/pending/20221125--sdkgen-nodejs--fix-nodejs-sdk-when-a-component-is-using-another-component-from-the-same-schema-as-a-property.yaml new file mode 100644 index 000000000000..afcaf17d0105 --- /dev/null +++ b/changelog/pending/20221125--sdkgen-nodejs--fix-nodejs-sdk-when-a-component-is-using-another-component-from-the-same-schema-as-a-property.yaml @@ -0,0 +1,4 @@ +changes: +- type: fix + scope: sdkgen/nodejs + description: Fix NodeJS SDK when a component is using another component from the same schema as a property diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go index 68dc85ed508c..89fd360bc00b 100644 --- a/pkg/codegen/nodejs/gen.go +++ b/pkg/codegen/nodejs/gen.go @@ -250,10 +250,12 @@ func (mod *modContext) resourceType(r *schema.ResourceType) string { pkg = r.Resource.Package } namingCtx, pkgName, external := mod.namingContext(pkg) - if external { - pkgName = externalModuleName(pkgName) + if !external { + name := tokenToName(r.Token) + return title(name) } + pkgName = externalModuleName(pkgName) modName, name := namingCtx.tokenToModName(r.Token), tokenToName(r.Token) return pkgName + modName + title(name)