Merge pull request #1067 from hey-api/fix/named-object-property-no-pr…

…operties fix: handle named object property with no nested properties
hey-api · Sep 19, 2024 · cc72738 · cc72738
2 parents 1594663 + 5a52da1
commit cc72738
Show file tree

Hide file tree

Showing 35 changed files with 115 additions and 1 deletion.
diff --git a/.changeset/grumpy-carrots-fix.md b/.changeset/grumpy-carrots-fix.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: handle named object property with no nested properties
diff --git a/packages/openapi-ts/src/openApi/v3/parser/getModel.ts b/packages/openapi-ts/src/openApi/v3/parser/getModel.ts
@@ -272,7 +272,9 @@ export const getModel = ({
         model.type === 'unknown'
       ) {
         model.export = 'dictionary';
-        model.name = '[key: string]';
+        if (!model.name) {
+          model.name = '[key: string]';
+        }
       }
 
       return model;

diff --git a/...api-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-bundle/types.gen.ts.snap b/...api-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-bundle/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...napi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-class/types.gen.ts.snap b/...napi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-class/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...ts__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/types.gen.ts.snap b/...ts__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...ts__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/types.gen.ts.snap b/...ts__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...s__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/types.gen.ts.snap b/...s__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...hots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/types.gen.ts.snap b/...hots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...es/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios/types.gen.ts.snap b/...es/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...api-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/types.gen.ts.snap b/...api-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...napi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-class/types.gen.ts.snap b/...napi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-class/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...ts__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query/types.gen.ts.snap b/...ts__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...ts__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query/types.gen.ts.snap b/...ts__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...s__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query/types.gen.ts.snap b/...s__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...hots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query/types.gen.ts.snap b/...hots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...es/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch/types.gen.ts.snap b/...es/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-schemas-form/schemas.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-schemas-form/schemas.gen.ts.snap
@@ -1805,6 +1805,11 @@ export const Generic_Schema_Duplicate_Issue_1_System_Boolean_Schema = {
         hasError: {
             type: 'boolean',
             readOnly: true
+        },
+        data: {
+            type: 'object',
+            properties: {},
+            additionalProperties: false
         }
     },
     additionalProperties: false

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-schemas-json/schemas.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-schemas-json/schemas.gen.ts.snap
@@ -1965,6 +1965,11 @@ export const Generic_Schema_Duplicate_Issue_1_System_Boolean_Schema = {
         hasError: {
             type: 'boolean',
             readOnly: true
+        },
+        data: {
+            type: 'object',
+            properties: {},
+            additionalProperties: false
         }
     },
     additionalProperties: false

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-schemas-name/schemas.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-schemas-name/schemas.gen.ts.snap
@@ -1965,6 +1965,11 @@ export const $Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
         hasError: {
             type: 'boolean',
             readOnly: true
+        },
+        data: {
+            type: 'object',
+            properties: {},
+            additionalProperties: false
         }
     },
     additionalProperties: false

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-types-PascalCase/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-types-PascalCase/types.gen.ts.snap
@@ -945,6 +945,9 @@ export type GenericSchemaDuplicateIssue_1_systemBoolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type GenericSchemaDuplicateIssue_1_systemString_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/types.gen.ts.snap
@@ -945,6 +945,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/.../openapi-ts/test/__snapshots__/test/generated/v3_angular_tree_shakeable/types.gen.ts.snap b/.../openapi-ts/test/__snapshots__/test/generated/v3_angular_tree_shakeable/types.gen.ts.snap
@@ -945,6 +945,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_axios/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_axios/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_client/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_client/types.gen.ts.snap
@@ -945,6 +945,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/types.gen.ts.snap
@@ -1024,6 +1024,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/...napi-ts/test/__snapshots__/test/generated/v3_enums_typescript_namespace/types.gen.ts.snap b/...napi-ts/test/__snapshots__/test/generated/v3_enums_typescript_namespace/types.gen.ts.snap
@@ -1055,6 +1055,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_node/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_node/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_services_filter/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_services_filter/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_services_name/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_services_name/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_tree_shakeable/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_tree_shakeable/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_types/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_types/types.gen.ts.snap
@@ -945,6 +945,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_types_no_tree/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_types_no_tree/types.gen.ts.snap
@@ -945,6 +945,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_xhr/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_xhr/types.gen.ts.snap
@@ -1068,6 +1068,9 @@ export type Generic_Schema_Duplicate_Issue_1_System_Boolean_ = {
     item?: boolean;
     error?: (string) | null;
     readonly hasError?: boolean;
+    data?: {
+        [key: string]: unknown;
+    };
 };
 
 export type Generic_Schema_Duplicate_Issue_1_System_String_ = {

diff --git a/packages/openapi-ts/test/spec/v3.json b/packages/openapi-ts/test/spec/v3.json
@@ -3590,6 +3590,11 @@
           "hasError": {
             "type": "boolean",
             "readOnly": true
+          },
+          "data": {
+            "type": "object",
+            "properties": {},
+            "additionalProperties": false
           }
         },
         "additionalProperties": false