@glissade/cli 0.44.0-pre.0 → 0.44.0-pre.1

package/dist/typedSdk.js

@@ -18,26 +18,29 @@ const CORE_TYPE_IMPORTS = {
 	path: "PathValue"
 };
 /**
-* Collect every animatable prop path across the manifest's node taxonomy (+ the
-* component surface is construction-only, so excluded). Deduped by path; the FIRST
-* value type wins and a differing later one is reported in `conflicts` (base targets
-* are uniform — a conflict is a taxonomy smell worth surfacing, not silently picking).
+* Collect every animatable prop path across the manifest's node taxonomy (component
+* props are construction-only → excluded). Value types are UNIONED per path — the
+* manifest encodes a polymorphic prop as a pipe-joined id (`'color|paint'`), and a
+* path can carry different types on different node types; both cases become the union
+* of members, so passing ANY valid member type-checks (a wrong-type-for-a-specific-node
+* still fails loud at bind — the honest best an instance-free SDK can do). `polymorphic`
+* lists the >1-member paths for the header note.
 */
 function collectTargets(manifest) {
 	const byPath = /* @__PURE__ */ new Map();
-	const conflicts = [];
 	for (const node of Object.values(manifest.nodes)) for (const [path, prop] of Object.entries(node.props)) {
 		if (!prop.animatable || prop.target === void 0) continue;
-		const existing = byPath.get(path);
-		if (existing === void 0) byPath.set(path, prop.type);
-		else if (existing !== prop.type) conflicts.push(`${path}: ${existing} vs ${prop.type}`);
+		const set = byPath.get(path) ?? /* @__PURE__ */ new Set();
+		for (const member of prop.type.split("|")) set.add(member.trim());
+		byPath.set(path, set);
 	}
+	const targets = [...byPath.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([path, set]) => ({
+		path,
+		valueTypes: [...set].sort()
+	}));
 	return {
-		targets: [...byPath.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([path, valueType]) => ({
-			path,
-			valueType
-		})),
-		conflicts
+		targets,
+		polymorphic: targets.filter((t) => t.valueTypes.length > 1).map((t) => `${t.path}: ${t.valueTypes.join(" | ")}`)
 	};
 }
 const tsValueOf = (valueType) => TS_VALUE_TYPE[valueType] ?? "unknown";
@@ -49,14 +52,18 @@ const tsValueOf = (valueType) => TS_VALUE_TYPE[valueType] ?? "unknown";
 * sorted, so the same manifest → byte-identical output (drift-guardable with `--check`).
 */
 function generateTypedSdk(manifest) {
-	const { targets, conflicts } = collectTargets(manifest);
-	const usedCoreTypes = [...new Set(targets.map((t) => CORE_TYPE_IMPORTS[t.valueType]).filter((n) => n !== void 0))].sort();
+	const { targets, polymorphic } = collectTargets(manifest);
+	const usedCoreTypes = [...new Set(targets.flatMap((t) => t.valueTypes.map((v) => CORE_TYPE_IMPORTS[v])).filter((n) => n !== void 0))].sort();
+	/** union of value-type id literals for a target, e.g. `'color' | 'paint'`. */
+	const typeIdUnion = (t) => t.valueTypes.map((v) => `'${v}'`).join(" | ");
+	/** union of TS value types for a target, e.g. `string | Paint`. */
+	const valueUnion = (t) => [...new Set(t.valueTypes.map(tsValueOf))].join(" | ");
 	const L = [];
 	L.push(`// GENERATED by \`gs types\` from the describe() API manifest v${manifest.version} — DO NOT EDIT.`);
 	L.push("// Regenerate after a glissade upgrade (or when you add a defineComponent target):");
 	L.push("//   gs types --out glissade-targets.ts");
 	L.push("// Then import `track` from here instead of @glissade/core to type-check your targets.");
-	if (conflicts.length) L.push(`// NOTE: ${conflicts.length} path(s) carry >1 value type across nodes: ${conflicts.join(", ")}`);
+	if (polymorphic.length) L.push(`// Polymorphic paths (accept a value-type UNION): ${polymorphic.join(", ")}`);
 	L.push("");
 	L.push(`import { track as _track, type Track, type Key } from '@glissade/core';`);
 	if (usedCoreTypes.length) L.push(`import type { ${usedCoreTypes.join(", ")} } from '@glissade/core';`);
@@ -69,14 +76,15 @@ function generateTypedSdk(manifest) {
 	L.push("/** A track target: any node id + a KNOWN animatable path. */");
 	L.push("export type TrackTarget = `${string}/${KnownTrackPath}`;");
 	L.push("");
-	L.push("/** The value-type id each path expects (a wrong `type` arg is a type error). */");
+	L.push("/** The value-type id each path expects (a wrong `type` arg is a type error;");
+	L.push(" *  a polymorphic prop like `fill: color|paint` accepts either member). */");
 	L.push("type TypeIdOf<P extends TrackTarget> =");
-	for (const t of targets) L.push(`  P extends \`\${string}/${t.path}\` ? '${t.valueType}' :`);
+	for (const t of targets) L.push(`  P extends \`\${string}/${t.path}\` ? ${typeIdUnion(t)} :`);
 	L.push("  never;");
 	L.push("");
 	L.push("/** The value each path animates (the keyframe value type). */");
 	L.push("type ValueOf<P extends TrackTarget> =");
-	for (const t of targets) L.push(`  P extends \`\${string}/${t.path}\` ? ${tsValueOf(t.valueType)} :`);
+	for (const t of targets) L.push(`  P extends \`\${string}/${t.path}\` ? ${valueUnion(t)} :`);
 	L.push("  never;");
 	L.push("");
 	L.push("/**");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glissade/cli",
-  "version": "0.44.0-pre.0",
+  "version": "0.44.0-pre.1",
   "description": "glissade CLI: headless rendering via backend-skia (+ FFmpeg mux).",
   "license": "Apache-2.0",
   "engines": {
@@ -28,15 +28,15 @@
     "@napi-rs/canvas": "^0.1.65",
     "esbuild": "0.28.0",
     "jiti": "^2.4.2",
-    "@glissade/backend-skia": "0.44.0-pre.0",
-    "@glissade/core": "0.44.0-pre.0",
-    "@glissade/interact": "0.44.0-pre.0",
-    "@glissade/lottie": "0.44.0-pre.0",
-    "@glissade/narrate": "0.44.0-pre.0",
-    "@glissade/player": "0.44.0-pre.0",
-    "@glissade/scene": "0.44.0-pre.0",
-    "@glissade/sfx": "0.44.0-pre.0",
-    "@glissade/svg": "0.44.0-pre.0"
+    "@glissade/backend-skia": "0.44.0-pre.1",
+    "@glissade/core": "0.44.0-pre.1",
+    "@glissade/interact": "0.44.0-pre.1",
+    "@glissade/lottie": "0.44.0-pre.1",
+    "@glissade/narrate": "0.44.0-pre.1",
+    "@glissade/player": "0.44.0-pre.1",
+    "@glissade/scene": "0.44.0-pre.1",
+    "@glissade/sfx": "0.44.0-pre.1",
+    "@glissade/svg": "0.44.0-pre.1"
   },
   "repository": {
     "type": "git",