@supalive/codegen 1.22.0 → 1.22.2

package/dist/cli.js

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

package/dist/index.d.ts

@@ -130,6 +130,9 @@ interface SchemaEnumEntry {
   field: string;
   /** Canonical Dart enum name, e.g. "PosDeviceStatus". */
   enumName: string;
+  /** True when {@link enumName} came from the column's own `.modelName("X")`
+   * rather than being derived from table + column. */
+  explicit: boolean;
   /** Values in schema (canonical) order. */
   values: string[];
   /** Order-independent value-set signature, for matching. */

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-DvV5kMq2.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-DCmLjz97.js";
 export { SchemaEnumRegistry, emit, extractClient, generate, generateToDisk, loadSchemaEnums, readEntryConfig, resolveConfig };

package/dist/{src-DvV5kMq2.js → src-DCmLjz97.js}

@@ -358,7 +358,7 @@ function scanObjectSchema(schema) {
 	}
 	return map;
 }
-function topLevelZodMethods(node) {
+function topLevelZodMethods(node, depth = 0) {
 	const methods = /* @__PURE__ */ new Set();
 	let cur = node;
 	while (cur && Node.isCallExpression(cur)) {
@@ -368,8 +368,14 @@ function topLevelZodMethods(node) {
 			cur = expr.getExpression();
 		} else break;
 	}
+	if (cur && Node.isIdentifier(cur) && depth < MAX_ALIAS_DEPTH) {
+		const init = resolveIdentifierInit(cur);
+		if (init) for (const m of topLevelZodMethods(init, depth + 1)) methods.add(m);
+	}
 	return methods;
 }
+/** Guards against a cyclic alias (`const A = B; const B = A;`) looping forever. */
+const MAX_ALIAS_DEPTH = 8;
 function topLevelZodDescription(node) {
 	let cur = node;
 	while (cur && Node.isCallExpression(cur)) {
@@ -532,6 +538,7 @@ var SchemaEnumRegistry = class SchemaEnumRegistry {
 		const matches = candidates.filter((c) => c.setSig === sig);
 		if (matches.length === 0) return void 0;
 		if (matches.length === 1) return matches[0];
+		if (matches.every((m) => m.enumName === matches[0].enumName)) return matches[0];
 		const pick = (test) => {
 			let best;
 			for (const m of matches) if (test(m.tableStem) && (!best || m.tableStem.length > best.tableStem.length)) best = m;
@@ -549,11 +556,13 @@ var SchemaEnumRegistry = class SchemaEnumRegistry {
 			for (const [fieldKey, zodType] of Object.entries(shape)) {
 				const values = readEnumValues(zodType);
 				if (!values || values.length === 0) continue;
+				const explicit = readGenType(zodType);
 				entries.push({
 					table,
 					tableStem,
 					field: camel(fieldKey),
-					enumName: tableStem + pascal(fieldKey),
+					enumName: explicit ?? tableStem + pascal(fieldKey),
+					explicit: explicit !== void 0,
 					values,
 					setSig: setSignature(values)
 				});
@@ -583,6 +592,32 @@ function readEnumValues(field) {
 	const entries = def?.entries ?? def?.values;
 	if (entries && typeof entries === "object") return Object.values(entries).map((v) => String(v));
 }
+/** Read an explicit `.modelName("X")` (i.e. `.meta({ __genType: "X" })`) off a
+* column, looking through the same optional/nullable/default wrappers as
+* {@link readEnumValues} and taking the outermost name so a wrapper can override
+* the shared base type. Realm-independent: we invoke the schema's OWN `.meta()`,
+* which reads the registry belonging to whichever Zod copy built it. */
+function readGenType(field) {
+	let cur = field;
+	for (let guard = 0; cur && guard < 12; guard++) {
+		const name = genTypeOf(cur);
+		if (name) return name;
+		const def = zodDef(cur);
+		if (def?.type && WRAPPERS.has(def.type) && def.innerType) {
+			cur = def.innerType;
+			continue;
+		}
+		return;
+	}
+}
+function genTypeOf(node) {
+	try {
+		const name = (node.meta?.())?.__genType;
+		return typeof name === "string" && name.length > 0 ? name : void 0;
+	} catch {
+		return;
+	}
+}
 function zodDef(node) {
 	const n = node;
 	return n?._zod?.def ?? n?.def;
@@ -642,6 +677,8 @@ async function loadSchemaEnums(config) {
 }
 //#endregion
 //#region src/extract.ts
+/** Do two enums carry the same constants, order aside? */
+const sameValueSet = (a, b) => a.length === b.length && [...a].sort().join("\0") === [...b].sort().join("\0");
 /** Load the router from the entry file and extract a ClientIR. */
 function extractClient(config, schemaEnums = SchemaEnumRegistry.empty()) {
 	const project = new Project({
@@ -976,6 +1013,7 @@ var Extractor = class {
 					type,
 					values: hit.values,
 					schemaName: hit.enumName,
+					customName: hit.explicit ? hit.enumName : void 0,
 					stem: ctx.stem,
 					field: ctx.field,
 					hint: ctx.hint
@@ -1012,14 +1050,14 @@ var Extractor = class {
 		const namedOwners = /* @__PURE__ */ new Map();
 		const assignNamed = (g, name) => {
 			const owner = namedOwners.get(name);
-			if (owner) {
+			if (owner && sameValueSet(owner.values, g.values)) {
 				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);
+			if (!owner) namedOwners.set(name, g);
 			this.pushEnumIR(finalName, g.values);
 		};
 		const customGroups = groups.filter((g) => g.customName).sort((a, b) => a.customName.localeCompare(b.customName));
@@ -1033,7 +1071,6 @@ var Extractor = class {
 			if (!arr.some((x) => x.type.name === g.type.name)) arr.push(g);
 			namedByField.set(g.field, arr);
 		}
-		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) {

package/package.json

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