@povio/openapi-codegen-cli 3.0.0-rc.10 → 3.0.0-rc.12

package/dist/{generate.runner-C-MWypBE.mjs → generate.runner-CmQsbF8c.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-BOWjt2I0.mjs";
+import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-oWuHuxoy.mjs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
 

package/dist/{generateCodeFromOpenAPIDoc-BOWjt2I0.mjs → generateCodeFromOpenAPIDoc-oWuHuxoy.mjs}

@@ -2189,13 +2189,16 @@ function resolveEndpointZodSchema({ resolver, schema, meta, tag, fallbackName, c
 		fallbackName,
 		resolver,
 		tag
-	}) : `${resolveZodSchemaName({
-		schema: schemaObject,
-		zodSchema,
-		fallbackName,
-		resolver,
-		tag
-	})}${zodChain}`;
+	}) : (() => {
+		const name = resolveZodSchemaName({
+			schema: schemaObject,
+			zodSchema,
+			fallbackName,
+			resolver,
+			tag
+		});
+		return isNamedZodSchema(name) ? name : name + zodChain;
+	})();
 	entries.set(metaKey, resolved);
 	return resolved;
 }
@@ -2406,7 +2409,7 @@ function getEndpointsFromOpenAPIDoc(resolver) {
 						const domainStr = rawSchema["x-domain-error-domain"];
 						const domainName = rawSchema["x-domain-error-name"];
 						const codeEnumArr = ((rawSchema?.properties)?.code)?.enum;
-						const domainCode = Array.isArray(codeEnumArr) && codeEnumArr.length === 1 && typeof codeEnumArr[0] === "number" ? codeEnumArr[0] : void 0;
+						const domainCode = Array.isArray(codeEnumArr) && codeEnumArr.length === 1 && (typeof codeEnumArr[0] === "number" || typeof codeEnumArr[0] === "string") ? codeEnumArr[0] : void 0;
 						endpoint.errors.push({
 							zodSchema: responseZodSchema,
 							status,
@@ -4804,6 +4807,7 @@ export const ${APP_REST_CLIENT_NAME} = new RestClient({
 function domainToPascalCase(domain) {
 	return domain.split(/[-_]/).map(capitalize).join("");
 }
+const VALID_IDENTIFIER = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
 function generateDomainErrors({ data }) {
 	const byDomain = /* @__PURE__ */ new Map();
 	for (const { endpoints } of data.values()) for (const endpoint of endpoints) for (const error of endpoint.errors) {
@@ -4821,8 +4825,16 @@ function generateDomainErrors({ data }) {
 	const blocks = [];
 	for (const [domain, codes] of [...byDomain.entries()].sort(([a], [b]) => a.localeCompare(b))) {
 		const pascalName = domainToPascalCase(domain);
-		const entries = [...codes.values()].sort((a, b) => a.code - b.code).map(({ code, name, description }) => {
-			return `${description ? `  /** ${description} */\n  ` : "  "}${name ?? `ERROR_${code}`}: ${code}`;
+		const entries = [...codes.values()].sort((a, b) => {
+			if (typeof a.code === "number" && typeof b.code === "number") return a.code - b.code;
+			const sa = String(a.code);
+			const sb = String(b.code);
+			return sa < sb ? -1 : sa > sb ? 1 : 0;
+		}).map(({ code, name, description }) => {
+			const comment = description ? `  /** ${description} */\n  ` : "  ";
+			const key = name ?? (typeof code === "string" ? code : `ERROR_${code}`);
+			if (!VALID_IDENTIFIER.test(key)) throw new Error(`Domain error code "${code}" produces an invalid identifier "${key}". Use the 'name' field on @ApiDomainErrorResponse to provide a valid identifier.`);
+			return `${comment}${key}: ${typeof code === "string" ? `"${code}"` : String(code)}`;
 		}).join(",\n");
 		blocks.push(`export const ${pascalName}DomainErrors = {\n${entries},\n} as const;`);
 		blocks.push(`export type ${pascalName}DomainErrorCode = (typeof ${pascalName}DomainErrors)[keyof typeof ${pascalName}DomainErrors];`);

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-BOWjt2I0.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-oWuHuxoy.mjs";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
 //#region src/generators/core/getMetadataFromOpenAPIDoc.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-BOWjt2I0.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-C-MWypBE.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-oWuHuxoy.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-CmQsbF8c.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.0.0-rc.10";
+	return "3.0.0-rc.12";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-BOWjt2I0.mjs";
-import { t as runGenerate } from "./generate.runner-C-MWypBE.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-oWuHuxoy.mjs";
+import { t as runGenerate } from "./generate.runner-CmQsbF8c.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "3.0.0-rc.10",
+  "version": "3.0.0-rc.12",
   "keywords": [
     "codegen",
     "openapi",