@ahoo-wang/fetcher-generator 3.16.0 → 3.16.2

package/dist/{src-B15FuHXN.js → src-Drc8UO0Q.js}

@@ -2,170 +2,37 @@ import { Project as e, Scope as t, VariableDeclarationKind as n } from "ts-morph
 import { ContentTypeValues as r, combineURLs as i } from "@ahoo-wang/fetcher";
 import { parse as a } from "yaml";
 import { readFile as o } from "fs";
-import { join as s, relative as c, sep as l } from "path";
-import { ResourceAttributionPathSpec as u } from "@ahoo-wang/fetcher-wow";
-//#region src/utils/logger.ts
-var ee = class {
-	getTimestamp() {
-		return (/* @__PURE__ */ new Date()).toTimeString().slice(0, 8);
-	}
-	info(e, ...t) {
-		let n = this.getTimestamp();
-		t.length > 0 ? console.log(`[${n}] ℹ️  ${e}`, ...t) : console.log(`[${n}] ℹ️  ${e}`);
-	}
-	success(e, ...t) {
-		let n = this.getTimestamp();
-		t.length > 0 ? console.log(`[${n}] ✅ ${e}`, ...t) : console.log(`[${n}] ✅ ${e}`);
-	}
-	error(e, ...t) {
-		let n = this.getTimestamp();
-		t.length > 0 ? console.error(`[${n}] ❌ ${e}`, ...t) : console.error(`[${n}] ❌ ${e}`);
-	}
-	progress(e, t = 0, ...n) {
-		let r = this.getTimestamp(), i = "  ".repeat(t);
-		n.length > 0 ? console.log(`[${r}] 🔄 ${i}${e}`, ...n) : console.log(`[${r}] 🔄 ${i}${e}`);
-	}
-	progressWithCount(e, t, n, r = 0, ...i) {
-		let a = this.getTimestamp(), o = "  ".repeat(r), s = `[${e}/${t}]`;
-		i.length > 0 ? console.log(`[${a}] 🔄 ${o}${s} ${n}`, ...i) : console.log(`[${a}] 🔄 ${o}${s} ${n}`);
-	}
-}, te = {
-	name: "@ahoo-wang/fetcher-generator",
-	version: "3.16.0",
-	description: "A powerful TypeScript code generation tool that automatically generates type-safe API client code based on OpenAPI specifications. It is designed for general use cases and is also deeply optimized for the [Wow](https://github.com/Ahoo-Wang/Wow) Domain-Driven Design framework, providing native support for the CQRS architectural pattern.",
-	keywords: [
-		"fetch",
-		"http",
-		"client",
-		"openapi",
-		"openapi3",
-		"swagger",
-		"generator",
-		"typescript",
-		"codegen",
-		"api",
-		"rest"
-	],
-	author: "Ahoo-Wang",
-	license: "Apache-2.0",
-	homepage: "https://github.com/Ahoo-Wang/fetcher/tree/master/packages/generator",
-	repository: {
-		type: "git",
-		url: "https://github.com/Ahoo-Wang/fetcher.git",
-		directory: "packages/generator"
-	},
-	bugs: { url: "https://github.com/Ahoo-Wang/fetcher/issues" },
-	type: "module",
-	engines: { node: ">=18.0.0" },
-	main: "./dist/index.umd.js",
-	module: "./dist/index.es.js",
-	types: "./dist/index.d.ts",
-	bin: { "fetcher-generator": "./dist/cli.js" },
-	exports: { ".": {
-		types: "./dist/index.d.ts",
-		import: "./dist/index.es.js",
-		require: "./dist/index.umd.js"
-	} },
-	files: [
-		"dist",
-		"README.md",
-		"README.zh-CN.md"
-	],
-	scripts: {
-		build: "vite build",
-		"test:ui": "vitest --ui",
-		test: "vitest run --coverage --testTimeout=15000",
-		lint: "eslint . --fix",
-		clean: "rm -rf dist",
-		analyze: "npx vite-bundle-analyzer -p auto",
-		generate: "node dist/cli.js generate -i test/demo.spec.json -o test-output -t tsconfig.json"
-	},
-	peerDependencies: {
-		"@ahoo-wang/fetcher": "workspace:^3.0.0",
-		"@ahoo-wang/fetcher-eventstream": "workspace:^3.0.0",
-		"@ahoo-wang/fetcher-decorator": "workspace:^3.0.0",
-		"@ahoo-wang/fetcher-openapi": "workspace:^3.0.0",
-		"@ahoo-wang/fetcher-wow": "workspace:^3.0.0"
-	},
-	dependencies: {
-		"ts-morph": "catalog:",
-		commander: "catalog:",
-		yaml: "catalog:"
-	},
-	devDependencies: {
-		"@eslint/js": "catalog:",
-		"@types/node": "catalog:",
-		"@vitest/coverage-v8": "catalog:",
-		"@vitest/ui": "catalog:",
-		eslint: "catalog:",
-		globals: "catalog:",
-		prettier: "catalog:",
-		typescript: "catalog:",
-		"typescript-eslint": "catalog:",
-		"unplugin-dts": "catalog:",
-		vite: "catalog:",
-		"vite-bundle-analyzer": "catalog:",
-		vitest: "catalog:"
-	}
-};
-//#endregion
-//#region src/utils/clis.ts
-function ne(e) {
-	if (!e) return !1;
-	try {
-		let t = new URL(e);
-		return t.protocol === "http:" || t.protocol === "https:";
-	} catch {
-		return e.length > 0;
-	}
-}
-async function re(e) {
-	let t = new ee();
-	process.on("SIGINT", () => {
-		t.error("Generation interrupted by user"), process.exit(130);
-	}), ne(e.input) || (t.error("Invalid input: must be a valid file path or HTTP/HTTPS URL"), process.exit(2));
-	try {
-		t.info(`Fetcher Generator v${te.version}`), t.info("Starting code generation..."), await new $({
-			inputPath: e.input,
-			outputDir: e.output,
-			configPath: e.config,
-			tsConfigFilePath: e.tsConfigFilePath,
-			logger: t
-		}).generate(), t.success(`Code generation completed successfully! Files generated in: ${e.output}`);
-	} catch (e) {
-		t.error("Error during code generation: \n", e), process.exit(1);
-	}
-}
-//#endregion
+import { join as s, relative as c, sep as ee } from "path";
+import { ResourceAttributionPathSpec as l } from "@ahoo-wang/fetcher-wow";
 //#region src/utils/components.ts
