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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.8-rc.8",
+  "version": "2.0.8",
   "keywords": [
     "codegen",
     "openapi",
@@ -16,7 +16,7 @@
     "url": "git+https://github.com/povio/openapi-codegen-cli.git"
   },
   "bin": {
-    "openapi-codegen": "./dist/sh.mjs"
+    "openapi-codegen": "./dist/sh.js"
   },
   "files": [
     "README.md",
@@ -24,62 +24,50 @@
     "src/assets/**",
     "src/generators/templates/**"
   ],
-  "type": "module",
   "main": "./dist/index.mjs",
-  "types": "./dist/index.d.mts",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
-    },
-    "./vite": {
-      "types": "./dist/vite.d.mts",
-      "import": "./dist/vite.mjs"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.mjs"
     },
     "./generator": {
-      "types": "./dist/generator.d.mts",
-      "import": "./dist/generator.mjs"
+      "types": "./dist/generator.d.ts",
+      "import": "./dist/generator.js",
+      "require": "./dist/generator.js"
     },
     "./acl": {
-      "types": "./dist/acl.d.mts",
-      "import": "./dist/acl.mjs"
+      "types": "./dist/acl.d.ts",
+      "import": "./dist/acl.mjs",
+      "require": "./dist/acl.mjs"
     }
   },
   "scripts": {
     "start": "node --import tsx ./src/sh.ts",
     "test": "vitest run",
     "test:watch": "vitest",
-    "build": "tsdown",
-    "start:dist": "node ./dist/sh.mjs",
-    "gen:base": "rm -rf ./test/generated/base && mkdir -p ./test/generated/base && pnpm start generate --config ./test/config.mjs --output ./test/generated/base --no-prettier",
-    "gen:next": "rm -rf ./test/generated/next && mkdir -p ./test/generated/next && pnpm start generate --config ./test/config.mjs --output ./test/generated/next --no-prettier",
-    "test:generated-eq": "vitest run ./src/generators/generated-output-eq.test.ts",
-    "gen:verify": "pnpm gen:base && pnpm gen:next && pnpm test:generated-eq",
+    "build:clean": "rm -rf ./dist",
+    "build:client": "vite build",
+    "build:cli": "node ./esbuild.mjs && chmod +x ./dist/sh.js",
+    "build": "yarn build:clean && yarn build:cli && yarn build:client",
+    "start:dist": "node ./dist/sh.js",
     "typecheck": "tsc --noEmit",
     "lint": "oxlint --type-aware --fix",
     "lint:check": "oxlint --type-aware",
     "format": "oxfmt",
     "format:check": "oxfmt --check",
-    "check": "pnpm typecheck && pnpm lint && pnpm test",
-    "push": "node ./scripts/publish.mjs",
-    "dev:generate": "rm -rf ./output && pnpm start generate --config ./test/config.mjs",
-    "dev:check": "pnpm start check --config ./test/config.mjs",
-    "snapshot:openapi-localhost": "node ./scripts/snapshot-openapi-localhost.mjs",
-    "bench:vite-codegen": "node ./scripts/benchmark-vite-codegen.mjs"
+    "check": "yarn typecheck && yarn lint && yarn test",
+    "push": "yarn exec ./scripts/publish.sh",
+    "dev:generate": "rm -rf ./output && yarn start generate --config ./test/config.ts",
+    "dev:check": "yarn start check --config ./test/config.ts"
   },
   "dependencies": {
-    "@apidevtools/swagger-parser": "^10.1.0",
-    "handlebars": "^4.7.8",
-    "i18next": "^25.8.13",
-    "import-fresh": "^3.3.1",
-    "prompt-sync": "^4.2.0",
-    "reflect-metadata": "^0.2.2",
-    "ts-pattern": "^5.9.0",
-    "typescript": "^5.9.3",
-    "yargs": "^18.0.0",
-    "openapi-types": "^12.1.3"
+    "i18next": "^25.8.11",
+    "import-fresh": "^3.3.1"
   },
   "devDependencies": {
+    "@apidevtools/swagger-parser": "^10.1.0",
     "@casl/ability": "^6.8.0",
     "@casl/react": "^5.0.1",
     "@tanstack/react-query": "~5.90.21",
@@ -88,16 +76,25 @@
     "@types/react": "^19.2.14",
     "@types/yargs": "^17.0.35",
     "@vitejs/plugin-react": "^5.1.4",
+    "axios": "^1.13.5",
+    "esbuild": "0.27.3",
+    "handlebars": "^4.7.8",
+    "openapi-types": "^12.1.3",
     "oxfmt": "^0.34.0",
-    "oxlint": "^1.50.0",
-    "oxlint-tsgolint": "^0.15.0",
+    "oxlint": "^1.49.0",
+    "oxlint-tsgolint": "^0.14.1",
+    "prompt-sync": "^4.2.0",
     "react": "^19.2.4",
-    "tsdown": "^0.21.0-beta.1",
+    "reflect-metadata": "^0.2.2",
+    "ts-pattern": "^5.9.0",
     "tsx": "^4.21.0",
     "type-fest": "^5.4.4",
-    "vite": "npm:rolldown-vite@^7.3.1",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.1",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "4.0.18"
+    "vitest": "4.0.18",
+    "yargs": "^17.7.2",
+    "zod": "^4.3.6"
   },
   "peerDependencies": {
     "@casl/ability": "^6.7.3",
@@ -105,7 +102,6 @@
     "@tanstack/react-query": "^5.90.21",
     "axios": "^1.13.1",
     "react": "^19.1.0",
-    "vite": "^6.0.0 || ^7.0.0",
     "zod": "^4.1.12"
   },
   "peerDependenciesMeta": {
@@ -114,14 +110,12 @@
     },
     "@casl/react": {
       "optional": true
-    },
-    "vite": {
-      "optional": true
     }
   },
   "engines": {
     "node": ">= 14",
-    "pnpm": ">= 9"
+    "npm": ">= 8",
+    "yarn": ">= 3.2"
   },
