@supalive/codegen 1.7.1 → 1.8.1

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as generateToDisk, r as readEntryConfig } from "./src-BTC1k7HX.js";
+import { n as generateToDisk, r as readEntryConfig } from "./src-CTW5fpJ-.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-BTC1k7HX.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-CTW5fpJ-.js";
 export { SchemaEnumRegistry, emit, extractClient, generate, generateToDisk, loadSchemaEnums, readEntryConfig, resolveConfig };

package/dist/{src-BTC1k7HX.js → src-CTW5fpJ-.js}

@@ -39,6 +39,20 @@ function procedureDocText(prop) {
 			const doc = stmt ? jsDocText(stmt) : void 0;
 			if (doc) return doc;
 		}
+		for (const def of idNode.getDefinitionNodes()) if (Node.isImportSpecifier(def)) {
+			const sourceFile = def.getImportDeclaration().getModuleSpecifierSourceFile();
+			if (sourceFile) {
+				const exported = sourceFile.getExportedDeclarations().get(def.getName());
+				if (exported && exported.length > 0) {
+					const decl = exported[0];
+					if (Node.isVariableDeclaration(decl)) {
+						const stmt = decl.getVariableStatement();
+						const doc = stmt ? jsDocText(stmt) : void 0;
+						if (doc) return doc;
+					}
+				}
+			}
+		}
 	}
 }
 /** The trimmed description of a node's last JSDoc block, if any. */
@@ -271,6 +285,79 @@ function findZodObjectLiteral(node) {
 	}
 	return cur && Node.isObjectLiteralExpression(cur) ? cur : void 0;
 }