-var d = "#/components/";
-`${d}`, `${d}`, `${d}`, `${d}`, `${d}`;
-function f(e) {
+var u = "#/components/";
+`${u}`, `${u}`, `${u}`, `${u}`, `${u}`;
+function d(e) {
 	return e.$ref.split("/").pop();
 }
-function p(e, t) {
-	let n = f(e);
+function f(e, t) {
+	let n = d(e);
 	return t.schemas?.[n];
 }
-function ie(e, t) {
-	let n = f(e);
+function p(e, t) {
+	let n = d(e);
 	return t.requestBodies?.[n];
 }
-function ae(e, t) {
-	let n = f(e);
+function te(e, t) {
+	let n = d(e);
 	return t.parameters?.[n];
 }
 function m(e, t) {
 	return {
-		key: f(e),
-		schema: p(e, t)
+		key: d(e),
+		schema: f(e, t)
 	};
 }
 //#endregion
 //#region src/utils/naming.ts
-var oe = /[-_'\s./?;:,()[\]{}|\\]+/;
+var ne = /[-_'\s./?;:,()[\]{}|\\]+/;
 function h(e) {
-	return e.split(oe);
+	return e.split(ne);
 }
 function g(e) {
 	return Array.isArray(e) ? e.flatMap((e) => _(h(e))) : _(h(e));
@@ -191,14 +58,14 @@ function y(e) {
 	let t = v(e);
 	return t.charAt(0).toLowerCase() + t.slice(1);
 }
-function se(e) {
+function re(e) {
 	return e === "" || Array.isArray(e) && e.length === 0 ? "" : g(e).filter((e) => e.length > 0).map((e) => e.toUpperCase()).join("_");
 }
 function b(e) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(e) ? e : `'${e}'`;
 }
-function ce(e) {
-	return /^\d+$/.test(e) ? `NUM_${e}` : b(se(e));
+function ie(e) {
+	return /^\d+$/.test(e) ? `NUM_${e}` : b(re(e));
 }
 //#endregion
 //#region src/utils/references.ts
@@ -210,70 +77,70 @@ function x(e) {
 function S(e, t) {
 	if (t && !x(t) && t.content) return t.content[e]?.schema;
 }
-function le(e) {
+function ae(e) {
 	return S(r.APPLICATION_JSON, e);
 }
-function ue(e) {
+function oe(e) {
 	return S(r.TEXT_EVENT_STREAM, e);
 }
-function de(e) {
+function se(e) {
 	return S("*/*", e);
 }
 //#endregion
 //#region src/utils/schemas.ts
-var fe = [
+var ce = [
 	"string",
 	"number",
 	"integer",
 	"boolean",
 	"null"
 ];
-function pe(e) {
-	return Array.isArray(e) ? !0 : fe.includes(e);
+function C(e) {
+	return Array.isArray(e) ? !0 : ce.includes(e);
 }
-function me(e) {
+function w(e) {
 	return Array.isArray(e.enum) && e.enum.length > 0;
 }
-var he = "x-enum-text";
-function ge(e) {
-	return e[he];
+var le = "x-enum-text";
+function ue(e) {
+	return e[le];
 }
-function C(e) {
+function T(e) {
 	return e.type === "object" && !!e.properties;
 }
-function w(e) {
+function E(e) {
 	return e.type === "array" && !!e.items;
 }
-function _e(e) {
+function de(e) {
 	return Array.isArray(e.anyOf) && e.anyOf.length > 0;
 }
-function ve(e) {
+function fe(e) {
 	return Array.isArray(e.oneOf) && e.oneOf.length > 0;
 }
-function T(e) {
+function D(e) {
 	return Array.isArray(e.allOf) && e.allOf.length > 0;
 }
-function E(e) {
-	return _e(e) || ve(e) || T(e);
+function O(e) {
+	return de(e) || fe(e) || D(e);
 }
-function D(e) {
+function k(e) {
 	return e.includes("|") || e.includes("&") ? `(${e})[]` : `${e}[]`;
 }
-function O(e) {
+function A(e) {
 	return e.type === "object" && !e.properties && e.additionalProperties !== void 0;
 }
-var ye = "x-map-key-schema";
-function be(e) {
-	return e[ye];
+var pe = "x-map-key-schema";
+function me(e) {
+	return e[pe];
 }
-function xe(e) {
+function he(e) {
 	return e.type === "object" ? e.properties ? Object.keys(e.properties).length === 0 : !0 : !1;
 }
-function Se(e) {
+function ge(e) {
 	return e.readOnly === !0;
 }
-function k(e) {
-	if (Array.isArray(e)) return e.map((e) => k(e)).join(" | ");
+function j(e) {
+	if (Array.isArray(e)) return e.map((e) => j(e)).join(" | ");
 	switch (e) {
 		case "string": return "string";
 		case "number":
@@ -283,28 +150,28 @@ function k(e) {
 		default: return "any";
 	}
 }
-function Ce(e) {
-	if (!C(e)) return [];
+function _e(e) {
+	if (!T(e)) return [];
 	let t = e.required || [];
 	return Object.keys(e.properties).filter((e) => !t.includes(e));
 }
 //#endregion
 //#region src/utils/operations.ts
-function we(e, t) {
+function ve(e, t) {
 	return e.operation.operationId && t.operation.operationId ? e.operation.operationId.localeCompare(t.operation.operationId) : e.path && t.path ? e.path.localeCompare(t.path) : e.method && t.method ? e.method.localeCompare(t.method) : 0;
 }
-function A(e) {
+function M(e) {
 	let t = [];
-	for (let [n, r] of Object.entries(e)) j(r).forEach((e) => {
+	for (let [n, r] of Object.entries(e)) N(r).forEach((e) => {
 		t.push({
 			method: e.method,
 			operation: e.operation,
 			path: n
 		});
 	});
-	return t.sort(we);
+	return t.sort(ve);
 }
-function j(e) {
+function N(e) {
 	return [
 		{
 			method: "get",
@@ -340,28 +207,28 @@ function j(e) {
 		}
 	].filter(({ operation: e }) => e !== void 0);
 }
-function M(e) {
+function P(e) {
 	return e.responses[200];
 }
-function N(e) {
-	return le(M(e));
+function F(e) {
+	return ae(P(e));
 }
-function Te(e, t) {
-	return e.parameters ? e.parameters.map((e) => x(e) ? ae(e, t) : e).filter((e) => e.in === "path") : [];
+function ye(e, t) {
+	return e.parameters ? e.parameters.map((e) => x(e) ? te(e, t) : e).filter((e) => e.in === "path") : [];
 }
-var Ee = "string";
-function P(e) {
-	return !e.schema || x(e.schema) || !e.schema.type || !pe(e.schema.type) ? Ee : k(e.schema.type);
+var be = "string";
+function I(e) {
+	return !e.schema || x(e.schema) || !e.schema.type || !C(e.schema.type) ? be : j(e.schema.type);
 }
 //#endregion
 //#region src/utils/resources.ts
-function F(e) {
-	return e.startsWith("http://") || e.startsWith("https://") ? De(e) : Oe(e);
+function L(e) {
+	return e.startsWith("http://") || e.startsWith("https://") ? xe(e) : Se(e);
 }
-async function De(e) {
+async function xe(e) {
 	return await (await fetch(e)).text();
 }
-function Oe(e) {
+function Se(e) {
 	return new Promise((t, n) => {
 		o(e, "utf-8", (e, r) => {
 			e ? n(e) : t(r);
@@ -370,124 +237,124 @@ function Oe(e) {
 }
 //#endregion
 //#region src/utils/parsers.ts
-async function ke(e) {
-	let t = await F(e);
-	switch (L(t)) {
-		case I.JSON: return JSON.parse(t);
-		case I.YAML: return a(t);
+async function Ce(e) {
+	let t = await L(e);
+	switch (z(t)) {
+		case R.JSON: return JSON.parse(t);
+		case R.YAML: return a(t);
 		default: throw Error(`Unsupported file format: ${e}`);
 	}
 }
-async function Ae(e) {
-	let t = await F(e);
-	switch (L(t)) {
-		case I.JSON: return JSON.parse(t);
-		case I.YAML: return a(t);
+async function we(e) {
+	let t = await L(e);
+	switch (z(t)) {
+		case R.JSON: return JSON.parse(t);
+		case R.YAML: return a(t);
 		default: throw Error(`Unsupported file format: ${e}`);
 	}
 }
-var I = /* @__PURE__ */ function(e) {
+var R = /* @__PURE__ */ function(e) {
 	return e.JSON = "json", e.YAML = "yaml", e;
 }({});
-function L(e) {
+function z(e) {
 	let t = e.trimStart();
-	if (t.startsWith("{") || t.startsWith("[")) return I.JSON;
-	if (t.startsWith("-") || t.startsWith("%YAML")) return I.YAML;
+	if (t.startsWith("{") || t.startsWith("[")) return R.JSON;
+	if (t.startsWith("-") || t.startsWith("%YAML")) return R.YAML;
 	try {
-		return JSON.parse(t), I.JSON;
+		return JSON.parse(t), R.JSON;
 	} catch {
-		if (t.length > 0) return I.YAML;
+		if (t.length > 0) return R.YAML;
 	}
 	throw Error("Unable to infer file format");
 }
 //#endregion
 //#region src/utils/sourceFiles.ts
-var R = "types.ts", je = "@";
-function Me(e) {
-	return i(e.path, R);
+var B = "types.ts", Te = "@";
+function Ee(e) {
+	return i(e.path, B);
 }
-function z(e, t, n) {
+function V(e, t, n) {
 	let r = i(t, n);
 	return e.getSourceFile(r) || e.createSourceFile(r, "", { overwrite: !0 });
 }
-function B(e, t, n) {
+function H(e, t, n) {
 	let r = e.getImportDeclaration((e) => e.getModuleSpecifierValue() === t);
 	r ||= e.addImportDeclaration({ moduleSpecifier: t }), n.forEach((e) => {
 		r.getNamedImports().some((t) => t.getName() === e) || r.addNamedImport(e);
 	});
 }
-function V(e, t, n) {
-	if (n.path.startsWith(je)) {
-		B(e, n.path, [n.name]);
+function U(e, t, n) {
+	if (n.path.startsWith(Te)) {
+		H(e, n.path, [n.name]);
 		return;
 	}
-	let r = c(e.getDirectoryPath(), s(t, n.path, R));
-	r = r.replace(/\.ts$/, ""), r = r.split(l).join("/"), r.startsWith(".") || (r = "./" + r), B(e, r, [n.name]);
+	let r = c(e.getDirectoryPath(), s(t, n.path, B));
+	r = r.replace(/\.ts$/, ""), r = r.split(ee).join("/"), r.startsWith(".") || (r = "./" + r), H(e, r, [n.name]);
 }
-function Ne(e, t, n, r) {
-	e.path !== r.path && V(t, n, r);
+function De(e, t, n, r) {
+	e.path !== r.path && U(t, n, r);
 }
-function Pe(e, t = "\n") {
+function Oe(e, t = "\n") {
 	if (!Array.isArray(e)) return;
 	let n = e.filter((e) => typeof e == "string" && e.length > 0);
 	return n.length > 0 ? n.join(t) : void 0;
 }
-function H(e, t) {
-	let n = Pe(t);
+function W(e, t) {
+	let n = Oe(t);
 	n && e.addJsDoc(n);
 }
-function U(e, t) {
+function G(e, t) {
 	let n = [e.title, e.description];
-	return t && n.push(`- key: ${t}`), e.format && n.push(`- format: ${e.format}`), Le(n, e, "default"), Le(n, e, "example"), ze(n, e), Be(n, e), Ve(n, e), n;
+	return t && n.push(`- key: ${t}`), e.format && n.push(`- format: ${e.format}`), je(n, e, "default"), je(n, e, "example"), Ne(n, e), Pe(n, e), Fe(n, e), n;
 }
-function Fe(e, t, n) {
-	H(e, U(t, n));
+function ke(e, t, n) {
+	W(e, G(t, n));
 }
-function Ie(e, t, n) {
-	let r = U(t, n);
-	Re(r, "schema", t), H(e, r);
+function Ae(e, t, n) {
+	let r = G(t, n);
+	Me(r, "schema", t), W(e, r);
 }
-function Le(e, t, n) {
+function je(e, t, n) {
 	let r = t[n];
 	if (r) {
 		if (typeof r != "object") {
 			e.push(`- ${n}: \`${r}\``);
 			return;
 		}
-		Re(e, n, r);
+		Me(e, n, r);
 	}
 }
-function Re(e, t, n) {
+function Me(e, t, n) {
 	e.push(`- ${t}: `), e.push("```json"), e.push(JSON.stringify(n, null, 2)), e.push("```");
 }
-function ze(e, t) {
+function Ne(e, t) {
 	let n = ["- Numeric Constraints"];
 	t.minimum !== void 0 && n.push(`  - minimum: ${t.minimum}`), t.maximum !== void 0 && n.push(`  - maximum: ${t.maximum}`), t.exclusiveMinimum !== void 0 && n.push(`  - exclusiveMinimum: ${t.exclusiveMinimum}`), t.exclusiveMaximum !== void 0 && n.push(`  - exclusiveMaximum: ${t.exclusiveMaximum}`), t.multipleOf !== void 0 && n.push(`  - multipleOf: ${t.multipleOf}`), n.length !== 1 && e.push(...n);
 }
-function Be(e, t) {
+function Pe(e, t) {
 	let n = ["- String Constraints"];
 	t.minLength !== void 0 && n.push(`  - minLength: ${t.minLength}`), t.maxLength !== void 0 && n.push(`  - maxLength: ${t.maxLength}`), t.pattern !== void 0 && n.push(`  - pattern: ${t.pattern}`), n.length !== 1 && e.push(...n);
 }
-function Ve(e, t) {
+function Fe(e, t) {
 	let n = ["- Array Constraints"];
 	t.minItems !== void 0 && n.push(`  - minItems: ${t.minItems}`), t.maxItems !== void 0 && n.push(`  - maxItems: ${t.maxItems}`), t.uniqueItems !== void 0 && n.push(`  - uniqueItems: ${t.uniqueItems}`), n.length !== 1 && e.push(...n);
 }
 //#endregion
 //#region src/aggregate/utils.ts
-function He(e) {
+function Ie(e) {
 	let t = e.split(".");
 	return t.length != 2 || t[0].length === 0 || t[1].length === 0 ? null : t;
 }
-function Ue(e) {
-	let t = He(e.name);
+function Le(e) {
+	let t = Ie(e.name);
 	return t ? {
 		tag: e,
 		contextAlias: t[0],
 		aggregateName: t[1]
 	} : null;
 }
-function We(e) {
-	let t = e?.map((e) => Ue(e)).filter((e) => e !== null);
+function Re(e) {
+	let t = e?.map((e) => Le(e)).filter((e) => e !== null);
 	if (!t) return /* @__PURE__ */ new Map();
 	let n = /* @__PURE__ */ new Map();
 	return t.forEach((e) => {
@@ -498,20 +365,20 @@ function We(e) {
 		});
 	}), n;
 }
-function Ge(e) {
+function ze(e) {
 	if (!e) return null;
 	let t = e.split(".");
 	return t.length == 3 ? t[2] : null;
 }
 //#endregion
 //#region src/aggregate/aggregateResolver.ts
-var Ke = "#/components/responses/wow.CommandOk", qe = "#/components/parameters/wow.id", Je = class {
+var Be = "#/components/responses/wow.CommandOk", Ve = "#/components/parameters/wow.id", He = class {
 	aggregates;
 	constructor(e) {
-		this.openAPI = e, this.aggregates = We(e.tags), this.build();
+		this.openAPI = e, this.aggregates = Re(e.tags), this.build();
 	}
 	build() {
-		let e = A(this.openAPI.paths);
+		let e = M(this.openAPI.paths);
 		for (let t of e) this.commands(t.path, t), this.state(t.operation), this.events(t.operation), this.fields(t.operation);
 	}
 	resolve() {
@@ -526,35 +393,35 @@ var Ke = "#/components/responses/wow.CommandOk", qe = "#/components/parameters/w
 	commands(e, t) {
 		let n = t.operation;
 		if (n.operationId === "wow.command.send") return;
-		let i = Ge(n.operationId);
+		let i = ze(n.operationId);
 		if (!i) return;
-		let a = M(n);
-		if (!a || !x(a) || a.$ref !== Ke || !n.requestBody) return;
-		let o = n.parameters ?? [], s = o.filter((e) => x(e) && e.$ref === qe).at(0), c = o.filter((e) => !x(e) && e.in === "path");
+		let a = P(n);
+		if (!a || !x(a) || a.$ref !== Be || !n.requestBody) return;
+		let o = n.parameters ?? [], s = o.filter((e) => x(e) && e.$ref === Ve).at(0), c = o.filter((e) => !x(e) && e.in === "path");
 		if (s) {
-			let e = ae(s, this.openAPI.components);
+			let e = te(s, this.openAPI.components);
 			c.push(e);
 		}
-		let l = n.requestBody.content[r.APPLICATION_JSON].schema, u = m(l, this.openAPI.components);
-		u.schema.title = u.schema.title || n.summary, u.schema.description = u.schema.description || n.description;
-		let ee = {
+		let ee = n.requestBody.content[r.APPLICATION_JSON].schema, l = m(ee, this.openAPI.components);
+		l.schema.title = l.schema.title || n.summary, l.schema.description = l.schema.description || n.description;
+		let u = {
 			name: i,
 			method: t.method,
 			path: e,
 			pathParameters: c,
 			summary: n.summary,
 			description: n.description,
-			schema: u,
+			schema: l,
 			operation: n
 		};
 		n.tags?.forEach((e) => {
 			let t = this.aggregates.get(e);
-			t && t.commands.set(i, ee);
+			t && t.commands.set(i, u);
 		});
 	}
 	state(e) {
 		if (!e.operationId?.endsWith(".snapshot_state.single")) return;
-		let t = N(e);
+		let t = F(e);
 		if (!x(t)) return;
 		let n = m(t, this.openAPI.components);
 		e.tags?.forEach((e) => {
@@ -564,11 +431,11 @@ var Ke = "#/components/responses/wow.CommandOk", qe = "#/components/parameters/w
 	}
 	events(e) {
 		if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query")) return;
-		let t = N(e);
+		let t = F(e);
 		if (x(t)) return;
 		let n = t?.items;
 		if (!x(n)) return;
-		let r = p(n, this.openAPI.components).properties.body.items.anyOf.map((e) => {
+		let r = f(n, this.openAPI.components).properties.body.items.anyOf.map((e) => {
 			let t = e.title, n = e.properties.name.const, r = e.properties.body, i = m(r, this.openAPI.components);
 			return i.schema.title = i.schema.title || e.title, {
 				title: t,
@@ -585,13 +452,13 @@ var Ke = "#/components/responses/wow.CommandOk", qe = "#/components/parameters/w
 	}
 	fields(e) {
 		if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count")) return;
-		let t = ie(e.requestBody, this.openAPI.components).content[r.APPLICATION_JSON].schema, n = p(t, this.openAPI.components).properties?.field, i = m(n, this.openAPI.components);
+		let t = p(e.requestBody, this.openAPI.components).content[r.APPLICATION_JSON].schema, n = f(t, this.openAPI.components).properties?.field, i = m(n, this.openAPI.components);
 		e.tags?.forEach((e) => {
 			let t = this.aggregates.get(e);
 			t && (t.fields = i);
 		});
 	}
-}, W = "@ahoo-wang/fetcher-wow", Ye = {
+}, K = "@ahoo-wang/fetcher-wow", Ue = {
 	"wow.command.CommandResult": "CommandResult",
 	"wow.command.CommandResultArray": "CommandResultArray",
 	"wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -626,15 +493,15 @@ var Ke = "#/components/responses/wow.CommandOk", qe = "#/components/parameters/w
 };
 //#endregion
 //#region src/model/modelInfo.ts
-function G(e) {
+function q(e) {
 	if (!e) return {
 		name: "",
 		path: "/"
 	};
-	let t = Ye[e];
+	let t = Ue[e];
 	if (t) return {
 		name: t,
-		path: W
+		path: K
 	};
 	let n = e.split("."), r = -1;
 	for (let e = 0; e < n.length; e++) if (n[e] && /^[A-Z]/.test(n[e])) {
@@ -647,29 +514,29 @@ function G(e) {
 		path: a
 	};
 }
-function K(e) {
-	return G(f(e));
+function J(e) {
+	return q(d(e));
 }
-function q(e) {
-	return `${se(e)}_BOUNDED_CONTEXT_ALIAS`;
+function Y(e) {
+	return `${re(e)}_BOUNDED_CONTEXT_ALIAS`;
 }
 //#endregion
 //#region src/model/typeGenerator.ts
-var Xe = class {
+var We = class {
 	constructor(e, t, n, r) {
 		this.modelInfo = e, this.sourceFile = t, this.keySchema = n, this.outputDir = r;
 	}
 	generate() {
 		let e = this.process();
-		e && Ie(e, this.keySchema.schema, this.keySchema.key);
+		e && Ae(e, this.keySchema.schema, this.keySchema.key);
 	}
 	process() {
 		let { schema: e } = this.keySchema;
-		return me(e) ? this.processEnum(e) : C(e) ? this.processInterface(e) : w(e) ? this.processArray(e) : T(e) ? this.processIntersection(e) : E(e) ? this.processComposition(e) : this.processTypeAlias(e);
+		return w(e) ? this.processEnum(e) : T(e) ? this.processInterface(e) : E(e) ? this.processArray(e) : D(e) ? this.processIntersection(e) : O(e) ? this.processComposition(e) : this.processTypeAlias(e);
 	}
 	resolveReference(e) {
-		let t = K(e);
-		return Ne(this.modelInfo, this.sourceFile, this.outputDir, t), t;
+		let t = J(e);
+		return De(this.modelInfo, this.sourceFile, this.outputDir, t), t;
 	}
 	resolveAdditionalProperties(e) {
 		return e.additionalProperties === void 0 || e.additionalProperties === !1 ? "" : e.additionalProperties === !0 ? "[key: string]: any" : `[key: string]: ${this.resolveType(e.additionalProperties)}`;
@@ -679,7 +546,7 @@ var Xe = class {
 		return Object.entries(t).map(([e, t]) => {
 			let n = this.resolveType(t), r = b(e);
 			if (!x(t)) {
-				let e = Pe(U(t), "\n * ");
+				let e = Oe(G(t), "\n * ");
 				if (e) return `
           /**
            * ${e}
@@ -692,7 +559,7 @@ var Xe = class {
 	}
 	resolveObjectType(e) {
 		let t = [];
-		if (C(e)) {
+		if (T(e)) {
 			let n = this.resolvePropertyDefinitions(e);
 			t.push(...n);
 		}
@@ -703,7 +570,7 @@ var Xe = class {
 		return e.additionalProperties === void 0 || e.additionalProperties === !1 || e.additionalProperties === !0 ? "any" : this.resolveType(e.additionalProperties);
 	}
 	resolveMapKeyType(e) {
-		let t = be(e);
+		let t = me(e);
 		return t ? this.resolveType(t) : "string";
 	}
 	resolveMapType(e) {
@@ -711,29 +578,29 @@ var Xe = class {
 	}
 	resolveType(e) {
 		if (x(e)) return this.resolveReference(e).name;
-		if (O(e)) return this.resolveMapType(e);
+		if (A(e)) return this.resolveMapType(e);
 		if (e.const) return `'${e.const}'`;
-		if (me(e)) return e.enum.map((e) => `\`${e}\``).join(" | ");
-		if (E(e)) {
-			let t = (e.oneOf || e.anyOf || e.allOf || []).map((e) => this.resolveType(e)), n = T(e) ? " & " : " | ";
+		if (w(e)) return e.enum.map((e) => `\`${e}\``).join(" | ");
+		if (O(e)) {
+			let t = (e.oneOf || e.anyOf || e.allOf || []).map((e) => this.resolveType(e)), n = D(e) ? " & " : " | ";
 			return `(${t.join(n)})`;
 		}
-		return w(e) ? D(this.resolveType(e.items)) : e.type === "object" ? this.resolveObjectType(e) : e.type ? k(e.type) : "any";
+		return E(e) ? k(this.resolveType(e.items)) : e.type === "object" ? this.resolveObjectType(e) : e.type ? j(e.type) : "any";
 	}
 	processEnum(e) {
-		let t = ge(e);
+		let t = ue(e);
 		return t && this.sourceFile.addEnum({
 			name: this.modelInfo.name + "EnumText",
 			isExported: !0,
 			members: Object.entries(t).map(([e, t]) => ({
-				name: ce(e),
+				name: ie(e),
 				initializer: `\`${t}\``
 			}))
 		}), this.sourceFile.addEnum({
 			name: this.modelInfo.name,
 			isExported: !0,
 			members: e.enum.filter((e) => typeof e == "string" && e.length > 0).map((e) => ({
-				name: ce(e),
+				name: ie(e),
 				initializer: `\`${e}\``
 			}))
 		});
@@ -743,8 +610,8 @@ var Xe = class {
 		a ? a.setType(r) : a = e.addProperty({
 			name: i,
 			type: r,
-			isReadonly: Se(n)
-		}), Fe(a, n);
+			isReadonly: ge(n)
+		}), ke(a, n);
 	}
 	processInterface(e) {
 		let t = this.sourceFile.addInterface({
@@ -785,7 +652,7 @@ var Xe = class {
 				t.addExtends(n);
 				return;
 			}
-			C(e) && Object.entries(e.properties).forEach(([e, n]) => {
+			T(e) && Object.entries(e.properties).forEach(([e, n]) => {
 				this.addPropertyToInterface(t, e, n);
 			});
 		}), t;
@@ -797,12 +664,12 @@ var Xe = class {
 			isExported: !0
 		});
 	}
-}, Ze = class {
+}, Ge = class {
 	constructor(e) {
 		this.context = e;
 	}
 	getOrCreateSourceFile(e) {
-		let t = Me(e);
+		let t = Ee(e);
 		return this.context.getOrCreateSourceFile(t);
 	}
 	generate() {
@@ -825,7 +692,7 @@ var Xe = class {
 	isWowSchema(e, t) {
 		if (e !== "wow.api.query.PagedList" && e.startsWith("wow.api.query.") && e.endsWith("PagedList") || e.startsWith("wow.api.query.Operator") && e.endsWith("Map")) return !1;
 		if (e.startsWith("wow.") || e.endsWith("AggregatedCondition") || e.endsWith("AggregatedDomainEventStream") || e.endsWith("AggregatedDomainEventStreamPagedList") || e.endsWith("AggregatedDomainEventStreamServerSentEventNonNullData") || e.endsWith("AggregatedListQuery") || e.endsWith("AggregatedPagedQuery") || e.endsWith("AggregatedSingleQuery")) return !0;
-		let n = G(e);
+		let n = q(e);
 		return t.has(n.name);
 	}
 	aggregatedSchemaSuffix = [
@@ -842,23 +709,23 @@ var Xe = class {
 		for (let [t, n] of this.context.contextAggregates) {
 			this.generateBoundedContext(t);
 			for (let t of n) this.aggregatedSchemaSuffix.forEach((n) => {
-				let r = v(G(t.state.key).name) + n;
+				let r = v(q(t.state.key).name) + n;
 				e.add(r);
 			});
 		}
 		return e;
 	}
 	generateKeyedSchema(e) {
-		let t = G(e.key);
-		new Xe(t, this.getOrCreateSourceFile(t), e, this.context.outputDir).generate();
+		let t = q(e.key);
+		new We(t, this.getOrCreateSourceFile(t), e, this.context.outputDir).generate();
 	}
 	generateBoundedContext(e) {
 		let t = `${e}/boundedContext.ts`;
 		this.context.logger.info(`Creating bounded context file: ${t}`);
-		let n = this.context.getOrCreateSourceFile(t), r = q(e);
+		let n = this.context.getOrCreateSourceFile(t), r = Y(e);
 		n.addStatements(`export const ${r} = '${e}';`);
 	}
-}, Qe = "@ahoo-wang/fetcher", $e = ["ResultExtractors"], et = "@ahoo-wang/fetcher-decorator", tt = [
+}, Ke = "@ahoo-wang/fetcher", qe = ["ResultExtractors"], Je = "@ahoo-wang/fetcher-decorator", Ye = [
 	"type ApiMetadata",
 	"type ApiMetadataCapable",
 	"type ParameterRequest",
@@ -872,20 +739,20 @@ var Xe = class {
 	"attribute",
 	"path",
 	"autoGeneratedError"
-], nt = {
+], Xe = {
 	type: "Promise<Response>",
 	metadata: "{resultExtractor: ResultExtractors.Response }"
-}, rt = {
+}, Ze = {
 	type: "Promise<string>",
 	metadata: "{resultExtractor: ResultExtractors.Text }"
-}, J = "{\n  headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },\n  resultExtractor: JsonEventStreamResultExtractor,\n}";
-function it(e) {
-	B(e, Qe, $e);
+}, X = "{\n  headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },\n  resultExtractor: JsonEventStreamResultExtractor,\n}";
+function Qe(e) {
+	H(e, Ke, qe);
 }
-function at(e) {
-	B(e, et, tt);
+function $e(e) {
+	H(e, Je, Ye);
 }
-function Y(e, t, n = [], r = [], i) {
+function Z(e, t, n = [], r = [], i) {
 	return t.addClass({
 		name: e,
 		isExported: !0,
@@ -897,7 +764,7 @@ function Y(e, t, n = [], r = [], i) {
 		}]
 	});
 }
-function ot(e, n) {
+function et(e, n) {
 	e.addImplements("ApiMetadataCapable"), e.addConstructor({ parameters: [{
 		name: "apiMetadata",
 		type: "ApiMetadata",
@@ -907,30 +774,30 @@ function ot(e, n) {
 		initializer: n
 	}] });
 }
-var st = "@ahoo-wang/fetcher-eventstream";
-function X(e) {
-	B(e, st, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
+var tt = "@ahoo-wang/fetcher-eventstream";
+function nt(e) {
+	H(e, tt, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
 }
 //#endregion
 //#region src/client/utils.ts
-function ct(e) {
+function rt(e) {
 	let t = 0, n = 0;
 	return e.commands.forEach((e) => {
-		e.path.startsWith(u.TENANT) && (t += 1), e.path.startsWith(u.OWNER) && (n += 1);
+		e.path.startsWith(l.TENANT) && (t += 1), e.path.startsWith(l.OWNER) && (n += 1);
 	}), t === 0 && n === 0 ? "ResourceAttributionPathSpec.NONE" : t > n ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function lt(e, t, n, r) {
-	return z(e, t, `${n.contextAlias}/${n.aggregateName}/${r}.ts`);
+function it(e, t, n, r) {
+	return V(e, t, `${n.contextAlias}/${n.aggregateName}/${r}.ts`);
 }
-function Z(e, t) {
+function Q(e, t) {
 	return `${v(e.aggregateName)}${t}`;
 }
-function Q(e) {
+function $(e) {
 	return e === "delete" ? "del" : e;
 }
-var ut = "x-fetcher-method";
-function dt(e, t) {
-	let n = e[ut];
+var at = "x-fetcher-method";
+function ot(e, t) {
+	let n = e[at];
 	if (n) return n;
 	if (!e.operationId) return;
 	let r = h(e.operationId);
@@ -942,12 +809,12 @@ function dt(e, t) {
 }
 //#endregion
 //#region src/client/apiClientGenerator.ts
-var ft = class {
+var st = class {
 	defaultParameterRequestType = "ParameterRequest";
-	defaultReturnType = nt;
+	defaultReturnType = Xe;
 	apiMetadataCtorInitializer;
 	constructor(e) {
-		this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${q(this.context.currentContextAlias)}}` : void 0;
+		this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${Y(this.context.currentContextAlias)}}` : void 0;
 	}
 	generate() {
 		this.context.logger.info("Starting API client generation");
@@ -970,30 +837,30 @@ var ft = class {
 		return this.context.currentContextAlias && (t = i(this.context.currentContextAlias, t)), t = i(t, `${e.name}ApiClient.ts`), this.context.logger.info(`Creating API client file: ${t}`), this.context.getOrCreateSourceFile(t);
 	}
 	generateApiClient(e, t) {
-		let n = G(e.name);
+		let n = q(e.name);
 		this.context.logger.info(`Generating API client class: ${n.name}ApiClient with ${t.size} operations`);
 		let r = this.createApiClientFile(n);
-		it(r), at(r), X(r);
-		let i = Y(n.name + "ApiClient", r);
-		H(i, [e.description]), ot(i, this.apiMetadataCtorInitializer), this.context.logger.info(`Processing ${t.size} operations for ${n.name}ApiClient`), t.forEach((t) => {
+		Qe(r), $e(r), nt(r);
+		let i = Z(n.name + "ApiClient", r);
+		W(i, [e.description]), et(i, this.apiMetadataCtorInitializer), this.context.logger.info(`Processing ${t.size} operations for ${n.name}ApiClient`), t.forEach((t) => {
 			this.processOperation(e, r, i, t);
 		}), this.context.logger.success(`Completed API client: ${n.name}ApiClient`);
 	}
 	getMethodName(e, t) {
-		let n = dt(t, (t) => e.getMethod(t) !== void 0);
+		let n = ot(t, (t) => e.getMethod(t) !== void 0);
 		if (!n) throw Error(`Unable to resolve method name for apiClientClass:${e.getName()}.`);
 		return n;
 	}
 	resolveRequestType(e, t) {
 		if (!t.requestBody) return this.context.logger.info(`No request body found for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`), this.defaultParameterRequestType;
 		let n;
-		if (x(t.requestBody) ? (this.context.logger.info(`Extracting request body from reference for operation: ${t.operationId}`), n = ie(t.requestBody, this.context.openAPI.components)) : n = t.requestBody, !n) return this.context.logger.info(`Request body extraction failed for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`), this.defaultParameterRequestType;
+		if (x(t.requestBody) ? (this.context.logger.info(`Extracting request body from reference for operation: ${t.operationId}`), n = p(t.requestBody, this.context.openAPI.components)) : n = t.requestBody, !n) return this.context.logger.info(`Request body extraction failed for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`), this.defaultParameterRequestType;
 		if (n.content["multipart/form-data"]) return this.context.logger.info(`Detected multipart/form-data content for operation ${t.operationId}, using ParameterRequest<FormData>`), "ParameterRequest<FormData>";
 		if (n.content["application/json"]) {
 			let r = n.content["application/json"].schema;
 			if (x(r)) {
-				let n = K(r);
-				this.context.logger.info(`Adding import for request body model: ${n.name} from ${n.path}`), V(e, this.context.outputDir, n);
+				let n = J(r);
+				this.context.logger.info(`Adding import for request body model: ${n.name} from ${n.path}`), U(e, this.context.outputDir, n);
 				let i = `ParameterRequest<${n.name}>`;
 				return this.context.logger.info(`Resolved request type for operation ${t.operationId}: ${i}`), i;
 			}
@@ -1001,10 +868,10 @@ var ft = class {
 		return this.context.logger.info(`Using default request type for operation ${t.operationId}: ${this.defaultParameterRequestType}`), this.defaultParameterRequestType;
 	}
 	resolveParameters(e, t, n) {
-		let r = Te(n, this.context.openAPI.components).filter((t) => !this.context.isIgnoreApiClientPathParameters(e.name, t.name));
+		let r = ye(n, this.context.openAPI.components).filter((t) => !this.context.isIgnoreApiClientPathParameters(e.name, t.name));
 		this.context.logger.info(`Found ${r.length} path parameters for operation ${n.operationId}`);
 		let i = r.map((e) => {
-			let t = P(e);
+			let t = I(e);
 			return this.context.logger.info(`Adding path parameter: ${e.name} (type: ${t})`), {
 				name: e.name,
 				type: t,
@@ -1035,48 +902,48 @@ var ft = class {
 	}
 	resolveType(e, t) {
 		if (x(t)) {
-			let n = K(t);
-			return V(e, this.context.outputDir, n), n.name;
+			let n = J(t);
+			return U(e, this.context.outputDir, n), n.name;
 		}
-		if (w(t)) return D(this.resolveType(e, t.items));
-		if (O(t)) {
+		if (E(t)) return k(this.resolveType(e, t.items));
+		if (A(t)) {
 			let n = t.additionalProperties;
 			return typeof n == "boolean" ? "Record<string, any>" : `Record<string, ${this.resolveType(e, n)}>`;
 		}
-		return t.type && pe(t.type) ? k(t.type) : "any";
+		return t.type && C(t.type) ? j(t.type) : "any";
 	}
 	resolveSchemaReturnType(e, t) {
 		return `Promise<${this.resolveType(e, t)}>`;
 	}
 	resolveReturnType(e, t) {
-		let n = M(t);
+		let n = P(t);
 		if (!n) return this.context.logger.info(`No OK response found for operation ${t.operationId}, using default return type: ${this.defaultReturnType.type}`), this.defaultReturnType;
-		let r = le(n) || de(n);
+		let r = ae(n) || se(n);
 		if (r) {
 			let n = this.resolveSchemaReturnType(e, r);
 			return this.context.logger.info(`Resolved JSON/wildcard response return type for operation ${t.operationId}: ${n}`), {
 				type: n,
-				metadata: n === rt.type ? rt.metadata : void 0
+				metadata: n === Ze.type ? Ze.metadata : void 0
 			};
 		}
-		let i = ue(n);
+		let i = oe(n);
 		if (i) {
 			if (x(i)) {
-				let n = p(i, this.context.openAPI.components);
-				if (w(n) && x(n.items)) {
-					let r = K(n.items);
-					this.context.logger.info(`Adding import for event stream model: ${r.name} from ${r.path}`), V(e, this.context.outputDir, r);
+				let n = f(i, this.context.openAPI.components);
+				if (E(n) && x(n.items)) {
+					let r = J(n.items);
+					this.context.logger.info(`Adding import for event stream model: ${r.name} from ${r.path}`), U(e, this.context.outputDir, r);
 					let i = `Promise<JsonServerSentEventStream<${r.name.includes("ServerSentEvent") ? `${r.name}['data']` : r.name}>>`;
 					return this.context.logger.info(`Resolved event stream return type for operation ${t.operationId}: ${i}`), {
 						type: i,
-						metadata: J
+						metadata: X
 					};
 				}
 			}
 			let n = "Promise<JsonServerSentEventStream<any>>";
 			return this.context.logger.info(`Resolved generic event stream return type for operation ${t.operationId}: ${n}`), {
 				type: n,
-				metadata: J
+				metadata: X
 			};
 		}
 		return this.context.logger.info(`Using default return type for operation ${t.operationId}: ${this.defaultReturnType.type}`), this.defaultReturnType;
@@ -1086,13 +953,13 @@ var ft = class {
 		let i = this.getMethodName(n, r.operation);
 		this.context.logger.info(`Generated method name: ${i}`);
 		let a = this.resolveParameters(e, t, r.operation), o = this.resolveReturnType(t, r.operation), s = o.metadata ? {
-			name: Q(r.method),
+			name: $(r.method),
 			arguments: [`'${r.path}'`, o.metadata]
 		} : {
-			name: Q(r.method),
+			name: $(r.method),
 			arguments: [`'${r.path}'`]
 		};
-		this.context.logger.info(`Creating method with ${a.length} parameters, return type: ${o.type}`), H(n.addMethod({
+		this.context.logger.info(`Creating method with ${a.length} parameters, return type: ${o.type}`), W(n.addMethod({
 			name: i,
 			decorators: [s],
 			parameters: a,
@@ -1107,7 +974,7 @@ var ft = class {
 	}
 	groupOperations(e) {
 		this.context.logger.info("Grouping operations by API client tags");
-		let t = /* @__PURE__ */ new Map(), n = A(this.context.openAPI.paths).filter((t) => {
+		let t = /* @__PURE__ */ new Map(), n = M(this.context.openAPI.paths).filter((t) => {
 			if (!t.operation.operationId) return !1;
 			let n = t.operation.tags;
 			return !n || n.length == 0 ? !1 : n.every((t) => e.has(t));
@@ -1123,7 +990,7 @@ var ft = class {
 	resolveApiTags() {
 		this.context.logger.info("Resolving API client tags from OpenAPI specification");
 		let e = /* @__PURE__ */ new Map(), t = this.context.openAPI.tags?.length || 0;
-		for (let t of Object.values(this.context.openAPI.paths)) j(t).forEach((t) => {
+		for (let t of Object.values(this.context.openAPI.paths)) N(t).forEach((t) => {
 			t.operation.tags?.forEach((t) => {
 				!this.shouldIgnoreTag(t) && !e.has(t) && e.set(t, {
 					name: t,
@@ -1140,7 +1007,7 @@ var ft = class {
 		for (let t of this.context.contextAggregates.values()) for (let n of t) if (n.aggregate.tag.name === e) return !0;
 		return !1;
 	}
-}, pt = class {
+}, ct = class {
 	commandEndpointPathsSuffix = "CommandEndpointPaths";
 	defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
 	constructor(e) {
@@ -1157,7 +1024,7 @@ var ft = class {
 	}
 	processAggregate(e) {
 		this.context.logger.info(`Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`);
-		let t = lt(this.context.project, this.context.outputDir, e.aggregate, "commandClient");
+		let t = it(this.context.project, this.context.outputDir, e.aggregate, "commandClient");
 		this.context.logger.info(`Processing command endpoint paths for ${e.commands.size} commands`);
 		let r = this.processCommandEndpointPaths(t, e);
 		this.processCommandTypes(t, e), this.context.logger.info(`Creating default command client options: ${this.defaultCommandClientOptionsName}`), t.addVariableStatement({
@@ -1166,12 +1033,12 @@ var ft = class {
 				name: this.defaultCommandClientOptionsName,
 				type: "ApiMetadata",
 				initializer: `{
-        basePath: ${q(e.aggregate.contextAlias)}
+        basePath: ${Y(e.aggregate.contextAlias)}
       }`
 			}],
 			isExported: !1
-		}), this.context.logger.info(`Adding imports from ${W}: CommandRequest, CommandResult, CommandResultEventStream, CommandBody, DeleteAggregateCommand, RecoverAggregateCommand`), t.addImportDeclaration({
-			moduleSpecifier: W,
+		}), this.context.logger.info(`Adding imports from ${K}: CommandRequest, CommandResult, CommandResultEventStream, CommandBody, DeleteAggregateCommand, RecoverAggregateCommand`), t.addImportDeclaration({
+			moduleSpecifier: K,
 			namedImports: [
 				"CommandRequest",
 				"CommandResult",
@@ -1181,10 +1048,10 @@ var ft = class {
 				"RecoverAggregateCommand"
 			],
 			isTypeOnly: !0
-		}), this.context.logger.info("Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"), X(t), this.context.logger.info("Adding import from @ahoo-wang/fetcher: ContentTypeValues"), B(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info("Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"), at(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e, r), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(`Command client generation completed for aggregate: ${e.aggregate.aggregateName}`);
+		}), this.context.logger.info("Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"), nt(t), this.context.logger.info("Adding import from @ahoo-wang/fetcher: ContentTypeValues"), H(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info("Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"), $e(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e, r), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(`Command client generation completed for aggregate: ${e.aggregate.aggregateName}`);
 	}
 	resolveAggregateCommandEndpointPathsName(e) {
-		return Z(e, this.commandEndpointPathsSuffix);
+		return Q(e, this.commandEndpointPathsSuffix);
 	}
 	processCommandEndpointPaths(e, t) {
 		let n = this.resolveAggregateCommandEndpointPathsName(t.aggregate);
@@ -1201,14 +1068,14 @@ var ft = class {
 		}), this.context.logger.success(`Command endpoint paths enum created with ${t.commands.size} entries`), n;
 	}
 	resolveCommandTypeName(e) {
-		let t = G(e.schema.key);
+		let t = q(e.schema.key);
 		return [t, t.name + "Command"];
 	}
 	resolveCommandType(e, t) {
 		let [n, r] = this.resolveCommandTypeName(t);
 		if (n.path === "@ahoo-wang/fetcher-wow") return;
-		V(e, this.context.outputDir, n);
-		let i = `${n.name}`, a = Ce(t.schema.schema).map((e) => `'${e}'`).join(" | ");
+		U(e, this.context.outputDir, n);
+		let i = `${n.name}`, a = _e(t.schema.schema).map((e) => `'${e}'`).join(" | ");
 		a !== "" && (i = `PartialBy<${i},${a}>`), i = `CommandBody<${i}>`, e.addTypeAlias({
 			name: r,
 			type: `${i}`,
@@ -1224,14 +1091,14 @@ var ft = class {
 		return `${e}.${t.name.toUpperCase()}`;
 	}
 	processCommandClient(e, t, n) {
-		let r = Y(Z(t.aggregate, "CommandClient"), e, [], ["R = CommandResult"]);
-		ot(r, this.defaultCommandClientOptionsName), t.commands.forEach((e) => {
+		let r = Z(Q(t.aggregate, "CommandClient"), e, [], ["R = CommandResult"]);
+		et(r, this.defaultCommandClientOptionsName), t.commands.forEach((e) => {
 			this.processCommandMethod(t, r, e, n);
 		});
 	}
 	processStreamCommandClient(e, t) {
-		let n = Z(t.aggregate, "CommandClient");
-		Y(Z(t.aggregate, "StreamCommandClient"), e, ["''", J], [], `${n}<CommandResultEventStream>`).addConstructor({
+		let n = Q(t.aggregate, "CommandClient");
+		Z(Q(t.aggregate, "StreamCommandClient"), e, ["''", X], [], `${n}<CommandResultEventStream>`).addConstructor({
 			parameters: [{
 				name: "apiMetadata",
 				type: "ApiMetadata",
@@ -1244,7 +1111,7 @@ var ft = class {
 		let [n, r] = this.resolveCommandTypeName(t);
 		this.context.logger.info(`Adding import for command model: ${n.name} from path: ${n.path}`);
 		let i = t.pathParameters.filter((t) => !this.context.isIgnoreCommandClientPathParameters(e.name, t.name)).map((e) => {
-			let t = P(e);
+			let t = I(e);
 			return this.context.logger.info(`Adding path parameter: ${e.name} (type: ${t})`), {
 				name: e.name,
 				type: t,
@@ -1257,7 +1124,7 @@ var ft = class {
 		});
 		return this.context.logger.info(`Adding command request parameter: commandRequest (type: CommandRequest<${r}>)`), i.push({
 			name: "commandRequest",
-			hasQuestionToken: xe(t.schema.schema),
+			hasQuestionToken: he(t.schema.schema),
 			type: `CommandRequest<${r}>`,
 			decorators: [{
 				name: "request",
@@ -1278,21 +1145,21 @@ var ft = class {
 		let i = this.resolveParameters(e.aggregate.tag, n), a = t.addMethod({
 			name: y(n.name),
 			decorators: [{
-				name: Q(n.method),
+				name: $(n.method),
 				arguments: [`${this.getEndpointPath(r, n)}`]
 			}],
 			parameters: i,
 			returnType: "Promise<R>",
 			statements: `throw autoGeneratedError(${i.map((e) => e.name).join(",")});`
 		});
-		this.context.logger.info(`Adding JSDoc documentation for method: ${y(n.name)}`), H(a, [
+		this.context.logger.info(`Adding JSDoc documentation for method: ${y(n.name)}`), W(a, [
 			n.summary,
 			n.description,
 			`- operationId: \`${n.operation.operationId}\``,
 			`- path: \`${n.path}\``
 		]), this.context.logger.success(`Command method generated: ${y(n.name)}`);
 	}
-}, mt = class {
+}, lt = class {
 	domainEventTypeSuffix = "DomainEventType";
 	domainEventTypeMapTitleSuffix = "DomainEventTypeMapTitle";
 	constructor(e) {
@@ -1308,12 +1175,12 @@ var ft = class {
 		this.context.logger.success("Query client generation completed");
 	}
 	createClientFilePath(e, t) {
-		return lt(this.context.project, this.context.outputDir, e, t);
+		return it(this.context.project, this.context.outputDir, e, t);
 	}
 	processQueryClient(e) {
 		let t = this.createClientFilePath(e.aggregate, "queryClient");
-		this.context.logger.info(`Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`), this.context.logger.info(`Adding imports from ${W}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`), t.addImportDeclaration({
-			moduleSpecifier: W,
+		this.context.logger.info(`Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`), this.context.logger.info(`Adding imports from ${K}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`), t.addImportDeclaration({
+			moduleSpecifier: K,
 			namedImports: [
 				"QueryClientFactory",
 				"QueryClientOptions",
@@ -1327,15 +1194,15 @@ var ft = class {
 				name: r,
 				type: "QueryClientOptions",
 				initializer: `{
-        contextAlias: ${q(e.aggregate.contextAlias)},
+        contextAlias: ${Y(e.aggregate.contextAlias)},
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${ct(e)},
+        resourceAttribution: ${rt(e)},
       }`
 			}],
 			isExported: !1
 		}), this.processAggregateDomainEventTypes(e, t);
-		let i = this.processAggregateDomainEventType(e, t), a = `${y(e.aggregate.aggregateName)}QueryClientFactory`, o = G(e.state.key), s = G(e.fields.key);
-		this.context.logger.info(`Adding import for state model: ${o.name} from path: ${o.path}`), V(t, this.context.outputDir, o), this.context.logger.info(`Adding import for fields model: ${s.name} from path: ${s.path}`), V(t, this.context.outputDir, s), this.context.logger.info(`Creating query client factory: ${a}`), t.addVariableStatement({
+		let i = this.processAggregateDomainEventType(e, t), a = `${y(e.aggregate.aggregateName)}QueryClientFactory`, o = q(e.state.key), s = q(e.fields.key);
+		this.context.logger.info(`Adding import for state model: ${o.name} from path: ${o.path}`), U(t, this.context.outputDir, o), this.context.logger.info(`Adding import for fields model: ${s.name} from path: ${s.path}`), U(t, this.context.outputDir, s), this.context.logger.info(`Creating query client factory: ${a}`), t.addVariableStatement({
 			declarationKind: n.Const,
 			declarations: [{
 				name: a,
@@ -1348,10 +1215,10 @@ var ft = class {
 		let n = [];
 		this.context.logger.info(`Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`);
 		for (let r of e.events.values()) {
-			let e = G(r.schema.key);
-			this.context.logger.info(`Adding import for event model: ${e.name} from path: ${e.path}`), V(t, this.context.outputDir, e), n.push(e);
+			let e = q(r.schema.key);
+			this.context.logger.info(`Adding import for event model: ${e.name} from path: ${e.path}`), U(t, this.context.outputDir, e), n.push(e);
 		}
-		let r = Z(e.aggregate, this.domainEventTypeSuffix), i = n.map((e) => e.name).join(" | ");
+		let r = Q(e.aggregate, this.domainEventTypeSuffix), i = n.map((e) => e.name).join(" | ");
 		return this.context.logger.info(`Creating domain event types union: ${r} = ${i}`), t.addTypeAlias({
 			isExported: !0,
 			name: r,
@@ -1359,7 +1226,7 @@ var ft = class {
 		}), r;
 	}
 	processAggregateDomainEventTypes(e, t) {
-		let n = Z(e.aggregate, this.domainEventTypeMapTitleSuffix), r = t.addEnum({
+		let n = Q(e.aggregate, this.domainEventTypeMapTitleSuffix), r = t.addEnum({
 			name: n,
 			isExported: !0
 		});
@@ -1368,12 +1235,12 @@ var ft = class {
 			initializer: `'${t.title}'`
 		});
 	}
-}, ht = class {
+}, ut = class {
 	queryClientGenerator;
 	commandClientGenerator;
 	apiClientGenerator;
 	constructor(e) {
-		this.context = e, this.queryClientGenerator = new mt(e), this.commandClientGenerator = new pt(e), this.apiClientGenerator = new ft(e);
+		this.context = e, this.queryClientGenerator = new lt(e), this.commandClientGenerator = new ct(e), this.apiClientGenerator = new st(e);
 	}
 	generate() {
 		this.context.logger.info("--- Generating Clients ---"), this.context.logger.progress(`Generating clients for ${this.context.contextAggregates.size} bounded contexts`);
@@ -1381,7 +1248,7 @@ var ft = class {
 		for (let [t] of this.context.contextAggregates) e++, this.context.logger.progressWithCount(e, this.context.contextAggregates.size, `Processing bounded context: ${t}`, 1);
 		this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.apiClientGenerator.generate(), this.context.logger.success("Client generation completed");
 	}
-}, gt = class {
+}, dt = class {
 	project;
 	openAPI;
 	outputDir;
@@ -1394,7 +1261,7 @@ var ft = class {
 		this.project = e.project, this.openAPI = e.openAPI, this.outputDir = e.outputDir, this.contextAggregates = e.contextAggregates, this.logger = e.logger, this.config = e.config ?? {}, this.currentContextAlias = this.openAPI.info["x-wow-context-alias"];
 	}
 	getOrCreateSourceFile(e) {
-		return z(this.project, this.outputDir, e);
+		return V(this.project, this.outputDir, e);
 	}
 	isIgnoreApiClientPathParameters(e, t) {
 		return (this.config.apiClients?.[e]?.ignorePathParameters ?? this.defaultIgnorePathParameters).includes(t);
@@ -1402,7 +1269,7 @@ var ft = class {
 	isIgnoreCommandClientPathParameters(e, t) {
 		return this.defaultIgnorePathParameters.includes(t);
 	}
-}, _t = "./fetcher-generator.config.json", $ = class {
+}, ft = "./fetcher-generator.config.json", pt = class {
 	project;
 	constructor(t) {
 		this.options = t, this.project = new e(t), this.options.logger.info(`Project instance created with tsConfigFilePath: ${this.options.tsConfigFilePath}`);
@@ -1411,17 +1278,17 @@ var ft = class {
 		this.options.logger.info("Starting code generation from OpenAPI specification");
 		let e = process.cwd();
 		this.options.logger.info(`Work directory: ${e}`), this.options.logger.info(`Input path: ${this.options.inputPath}`), this.options.logger.info(`Output directory: ${this.options.outputDir}`), this.options.logger.info("Parsing OpenAPI specification");
-		let t = await ke(this.options.inputPath);
+		let t = await Ce(this.options.inputPath);
 		this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-		let n = new Je(t).resolve();
+		let n = new He(t).resolve();
 		this.options.logger.info(`Resolved ${n.size} bounded context aggregates`);
 		let r = this.options.configPath ?? "./fetcher-generator.config.json", i = {};
 		try {
-			this.options.logger.info(`Parsing configuration file: ${r}`), i = await Ae(r);
+			this.options.logger.info(`Parsing configuration file: ${r}`), i = await we(r);
 		} catch (e) {
 			this.options.logger.info(`Configuration file parsing failed: ${e}`);
 		}
-		let a = new gt({
+		let a = new dt({
 			openAPI: t,
 			project: this.project,
 			outputDir: this.options.outputDir,
@@ -1429,7 +1296,7 @@ var ft = class {
 			logger: this.options.logger,
 			config: i
 		});
-		this.options.logger.info("Generating models"), new Ze(a).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ht(a).generate(), this.options.logger.info("Clients generated successfully");
+		this.options.logger.info("Generating models"), new Ge(a).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ut(a).generate(), this.options.logger.info("Clients generated successfully");
 		let o = this.project.getDirectory(this.options.outputDir);
 		if (!o) {
 			this.options.logger.info("Output directory not found.");
@@ -1481,6 +1348,6 @@ var ft = class {
 	}
 };
 //#endregion
-export { te as i, _t as n, re as r, $ as t };
+export { ft as n, pt as t };
 
-//# sourceMappingURL=src-B15FuHXN.js.map
+//# sourceMappingURL=src-Drc8UO0Q.js.map