@supalive/codegen 1.4.0 → 1.5.1

package/dist/cli.js

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

package/dist/{src-O2U-Keyx.js → src-DM44BrYS.js}

@@ -714,18 +714,18 @@ var Extractor = class {
 			const propType = prop.getTypeAtLocation(this.locationNode);
 			const declaredOptional = (prop.getFlags() & ts.SymbolFlags.Optional) !== 0;
 			const { core, hasNull, hasUndefined } = splitNullish(propType);
-			const dt = core.length === 0 ? { kind: "dynamic" } : core.length === 1 ? this.walkSingle(core[0], name + pascal(jsonKey)) : this.walkUnion(core, {
-				hint: name + pascal(jsonKey),
-				stem: cleanStem(name),
-				field: jsonKey
-			});
 			const acc = fieldMap.get(jsonKey) ?? {
 				types: [],
 				present: 0,
 				nullable: false,
 				optional: false
 			};
-			acc.types.push(dt);
+			if (core.length === 1) acc.types.push(this.walkSingle(core[0], name + pascal(jsonKey)));
+			else if (core.length > 1) acc.types.push(this.walkUnion(core, {
+				hint: name + pascal(jsonKey),
+				stem: cleanStem(name),
+				field: jsonKey
+			}));
 			acc.present++;
 			if (hasNull) acc.nullable = true;
 			if (declaredOptional || hasUndefined) acc.optional = true;
@@ -733,7 +733,7 @@ var Extractor = class {
 		}
 		const fields = [];
 		for (const [jsonKey, acc] of fieldMap) {
-			const consistent = acc.types.every((t) => JSON.stringify(t) === JSON.stringify(acc.types[0]));
+			const consistent = acc.types.length > 0 && acc.types.every((t) => JSON.stringify(t) === JSON.stringify(acc.types[0]));
 			fields.push({
 				name: camel(jsonKey),
 				jsonKey,
@@ -808,6 +808,7 @@ function uniqueName(symName, registry, _type) {
 	return pascal(symName);
 }
 function singular(hint) {
+	if (hint.endsWith("Result") && hint.length > 6) return hint.slice(0, -6) + "Item";
 	if (hint.endsWith("ies")) return hint.slice(0, -3) + "y";
 	if (hint.endsWith("s") && !hint.endsWith("ss")) return hint.slice(0, -1);
 	return hint + "Item";
@@ -823,7 +824,8 @@ function cleanStem(modelName) {
 	for (const suffix of [
 		"ResultItem",
 		"Result",
-		"Args"
+		"Args",
+		"Item"
 	]) if (s.length > suffix.length && s.endsWith(suffix)) {
 		s = s.slice(0, -suffix.length);
 		break;
@@ -1044,6 +1046,7 @@ function emitModel(m) {
 		return `(identical(other.${f.name}, ${f.name}) || ${cmp})`;
 	}).join(" &&\n          ");
 	const hashParts = m.fields.map((f) => isDeep(f) ? `deepHashCode(${f.name})` : f.name).join(", ");
+	const toStringFields = m.fields.map((f) => `${f.name}: $${f.name}`).join(", ");
 	const hashBody = m.fields.length === 0 ? "runtimeType.hashCode" : m.fields.length <= 19 ? `Object.hash(runtimeType, ${hashParts})` : `Object.hashAll([runtimeType, ${hashParts}])`;
 	return `${docComment(m.doc, "")}class ${m.name} implements SupaliveModel {
   const ${m.name}(${m.fields.length ? "{\n" + ctorParams + ",\n  }" : ""});
@@ -1070,6 +1073,11 @@ ${toJson}
 
   @override
   int get hashCode => ${hashBody};
+
+  @override
+  String toString() {
+    return '${m.name}{${toStringFields}}';
+  }
 }
 `;
 }

package/package.json

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