fix: additional properties integer type

Author: mrlubos

.changeset/fuzzy-ties-fly.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: correctly handle integer type in additional properties

packages/openapi-ts/src/openApi/common/parser/__tests__/type.spec.ts

@@ -16,27 +16,28 @@ vi.mock('../../../../utils/config', () => {
 
 describe('getMappedType', () => {
   it.each([
-    { expected: undefined, type: '' },
-    { expected: 'unknown', type: 'any' },
-    { expected: 'unknown[]', type: 'array' },
+    { expected: 'binary', type: 'file' },
     { expected: 'boolean', type: 'boolean' },
+    { expected: 'null', type: 'null' },
     { expected: 'number', type: 'byte' },
-    { expected: 'string', type: 'char' },
-    { expected: 'string', type: 'date-time' },
-    { expected: 'string', type: 'date' },
     { expected: 'number', type: 'double' },
-    { expected: 'binary', type: 'file' },
     { expected: 'number', type: 'float' },
     { expected: 'number', type: 'int' },
     { expected: 'number', type: 'integer' },
     { expected: 'number', type: 'long' },
-    { expected: 'null', type: 'null' },
     { expected: 'number', type: 'number' },
-    { expected: 'unknown', type: 'object' },
-    { expected: 'string', type: 'password' },
     { expected: 'number', type: 'short' },
+    { expected: 'string', type: 'char' },
+    { expected: 'string', type: 'date-time' },
+    { expected: 'string', type: 'date' },
+    { expected: 'string', type: 'password' },
     { expected: 'string', type: 'string' },
+    { expected: 'unknown', type: 'any' },
+    { expected: 'unknown', type: 'object' },
+    { expected: 'unknown', type: 'unknown' },
+    { expected: 'unknown[]', type: 'array' },
     { expected: 'void', type: 'void' },
+    { expected: undefined, type: '' },
   ])('should map type $type to $expected', ({ type, expected }) => {
     expect(getMappedType(type)).toEqual(expected);
   });

packages/openapi-ts/src/openApi/common/parser/type.ts

@@ -24,6 +24,7 @@ export const getMappedType = (
   switch (type) {
     case 'any':
     case 'object':
+    case 'unknown':
       return 'unknown';
     case 'array':
       return 'unknown[]';

packages/openapi-ts/src/openApi/v3/parser/getModel.ts

@@ -223,10 +223,8 @@ export const getModel = ({
   ) {
     if (
       definition.properties &&
-      !(
-        !Object.keys(definition.properties).length &&
-        definition.additionalProperties
-      )
+      (Object.keys(definition.properties).length > 0 ||
+        !definition.additionalProperties)
     ) {
       model.base = 'unknown';
       model.export = 'interface';
@@ -253,6 +251,7 @@ export const getModel = ({
 
       if (definition.additionalProperties) {
         const modelProperty = getAdditionalPropertiesModel({
+          debug,
           definition,
           getModel,
           model,

packages/openapi-ts/src/openApi/v3/parser/getModelProperties.ts

@@ -55,7 +55,7 @@ export const getAdditionalPropertiesModel = ({
   if (
     definition.additionalProperties &&
     definition.properties &&
-    Object.keys(definition.properties).length
+    Object.keys(definition.properties).length > 0
   ) {
     const additionalPropertiesType =
       typeof definition.additionalProperties === 'object' &&
@@ -64,7 +64,7 @@ export const getAdditionalPropertiesModel = ({
         ? definition.additionalProperties.type
         : apModel.base;
     const additionalProperties = [
-      additionalPropertiesType,
+      getType({ type: additionalPropertiesType }).base,
       ...model.properties.map((property) => property.base),
     ];
     apModel.base = additionalProperties.filter(unique).join(' | ');

packages/openapi-ts/src/openApi/v3/parser/getOperationRequestBody.ts

@@ -9,10 +9,12 @@ import { getModel } from './getModel';
 
 export const getOperationRequestBody = ({
   body,
+  debug,
   openApi,
   types,
 }: {
   body: OpenApiRequestBody;
+  debug?: boolean;
   openApi: OpenApi;
   types: Client['types'];
 }): OperationParameter => {
@@ -73,7 +75,7 @@ export const getOperationRequestBody = ({
   }
 
   const model = getModel({
-    debug: true,
+    debug,
     definition: content.schema,
     openApi,
     types,

packages/openapi-ts/src/openApi/v3/parser/operation.ts

@@ -40,6 +40,7 @@ const mergeParameters = (
 };
 
 export const getOperation = ({
+  debug,
   method,
   op,
   openApi,
@@ -48,6 +49,7 @@ export const getOperation = ({
   types,
   url,
 }: {
+  debug?: boolean;
   method: Lowercase<Operation['method']>;
   op: OpenApiOperation;
   openApi: OpenApi;
@@ -117,6 +119,7 @@ export const getOperation = ({
     const requestBodyDef = getRef<OpenApiRequestBody>(openApi, op.requestBody);
     const requestBody = getOperationRequestBody({
       body: requestBodyDef,
+      debug,
       openApi,
       types,
     });

packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-bundle/types.gen.ts.snap

@@ -1057,6 +1057,11 @@ export type AdditionalPropertiesUnknownIssue3 = string & {
     };
 };
 
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: (number) | undefined;
+};
+
 /**
  * This is a reusable parameter
  */

packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-class/types.gen.ts.snap

@@ -1057,6 +1057,11 @@ export type AdditionalPropertiesUnknownIssue3 = string & {
     };
 };
 
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: (number) | undefined;
+};
+
 /**
  * This is a reusable parameter
  */

packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/types.gen.ts.snap

@@ -1057,6 +1057,11 @@ export type AdditionalPropertiesUnknownIssue3 = string & {
     };
 };
 
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: (number) | undefined;
+};
+
 /**
  * This is a reusable parameter
  */