fix: handle null type in openapi web sdk generator

straw-hat-team · Nov 20, 2024 · 1a53ede · 1a53ede
1 parent cbd907a
commit 1a53ede
Show file tree

Hide file tree

Showing 5 changed files with 486 additions and 394 deletions.
diff --git a/packages/@straw-hat/openapi-web-sdk-generator/src/dir.ts b/packages/@straw-hat/openapi-web-sdk-generator/src/dir.ts
@@ -1,5 +1,5 @@
 import { deleteAsync } from 'del';
-import makeDir from 'make-dir';
+import { makeDirectory } from 'make-dir';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { createDebugger, formatCode } from './helpers.js';
@@ -34,7 +34,7 @@ export class Dir {
   createDir(...pathsSegments: string[]) {
     const dirPath = this.resolve(...pathsSegments);
     this.debug(`Ensure directory ${dirPath}`);
-    return makeDir(dirPath);
+    return makeDirectory(dirPath);
   }
 
   readFile(relativePath: string) {

diff --git a/packages/@straw-hat/openapi-web-sdk-generator/src/engine/add-typescript-type.ts b/packages/@straw-hat/openapi-web-sdk-generator/src/engine/add-typescript-type.ts
@@ -163,6 +163,16 @@ function integerType(scope: Scope, schema: OpenAPIV3.NonArraySchemaObject) {
   return numberType(scope, schema);
 }
 
+
+function nullType(scope: Scope, schema: OpenAPIV3.NonArraySchemaObject) {
+  return scope.maybeRegisterType(schema, {
+    name: undefined,
+    definition: 'null',
+    docs: createDocs(schema),
+  });
+}
+
+
 function unknownType(scope: Scope, schema: OpenAPIV3.NonArraySchemaObject) {
   return scope.maybeRegisterType(schema, {
     name: undefined,
@@ -267,6 +277,10 @@ export async function addTypeScripType(
     case 'integer': {
       return integerType(scope, schema);
     }
+    // @ts-expect-error TODO: fix openapi-types to allow null
+    case 'null': {
+      return nullType(scope, schema);
+    }
     default: {
       return unknownType(scope, schema);
     }