@povio/openapi-codegen-cli 3.0.0-rc.8 → 3.0.0

package/dist/generator.d.mts

@@ -1,4 +1,4 @@
-import { n as GenerateFileData, t as GenerateOptions } from "./options-BPAjzilp.mjs";
+import { n as GenerateFileData, t as GenerateOptions } from "./options-BZOw7Hx4.mjs";
 import { OpenAPIV3 } from "openapi-types";
 
 //#region src/generators/types/metadata.d.ts

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-DGox5gzo.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-C-n0Knj8.mjs";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { a as ErrorHandler, c as SharedErrorHandler, i as ErrorEntry, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as GeneralErrorCodes, t as ApplicationException } from "./error-handling-B4aYKmyL.mjs";
-import "./options-BPAjzilp.mjs";
-import { t as OpenAPICodegenConfig } from "./config-C1ME3Ay4.mjs";
+import { a as ErrorHandler, c as SharedErrorHandler, i as ErrorEntry, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as GeneralErrorCodes, t as ApplicationException } from "./error-handling-oM5YJYYH.mjs";
+import "./options-BZOw7Hx4.mjs";
+import { t as OpenAPICodegenConfig } from "./config-CrZa_Jbm.mjs";
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders, CreateAxiosDefaults } from "axios";
 import { z } from "zod";
 import "i18next";
@@ -26,6 +26,7 @@ interface RequestInfo<ZOutput, ECodes extends string> {
 }
 interface RequestConfig<IsRawRes extends boolean = false> {
   rawResponse?: IsRawRes;
+  allowInvalidResponseData?: boolean;
 }
 type Response<ZOutput, IsRawRes extends boolean = false> = IsRawRes extends true ? AxiosResponse<ZOutput> : ZOutput;
 interface RestClient {
@@ -90,6 +91,7 @@ declare namespace OpenApiQueryConfig {
     invalidateCurrentModule?: boolean;
     invalidationMap?: InvalidationMap<TQueryModule>;
     crossTabInvalidation?: boolean;
+    allowInvalidResponseData?: boolean;
     onError?: (error: unknown) => void;
   }
   type ProviderProps<TQueryModule extends QueryModule = QueryModule> = Type<TQueryModule>;
@@ -98,6 +100,7 @@ declare namespace OpenApiQueryConfig {
     invalidateCurrentModule,
     invalidationMap,
     crossTabInvalidation,
+    allowInvalidResponseData,
     onError,
     children
   }: PropsWithChildren<ProviderProps<TQueryModule>>): react_jsx_runtime0.JSX.Element;

package/dist/index.mjs

