deps: update

Author: vladkens

Makefile

@@ -1,15 +1,18 @@
-.PHONY: test-ts test-ts-matrix clean
+.PHONY: test test-ts test-matrix-ts clean
 
 default:
 	yarn ci
 
+test:
+	yarn test
+
 test-ts:
 	@echo "-- $(v) --------------------"
 	$(eval name=apigen_ts$(v))
 	@docker -l warning build -f Dockerfile.test --build-arg TS_VER=$(v) -t $(name) .
 	@docker run $(name)
 
-test-ts-matrix:
+test-matrix-ts:
 	@make test-ts v=5.0.4
 	@make test-ts v=5.1.6
 	@make test-ts v=5.2.2
@@ -18,6 +21,7 @@ test-ts-matrix:
 	@make test-ts v=5.5.4
 	@make test-ts v=5.6.3
 	@make test-ts v=5.7.3
+	@make test-ts v=5.8.3
 	@make test-ts v=next
 
 clean:

package.json

@@ -22,23 +22,23 @@
     "ci": "tsc --noEmit && yarn test-cov && yarn build"
   },
   "dependencies": {
-    "@redocly/openapi-core": "1.27.2",
+    "@redocly/openapi-core": "1.34.1",
     "@types/lodash-es": "4.17.12",
     "@types/swagger2openapi": "7.0.4",
     "array-utils-ts": "1.0.2",
-    "cleye": "1.3.2",
+    "cleye": "1.3.4",
     "lodash-es": "4.17.21",
     "swagger2openapi": "7.0.8"
   },
   "devDependencies": {
-    "@types/node": "22.10.7",
+    "@types/node": "22.14.0",
     "c8": "10.1.3",
-    "fetch-mock": "12.2.0",
-    "pkgroll": "2.6.1",
-    "prettier": "3.4.2",
+    "fetch-mock": "12.5.2",
+    "pkgroll": "2.12.1",
+    "prettier": "3.5.3",
     "prettier-plugin-organize-imports": "4.1.0",
     "tsm": "2.3.0",
-    "typescript": "5.7.3",
+    "typescript": "5.8.3",
     "uvu": "0.5.6"
   },
   "peerDependencies": {

src/schema.ts

@@ -63,7 +63,7 @@ export const getReqSchema = (ctx: Context, config: Oas3Operation) => {
   return undefined
 }
 
-export const getRepSchema = (ctx: Context, config: Oas3Operation): Oas3Schema | undefined => {
+export const getRepSchema = (ctx: Context, config: Oas3Operation): OAS3 | undefined => {
   const successCodes = Object.keys(config.responses ?? {})
     .filter((x) => x.startsWith("2"))
     .filter((x) => get(config, ["responses", x, "content"]))

src/type-gen.ts

@@ -38,7 +38,8 @@ export const normalizeIdentifier = (val: string, asVar = false) => {
 const makeInlineEnum = (s: OAS3) => {
   if (!s.enum) return undefined
 
-  const values = filterEmpty(s.enum)
+  // https://swagger.io/docs/specification/v3_0/data-models/enums/
+  const values = filterEmpty(s.enum) as Array<string | number | boolean>
   if (!values.length) return undefined
 
   if (!s.type) {
@@ -53,7 +54,7 @@ const makeInlineEnum = (s: OAS3) => {
   }
 
   if (s.type === "number") {
-    const tokens = uniq(values).map((x) => f.createNumericLiteral(x))
+    const tokens = uniq(values).map((x) => f.createNumericLiteral(x as number))
     return f.createUnionTypeNode(tokens.map((x) => f.createLiteralTypeNode(x)))
   }
 
@@ -81,6 +82,13 @@ const makeObject = (ctx: Context, s: OAS3): ts.TypeNode => {
   return f.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword)
 }
 
+const makeLiteralUnion = (ctx: Context, types: string[]): ts.TypeNode => {
+  const tokens = types.map((x) => makeType(ctx, { type: x }))
+  const hasUnknown = tokens.some((x) => x.kind === ts.SyntaxKind.UnknownKeyword)
+  if (hasUnknown) return f.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
+  return f.createUnionTypeNode(tokens)
+}
+
 export const makeType = (ctx: Context, s?: Referenced<OAS3>): ts.TypeNode => {
   const mk = makeType.bind(null, ctx)
 
@@ -108,6 +116,7 @@ export const makeType = (ctx: Context, s?: Referenced<OAS3>): ts.TypeNode => {
 
   if ("enum" in s && s.enum && !Array.isArray(s.type)) {
     const isArray = s.type === "array"
+    // @ts-expect-error todo: fix type
     const t = makeInlineEnum(isArray ? { ...s, type: s.items?.type } : s)
     if (t) return isArray ? f.createArrayTypeNode(t) : t
   }
@@ -123,26 +132,15 @@ export const makeType = (ctx: Context, s?: Referenced<OAS3>): ts.TypeNode => {
   }
 
   if ("type" in s) {
-    // openapi v3.1 can have type as array
-    if (Array.isArray(s.type)) {
-      const types: OAS3[] = []
-      for (const type of s.type) {
-        if (type === "null") types.push({ type: "null" })
-        else types.push({ ...s, type })
-      }
-
-      return mk({ oneOf: types })
-    }
-
     let t: ts.TypeNode
     // if (s.type === "object") t = f.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
     if (s.type === "object") t = makeObject(ctx, s)
     else if (s.type === "boolean") t = f.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword)
     else if (s.type === "number") t = f.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword)
     else if (s.type === "string") t = f.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
-    else if (s.type === "array") t = f.createArrayTypeNode(mk(s.items))
     else if (s.type === "null") t = f.createLiteralTypeNode(f.createNull())
-    else if (isArray(s.type)) t = f.createUnionTypeNode(s.type.map((x) => mk({ type: x })))
+    else if (isArray(s.type)) t = makeLiteralUnion(ctx, s.type)
+    else if (s.type === "array" && !isBoolean(s.items)) t = f.createArrayTypeNode(mk(s.items))
     else {
       console.warn(`makeType: unknown type "${s.type}"`)
       return f.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
@@ -153,7 +151,12 @@ export const makeType = (ctx: Context, s?: Referenced<OAS3>): ts.TypeNode => {
       if (s.format === "date-time" && ctx.parseDates) t = f.createTypeReferenceNode("Date")
     }
 
-    return s.nullable ? f.createUnionTypeNode([t, f.createLiteralTypeNode(f.createNull())]) : t
+    // openapi 3.0 has nullable as boolean property
+    if ("nullable" in s && s.nullable) {
+      return f.createUnionTypeNode([t, f.createLiteralTypeNode(f.createNull())])
+    }
+
+    return t
   }
 
   // throw new Error(`makeType: unknown schema ${JSON.stringify(s)}`)

test/type-gen.test.ts

@@ -1,9 +1,10 @@
-import { Oas3Schema, Oas3_1Schema } from "@redocly/openapi-core"
+import { Oas3Schema } from "@redocly/openapi-core"
 import ts from "typescript"
 import { test } from "uvu"
 import { equal } from "uvu/assert"
 import { initCtx } from "../src/config"
 import { printCode } from "../src/printer"
+import { OAS3 } from "../src/schema"
 import { makeType, makeTypeAlias } from "../src/type-gen"
 
 type Cfg = {
@@ -12,7 +13,7 @@ type Cfg = {
 }
 
 test("type inline", async () => {
-  const t = (l: Oas3_1Schema, r: string, cfg?: Cfg) => {
+  const t = (l: OAS3, r: string, cfg?: Cfg) => {
     const ctx = initCtx({ ...cfg })
     const res = makeType(ctx, l)
     const txt = printCode([res as unknown as ts.Statement])
@@ -35,12 +36,17 @@ test("type inline", async () => {
   t({ type: "object" }, "object") // should be unknown?
   t({ type: "array" }, "void[]") // should be unknown?
 
-  // nullable
-  t({ type: "string", nullable: true }, "string | null")
+  // nullable (3.0)
   t({ type: "string", nullable: false }, "string")
+  t({ type: "string", nullable: true }, "string | null")
   t({ type: "number", nullable: true }, "number | null")
   t({ type: "date", nullable: true }, "unknown") // just unknown
 
+  // nullable (3.1)
+  t({ type: ["string", "null"] }, "string | null")
+  t({ type: ["number", "null"] }, "number | null")
+  t({ type: ["date", "null"] }, "unknown") // just unknown
+
   // combinations
   t({ oneOf: [{ type: "string" }, { type: "number" }] }, "string | number")
   t({ anyOf: [{ type: "string" }, { type: "number" }] }, "string | number")