fix: generation, bump react-query (#59)

* feat: support for zod null type

* fix: conditional property access

* chore: update react-query version

* fix: tests

* chore: bump version

Author: izakgl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "keywords": [
     "codegen",
     "openapi",
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.1.0",
     "@casl/ability": "^6.7.3",
     "@casl/react": "^5.0.0",
-    "@tanstack/react-query": "~5.85.9",
+    "@tanstack/react-query": "~5.90.21",
     "@types/node": "^20.12.12",
     "@types/prompt-sync": "^4.2.3",
     "@types/react": "^19.1.0",
@@ -100,7 +100,7 @@
   "peerDependencies": {
     "@casl/ability": "^6.7.3",
     "@casl/react": "^5.0.0",
-    "@tanstack/react-query": "^5.85.9",
+    "@tanstack/react-query": "^5.90.21",
     "axios": "^1.13.1",
     "react": "^19.1.0",
     "zod": "^4.1.12"

src/generators/core/SchemaResolver.class.ts

@@ -366,7 +366,7 @@ export class SchemaResolver {
 
         for (const statusCode in operation.responses) {
           const responseObj = <OpenAPIV3.ResponseObject>this.resolveObject(operation.responses[statusCode]);
-          const mediaTypes = Object.keys(responseObj.content ?? {});
+          const mediaTypes = Object.keys(responseObj?.content ?? {});
           const matchingMediaType = mediaTypes.find(isMediaTypeAllowed);
           if (matchingMediaType) {
             const matchingMediaSchema = responseObj.content?.[matchingMediaType]?.schema;

src/generators/core/endpoints/getEndpointParameter.ts

@@ -46,7 +46,7 @@ export function getEndpointParameter({
       throw new Error(`Unsupported media type for param ${paramObj.name}: ${mediaTypes.join(", ")}`);
     }
 
-    const mediaTypeObject = paramObj.content[matchingMediaType];
+    const mediaTypeObject = paramObj.content?.[matchingMediaType];
     if (!mediaTypeObject) {
       throw new Error(`No content with media type for param ${paramObj.name}: ${matchingMediaType}`);
     }

src/generators/core/endpoints/getEndpointsFromOpenAPIDoc.ts

@@ -121,7 +121,7 @@ export function getEndpointsFromOpenAPIDoc(resolver: SchemaResolver) {
         endpoint.responseStatusCodes.push(statusCode);
 
         const responseObj = <OpenAPIV3.ResponseObject>resolver.resolveObject(operation.responses[statusCode]);
-        const mediaTypes = Object.keys(responseObj.content ?? {});
+        const mediaTypes = Object.keys(responseObj?.content ?? {});
         const matchingMediaType = mediaTypes.find(isMediaTypeAllowed);
 
         let schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined;
@@ -168,12 +168,12 @@ export function getEndpointsFromOpenAPIDoc(resolver: SchemaResolver) {
           if (isMainResponseStatus(status) && !endpoint.response) {
             endpoint.response = responseZodSchema;
             endpoint.responseObject = responseObj;
-            endpoint.responseDescription = responseObj.description;
+            endpoint.responseDescription = responseObj?.description;
           } else if (statusCode !== "default" && isErrorStatus(status)) {
             endpoint.errors.push({
               zodSchema: responseZodSchema,
               status,
-              description: responseObj.description,
+              description: responseObj?.description,
             });
           }
         }

src/generators/core/zod/getZodSchema.ts

@@ -179,6 +179,10 @@ export function getZodSchema({ schema, resolver, meta: inheritedMeta, tag }: Get
     return zodSchema.assign(ANY_SCHEMA);
   }
 
+  if ((schemaType as unknown) === "null") {
+    return zodSchema.assign("z.null()");
+  }
+
   if (!schemaType) {
     return zodSchema.assign("z.unknown()");
   }

src/generators/utils/generate/generate.acl.utils.ts

@@ -27,7 +27,7 @@ export const hasAbilityConditions = (endpoint: Endpoint) => !!getAbilityConditio
 export const getAbilityConditionsTypes = (endpoint: Endpoint) =>
   endpoint.acl?.[0].conditionsTypes?.sort((a, b) => a.name.localeCompare(b.name));
 
-export const getAbilityDescription = (endpoint: Endpoint) => endpoint.acl?.[0].description;
+export const getAbilityDescription = (endpoint: Endpoint) => endpoint.acl?.[0]?.description;
 
 export const getAbilitySubjectTypes = (endpoint: Endpoint) => {
   const abilitySubject = getAbilitySubject(endpoint);

src/generators/utils/generate/generate.configs.utils.ts

@@ -241,7 +241,7 @@ function getInputsConfig(resolver: SchemaResolver, endpointParameter?: EndpointP
 
   let schema: OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined;
   if (endpointParameter.type === "Body") {
-    schema = endpointParameter.bodyObject?.content[JSON_APPLICATION_FORMAT]?.schema;
+    schema = endpointParameter.bodyObject?.content?.[JSON_APPLICATION_FORMAT]?.schema;
   } else {
     schema = endpointParameter.parameterObject?.schema;
   }

src/generators/utils/generate/generate.zod.utils.ts

@@ -104,7 +104,7 @@ export function getZodSchemaPropertyDescriptions(resolver: SchemaResolver, data:
 
     if (schemaData.schema && segments[segments.length - 1] !== ARRAY_INDEX) {
       const resolvedSchema = resolver.resolveObject(schemaData.schema);
-      const schemaDescriptions = [resolvedSchema.description, ...getSchemaDescriptions(resolvedSchema)].filter(Boolean);
+      const schemaDescriptions = [resolvedSchema?.description, ...getSchemaDescriptions(resolvedSchema)].filter(Boolean);
       const propertyKey = segments.join(".");
       if (!(properties[propertyKey] && "type" in schemaData.schema && schemaData.schema.type === "object")) {
         delete properties[propertyKey];

vitest.config.ts

@@ -1,11 +1,17 @@
 /// <reference types="vitest" />
 
 import { defineConfig } from "vitest/config";
+import { resolve } from "path";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   test: {
     include: ["src/**/*.test.ts"],
     snapshotFormat: { indent: 4, escapeString: false },
   },
+  resolve: {
+    alias: {
+      "@": resolve(process.cwd(), "./src"),
+    },
+  },
 });

yarn.lock

@@ -1345,7 +1345,7 @@ __metadata:
     "@apidevtools/swagger-parser": "npm:^10.1.0"
     "@casl/ability": "npm:^6.7.3"
     "@casl/react": "npm:^5.0.0"
-    "@tanstack/react-query": "npm:~5.85.9"
+    "@tanstack/react-query": "npm:~5.90.21"
     "@types/node": "npm:^20.12.12"
     "@types/prompt-sync": "npm:^4.2.3"
     "@types/react": "npm:^19.1.0"
@@ -1376,7 +1376,7 @@ __metadata:
   peerDependencies:
     "@casl/ability": ^6.7.3
     "@casl/react": ^5.0.0
-    "@tanstack/react-query": ^5.85.9
+    "@tanstack/react-query": ^5.90.21
     axios: ^1.13.1
     react: ^19.1.0
     zod: ^4.1.12
@@ -1792,21 +1792,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:5.85.9":
-  version: 5.85.9
-  resolution: "@tanstack/query-core@npm:5.85.9"
-  checksum: 10c0/c7a02e816f49e2b0c8cfc7db1541742d85e6aca82c67f849813b352800dc225dbf89d506c3187c9ffb5643bb0b0309255b03b039fbffaae293415850baaae2ab
+"@tanstack/query-core@npm:5.90.20":
+  version: 5.90.20
+  resolution: "@tanstack/query-core@npm:5.90.20"
+  checksum: 10c0/70637dfcecd5ed9d810629aa27f1632af8a4bcd083e75cf29408d058c32f8234704a3231ec280e2c4016ea0485b16124fdf70ab97793b5a7b670f43f7659e9fe
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:~5.85.9":
-  version: 5.85.9
-  resolution: "@tanstack/react-query@npm:5.85.9"
+"@tanstack/react-query@npm:~5.90.21":
+  version: 5.90.21
+  resolution: "@tanstack/react-query@npm:5.90.21"
   dependencies:
-    "@tanstack/query-core": "npm:5.85.9"
+    "@tanstack/query-core": "npm:5.90.20"
   peerDependencies:
     react: ^18 || ^19
-  checksum: 10c0/d20f418567812bc2417784d2da319f59f3f7ab96deba47e18aae59716c8499c85b7eb5b10ff5463958fb3f07043facbf2a815d541bafb644e8a339a8d4f5a88f
+  checksum: 10c0/e8994c57f6ceb2c886a4d6486a8c6a3f89bc6b1220de3e732448d7fcbeb386e9358f03c73804de72004c6ac2668d0bf1b44cedbb273d3e4b33afcbaee7b7d24d
   languageName: node
   linkType: hard