-  "packageManager": "pnpm@10.4.0"
+  "packageManager": "yarn@4.2.2"
 }

package/src/generators/templates/endpoints.hbs

@@ -37,6 +37,7 @@ export const {{endpointName endpoint}} = ({{{genEndpointParams endpoint}}}{{#if
         {{/if}}{{{genEndpointConfig endpoint}}}
     )
 };
+
 {{/each}}
 {{#if includeNamespace}}
 }

package/src/generators/templates/partials/query-use-infinite-query.hbs

@@ -1,9 +1,10 @@
 {{! Js docs }}
 {{{genQueryJsDocs endpoint infiniteQuery=true}}}
 {{! Infinite query definition}}
-export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint excludePageParam=true}}} }: { {{{genEndpointParams endpoint excludePageParam=true}}} }, {{/if}}options?: AppInfiniteQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
+export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint excludePageParam=true)}}params: { {{{genEndpointParams endpoint excludePageParam=true}}} } = {}{{else}}{ {{{endpointArgs endpoint excludePageParam=true}}} }: { {{{genEndpointParams endpoint excludePageParam=true}}} }{{/if}}, {{/if}}options?: AppInfiniteQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
   {{! Use acl check }}
   {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
+  {{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint excludePageParam=true)}}const { {{{endpointArgs endpoint excludePageParam=true}}} } = params;{{/if}}{{/if}}
 
   return {{infiniteQueryHook}}({
     queryKey: keys.{{endpointName endpoint}}Infinite({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint excludePageParam=true}}}{{/if}}),
