@supalive/codegen 1.20.0 → 1.20.2

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as generateToDisk, r as readEntryConfig } from "./src-BG6JNyje.js";
+import { n as generateToDisk, r as readEntryConfig } from "./src-BHtJlw3J.js";
 import path from "node:path";
 //#region src/cli.ts
 function parseArgs(argv) {

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as emit, c as loadSchemaEnums, i as resolveConfig, n as generateToDisk, o as extractClient, r as readEntryConfig, s as SchemaEnumRegistry, t as generate } from "./src-BG6JNyje.js";
+import { a as emit, c as loadSchemaEnums, i as resolveConfig, n as generateToDisk, o as extractClient, r as readEntryConfig, s as SchemaEnumRegistry, t as generate } from "./src-BHtJlw3J.js";
 export { SchemaEnumRegistry, emit, extractClient, generate, generateToDisk, loadSchemaEnums, readEntryConfig, resolveConfig };

package/dist/{src-BG6JNyje.js → src-BHtJlw3J.js}

@@ -186,7 +186,10 @@ function scanOutputSchemaNode(node) {
 			if (methods.has("default") || methods.has("catch") || methods.has("prefault")) meta.optional = true;
 			const description = topLevelZodDescription(init);
 			if (description) meta.description = description;
-			if (meta.numeric || meta.optional || meta.description) fieldMeta.set(key, meta);
+			const enumMeta = topLevelEnumMeta(init);
+			if (enumMeta?.modelName) meta.modelName = enumMeta.modelName;
+			if (enumMeta?.values) meta.enumValues = enumMeta.values;
+			if (meta.numeric || meta.optional || meta.description || meta.modelName || meta.enumValues) fieldMeta.set(key, meta);
 			const nestedMeta = scanOutputSchemaNode(init);
 			if (nestedMeta) nested.set(key, nestedMeta);
 		}
@@ -348,7 +351,10 @@ function scanObjectSchema(schema) {
 		if (methods.has("default") || methods.has("catch") || methods.has("prefault")) meta.optional = true;
 		const description = topLevelZodDescription(init);
 		if (description) meta.description = description;
-		if (meta.numeric || meta.optional || meta.description) map.set(key, meta);
+		const enumMeta = topLevelEnumMeta(init);
+		if (enumMeta?.modelName) meta.modelName = enumMeta.modelName;
+		if (enumMeta?.values) meta.enumValues = enumMeta.values;
+		if (meta.numeric || meta.optional || meta.description || meta.modelName || meta.enumValues) map.set(key, meta);
 	}
 	return map;
 }
@@ -387,6 +393,72 @@ function topLevelZodDescription(node) {
 		cur = expr.getExpression();
 	}
 }
+/**
+* For a field whose init is a Zod enum, read the enum's wire values and the
+* model name it provides via `.modelName("X")` / `.meta({ __genType: "X" })`.
+* Works whether the enum is inlined in the field or referenced through a const
+* (e.g. `ZodTenantBillingPlanType`), even when wrapped in `.meta({...})` /
+* `.optional()` and defined through `z.lazy(() => ...)`. Returns `undefined`
+* when the chain is not an enum, so object/array model names (which
+* `scanOutputSchemaNode` already reads at the top level) are not captured.
+*/
+function topLevelEnumMeta(node) {
+	let modelName;
+	let isEnum = false;
+	const values = [];
+	const walk = (n) => {
+		if (!n) return;
+		if (Node.isIdentifier(n)) {
+			const init = resolveIdentifierInit(n);
+			if (init) walk(init);
+			return;
+		}
+		if (Node.isPropertyAccessExpression(n)) return;
+		if (!Node.isCallExpression(n)) return;
+		const expr = n.getExpression();
+		if (!Node.isPropertyAccessExpression(expr)) return;
+		const method = expr.getName();
+		if (method === "enum") {
+			isEnum = true;
+			const arg = n.getArguments()[0];
+			if (arg && Node.isArrayLiteralExpression(arg)) {
+				for (const el of arg.getElements()) if (Node.isStringLiteral(el)) values.push(el.getLiteralValue());
+			}
+		} else if (method === "modelName") {
+			const arg = n.getArguments()[0];
+			if (arg && Node.isStringLiteral(arg)) modelName = arg.getLiteralValue();
+		} else if (method === "meta") {
+			const arg = n.getArguments()[0];
+			if (arg && Node.isObjectLiteralExpression(arg)) {
+				const genType = arg.getProperty("__genType");
+				if (genType && Node.isPropertyAssignment(genType)) {
+					const init = genType.getInitializer();
+					if (init && Node.isStringLiteral(init)) modelName = init.getLiteralValue();
+				}
+			}
+		} else if (method === "lazy") {
+			const arg = n.getArguments()[0];
+			if (arg && Node.isArrowFunction(arg)) {
+				const body = arg.getBody();
+				if (Node.isCallExpression(body)) {
+					walk(body);
+					return;
+				}
+				if (Node.isBlock(body)) {
+					for (const stmt of body.getStatements()) if (Node.isReturnStatement(stmt)) walk(stmt.getExpression());
+					return;
+				}
+			}
+		}
+		walk(expr.getExpression());
+	};
+	walk(node);
+	if (!isEnum) return void 0;
+	return {
+		modelName,
+		values: values.length > 0 ? values : void 0
+	};
+}
 function findZodObjectLiteral(node) {
 	let cur = node;
 	while (cur && Node.isCallExpression(cur)) {
@@ -564,7 +636,7 @@ async function loadSchemaEnums(config) {
 			} catch {}
 		}
 	} catch (err) {
-		console.warn(`[supalive-codegen] Could not load schemaModule (${config.schemaModule}) for schema-aware enum names; falling back to structural names. ${err instanceof Error ? err.message : String(err)}`);
+		console.warn(`[supalive-codegen] Could not load schemaModule (${config.schemaModule}) for schema-aware enum names; falling back to structural names. Error: ${err instanceof Error ? err.message : String(err)}`);
 		return SchemaEnumRegistry.empty();
 	}
 }
