chore: ongoing

maxholman · maxholman · commit 2902a5a4c1c6 · 2024-10-13T10:12:11.000+08:00
diff --git a/__tests__/fixtures/openai/commands.ts b/__tests__/fixtures/openai/commands.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:20.017Z
+ * Generated on 2024-10-13T02:06:31.654Z
  *
  */
 /** eslint-disable max-classes */
diff --git a/__tests__/fixtures/openai/main.ts b/__tests__/fixtures/openai/main.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:20.017Z
+ * Generated on 2024-10-13T02:06:31.654Z
  *
  */
 import {
diff --git a/__tests__/fixtures/openai/types.ts b/__tests__/fixtures/openai/types.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:20.017Z
+ * Generated on 2024-10-13T02:06:31.654Z
  *
  */
 import type { JsonifiableObject } from 'type-fest/source/jsonifiable.js';
diff --git a/__tests__/fixtures/petstore/commands.ts b/__tests__/fixtures/petstore/commands.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:16.299Z
+ * Generated on 2024-10-13T02:06:27.975Z
  *
  */
 /** eslint-disable max-classes */
diff --git a/__tests__/fixtures/petstore/main.ts b/__tests__/fixtures/petstore/main.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:16.299Z
+ * Generated on 2024-10-13T02:06:27.975Z
  *
  */
 import {
diff --git a/__tests__/fixtures/petstore/types.ts b/__tests__/fixtures/petstore/types.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:16.299Z
+ * Generated on 2024-10-13T02:06:27.975Z
  *
  */
 
diff --git a/__tests__/fixtures/test1/commands.ts b/__tests__/fixtures/test1/commands.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:17.798Z
+ * Generated on 2024-10-13T02:06:29.480Z
  *
  */
 /** eslint-disable max-classes */
diff --git a/__tests__/fixtures/test1/main.ts b/__tests__/fixtures/test1/main.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:17.798Z
+ * Generated on 2024-10-13T02:06:29.480Z
  *
  */
 import {
diff --git a/__tests__/fixtures/test1/types.ts b/__tests__/fixtures/test1/types.ts
@@ -3,7 +3,7 @@
  *
  * WARN: Do not edit directly.
  *
- * Generated on 2024-10-13T01:58:17.798Z
+ * Generated on 2024-10-13T02:06:29.480Z
  *
  */
 import type { Jsonify } from 'type-fest';
diff --git a/__tests__/nullables.test.ts b/__tests__/nullables.test.ts
@@ -5,7 +5,7 @@ test('nullables', async () => {
   const result = await processOpenApiDocument(
     '/tmp/like-you-know-whatever', // if we dont call .save() it doesnt matter what this path is
     {
-      openapi: '3.0.0',
+      openapi: '3.1.0',
       info: {
         title: 'Test',
         version: '1.0.0',
diff --git a/lib/process-schema.ts b/lib/process-schema.ts
@@ -35,15 +35,23 @@ function schemaTypeIsNull(
 }
 
 function maybeUnion(...types: (string | WriterFunction)[]) {
-  const [first = 'unknown', second, ...rest] = types;
+  const [first, second, ...rest] = types;
+
+  if (typeof first === 'undefined') {
+    return 'unknown';
+  }
 
   return typeof second === 'undefined'
     ? first
     : Writers.unionType(first, second, ...rest);
 }
 
 function maybeIntersection(...types: (string | WriterFunction)[]) {
-  const [first = 'unknown', second, ...rest] = types;
+  const [first, second, ...rest] = types;
+
+  if (typeof first === 'undefined') {
+    return 'unknown';
+  }
 
   return typeof second === 'undefined'
     ? first
@@ -55,9 +63,12 @@ export function schemaToType(
     string,
     InterfaceDeclaration | TypeAliasDeclaration | EnumDeclaration
   >,
-  parentSchema: OpenAPIV3_1.SchemaObject,
+  parentSchema: OpenAPIV3_1.SchemaObject | OpenAPIV3.SchemaObject,
   propertyName: string,
-  schemaObject: OpenAPIV3_1.SchemaObject | OpenAPIV3_1.ReferenceObject,
+  schemaObject:
+    | OpenAPIV3_1.SchemaObject
+    | OpenAPIV3.SchemaObject
+    | OpenAPIV3_1.ReferenceObject,
   options: {
     exactOptionalPropertyTypes?: boolean;
     booleanAsStringish?: boolean;
@@ -139,7 +150,7 @@ export function schemaToType(
         name,
         hasQuestionToken,
         type: maybeWithNullUnion(
-          schemaObject.type[0] || 'never',
+          schemaObject.type[0] || 'unknown', // weird edge case
           schemaTypeIsNull(schemaObject),
         ),
         docs,
@@ -150,19 +161,20 @@ export function schemaToType(
       name,
       hasQuestionToken,
       type: maybeUnion(
-        ...schemaObject.type.map((schemaStr) => {
+        ...schemaObject.type.map((type) => {
           const schema =
-            schemaStr === 'array'
+            type === 'array'
               ? ({
+                  items: {},
+                  ...schemaObject,
                   type: 'array',
-                  items: {
-                    type: 'object',
-                    properties: {},
-                  },
-                } satisfies OpenAPIV3_1.ArraySchemaObject)
-              : ({
-                  type: schemaStr,
-                } satisfies OpenAPIV3_1.NonArraySchemaObject);
+                } satisfies
+                  | OpenAPIV3.ArraySchemaObject
+                  | OpenAPIV3_1.ArraySchemaObject)
+              : {
+                  ...schemaObject,
+                  type,
+                };
 
           return (
             schemaToType(typesAndInterfaces, schemaObject, name, schema).type ||

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* WARN: Do not edit directly.`
`5`	`5`	`*`
`6`		`- * Generated on 2024-10-13T01:58:20.017Z`
	`6`	`+ * Generated on 2024-10-13T02:06:31.654Z`
`7`	`7`	`*`
`8`	`8`	`*/`
`9`	`9`	`/** eslint-disable max-classes */`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* WARN: Do not edit directly.`
`5`	`5`	`*`
`6`		`- * Generated on 2024-10-13T01:58:16.299Z`
	`6`	`+ * Generated on 2024-10-13T02:06:27.975Z`
`7`	`7`	`*`
`8`	`8`	`*/`
`9`	`9`	`/** eslint-disable max-classes */`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* WARN: Do not edit directly.`
`5`	`5`	`*`
`6`		`- * Generated on 2024-10-13T01:58:17.798Z`
	`6`	`+ * Generated on 2024-10-13T02:06:29.480Z`
`7`	`7`	`*`
`8`	`8`	`*/`
`9`	`9`	`/** eslint-disable max-classes */`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ test('nullables', async () => {`
`5`	`5`	`const result = await processOpenApiDocument(`
`6`	`6`	`'/tmp/like-you-know-whatever', // if we dont call .save() it doesnt matter what this path is`
`7`	`7`	`{`
`8`		`- openapi: '3.0.0',`
	`8`	`+ openapi: '3.1.0',`
`9`	`9`	`info: {`
`10`	`10`	`title: 'Test',`
`11`	`11`	`version: '1.0.0',`