+/**
+* Read `@genType` JSDoc tags from procedure declarations for return type overrides.
+*
+* Syntax:
+*   - Object shape: `/** @genType {{value: List<StoreCardItem>}} *​/` — overrides specific fields
+*   - Direct type:  `/** @genType List<StoreCardItem> *​/` — overrides the whole return type
+*
+* Returns a map of procedure name → raw `@genType` value string.
+*/
+function scanProcedureTypeOverrides(routerDecl) {
+	const result = /* @__PURE__ */ new Map();
+	try {
+		const proceduresObj = getProceduresObjectLiteral(routerDecl);
+		if (!proceduresObj) return result;
+		for (const prop of proceduresObj.getProperties()) {
+			const key = getPropertyKey(prop);
+			if (!key) continue;
+			const typeValue = procedureTypeTag(prop);
+			if (typeValue) result.set(key, typeValue);
+		}
+	} catch {}
+	return result;
+}
+/** Read the `@genType` tag from a procedure declaration's JSDoc. */
+function procedureTypeTag(prop) {
+	const tag = findTypeTagOnNode(prop);
+	if (tag) return tag;
+	let idNode;
+	if (Node.isShorthandPropertyAssignment(prop)) idNode = prop.getNameNode();
+	else if (Node.isPropertyAssignment(prop)) idNode = prop.getInitializer();
+	if (idNode && Node.isIdentifier(idNode)) {
+		for (const def of idNode.getDefinitionNodes()) if (Node.isVariableDeclaration(def)) {
+			const stmt = def.getVariableStatement();
+			if (stmt) {
+				const tag = findTypeTagOnNode(stmt);
+				if (tag) return tag;
+			}
+		}
+		for (const def of idNode.getDefinitionNodes()) if (Node.isImportSpecifier(def)) {
+			const sourceFile = def.getImportDeclaration().getModuleSpecifierSourceFile();
+			if (sourceFile) {
+				const exported = sourceFile.getExportedDeclarations().get(def.getName());
+				if (exported && exported.length > 0) {
+					const decl = exported[0];
+					if (Node.isVariableDeclaration(decl)) {
+						const stmt = decl.getVariableStatement();
+						if (stmt) {
+							const tag = findTypeTagOnNode(stmt);
+							if (tag) return tag;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+/** Extract the `@genType` tag value from a JSDocable node, if present. */
+function findTypeTagOnNode(node) {
+	if (!Node.isJSDocable(node)) return void 0;
+	const docs = node.getJsDocs();
+	if (docs.length === 0) return void 0;
+	const jd = docs[docs.length - 1];
+	for (const tag of jd.getTags()) if (tag.getTagName() === "genType") {
+		const text = tag.compilerNode.typeExpression?.getText?.()?.trim();
+		if (text) return text;
+		const comment = tag.getComment();
+		if (typeof comment === "string") return comment.trim();
+		if (Array.isArray(comment)) {
+			const joined = comment.map((c) => c.getText?.() ?? "").join("").trim();
+			if (joined) return joined;
+		}
+	}
+}
 //#endregion
 //#region src/names.ts
 /** PascalCase an arbitrary string (splitting on any non-alphanumeric run). */
@@ -462,7 +549,7 @@ function extractClient(config, schemaEnums = SchemaEnumRegistry.empty()) {
 	const proceduresType = proceduresSym.getTypeAtLocation(routerDecl);
 	const argMeta = scanZodArgMeta(routerDecl);
 	const procDocs = scanProcedureDocs(routerDecl);
-	const extractor = new Extractor(routerDecl, config, argMeta, project.getTypeChecker(), schemaEnums);
+	const extractor = new Extractor(routerDecl, config, argMeta, scanProcedureTypeOverrides(routerDecl), project.getTypeChecker(), schemaEnums);
 	const procedures = [];
 	for (const procSym of proceduresType.getProperties()) {
 		const name = procSym.getName();
@@ -486,6 +573,7 @@ var Extractor = class {
 	locationNode;
 	config;
 	argMeta;
+	procTypeOverrides;
 	tc;
 	schemaEnums;
 	modelRegistry = /* @__PURE__ */ new Map();
@@ -495,10 +583,11 @@ var Extractor = class {
 	enumsFinalized = false;
 	nameCounts = /* @__PURE__ */ new Map();
 	visiting = /* @__PURE__ */ new Set();
-	constructor(locationNode, config, argMeta, tc, schemaEnums) {
+	constructor(locationNode, config, argMeta, procTypeOverrides, tc, schemaEnums) {
 		this.locationNode = locationNode;
 		this.config = config;
 		this.argMeta = argMeta;
+		this.procTypeOverrides = procTypeOverrides;
 		this.tc = tc;
 		this.schemaEnums = schemaEnums;
 	}
@@ -512,6 +601,36 @@ var Extractor = class {
 			return;
 		}
 	}
+	/**
+	* Read an `@genType` JSDoc tag from a property and parse it into a DartType.
+	*
+	* Supported formats:
+	*   - `/** @genType StoreCardItem *​/` → model with that name
+	*   - `/** @genType List<StoreCardItem> *​/` → list with model element
+	*   - `/** @genType String *​/`, `/** @genType int *​/`, etc. → primitive
+	*/
+	readTypeOverride(prop) {
+		try {
+			const decls = prop.getDeclarations();
+			if (!decls || decls.length === 0) return null;
+			const node = decls[0];
+			if (!Node.isJSDocable(node)) return null;
+			const jsDocs = node.getJsDocs();
+			if (jsDocs.length === 0) return null;
+			const typeTag = jsDocs[jsDocs.length - 1].getTags().find((t) => t.getTagName() === "genType");
+			if (!typeTag) return null;
+			let raw = typeTag.compilerNode.typeExpression?.getText?.()?.trim();
+			if (!raw) {
+				const comment = typeTag.getComment();
+				if (typeof comment === "string") raw = comment.trim();
+				else if (Array.isArray(comment)) raw = comment.map((c) => c.getText?.() ?? "").join("").trim();
+			}
+			if (!raw) return null;
+			return parseTypeOverride(raw);
+		} catch {
+			return null;
+		}
+	}
 	models() {
 		this.finalizeEnums();
 		return [...this.modelRegistry.values()];
@@ -544,7 +663,77 @@ var Extractor = class {
 		}
 		const ret = unwrapPromise(sig.getReturnType());
 		const { hasNull, hasUndefined } = splitNullish(ret);
-		const resultType = this.walk(ret, pascal(name) + "Result");
+		const procOverrideRaw = this.procTypeOverrides.get(name);
+		let resultType;
+		if (procOverrideRaw) {
+			const parsed = parseProcTypeOverride(procOverrideRaw);
+			if (parsed) if (parsed.kind === "direct") {
+				const core = splitNullish(ret).core;
+				if (core.length > 0) {
+					if (parsed.dartType.kind === "model") this.walkSingle(core[0], parsed.dartType.name);
+					else if (parsed.dartType.kind === "list" && parsed.dartType.element.kind === "model") {
+						const actualEl = core[0].isArray() ? core[0].getArrayElementTypeOrThrow() : core[0];
+						this.walkSingle(actualEl, parsed.dartType.element.name);
+					}
+				}
+				resultType = parsed.dartType;
+			} else {
+				const core = splitNullish(ret).core;
+				const actualType = core.length > 0 ? core[0] : void 0;
+				const modelName = pascal(name) + "Result";
+				const fields = [];
+				const overrideKeys = new Set(parsed.fields.keys());
+				for (const [fieldName, fieldType] of parsed.fields) {
+					if (actualType && actualType.isObject()) {
+						const actualProp = actualType.getProperty(fieldName);
+						if (actualProp) {
+							const actualPropType = actualProp.getTypeAtLocation(this.locationNode);
+							if (fieldType.kind === "model") this.walkSingle(actualPropType, fieldType.name);
+							else if (fieldType.kind === "list" && fieldType.element.kind === "model") {
+								const core2 = splitNullish(actualPropType).core;
+								if (core2.length > 0) {
+									const el = core2[0].isArray() ? core2[0].getArrayElementTypeOrThrow() : core2[0];
+									this.walkSingle(el, fieldType.element.name);
+								}
+							}
+						}
+					}
+					fields.push({
+						name: camel(fieldName),
+						jsonKey: fieldName,
+						type: fieldType,
+						optional: false,
+						nullable: false
+					});
+				}
+				if (actualType && actualType.isObject()) for (const prop of actualType.getProperties()) {
+					const jsonKey = prop.getName();
+					if (overrideKeys.has(jsonKey)) continue;
+					if (prop.getFlags() & ts.SymbolFlags.Method) continue;
+					const { core: propCore, hasNull, hasUndefined } = splitNullish(prop.getTypeAtLocation(this.locationNode));
+					const optional = hasUndefined;
+					const nullable = hasNull;
+					const fieldHint = modelName.replace(/Result$/, "") + pascal(jsonKey);
+					const dartType = propCore.length > 0 ? propCore.length === 1 ? this.walkSingle(propCore[0], fieldHint) : this.walkUnion(propCore, { hint: fieldHint }) : { kind: "dynamic" };
+					fields.push({
+						name: camel(jsonKey),
+						jsonKey,
+						type: dartType,
+						optional,
+						nullable
+					});
+				}
+				this.modelRegistry.set(modelName, {
+					name: modelName,
+					fields
+				});
+				resultType = {
+					kind: "model",
+					name: modelName
+				};
+			}
+			else resultType = this.walk(ret, pascal(name) + "Result");
+		} else resultType = this.walk(ret, pascal(name) + "Result");
 		return {
 			name,
 			kind,
@@ -628,11 +817,24 @@ var Extractor = class {
 			const { core, hasNull, hasUndefined } = splitNullish(propType);
 			const optional = declaredOptional || hasUndefined;
 			const nullable = hasNull;
+			const typeOverride = this.readTypeOverride(prop);
 			let dartType;
-			if (core.length === 0) dartType = { kind: "dynamic" };
-			else if (core.length === 1) dartType = this.walkSingle(core[0], name + pascal(jsonKey));
-			else dartType = this.walkUnion(core, {
-				hint: name + pascal(jsonKey),
+			if (typeOverride) if (typeOverride.kind === "list" && typeOverride.element.kind === "model") if (core.length > 0) {
+				const actualEl = core[0].isArray() ? core[0].getArrayElementTypeOrThrow() : core[0];
+				dartType = {
+					kind: "list",
+					element: this.walkSingle(actualEl, typeOverride.element.name)
+				};
+			} else dartType = typeOverride;
+			else if (typeOverride.kind === "model") if (core.length > 0) dartType = this.walkSingle(core[0], typeOverride.name);
+			else dartType = typeOverride;
+			else dartType = typeOverride;
+			else if (core.length === 0) dartType = { kind: "dynamic" };
+			else if (core.length === 1) {
+				const fieldHint = name.replace(/Result$/, "") + pascal(jsonKey);
+				dartType = this.walkSingle(core[0], fieldHint);
+			} else dartType = this.walkUnion(core, {
+				hint: name.replace(/Result$/, "") + pascal(jsonKey),
 				stem: cleanStem(name),
 				field: jsonKey
 			});
@@ -916,6 +1118,101 @@ function cleanStem(modelName) {
 	}
 	return singularizeWord(s);
 }
+const PRIMITIVE_MAP = {
+	string: "string",
+	int: "int",
+	double: "double",
+	bool: "bool",
+	bigint: "bigint",
+	bytes: "bytes",
+	datetime: "datetime",
+	dynamic: "dynamic"
+};
+/**
+* Parse an `@type` override value into a DartType.
+*
+* - `"StoreCardItem"` → `{ kind: "model", name: "StoreCardItem" }`
+* - `"List<StoreCardItem>"` → `{ kind: "list", element: { kind: "model", name: "StoreCardItem" } }`
+* - `"String"` → `{ kind: "string" }`
+* - `"int"` → `{ kind: "int" }`
+*/
+function parseTypeOverride(raw) {
+	const listMatch = raw.match(/^List<(.+)>$/);
+	if (listMatch) {
+		const innerType = parseTypeOverride(listMatch[1].trim());
+		return innerType ? {
+			kind: "list",
+			element: innerType
+		} : null;
+	}
+	const prim = PRIMITIVE_MAP[raw.toLowerCase()];
+	if (prim) return { kind: prim };
+	return {
+		kind: "model",
+		name: raw
+	};
+}
+/**
+* Parse a procedure-level `@genType` value.
+*
+* - `{{value: List<StoreCardItem>}}` → object shape with field overrides
+* - `List<StoreCardItem>` → direct type override
+* - `StoreCardResult` → direct model name override
+*/
+function parseProcTypeOverride(raw) {
+	const objectMatch = raw.match(/^\{([\s\S]+)\}$/);
+	if (objectMatch) {
+		let inner = objectMatch[1];
+		if (inner.startsWith("{")) inner = inner.slice(1);
+		if (inner.endsWith("}")) inner = inner.slice(0, -1);
+		const fields = parseFieldOverrides(inner);
+		return fields.size > 0 ? {
+			kind: "object",
+			fields
+		} : null;
+	}
+	const dartType = parseTypeOverride(raw);
+	return dartType ? {
+		kind: "direct",
+		dartType
+	} : null;
+}
+/**
+* Parse comma-separated `field: Type` entries inside an object shape override.
+*
+* Handles nested `List<T>` types (the colon inside `List<...>` must not split
+* the field name). Examples:
+*   - `"value: List<StoreCardItem>"` → `{ value: { kind: "list", ... } }`
+*   - `"name: String, count: int"` → two entries
+*/
+function parseFieldOverrides(raw) {
+	const fields = /* @__PURE__ */ new Map();
+	const parts = splitOutsideAngles(raw);
+	for (const part of parts) {
+		const colonIdx = part.indexOf(":");
+		if (colonIdx === -1) continue;
+		const fieldName = part.slice(0, colonIdx).trim();
+		const typeStr = part.slice(colonIdx + 1).trim();
+		if (!fieldName || !typeStr) continue;
+		const dartType = parseTypeOverride(typeStr);
+		if (dartType) fields.set(fieldName, dartType);
+	}
+	return fields;
+}
+/** Split a string by commas, ignoring commas inside `<...>` angle brackets. */
+function splitOutsideAngles(raw) {
+	const parts = [];
+	let depth = 0;
+	let start = 0;
+	for (let i = 0; i < raw.length; i++) if (raw[i] === "<") depth++;
+	else if (raw[i] === ">") depth = Math.max(0, depth - 1);
+	else if (raw[i] === "," && depth === 0) {
+		parts.push(raw.slice(start, i));
+		start = i + 1;
+	}
+	parts.push(raw.slice(start));
+	return parts;
+}
 /** The bare candidate name for a structural (non-schema) enum group. */
 function fallbackBase(g) {
 	return pascal(g.field ?? g.hint);

package/package.json

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