@povio/openapi-codegen-cli 3.0.0-rc.1 → 3.0.0-rc.3

package/README.md

@@ -92,7 +92,10 @@ yarn openapi-codegen generate --config my-config.ts
   --axiosRequestConfig                Include Axios request config parameters in query hooks (default: false)
   --infiniteQueries                   Generate infinite queries for paginated API endpoints (default: false)
   --mutationEffects                   Add mutation effects options to mutation hooks (default: true)
-  --mutationScope                     Serialize mutations for the same path-param resource via TanStack scope.id (default: false)
+  --mutationScope                     Serialize mutations for the same path-param resource via TanStack scope.id (default: false).
+                                      In config files also accepts { include: string[] } or { exclude: string[] } to opt specific
+                                      operations in/out of scoping. Use "Tag/operationId" format for precision (e.g. "EmployeeSettings/update")
+                                      or just "operationId" to match across all tags. Cannot specify both include and exclude.
   --mutationDefaultOnError            Use OpenApiQueryConfig.onError as the default onError for mutation hooks (default: false)
   --workspaceContext                  Comma-separated list of path/ACL params that generated hooks may resolve from OpenApiWorkspaceContext
   --inlineEndpoints                   Inline endpoint implementations into generated query files (default: false)

package/dist/{config-CKmoJbQB.d.mts → config-1XCOTZ4a.d.mts}

@@ -1,4 +1,4 @@
-import { t as GenerateOptions } from "./options-C6CNQ6tq.mjs";
+import { t as GenerateOptions } from "./options-saKmD8s1.mjs";
 
 //#region src/generators/types/config.d.ts
 type OpenAPICodegenConfig = Partial<GenerateOptions>;

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

package/dist/{generateCodeFromOpenAPIDoc-BKIXvJIW.mjs → generateCodeFromOpenAPIDoc-D-UDIQX5.mjs}

@@ -1717,12 +1717,26 @@ function getAclImports({ tag, endpoints, options }) {
 		options
 	});
 }