@@ -672,6 +744,8 @@ var Extractor = class {
 				if (meta.numeric && (f.type.kind === "double" || f.type.kind === "int")) f.type = { kind: meta.numeric };
 				if (meta.optional) f.optional = true;
 				if (meta.description && !f.doc) f.doc = meta.description;
+				if (meta.modelName && f.type.kind === "enum") this.setEnumCustomName(f.type, meta.modelName);
+				else if (meta.modelName && meta.enumValues && f.type.kind === "string") this.upgradeStringToEnum(f, meta, argsType.name);
 			}
 		}
 		const ret = unwrapPromise(sig.getReturnType());
@@ -692,20 +766,24 @@ var Extractor = class {
 	/**
 	* Recursively apply output schema metadata to a DartType tree.
 	* Patches numeric types (int/bigint), renames models via __genType,
-	* and recurses into nested objects and lists.
+	* names enums from their `.modelName("X")`, and recurses into nested
+	* objects and lists.
 	*/
 	applyOutputMeta(dt, meta) {
-		if (meta.modelName && dt.kind === "model") {
-			const existing = this.modelRegistry.get(dt.name);
-			if (existing && !this.modelRegistry.has(meta.modelName)) {
-				const renamed = {
-					...existing,
-					name: meta.modelName
-				};
-				this.modelRegistry.set(meta.modelName, renamed);
-				this.modelRegistry.delete(dt.name);
-			}
-			dt.name = meta.modelName;
+		if (meta.modelName) {
+			if (dt.kind === "model") {
+				const existing = this.modelRegistry.get(dt.name);
+				if (existing && !this.modelRegistry.has(meta.modelName)) {
+					const renamed = {
+						...existing,
+						name: meta.modelName
+					};
+					this.modelRegistry.set(meta.modelName, renamed);
+					this.modelRegistry.delete(dt.name);
+				}
+				dt.name = meta.modelName;
+			} else if (dt.kind === "enum") this.setEnumCustomName(dt, meta.modelName);
+			else if (dt.kind === "list" && dt.element.kind === "enum") this.setEnumCustomName(dt.element, meta.modelName);
 		}
 		if (dt.kind === "model") {
 			const model = this.modelRegistry.get(dt.name);
@@ -715,6 +793,8 @@ var Extractor = class {
 					if (fMeta.numeric && (f.type.kind === "double" || f.type.kind === "int")) f.type = { kind: fMeta.numeric };
 					if (fMeta.optional) f.optional = true;
 					if (fMeta.description && !f.doc) f.doc = fMeta.description;
+					if (fMeta.modelName && f.type.kind === "enum") this.setEnumCustomName(f.type, fMeta.modelName);
+					else if (fMeta.modelName && fMeta.enumValues && f.type.kind === "string") this.upgradeStringToEnum(f, fMeta, dt.name);
 				}
 				const nestedMeta = meta.nested.get(f.jsonKey);
 				if (nestedMeta) this.applyOutputMeta(f.type, nestedMeta);
@@ -724,6 +804,26 @@ var Extractor = class {
 			if (elMeta) this.applyOutputMeta(dt.element, elMeta);
 		}
 	}
+	/** Give an enum a canonical name from `.modelName()` / `__genType`. */
+	setEnumCustomName(type, name) {
+		if (type.name === name) return;
+		const group = this.enumGroups.get(type.name);
+		if (group) group.customName = name;
+	}
+	/**
+	* A field whose TS type widened to `String` but whose returns/args Zod schema
+	* declares an enum (e.g. a handler returning literal `plan` strings) is
+	* upgraded to the enum, named from the schema's `.modelName("X")`.
+	*/
+	upgradeStringToEnum(f, meta, stem) {
+		const type = this.registerEnum(meta.enumValues, {
+			hint: f.jsonKey,
+			field: f.jsonKey,
+			stem: cleanStem(stem)
+		});
+		this.setEnumCustomName(type, meta.modelName);
+		f.type = type;
+	}
 	walk(type, hint) {
 		const { core } = splitNullish(type);
 		if (core.length === 0) return { kind: "dynamic" };
@@ -909,19 +1009,45 @@ var Extractor = class {
 		this.enumsFinalized = true;
 		const used = new Set(this.modelRegistry.keys());
 		const groups = [...this.enumGroups.values()];
-		const schemaGroups = groups.filter((g) => g.schemaName).sort((a, b) => a.schemaName.localeCompare(b.schemaName));
-		for (const g of schemaGroups) {
-			const name = this.ensureUnique(g.schemaName, used);
-			g.type.name = name;
-			this.pushEnumIR(name, g.values);
+		const namedOwners = /* @__PURE__ */ new Map();
+		const assignNamed = (g, name) => {
+			const owner = namedOwners.get(name);
+			if (owner) {
+				g.type.name = owner.type.name;
+				return;
+			}
+			const finalName = used.has(name) ? this.ensureUnique(name, used) : name;
+			used.add(finalName);
+			g.type.name = finalName;
+			namedOwners.set(name, g);
+			this.pushEnumIR(finalName, g.values);
+		};
+		const customGroups = groups.filter((g) => g.customName).sort((a, b) => a.customName.localeCompare(b.customName));
+		for (const g of customGroups) assignNamed(g, g.customName);
+		const schemaGroups = groups.filter((g) => g.schemaName && !g.customName).sort((a, b) => a.schemaName.localeCompare(b.schemaName));
+		for (const g of schemaGroups) assignNamed(g, g.schemaName);
+		const namedByField = /* @__PURE__ */ new Map();
+		for (const g of groups) {
+			if (!g.customName && !g.schemaName || !g.field) continue;
+			const arr = namedByField.get(g.field) ?? [];
+			if (!arr.some((x) => x.type.name === g.type.name)) arr.push(g);
+			namedByField.set(g.field, arr);
 		}
-		const fallbackGroups = groups.filter((g) => !g.schemaName).sort((a, b) => fallbackBase(a).localeCompare(fallbackBase(b)));
+		const sameValueSet = (a, b) => a.length === b.length && [...a].sort().join("\0") === [...b].sort().join("\0");
+		const fallbackGroups = groups.filter((g) => !g.schemaName && !g.customName).sort((a, b) => fallbackBase(a).localeCompare(fallbackBase(b)));
 		const baseCount = /* @__PURE__ */ new Map();
 		for (const g of fallbackGroups) {
 			const base = fallbackBase(g);
 			baseCount.set(base, (baseCount.get(base) ?? 0) + 1);
 		}
 		for (const g of fallbackGroups) {
+			if (g.field) {
+				const matches = (namedByField.get(g.field) ?? []).filter((n) => sameValueSet(n.values, g.values));
+				if (matches.length === 1) {
+					g.type.name = matches[0].type.name;
+					continue;
+				}
+			}
 			const base = fallbackBase(g);
 			let name;
 			if (baseCount.get(base) === 1 && !used.has(base)) name = base;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supalive/codegen",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "description": "Generate type-safe client code (Dart, and more) from a Supalive TypeScript router.",
   "author": "Rebaz Raouf",
   "license": "MIT",