@povio/openapi-codegen-cli 2.0.8-rc.32 → 2.0.8-rc.34

package/dist/{generate.runner-CMi5XAiu.mjs → generate.runner-CTwFD7Th.mjs}

@@ -1,5 +1,4 @@
-import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-DkNqNy-S.mjs";
-import fs from "fs";
+import { S as Profiler, i as writeGenerateFileData, m as DEFAULT_GENERATE_OPTIONS, o as deepMerge, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-B--xr_dZ.mjs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
@@ -24,10 +23,11 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 	}));
 	const openApiDoc = await getOpenApiDoc(config.input, profiler);
 	const filesData = profiler.runSync("generate.total", () => generateCodeFromOpenAPIDoc(openApiDoc, config, profiler));
-	if (config.clearOutput) profiler.runSync("files.clearOutput", () => {
-		fs.rmSync(config.output, {
-			force: true,
-			recursive: true
+	if (config.clearOutput) profiler.runSync("files.removeStaleGenerated", () => {
+		removeStaleGeneratedFiles({
+			output: config.output,
+			filesData,
+			options: config
 		});
 	});
 	await profiler.runAsync("files.write", async () => {

package/dist/{generateCodeFromOpenAPIDoc-DkNqNy-S.mjs → generateCodeFromOpenAPIDoc-B--xr_dZ.mjs}

@@ -3076,6 +3076,51 @@ async function writeFile({ fileName, content }, options) {
 async function writeGenerateFileData(filesData, options) {
 	for (const file of filesData) await writeFile(file, options);
 }
+function removeStaleGeneratedFiles({ output, filesData, options }) {
+	if (!fs.existsSync(output)) return;
+	const expectedFiles = new Set(filesData.map((file) => path.resolve(file.fileName)));
+	const generatedSuffixes = new Set(Object.values(options.configs).map((config) => config.outputFileNameSuffix));
+	const staleFiles = [];
+	const visit = (dirPath) => {
+		for (const dirent of fs.readdirSync(dirPath, { withFileTypes: true })) {
+			const entryPath = path.join(dirPath, dirent.name);
+			if (dirent.isDirectory()) {
+				visit(entryPath);
+				continue;
+			}
+			if (isGeneratedFile(entryPath, output, generatedSuffixes) && !expectedFiles.has(path.resolve(entryPath))) staleFiles.push(entryPath);
+		}
+	};
+	visit(output);
+	staleFiles.forEach((filePath) => fs.rmSync(filePath, { force: true }));
+	removeEmptyDirectories(output);
+}
+function isGeneratedFile(filePath, output, generatedSuffixes) {
+	const relativePath = path.relative(output, filePath);
+	if (relativePath === ".openapi-codegen-cache.json") return true;
+	const normalizedRelativePath = relativePath.split(path.sep).join("/");
+	if ([
+		"app-rest-client.ts",
+		"queryModules.ts",
+		"acl/app.ability.ts"
+	].includes(normalizedRelativePath)) return true;
+	if (path.parse(filePath).ext !== ".ts") return false;
+	const segments = relativePath.split(path.sep).filter(Boolean);
+	if (segments.length < 2) return false;
+	const moduleName = segments[0];
+	const fileName = segments[segments.length - 1];
+	if (!fileName.startsWith(`${moduleName}.`)) return false;
+	const suffix = fileName.slice(moduleName.length + 1).replace(/\.tsx?$/, "");
+	return generatedSuffixes.has(suffix);
+}
+function removeEmptyDirectories(root) {
+	if (!fs.existsSync(root)) return;
+	const removeIfEmpty = (dirPath) => {
+		for (const dirent of fs.readdirSync(dirPath, { withFileTypes: true })) if (dirent.isDirectory()) removeIfEmpty(path.join(dirPath, dirent.name));
+		if (dirPath !== root && fs.readdirSync(dirPath).length === 0) fs.rmdirSync(dirPath);
+	};
+	removeIfEmpty(root);
+}
 
 //#endregion
 //#region src/generators/generate/generateAcl.ts
@@ -4087,6 +4132,12 @@ function renderEndpointParams(resolver, endpoint, options) {
 function renderEndpointArgs(resolver, endpoint, options, replacements) {
 	return getEndpointParamMapping(resolver, endpoint, options).map((param) => replacements?.[param.name] ?? param.name).join(", ");
 }
+function renderEndpointObjectArgs(resolver, endpoint, options, replacements) {
+	return getEndpointParamMapping(resolver, endpoint, options).map((param) => {
+		const replacement = replacements?.[param.name];
+		return replacement && replacement !== param.name ? `${param.name}: ${replacement}` : param.name;
+	}).join(", ");
+}
 function renderEndpointParamDescription(endpointParam) {
 	const strs = [`${endpointParam.paramType} parameter`];
 	const description = endpointParam.parameterObject?.description || endpointParam.bodyObject?.description;
@@ -4292,7 +4343,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
-	const resolvedEndpointArgs = renderEndpointArgs(resolver, endpoint, {}, workspaceParamReplacements);
+	const resolvedEndpointArgs = renderEndpointObjectArgs(resolver, endpoint, {}, workspaceParamReplacements);
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		optionalPathParams: resolver.options.workspaceContext,
 		modelNamespaceTag: tag
@@ -4458,7 +4509,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 		modelNamespaceTag: tag
 	});
 	const endpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
-	const resolvedEndpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true }, workspaceParamReplacements);
+	const resolvedEndpointArgsWithoutPage = renderEndpointObjectArgs(resolver, endpoint, { excludePageParam: true }, workspaceParamReplacements);
 	const queryOptionsName = getInfiniteQueryOptionsName(endpoint);
 	const queryOptionsArgs = `${resolvedEndpointArgsWithoutPage ? `{ ${resolvedEndpointArgsWithoutPage} }` : ""}${hasAxiosRequestConfig ? `${resolvedEndpointArgsWithoutPage ? ", " : ""}${AXIOS_REQUEST_CONFIG_NAME}` : ""}`;
 	const hasQueryFnOverride = hasAclCheck;
@@ -4624,4 +4675,4 @@ function generateCodeFromOpenAPIDoc(openApiDoc, options, profiler) {
 }
 
 //#endregion
-export { VALIDATION_ERROR_TYPE_TITLE as S, isMediaTypeAllowed as _, deepMerge as a, formatTag as b, getSchemaTsMetaType as c, getTagImportPath as d, getQueryName as f, groupByType as g, GenerateType as h, getDataFromOpenAPIDoc as i, getTsTypeBase as l, getNamespaceName as m, getOutputFileName as n, isMutation as o, DEFAULT_GENERATE_OPTIONS as p, writeGenerateFileData as r, isQuery as s, generateCodeFromOpenAPIDoc as t, getTagFileName as u, isParamMediaTypeAllowed as v, Profiler as x, invalidVariableNameCharactersToCamel as y };
+export { VALIDATION_ERROR_TYPE_TITLE as C, Profiler as S, groupByType as _, getDataFromOpenAPIDoc as a, invalidVariableNameCharactersToCamel as b, isQuery as c, getTagFileName as d, getTagImportPath as f, GenerateType as g, getNamespaceName as h, writeGenerateFileData as i, getSchemaTsMetaType as l, DEFAULT_GENERATE_OPTIONS as m, getOutputFileName as n, deepMerge as o, getQueryName as p, removeStaleGeneratedFiles as r, isMutation as s, generateCodeFromOpenAPIDoc as t, getTsTypeBase as u, isMediaTypeAllowed as v, formatTag as x, isParamMediaTypeAllowed as y };

package/dist/generator.mjs

@@ -1,4 +1,4 @@
-import { _ as isMediaTypeAllowed, b as formatTag, c as getSchemaTsMetaType, d as getTagImportPath, f as getQueryName, h as GenerateType, i as getDataFromOpenAPIDoc, l as getTsTypeBase, m as getNamespaceName, o as isMutation, p as DEFAULT_GENERATE_OPTIONS, s as isQuery, t as generateCodeFromOpenAPIDoc, v as isParamMediaTypeAllowed, y as invalidVariableNameCharactersToCamel } from "./generateCodeFromOpenAPIDoc-DkNqNy-S.mjs";
+import { a as getDataFromOpenAPIDoc, b as invalidVariableNameCharactersToCamel, c as isQuery, f as getTagImportPath, g as GenerateType, h as getNamespaceName, l as getSchemaTsMetaType, m as DEFAULT_GENERATE_OPTIONS, p as getQueryName, s as isMutation, t as generateCodeFromOpenAPIDoc, u as getTsTypeBase, v as isMediaTypeAllowed, x as formatTag, y as isParamMediaTypeAllowed } from "./generateCodeFromOpenAPIDoc-B--xr_dZ.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 { S as VALIDATION_ERROR_TYPE_TITLE, g as groupByType, h as GenerateType, i as getDataFromOpenAPIDoc, n as getOutputFileName, u as getTagFileName, x as Profiler } from "./generateCodeFromOpenAPIDoc-DkNqNy-S.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-CMi5XAiu.mjs";
+import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, _ as groupByType, a as getDataFromOpenAPIDoc, d as getTagFileName, g as GenerateType, n as getOutputFileName } from "./generateCodeFromOpenAPIDoc-B--xr_dZ.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-CTwFD7Th.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 "2.0.8-rc.32";
+	return "2.0.8-rc.34";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { x as Profiler } from "./generateCodeFromOpenAPIDoc-DkNqNy-S.mjs";
-import { t as runGenerate } from "./generate.runner-CMi5XAiu.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-B--xr_dZ.mjs";
+import { t as runGenerate } from "./generate.runner-CTwFD7Th.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts
@@ -18,6 +18,7 @@ function openApiCodegen(config) {
 				profiler: new Profiler(process.env.OPENAPI_CODEGEN_PROFILE === "1")
 			});
 		});
+		return queue;
 	};
 	const setupWatcher = (server) => {
 		if (!isLocalInput || !config.input) return;
@@ -32,10 +33,11 @@ function openApiCodegen(config) {
 		configResolved(config) {
 			resolvedViteConfig = config;
 		},
-		buildStart() {
-			enqueueGenerate();
+		async buildStart() {
+			await enqueueGenerate();
 		},
-		configureServer(server) {
+		async configureServer(server) {
+			await enqueueGenerate();
 			setupWatcher(server);
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.8-rc.32",
+  "version": "2.0.8-rc.34",
   "keywords": [
     "codegen",
     "openapi",