@@ -12,10 +13,11 @@ export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endp
     {{#if hasQueryFnBody}}return {{/if}}{{importedEndpointName endpoint}}({{{endpointArgs endpoint replacePageParam=true}}}{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}{{/if}})
     {{#if hasQueryFnBody}} }{{/if}},
     initialPageParam: 1,
-    getNextPageParam: ({ {{pageParamName}}, {{totalItemsName}}, {{limitParamName}}: limitParam }) => {
-      const pageParam = {{pageParamName}} ?? 1;
-      return pageParam * limitParam < {{totalItemsName}} ? pageParam + 1 : null;
+    getNextPageParam: (response) => {
+      const pageParam = (response.{{pageParamName}} ?? 1);
+      const limitParam = response.{{limitParamName}};
+      return pageParam * limitParam < response.{{totalItemsName}} ? pageParam + 1 : null;
     },
     ...options,
   });
-};
+};

package/src/generators/templates/partials/query-use-query.hbs

@@ -1,10 +1,11 @@
 {{! Js docs }}
 {{{genQueryJsDocs endpoint query=true}}}
 {{! Query definition}}
-export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint}}} }: { {{{genEndpointParams endpoint}}} }, {{/if}}options?: AppQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
+export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint)}}params: { {{{genEndpointParams endpoint}}} } = {}{{else}}{ {{{endpointArgs endpoint}}} }: { {{{genEndpointParams endpoint}}} }{{/if}}, {{/if}}options?: AppQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
   {{! Use acl check }}
   {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
-  
+  {{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint)}}const { {{{endpointArgs endpoint}}} } = params;{{/if}}{{/if}}
+
   return {{queryHook}}({
     queryKey: keys.{{endpointName endpoint}}({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint}}}{{/if}}),
     queryFn: {{#if hasQueryFn}}() => {{#if hasQueryFnBody}}{ {{/if}} 
@@ -13,4 +14,4 @@ export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{
     {{#if hasQueryFnBody}} }{{/if}},
     ...options,
   });
-};
+};

package/dist/acl.d.mts

@@ -1,48 +0,0 @@
-import * as react from "react";
-import { PropsWithChildren } from "react";
-import * as react_jsx_runtime0 from "react/jsx-runtime";
-import { AbilityTuple, PureAbility, RawRuleOf, Subject } from "@casl/ability";
-import { PackRule } from "@casl/ability/extra";
-import { BoundCanProps } from "@casl/react";
-
-//#region src/lib/acl/appAbility.types.d.ts
-type AppAbilities = AbilityTuple<string, Subject>;
-type AppAbility = PureAbility<AppAbilities>;
-//#endregion
-//#region src/lib/acl/ability.context.d.ts
-declare namespace AbilityContext {
-  export const Consumer: react.Consumer<AppAbility>;
-  interface ProviderProps {
-    user?: {
-      aclRules?: PackRule<RawRuleOf<AppAbility>>[];
-    } | null;
-  }
-  export const Provider: ({
-    children
-  }: PropsWithChildren<ProviderProps>) => react_jsx_runtime0.JSX.Element;
-  export const useAbility: <TAppAbilities extends AppAbilities = AppAbilities>() => PureAbility<TAppAbilities>;
-  export {};
-}
-//#endregion
-//#region src/lib/acl/AclGuard.d.ts
-interface AclGuardProps<TAppAbilities extends AppAbilities = AppAbilities> {
-  canUse: TAppAbilities;
-  redirectTo?: string;
-}
-declare const createAclGuard: <TAppAbilities extends AppAbilities = AppAbilities>() => ({
-  canUse,
-  redirectTo,
-  children
-}: PropsWithChildren<AclGuardProps<TAppAbilities>>) => react.ReactNode;
-//#endregion
-//#region src/lib/acl/Can.d.ts
-type CanAbility = PureAbility<AbilityTuple<AppAbilities[0], AppAbilities[1]>>;
-type CanProps<TAppAbilities extends AppAbilities = AppAbilities> = {
-  use: TAppAbilities;
-} & Omit<BoundCanProps<CanAbility>, "do" | "I" | "on" | "a" | "an" | "this">;
-declare const Can: <TAppAbilities extends AppAbilities = AppAbilities>({
-  use,
-  ...props
-}: CanProps<TAppAbilities>) => react_jsx_runtime0.JSX.Element;
-//#endregion
-export { AbilityContext, type AppAbilities, type AppAbility, Can, createAclGuard };

package/dist/auth.context-DKjzWiaA.mjs

@@ -1,59 +0,0 @@
-import { createContext, use, useMemo } from "react";
-import { jsx } from "react/jsx-runtime";
-
-//#region src/lib/config/router.context.tsx
-let OpenApiRouter;
-(function(_OpenApiRouter) {
-	const Context = createContext(null);
-	_OpenApiRouter.Provider = ({ children, replace }) => {
-		return /* @__PURE__ */ jsx(Context, {
-			value: useMemo(() => ({ replace }), [replace]),
-			children
-		});
-	};
-	_OpenApiRouter.useRouter = () => {
-		const context = use(Context);
-		if (!context) throw new Error("useRouter must be used within an OpenApiRouter.Provider");
-		return context;
-	};
-})(OpenApiRouter || (OpenApiRouter = {}));
-
-//#endregion
-//#region src/lib/auth/auth.context.tsx
-let AuthContext;
-(function(_AuthContext) {
-	const Context = createContext({});
-	_AuthContext.Provider = ({ isAuthenticated, isInitializing, logout, updateTokens, accessToken, user, userPromise, routes, loadingState, children }) => {
-		const value = useMemo(() => ({
-			isAuthenticated,
-			isInitializing,
-			logout,
-			updateTokens,
-			accessToken,
-			user,
-			userPromise,
-			routes,
-			loadingState
-		}), [
-			isAuthenticated,
-			isInitializing,
-			logout,
-			updateTokens,
-			accessToken,
-			user,
-			userPromise,
-			routes,
-			loadingState
-		]);
-		return /* @__PURE__ */ jsx(Context.Provider, {
-			value,
-			children
-		});
-	};
-	_AuthContext.useAuth = () => {
-		return use(Context);
-	};
-})(AuthContext || (AuthContext = {}));
-
-//#endregion
-export { OpenApiRouter as n, AuthContext as t };

package/dist/config-Cu_GYfai.d.mts

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

package/dist/generate.runner-DNldmk0f.mjs

@@ -1,98 +0,0 @@
-import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-B5lnFNGB.mjs";
-import fs from "fs";
-import path from "path";
-import SwaggerParser from "@apidevtools/swagger-parser";
-
-//#region src/generators/core/resolveConfig.ts
-function resolveConfig({ fileConfig = {}, params: { excludeTags, inlineEndpointsExcludeModules, ...options } }) {
-	const resolvedConfig = deepMerge(DEFAULT_GENERATE_OPTIONS, fileConfig ?? {}, {
-		...options,
-		excludeTags: excludeTags?.split(","),
-		inlineEndpointsExcludeModules: inlineEndpointsExcludeModules?.split(",")
-	});
-	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
-	return resolvedConfig;
-}
-
-//#endregion
-//#region src/generators/run/generate.runner.ts
-const CACHE_FILE_NAME = ".openapi-codegen-cache.json";
-async function runGenerate({ fileConfig, params, profiler = new Profiler(process.env.OPENAPI_CODEGEN_PROFILE === "1") }) {
-	const config = profiler.runSync("config.resolve", () => resolveConfig({
-		fileConfig,
-		params: params ?? {}
-	}));
-	const openApiDoc = await getOpenApiDoc(config.input, profiler);
-	const openApiHash = hashString(stableStringify(openApiDoc));
-	const optionsHash = hashString(stableStringify(getCacheableConfig(config)));
-	const cacheFilePath = path.resolve(config.output, CACHE_FILE_NAME);
-	if (config.incremental) {
-		const cached = readCache(cacheFilePath);
-		if (cached && cached.openApiHash === openApiHash && cached.optionsHash === optionsHash) return {
-			skipped: true,
-			config
-		};
-	}
-	const filesData = profiler.runSync("generate.total", () => generateCodeFromOpenAPIDoc(openApiDoc, config, profiler));
-	profiler.runSync("files.write", () => writeGenerateFileData(filesData));
-	if (config.incremental) writeCache(cacheFilePath, {
-		openApiHash,
-		optionsHash
-	});
-	return {
-		skipped: false,
-		config
-	};
-}
-async function getOpenApiDoc(input, profiler) {
-	const parsedDoc = await profiler.runAsync("openapi.parse", async () => await SwaggerParser.parse(input));
-	if (!profiler.runSync("openapi.detectExternalRefs", () => hasExternalRef(parsedDoc))) return parsedDoc;
-	return await profiler.runAsync("openapi.bundle", async () => await SwaggerParser.bundle(input));
-}
-function hasExternalRef(value) {
-	const stack = [value];
-	const visited = /* @__PURE__ */ new Set();
-	while (stack.length > 0) {
-		const current = stack.pop();
-		if (!current || typeof current !== "object") continue;
-		if (visited.has(current)) continue;
-		visited.add(current);
-		if ("$ref" in current && typeof current.$ref === "string" && !current.$ref.startsWith("#/")) return true;
-		for (const nested of Object.values(current)) if (nested && typeof nested === "object") stack.push(nested);
-	}
-	return false;
-}
-function getCacheableConfig(config) {
-	const { output, incremental, ...cacheableConfig } = config;
-	return cacheableConfig;
-}
-function readCache(filePath) {
-	if (!fs.existsSync(filePath)) return null;
-	try {
-		return JSON.parse(fs.readFileSync(filePath, "utf-8"));
-	} catch {
-		return null;
-	}
-}
-function writeCache(filePath, data) {
-	const dir = path.dirname(filePath);
-	if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-	fs.writeFileSync(filePath, JSON.stringify(data), "utf-8");
-}
-function hashString(input) {
-	let hash = 2166136261;
-	for (let i = 0; i < input.length; i += 1) {
-		hash ^= input.charCodeAt(i);
-		hash = Math.imul(hash, 16777619);
-	}
-	return (hash >>> 0).toString(16);
-}
-function stableStringify(input) {
-	if (input === null || typeof input !== "object") return JSON.stringify(input);
-	if (Array.isArray(input)) return `[${input.map((item) => stableStringify(item)).join(",")}]`;
-	const obj = input;
-	return `{${Object.keys(obj).sort((a, b) => a.localeCompare(b)).map((key) => `${JSON.stringify(key)}:${stableStringify(obj[key])}`).join(",")}}`;
-}
-
-//#endregion
-export { resolveConfig as n, runGenerate as t };