@@ -66,9 +66,18 @@ var RestClient = class {
 	async makeRequest(requestInfo, requestConfig) {
 		const errorStack = (/* @__PURE__ */ new Error()).stack;
 		try {
-			const { rawResponse, ...config } = requestConfig;
+			const { rawResponse, allowInvalidResponseData, ...config } = requestConfig;
 			const res = await this.client(config);
-			const resData = requestInfo.resSchema.parse(res.data);
+			const responseData = res.status === 204 && res.data === "" ? void 0 : res.data;
+			const parseResult = requestInfo.resSchema.safeParse(responseData);
+			let resData;
+			if (parseResult.success) resData = parseResult.data;
+			else if (allowInvalidResponseData && config.method === "get") {
+				parseResult.error.name = "BE Response schema mismatch - ZodError";
+				parseResult.error.stack = [parseResult.error.stack, ...errorStack?.split("\n").slice(2) ?? []].join("\n");
+				console.error(parseResult.error);
+				resData = res.data;
+			} else throw parseResult.error;
 			return rawResponse ? {
 				...res,
 				data: resData
@@ -113,18 +122,20 @@ var RestInterceptor = class {
 let OpenApiQueryConfig;
 (function(_OpenApiQueryConfig) {
 	const Context = createContext({});
-	function Provider({ preferUpdate, invalidateCurrentModule, invalidationMap, crossTabInvalidation, onError, children }) {
+	function Provider({ preferUpdate, invalidateCurrentModule, invalidationMap, crossTabInvalidation, allowInvalidResponseData, onError, children }) {
 		const value = useMemo(() => ({
 			preferUpdate,
 			invalidateCurrentModule,
 			invalidationMap,
 			crossTabInvalidation,
+			allowInvalidResponseData,
 			onError
 		}), [
 			preferUpdate,
 			invalidateCurrentModule,
 			invalidationMap,
 			crossTabInvalidation,
+			allowInvalidResponseData,
 			onError
 		]);
 		return /* @__PURE__ */ jsx(Context.Provider, {

package/dist/metro.d.mts

@@ -0,0 +1,32 @@
+import { r as GenerateFileFormatter } from "./options-BZOw7Hx4.mjs";
+import { t as OpenAPICodegenConfig } from "./config-CrZa_Jbm.mjs";
+import { IncomingMessage, ServerResponse } from "http";
+
+//#region src/metro/openapi-codegen.plugin.d.ts
+type OpenApiCodegenMetroConfig = OpenAPICodegenConfig & {
+  formatGeneratedFile?: GenerateFileFormatter;
+};
+type OpenApiCodegenMetroOptions = {
+  root?: string;
+  watchOpenApiInput?: boolean;
+};
+type MetroNextFunction = (error?: unknown) => void;
+type MetroMiddleware = (request: IncomingMessage, response: ServerResponse, next: MetroNextFunction) => unknown;
+type MetroServer = unknown;
+type MetroConfig = {
+  projectRoot?: string;
+  server?: {
+    enhanceMiddleware?: (middleware: MetroMiddleware, server: MetroServer) => MetroMiddleware;
+    [key: string]: unknown;
+  };
+  transformer?: {
+    getTransformOptions?: (...args: unknown[]) => unknown;
+    [key: string]: unknown;
+  };
+  watchFolders?: readonly string[];
+  [key: string]: unknown;
+};
+declare function withOpenApiCodegen<TMetroConfig extends MetroConfig>(metroConfig: Promise<TMetroConfig>, codegenConfig: OpenApiCodegenMetroConfig, options?: OpenApiCodegenMetroOptions): Promise<TMetroConfig>;
+declare function withOpenApiCodegen<TMetroConfig extends MetroConfig>(metroConfig: TMetroConfig, codegenConfig: OpenApiCodegenMetroConfig, options?: OpenApiCodegenMetroOptions): TMetroConfig;
+//#endregion
+export { type MetroConfig, type MetroMiddleware, type OpenAPICodegenConfig, type OpenApiCodegenMetroConfig, type OpenApiCodegenMetroOptions, withOpenApiCodegen };

package/dist/metro.mjs

@@ -0,0 +1,86 @@
+import "./generateCodeFromOpenAPIDoc-C-n0Knj8.mjs";
+import "./generate.runner-BXTc97I0.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-QGd35-a3.mjs";
+import fs from "fs";
+import path from "path";
+
+//#region src/metro/openapi-codegen.plugin.ts
+function withOpenApiCodegen(metroConfig, codegenConfig, options = {}) {
+	if (isPromiseLike(metroConfig)) return metroConfig.then((resolvedConfig) => withResolvedOpenApiCodegen(resolvedConfig, codegenConfig, options));
+	return withResolvedOpenApiCodegen(metroConfig, codegenConfig, options);
+}
+function withResolvedOpenApiCodegen(metroConfig, codegenConfig, options) {
+	const root = path.resolve(options.root ?? metroConfig.projectRoot ?? process.cwd());
+	const codegen = createOpenApiCodegenRunner(codegenConfig);
+	const originalEnhanceMiddleware = metroConfig.server?.enhanceMiddleware;
+	const originalGetTransformOptions = metroConfig.transformer?.getTransformOptions;
+	let startupSucceeded = false;
+	let inflightGenerate;
+	let inputWatcher;
+	const requestStartupGenerate = () => {
+		if (startupSucceeded) return Promise.resolve();
+		if (inflightGenerate) return inflightGenerate;
+		const attempt = codegen.enqueueGenerate(root).then(() => {
+			startupSucceeded = true;
+			inflightGenerate = void 0;
+		}, (error) => {
+			inflightGenerate = void 0;
+			throw error;
+		});
+		inflightGenerate = attempt;
+		return attempt;
+	};
+	const ensureInputWatcher = () => {
+		if (options.watchOpenApiInput === false || inputWatcher) return;
+		const inputPath = codegen.getLocalInputPath(root);
+		if (!inputPath) return;
+		try {
+			inputWatcher = fs.watch(inputPath, { persistent: false }, () => {
+				startupSucceeded = false;
+				requestStartupGenerate().catch(reportGenerateError);
+			});
+			inputWatcher.on("error", reportWatcherError);
+		} catch (error) {
+			reportWatcherError(error);
+		}
+	};
+	const wrappedConfig = {
+		...metroConfig,
+		server: {
+			...metroConfig.server,
+			enhanceMiddleware(middleware, server) {
+				ensureInputWatcher();
+				const enhancedMiddleware = originalEnhanceMiddleware ? originalEnhanceMiddleware(middleware, server) : middleware;
+				return async (request, response, next) => {
+					try {
+						await requestStartupGenerate();
+						return await enhancedMiddleware(request, response, next);
+					} catch (error) {
+						next(error);
+					}
+				};
+			}
+		},
+		transformer: {
+			...metroConfig.transformer,
+			async getTransformOptions(...args) {
+				await requestStartupGenerate();
+				return originalGetTransformOptions ? originalGetTransformOptions(...args) : void 0;
+			}
+		}
+	};
+	if (options.root || metroConfig.projectRoot) wrappedConfig.projectRoot = root;
+	return wrappedConfig;
+}
+function isPromiseLike(value) {
+	return typeof value.then === "function";
+}
+function reportGenerateError(error) {
+	console.error("[openapi-codegen] Failed to generate OpenAPI client from Metro config.", error);
+}
+function reportWatcherError(error) {
+	console.error("[openapi-codegen] Failed to watch OpenAPI input from Metro config.", error);
+}
+
+//#endregion
+export { withOpenApiCodegen };

package/dist/openapi-codegen.runner-QGd35-a3.mjs

@@ -0,0 +1,42 @@
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-C-n0Knj8.mjs";
+import { t as runGenerate } from "./generate.runner-BXTc97I0.mjs";
+import path from "path";
+
+//#region src/plugins/openapi-codegen.runner.ts
+function createOpenApiCodegenRunner(config) {
+	let queue = Promise.resolve();
+	const { formatGeneratedFile, ...fileConfig } = config;
+	const enqueueGenerate = (root) => {
+		const run = queue.catch(() => void 0).then(async () => {
+			const profiler = new Profiler(process.env.OPENAPI_CODEGEN_PROFILE === "1");
+			await runGenerate({
+				fileConfig: normalizeOpenApiCodegenPaths(fileConfig, root),
+				formatGeneratedFile,
+				profiler
+			});
+		});
+		queue = run.then(() => void 0, () => void 0);
+		return run;
+	};
+	return {
+		enqueueGenerate,
+		getLocalInputPath: (root) => getLocalInputPath(config.input, root),
+		isLocalInput: isLocalOpenApiInput(config.input)
+	};
+}
+function normalizeOpenApiCodegenPaths(config, root) {
+	const normalized = { ...config };
+	if (typeof normalized.output === "string" && !path.isAbsolute(normalized.output)) normalized.output = path.resolve(root, normalized.output);
+	if (typeof normalized.input === "string" && !path.isAbsolute(normalized.input) && isLocalOpenApiInput(normalized.input)) normalized.input = path.resolve(root, normalized.input);
+	return normalized;
+}
+function getLocalInputPath(input, root) {
+	if (!isLocalOpenApiInput(input)) return;
+	return path.resolve(root, input);
+}
+function isLocalOpenApiInput(input) {
+	return typeof input === "string" && !/^https?:\/\//i.test(input);
+}
+
+//#endregion
+export { createOpenApiCodegenRunner as t };

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-DGox5gzo.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-C94-P4xF.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-C-n0Knj8.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-BXTc97I0.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.8";
+	return "3.0.0";
 }
 
 //#endregion

package/dist/vite.d.mts

@@ -1,11 +1,14 @@
-import { r as GenerateFileFormatter } from "./options-BPAjzilp.mjs";
-import { t as OpenAPICodegenConfig } from "./config-C1ME3Ay4.mjs";
+import { r as GenerateFileFormatter } from "./options-BZOw7Hx4.mjs";
+import { t as OpenAPICodegenConfig } from "./config-CrZa_Jbm.mjs";
 import { Plugin } from "vite";
 
-//#region src/vite/openapi-codegen.plugin.d.ts
-type OpenApiCodegenViteConfig = OpenAPICodegenConfig & {
+//#region src/plugins/openapi-codegen.runner.d.ts
+type OpenApiCodegenPluginConfig = OpenAPICodegenConfig & {
   formatGeneratedFile?: GenerateFileFormatter;
 };
+//#endregion
+//#region src/vite/openapi-codegen.plugin.d.ts
+type OpenApiCodegenViteConfig = OpenApiCodegenPluginConfig;
 declare function openApiCodegen(config: OpenApiCodegenViteConfig): Plugin;
 //#endregion
 export { type OpenAPICodegenConfig, type OpenApiCodegenViteConfig, openApiCodegen };

package/dist/vite.mjs

@@ -1,28 +1,20 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-DGox5gzo.mjs";
-import { t as runGenerate } from "./generate.runner-C94-P4xF.mjs";
+import "./generateCodeFromOpenAPIDoc-C-n0Knj8.mjs";
+import "./generate.runner-BXTc97I0.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-QGd35-a3.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts
 function openApiCodegen(config) {
 	let resolvedViteConfig;
-	let queue = Promise.resolve();
-	const isLocalInput = typeof config.input === "string" && !/^https?:\/\//i.test(config.input);
-	const { formatGeneratedFile, ...normalizedConfig } = config;
+	const codegen = createOpenApiCodegenRunner(config);
 	const enqueueGenerate = () => {
-		queue = queue.then(async () => {
-			const currentConfig = resolvedViteConfig;
-			if (!currentConfig) return;
-			await runGenerate({
-				fileConfig: normalizePaths(normalizedConfig, currentConfig.root),
-				formatGeneratedFile,
-				profiler: new Profiler(process.env.OPENAPI_CODEGEN_PROFILE === "1")
-			});
-		});
-		return queue;
+		const currentConfig = resolvedViteConfig;
+		if (!currentConfig) return Promise.resolve();
+		return codegen.enqueueGenerate(currentConfig.root);
 	};
 	const setupWatcher = (server) => {
-		if (!isLocalInput || !config.input) return;
-		const openApiPath = path.resolve(server.config.root, config.input);
+		const openApiPath = codegen.getLocalInputPath(server.config.root);
+		if (!openApiPath) return;
 		server.watcher.add(openApiPath);
 		server.watcher.on("change", (changedPath) => {
 			if (path.resolve(changedPath) === openApiPath) enqueueGenerate();
@@ -42,12 +34,6 @@ function openApiCodegen(config) {
 		}
 	};
 }
-function normalizePaths(config, root) {
-	const normalized = { ...config };
-	if (typeof normalized.output === "string" && !path.isAbsolute(normalized.output)) normalized.output = path.resolve(root, normalized.output);
-	if (typeof normalized.input === "string" && !path.isAbsolute(normalized.input) && !/^https?:\/\//i.test(normalized.input)) normalized.input = path.resolve(root, normalized.input);
-	return normalized;
-}
 
 //#endregion
 export { openApiCodegen };

package/dist/zod.d.mts

@@ -1,4 +1,4 @@
-import { a as ErrorHandler } from "./error-handling-B4aYKmyL.mjs";
+import { a as ErrorHandler } from "./error-handling-oM5YJYYH.mjs";
 import { z } from "zod";
 
 //#region src/zod.d.ts

package/package.json

@@ -1,6 +1,5 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "3.0.0-rc.8",
   "keywords": [
     "codegen",
     "openapi",
@@ -35,6 +34,10 @@
       "types": "./dist/vite.d.mts",
       "import": "./dist/vite.mjs"
     },
+    "./metro": {
+      "types": "./dist/metro.d.mts",
+      "import": "./dist/metro.mjs"
+    },
     "./generator": {
       "types": "./dist/generator.d.mts",
       "import": "./dist/generator.mjs"
@@ -127,5 +130,6 @@
     "node": ">= 14",
     "pnpm": ">= 9"
   },
-  "packageManager": "pnpm@10.4.0"
+  "packageManager": "pnpm@10.4.0",
+  "version": "3.0.0"
 }