fix(type-safe-api): fix typescript generated code for dictionary types

aws · Oct 30, 2024 · a590627 · a590627
1 parent 752077c
commit a590627
Show file tree

Hide file tree

Showing 5 changed files with 2,761 additions and 308 deletions.
diff --git a/...e-safe-api/scripts/type-safe-api/generators/typescript/templates/client/models/models.ejs b/...e-safe-api/scripts/type-safe-api/generators/typescript/templates/client/models/models.ejs
@@ -62,8 +62,8 @@ export type <%- model.name %> =<% model.properties.forEach((composedType, i) =>
  <%_ } _%>
  */
 export interface <%= model.name %> {
-<%_ if (model.additionalProperties) { _%>
-    [key: string]: <%- model.additionalProperties.typescriptType %>;
+<%_ if (model.export === "dictionary" && model.link) { _%>
+    [key: string]: <%- model.link.typescriptType %>;
 <%_ } _%>
 <%_ model.properties.forEach((property) => { _%>
     /**
@@ -126,7 +126,7 @@ export function <%= model.name %>FromJSONTyped(json: any, ignoreDiscriminator: b
 <%_ } else { _%>
     return {
 
-<%_ if (model.additionalProperties) { _%>
+<%_ if (model.export === "dictionary") { _%>
             ...json,
 <%_ } _%>
 <%_ model.properties.forEach((property) => { _%>
@@ -173,7 +173,7 @@ export function <%= model.name %>ToJSON(value?: <%= model.name %> | null): any {
 <%_ } else { _%>
     return {
 
-<%_ if (model.additionalProperties) { _%>
+<%_ if (model.export === "dictionary") { _%>
             ...value,
 <%_ } _%>
 <%_ model.properties.forEach((property) => { _%>

diff --git a/packages/type-safe-api/test/resources/specs/edge-cases.yaml b/packages/type-safe-api/test/resources/specs/edge-cases.yaml
@@ -138,6 +138,16 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ArrayOfOneOfs"
+  /additional-properties:
+    post:
+      operationId: dictionary
+      responses:
+        200:
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/AdditionalPropertiesResponse"
 components:
   schemas:
     MyEnum:
@@ -165,3 +175,23 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/NamedOneOfUnion"
+    AdditionalPropertiesResponse:
+      type: object
+      properties:
+        dictionaryOfObjects:
+          $ref: "#/components/schemas/Dictionary"
+        dictionaryOfPrimitives:
+          type: object
+          additionalProperties:
+            type: string
+    Dictionary:
+      type: object
+      additionalProperties:
+        type: array
+        items:
+          $ref: "#/components/schemas/SomeObject"
+    SomeObject:
+      type: object
+      properties:
+        a:
+          type: string