@povio/openapi-codegen-cli 3.1.0 → 3.1.1

package/dist/{generate.runner-DnUDkoAZ.mjs → generate.runner-C1HrS_9G.mjs}

@@ -1,4 +1,4 @@
-import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-CbQ9gQss.mjs";
+import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-DseBECa-.mjs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
 

package/dist/{generateCodeFromOpenAPIDoc-CbQ9gQss.mjs → generateCodeFromOpenAPIDoc-DseBECa-.mjs}

@@ -4028,7 +4028,7 @@ function generateModels({ resolver, data, tag }) {
 		const schemaRef = resolver.getRefByZodSchemaName(key);
 		zodSchemasData[key] = {
 			code,
-			isCiruclar: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
+			isCircular: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
 			isEnum: isEnumZodSchema(code),
 			schemaObj: resolver.getZodSchemaObj(key)
 		};
@@ -4049,14 +4049,50 @@ function generateModels({ resolver, data, tag }) {
 			tag,
 			resolver
 		}));
-		lines.push(`export const ${name} = ${zodSchema.code};`);
-		lines.push(`export type ${getZodSchemaInferedTypeName(name, resolver.options)} = z.infer<typeof ${name}>;`);
+		const inferredTypeName = getZodSchemaInferedTypeName(name, resolver.options);
+		if (zodSchema.isCircular && zodSchema.schemaObj) lines.push(`export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		const typeAnnotation = zodSchema.isCircular ? `: z.ZodObject<z.ZodRawShape> & z.ZodType<${inferredTypeName}>` : "";
+		lines.push(`export const ${name}${typeAnnotation} = ${zodSchema.code};`);
+		if (!zodSchema.isCircular) lines.push(`export type ${inferredTypeName} = z.infer<typeof ${name}>;`);
 		if (zodSchema.isEnum) lines.push(`export const ${getZodSchemaInferedTypeName(name, resolver.options)} = ${name}.enum;`);
 		lines.push("");
 	}
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderSchemaType(schema, resolver) {
+	if (isReferenceObject(schema)) {
+		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
+		return schemaName ? getZodSchemaInferedTypeName(schemaName, resolver.options) : "unknown";
+	}
+	const composite = schema.allOf ?? schema.oneOf ?? schema.anyOf;
+	if (composite?.length) {
+		const separator = schema.allOf ? " & " : " | ";
+		return addNullable(schema, composite.map((part) => renderSchemaType(part, resolver)).join(separator));
+	}
+	if (schema.enum?.length) return addNullable(schema, schema.enum.map((value) => JSON.stringify(value)).join(" | "));
+	if (schema.type === "array") return addNullable(schema, `Array<${schema.items ? renderSchemaType(schema.items, resolver) : "unknown"}>`);
+	if (schema.type === "object" || schema.properties || schema.additionalProperties) {
+		const properties = Object.entries(schema.properties ?? {}).map(([name, property]) => {
+			const isRequired = resolver.options.withImplicitRequiredProps || schema.required?.includes(name);
+			const hasDefault = !isReferenceObject(property) && property.default !== void 0;
+			const optional = isRequired || hasDefault ? "" : "?";
+			const propertyType = renderSchemaType(property, resolver);
+			const outputType = resolver.options.replaceOptionalWithNullish && optional && (isReferenceObject(property) || !property.nullable) ? `${propertyType} | null` : propertyType;
+			return `${wrapWithQuotesIfNeeded(name)}${optional}: ${outputType}`;
+		});
+		if (schema.additionalProperties) {
+			const valueType = typeof schema.additionalProperties === "object" ? renderSchemaType(schema.additionalProperties, resolver) : "unknown";
+			properties.push(`[key: string]: ${valueType}`);
+		}
+		return addNullable(schema, `{ ${properties.join("; ")} }`);
+	}
+	const primitiveType = schema.type;
+	return addNullable(schema, primitiveType === "string" ? "string" : primitiveType === "number" || primitiveType === "integer" ? "number" : primitiveType === "boolean" ? "boolean" : primitiveType === "null" ? "null" : "unknown");
+}
+function addNullable(schema, type) {
+	return schema.nullable && type !== "null" ? `${type} | null` : type;
+}
 function renderModelsProxy({ resolver, data, tag }) {
 	const commonZodSchemas = data.get(resolver.options.defaultTag)?.zodSchemas ?? {};
 	const schemaNames = getUsedSchemaNames({

package/dist/generator.mjs

@@ -1,4 +1,4 @@
-import { _ as getNamespaceName, a as getDataFromOpenAPIDoc, b as isParamMediaTypeAllowed, c as getSchemaTsMetaType, d as getTagImportPath, f as getQueryName, g as invalidVariableNameCharactersToCamel, l as getTsTypeBase, o as isMutation, p as DEFAULT_GENERATE_OPTIONS, s as isQuery, t as generateCodeFromOpenAPIDoc, v as GenerateType, x as formatTag, y as isMediaTypeAllowed } from "./generateCodeFromOpenAPIDoc-CbQ9gQss.mjs";
+import { _ as getNamespaceName, a as getDataFromOpenAPIDoc, b as isParamMediaTypeAllowed, c as getSchemaTsMetaType, d as getTagImportPath, f as getQueryName, g as invalidVariableNameCharactersToCamel, l as getTsTypeBase, o as isMutation, p as DEFAULT_GENERATE_OPTIONS, s as isQuery, t as generateCodeFromOpenAPIDoc, v as GenerateType, x as formatTag, y as isMediaTypeAllowed } from "./generateCodeFromOpenAPIDoc-DseBECa-.mjs";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts

package/dist/metro.cjs

@@ -3838,7 +3838,7 @@ function generateModels({ resolver, data, tag }) {
 		const schemaRef = resolver.getRefByZodSchemaName(key);
 		zodSchemasData[key] = {
 			code,
-			isCiruclar: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
+			isCircular: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
 			isEnum: isEnumZodSchema(code),
 			schemaObj: resolver.getZodSchemaObj(key)
 		};
@@ -3859,14 +3859,50 @@ function generateModels({ resolver, data, tag }) {
 			tag,
 			resolver
 		}));
-		lines.push(`export const ${name} = ${zodSchema.code};`);
-		lines.push(`export type ${getZodSchemaInferedTypeName(name, resolver.options)} = z.infer<typeof ${name}>;`);
+		const inferredTypeName = getZodSchemaInferedTypeName(name, resolver.options);
+		if (zodSchema.isCircular && zodSchema.schemaObj) lines.push(`export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		const typeAnnotation = zodSchema.isCircular ? `: z.ZodObject<z.ZodRawShape> & z.ZodType<${inferredTypeName}>` : "";
+		lines.push(`export const ${name}${typeAnnotation} = ${zodSchema.code};`);
+		if (!zodSchema.isCircular) lines.push(`export type ${inferredTypeName} = z.infer<typeof ${name}>;`);
 		if (zodSchema.isEnum) lines.push(`export const ${getZodSchemaInferedTypeName(name, resolver.options)} = ${name}.enum;`);
 		lines.push("");
 	}
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderSchemaType(schema, resolver) {
+	if (isReferenceObject(schema)) {
+		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
+		return schemaName ? getZodSchemaInferedTypeName(schemaName, resolver.options) : "unknown";
+	}
+	const composite = schema.allOf ?? schema.oneOf ?? schema.anyOf;
+	if (composite?.length) {
+		const separator = schema.allOf ? " & " : " | ";
+		return addNullable(schema, composite.map((part) => renderSchemaType(part, resolver)).join(separator));
+	}
+	if (schema.enum?.length) return addNullable(schema, schema.enum.map((value) => JSON.stringify(value)).join(" | "));
+	if (schema.type === "array") return addNullable(schema, `Array<${schema.items ? renderSchemaType(schema.items, resolver) : "unknown"}>`);
+	if (schema.type === "object" || schema.properties || schema.additionalProperties) {
+		const properties = Object.entries(schema.properties ?? {}).map(([name, property]) => {
+			const isRequired = resolver.options.withImplicitRequiredProps || schema.required?.includes(name);
+			const hasDefault = !isReferenceObject(property) && property.default !== void 0;
+			const optional = isRequired || hasDefault ? "" : "?";
+			const propertyType = renderSchemaType(property, resolver);
+			const outputType = resolver.options.replaceOptionalWithNullish && optional && (isReferenceObject(property) || !property.nullable) ? `${propertyType} | null` : propertyType;
+			return `${wrapWithQuotesIfNeeded(name)}${optional}: ${outputType}`;
+		});
+		if (schema.additionalProperties) {
+			const valueType = typeof schema.additionalProperties === "object" ? renderSchemaType(schema.additionalProperties, resolver) : "unknown";
+			properties.push(`[key: string]: ${valueType}`);
+		}
+		return addNullable(schema, `{ ${properties.join("; ")} }`);
+	}
+	const primitiveType = schema.type;
+	return addNullable(schema, primitiveType === "string" ? "string" : primitiveType === "number" || primitiveType === "integer" ? "number" : primitiveType === "boolean" ? "boolean" : primitiveType === "null" ? "null" : "unknown");
+}
+function addNullable(schema, type) {
+	return schema.nullable && type !== "null" ? `${type} | null` : type;
+}
 function renderModelsProxy({ resolver, data, tag }) {
 	const commonZodSchemas = data.get(resolver.options.defaultTag)?.zodSchemas ?? {};
 	const schemaNames = getUsedSchemaNames({

package/dist/metro.mjs

@@ -1,6 +1,6 @@
-import "./generateCodeFromOpenAPIDoc-CbQ9gQss.mjs";
-import "./generate.runner-DnUDkoAZ.mjs";
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BqOhUduF.mjs";
+import "./generateCodeFromOpenAPIDoc-DseBECa-.mjs";
+import "./generate.runner-C1HrS_9G.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-Co_bG00_.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-wLs5vqw6.mjs";
 import fs from "fs";
 import path from "path";

package/dist/{openapi-codegen.runner-BqOhUduF.mjs → openapi-codegen.runner-Co_bG00_.mjs}

@@ -1,5 +1,5 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-CbQ9gQss.mjs";
-import { t as runGenerate } from "./generate.runner-DnUDkoAZ.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-DseBECa-.mjs";
+import { t as runGenerate } from "./generate.runner-C1HrS_9G.mjs";
 import path from "path";
 
 //#region src/plugins/openapi-codegen.runner.ts

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, a as getDataFromOpenAPIDoc, m as groupByType, n as getOutputFileName, u as getTagFileName, v as GenerateType } from "./generateCodeFromOpenAPIDoc-CbQ9gQss.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-DnUDkoAZ.mjs";
+import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, a as getDataFromOpenAPIDoc, m as groupByType, n as getOutputFileName, u as getTagFileName, v as GenerateType } from "./generateCodeFromOpenAPIDoc-DseBECa-.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-C1HrS_9G.mjs";
 import { createRequire } from "node:module";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
@@ -39,7 +39,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "3.1.0";
+	return "3.1.1";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,6 +1,6 @@
-import "./generateCodeFromOpenAPIDoc-CbQ9gQss.mjs";
-import "./generate.runner-DnUDkoAZ.mjs";
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BqOhUduF.mjs";
+import "./generateCodeFromOpenAPIDoc-DseBECa-.mjs";
+import "./generate.runner-C1HrS_9G.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-Co_bG00_.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-wLs5vqw6.mjs";
 import path from "path";
 

package/package.json

@@ -139,5 +139,5 @@
     "pnpm": ">= 9"
   },
   "packageManager": "pnpm@10.4.0",
-  "version": "3.1.0"
+  "version": "3.1.1"
 }