+function normalizeOutputPath(output) {
+	return output.replace(/\\/g, "/").replace(/\/$/, "");
+}
+function outputMatchesTsPath(options) {
+	const normalizedOutput = normalizeOutputPath(options.output);
+	if (options.tsPath.startsWith("@/")) {
+		const physicalPath = `src/${options.tsPath.slice(2)}`;
+		return normalizedOutput === physicalPath || normalizedOutput.endsWith(`/${physicalPath}`);
+	}
+	return normalizedOutput === options.tsPath;
+}
+function shouldUseRelativeImports(options) {
+	return options.importPath === "ts" && options.tsPath === "@/data" && !outputMatchesTsPath(options);
+}
 function getImportPath(options, fromRoot = false) {
-	let importPath = options.tsPath;
-	if (options.importPath === "relative") importPath = fromRoot ? "./" : "../";
-	else if (options.importPath === "absolute") importPath = options.output;
-	else if (new RegExp(`${TEMPLATE_DATA_FILE_PATH}`, "g").test(options.output)) importPath = options.output.replace(new RegExp(`.*${TEMPLATE_DATA_FILE_PATH}`, "g"), options.tsPath);
-	return `${importPath}/`.replace(/\/\//g, "/");
+	if (options.importPath === "relative") return `${fromRoot ? "./" : "../"}`.replace(/\/\//g, "/");
+	if (options.importPath === "absolute") return `${options.output}/`.replace(/\/\//g, "/");
+	if (new RegExp(`${TEMPLATE_DATA_FILE_PATH}`, "g").test(options.output)) return `${options.output.replace(new RegExp(`.*${TEMPLATE_DATA_FILE_PATH}`, "g"), options.tsPath)}/`.replace(/\/\//g, "/");
+	if (shouldUseRelativeImports(options)) return `${fromRoot ? "./" : "../"}`.replace(/\/\//g, "/");
+	return `${options.tsPath}/`.replace(/\/\//g, "/");
 }
 function getImports({ type = GenerateType.Models, tag: currentTag, entities, getTag, getEntityName, options }) {
 	const imports = /* @__PURE__ */ new Map();
@@ -2207,9 +2221,16 @@ function getEndpointBody({ resolver, operation, operationName, isUniqueOperation
 	};
 }
 
+//#endregion
+//#region src/generators/utils/query-filter-component-names.utils.ts
+function resolveQueryFilterComponentName(operationId, queryFilterComponentNames) {
+	if (!operationId || !queryFilterComponentNames) return;
+	return queryFilterComponentNames[operationId];
+}
+
 //#endregion
 //#region src/generators/core/endpoints/getEndpointParameter.ts
-function getEndpointParameter({ resolver, param, operationName, isUniqueOperationName, tag }) {
+function getEndpointParameter({ resolver, param, operationName, operationId, isUniqueOperationName, tag }) {
 	const paramObj = resolver.resolveObject(param);
 	if (!ALLOWED_PATH_IN.includes(paramObj.in)) return;
 	let schema = {};
@@ -2222,7 +2243,8 @@ function getEndpointParameter({ resolver, param, operationName, isUniqueOperatio
 		schema = mediaTypeObject?.schema ?? mediaTypeObject;
 	} else if (paramObj.schema) schema = paramObj.schema;
 	if (resolver.options.withDescription && schema) schema.description = (paramObj.description ?? "").trim();
-	const fallbackName = getParamZodSchemaName(getZodSchemaOperationName(operationName, isUniqueOperationName, tag), paramObj.name);
+	const zodSchemaOperationName = getZodSchemaOperationName(operationName, isUniqueOperationName, tag);
+	const fallbackName = (paramObj.name === resolver.options.filterParamName && !isReferenceObject(schema) && resolver.options.queryFilterComponentNames ? resolveQueryFilterComponentName(operationId, resolver.options.queryFilterComponentNames) : void 0) ?? getParamZodSchemaName(zodSchemaOperationName, paramObj.name);
 	let parameterSortingEnumSchemaName = void 0;
 	if (isSortingParameterObject(paramObj)) {
 		const enumZodSchemaName = getEnumZodSchemaName(fallbackName, resolver.options.enumSuffix, resolver.options.schemaSuffix);
@@ -2321,6 +2343,7 @@ function getEndpointsFromOpenAPIDoc(resolver) {
 					resolver,
 					param,
 					operationName,
+					operationId: operation.operationId,
 					isUniqueOperationName,
 					tag
 				});
@@ -4034,6 +4057,10 @@ function renderModelJsDocs({ name, zodSchema, tag, resolver }) {
 const endpointParamMappingCache = /* @__PURE__ */ new WeakMap();
 function generateQueries(params) {
 	const { resolver, data, tag } = params;
+	const mutationScopeOption = resolver.options.mutationScope;
+	if (mutationScopeOption && typeof mutationScopeOption === "object") {
+		if ("include" in mutationScopeOption && "exclude" in mutationScopeOption) throw new Error("mutationScope cannot specify both 'include' and 'exclude'");
+	}
 	const inlineEndpoints = shouldInlineEndpointsForTag(tag, resolver.options);
 	const endpoints = data.get(tag)?.endpoints;
 	if (!endpoints || endpoints.length === 0) return;
@@ -4541,6 +4568,27 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	const destructuredVariables = precomputed?.destructuredVariables ?? getDestructuredVariables(resolver, endpoint, updateQueryEndpoints);
 	const hasMutationFnBody = endpoint.mediaUpload || hasAclCheck || Object.keys(workspaceParamReplacements).length > 0;
 	const mutationVariablesType = endpoint.mediaUpload ? `${endpointParams}${endpointParams ? "; " : ""}abortController?: AbortController; onUploadProgress?: (progress: { loaded: number; total: number }) => void` : endpointParams;
+	const isPost = endpoint.method === "post";
+	const mutationScopeOption = resolver.options.mutationScope;
+	const operationId = getEndpointName(endpoint);
+	const scopeMatchKey = `${tag}/${operationId}`;
+	let scopeEnabled = false;
+	if (!isPost && mutationScopeOption) {
+		if (mutationScopeOption === true) scopeEnabled = true;
+		else if (typeof mutationScopeOption === "object" && "include" in mutationScopeOption) scopeEnabled = mutationScopeOption.include.some((id) => id === operationId || id === scopeMatchKey);
+		else if (typeof mutationScopeOption === "object" && "exclude" in mutationScopeOption) scopeEnabled = !mutationScopeOption.exclude.some((id) => id === operationId || id === scopeMatchKey);
+	}
+	const scopePathParams = scopeEnabled ? mapEndpointParamsToFunctionParams(resolver, endpoint, {}).filter((p) => p.paramType === "Path") : [];
+	const isScoped = scopePathParams.length > 0;
+	const nonPathEndpointParams = isScoped ? renderEndpointParams(resolver, endpoint, {
+		includeFileParam: true,
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag,
+		excludePathParams: true
+	}) : endpointParams;
+	const nonPathMutationVariablesType = isScoped ? endpoint.mediaUpload ? `${nonPathEndpointParams}${nonPathEndpointParams ? "; " : ""}abortController?: AbortController; onUploadProgress?: (progress: { loaded: number; total: number }) => void` : nonPathEndpointParams : mutationVariablesType;
+	const pathParamFirstArg = isScoped ? `{ ${scopePathParams.map((p) => p.name).join(", ")} }: { ${scopePathParams.map((p) => `${p.name}: ${p.type}`).join("; ")} }, ` : "";
+	const mutationOptionsTypeArg = isScoped ? nonPathMutationVariablesType ? `, { ${nonPathMutationVariablesType} }` : "" : `, { ${mutationVariablesType} }`;
 	const lines = [];
 	lines.push(renderQueryJsDocs({
 		resolver,
@@ -4548,7 +4596,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		mode: "mutation",
 		tag
 	}));
-	lines.push(`export const ${getQueryName(endpoint, true)} = (options?: AppMutationOptions<typeof ${endpointFunction}, { ${mutationVariablesType} }>${hasMutationEffects ? ` & ${MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
+	lines.push(`export const ${getQueryName(endpoint, true)} = (${pathParamFirstArg}options?: AppMutationOptions<typeof ${endpointFunction}${mutationOptionsTypeArg}>${hasMutationEffects ? ` & ${MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
 	if (hasMutationDefaultOnError) lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceContextDestructure({
@@ -4559,7 +4607,13 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	if (hasMutationEffects) lines.push(`  const { runMutationEffects } = useMutationEffects<typeof ${QUERY_MODULE_ENUM}.${tag}>({ currentModule: ${QUERIES_MODULE_NAME} });`);
 	lines.push("");
 	lines.push(`  return ${QUERY_HOOKS.mutation}({`);
-	const mutationFnArg = endpointParams ? `{ ${destructuredMutationArgs}${endpoint.mediaUpload ? `${destructuredMutationArgs ? ", " : ""}abortController, onUploadProgress` : ""} }` : "";
+	const nonPathDestructuredArgs = isScoped ? renderEndpointArgs(resolver, endpoint, {
+		includeFileParam: true,
+		excludePathParams: true
+	}) : destructuredMutationArgs;
+	const effectiveParams = isScoped ? nonPathEndpointParams : endpointParams;
+	const effectiveArgs = isScoped ? nonPathDestructuredArgs : destructuredMutationArgs;
+	const mutationFnArg = effectiveParams || endpoint.mediaUpload ? `{ ${effectiveArgs}${endpoint.mediaUpload ? `${effectiveArgs ? ", " : ""}abortController, onUploadProgress` : ""} }` : "";
 	lines.push(`    mutationFn: ${endpoint.mediaUpload ? "async " : ""}(${mutationFnArg}) => ${hasMutationFnBody ? "{ " : ""}`);
 	lines.push(...renderWorkspaceParamCoalescing({
 		replacements: workspaceParamReplacements,
@@ -4596,12 +4650,18 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	} else lines.push(`      ${hasMutationFnBody ? "return " : ""}${endpointFunction}(${resolvedEndpointArgs}${hasAxiosRequestConfig ? `${resolvedEndpointArgs ? ", " : ""}${AXIOS_REQUEST_CONFIG_NAME}` : ""})`);
 	if (hasMutationFnBody) lines.push("    },");
 	else lines.push(",");
+	if (isScoped) {
+		const scopePathParamInterpolations = scopePathParams.map((p) => `:\${${p.name}}`).join("");
+		lines.push(`    scope: { id: \`${getEndpointName(endpoint)}${scopePathParamInterpolations}\` },`);
+	}
 	lines.push("    ...options,");
 	if (hasMutationDefaultOnError) lines.push("    onError: options?.onError ?? queryConfig.onError,");
 	if (hasMutationEffects) {
 		lines.push("    onSuccess: async (resData, variables, onMutateResult, context) => {");
 		if (updateQueryEndpoints.length > 0) {
-			if (destructuredVariables.length > 0) lines.push(`      const { ${destructuredVariables.join(", ")} } = variables;`);
+			const scopedPathParamNames = new Set(scopePathParams.map((p) => p.name));
+			const variablesDestructure = destructuredVariables.filter((v) => !scopedPathParamNames.has(v));
+			if (variablesDestructure.length > 0) lines.push(`      const { ${variablesDestructure.join(", ")} } = variables;`);
 			lines.push(...renderWorkspaceParamCoalescing({
 				replacements: workspaceParamReplacements,
 				indent: "      "

package/dist/generator.d.mts

@@ -1,4 +1,4 @@
-import { n as GenerateFileData, t as GenerateOptions } from "./options-C6CNQ6tq.mjs";
+import { n as GenerateFileData, t as GenerateOptions } from "./options-saKmD8s1.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-BKIXvJIW.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-D-UDIQX5.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 GeneralErrorCodes, i as ErrorHandlerOptions, n as ErrorEntry, o as SharedErrorHandler, r as ErrorHandler, t as ApplicationException } from "./error-handling-CvW_FecB.mjs";
-import "./options-C6CNQ6tq.mjs";
-import { t as OpenAPICodegenConfig } from "./config-CKmoJbQB.mjs";
+import "./options-saKmD8s1.mjs";
+import { t as OpenAPICodegenConfig } from "./config-1XCOTZ4a.mjs";
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders, CreateAxiosDefaults } from "axios";
 import { z } from "zod";
 import "i18next";

package/dist/{options-C6CNQ6tq.d.mts → options-saKmD8s1.d.mts}

@@ -42,7 +42,11 @@ interface QueriesGenerateOptions {
   mutationDefaultOnError?: boolean;
   workspaceContext?: string[];
   prefetchQueries?: boolean;
-  mutationScope?: boolean;
+  mutationScope?: boolean | {
+    include: string[];
+  } | {
+    exclude: string[];
+  };
 }
 interface InfiniteQueriesGenerateOptions {
   infiniteQueries?: boolean;
@@ -68,6 +72,13 @@ interface BuilderConfigsGenerateOptions {
   dynamicInputsImportPath: string;
   dynamicColumnsImportPath: string;
 }
+interface QueryFilterComponentNameOptions {
+  /**
+   * Optional map of OpenAPI operationId to stable filter schema names.
+   * Used for inline `filter` query objects when migrating away from named filter DTO refs.
+   */
+  queryFilterComponentNames?: Record<string, string>;
+}
 interface GenerateConfig {
   outputFileNameSuffix: string;
   namespaceSuffix: string;
@@ -78,6 +89,8 @@ interface BaseGenerateOptions {
   clearOutput?: boolean;
   incremental?: boolean;
   splitByTags: boolean;
+  /** When true, non-default tags emit proxy models that re-export from CommonModels. */
+  modelsInCommon?: boolean;
   defaultTag: string;
   includeTags: string[];
   excludeTags: string[];
@@ -91,6 +104,6 @@ interface BaseGenerateOptions {
   modelsOnly?: boolean;
   standalone?: boolean;
 }
-interface GenerateOptions extends BaseGenerateOptions, ZodGenerateOptions, EndpointsGenerateOptions, QueriesGenerateOptions, InfiniteQueriesGenerateOptions, ACLGenerateOptions, BuilderConfigsGenerateOptions {}
+interface GenerateOptions extends BaseGenerateOptions, ZodGenerateOptions, EndpointsGenerateOptions, QueriesGenerateOptions, InfiniteQueriesGenerateOptions, ACLGenerateOptions, BuilderConfigsGenerateOptions, QueryFilterComponentNameOptions {}
 //#endregion
 export { GenerateFileData as n, GenerateFileFormatter as r, GenerateOptions 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-BKIXvJIW.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-B0iop_CE.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-D-UDIQX5.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-CioDqx6u.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.1";
+	return "3.0.0-rc.3";
 }
 
 //#endregion

package/dist/vite.d.mts

@@ -1,5 +1,5 @@
-import { r as GenerateFileFormatter } from "./options-C6CNQ6tq.mjs";
-import { t as OpenAPICodegenConfig } from "./config-CKmoJbQB.mjs";
+import { r as GenerateFileFormatter } from "./options-saKmD8s1.mjs";
+import { t as OpenAPICodegenConfig } from "./config-1XCOTZ4a.mjs";
 import { Plugin } from "vite";
 
 //#region src/vite/openapi-codegen.plugin.d.ts

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-BKIXvJIW.mjs";
-import { t as runGenerate } from "./generate.runner-B0iop_CE.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-D-UDIQX5.mjs";
+import { t as runGenerate } from "./generate.runner-CioDqx6u.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.1",
+  "version": "3.0.0-rc.3",
   "keywords": [
     "codegen",
     "openapi",