@womp/spark-agent 6.5.0 → 8.0.0

package/dist/geometry/lower.js

@@ -1,4 +1,4 @@
-import { astNameToTitle, defaultScalar, valueBackendName, isArrayPortType, } from "./common.js";
+import { astNameToTitle, backendTypeId, defaultScalar, valueBackendName, isArrayPortType, } from "./common.js";
 class GraphBuilder {
     nextId = 0;
     nodes = {};
@@ -28,10 +28,7 @@ class GraphBuilder {
     }
 }
 function resolveBackendSchema(nodeType, flowirRegistry, backendRegistry) {
-    const typeId = flowirRegistry.getNodeTypeId(nodeType);
-    if (typeId === null)
-        return null;
-    return backendRegistry.getSchema(typeId);
+    return backendRegistry.getSchema(backendTypeId(flowirRegistry, nodeType));
 }
 function toLiteral(value) {
     if (value.kind === "int")
@@ -45,10 +42,7 @@ function toLiteral(value) {
     return null;
 }
 function isVecPortType(type) {
-    return (type === "Vec3" ||
-        type === "Vec" ||
-        type === "Vec3[]" ||
-        type === "VecArray");
+    return type === "Vec" || type === "VecArray";
 }
 function isZeroVec(v) {
     if (!v || typeof v !== "object")
@@ -56,11 +50,9 @@ function isZeroVec(v) {
     const vec = v;
     return vec.x === 0 && vec.y === 0 && vec.z === 0;
 }
-function isDefaultValue(value, port, dialectPort) {
+function isDefaultValue(value, port) {
     if (port.enumValues?.length)
         return false;
-    if (dialectPort?.enum)
-        return false;
     if (defaultScalar(port) === null)
         return false;
     if (value === 0)
@@ -91,9 +83,9 @@ function encodeLiteralForPort(literal, port) {
     }
     return isArray ? [scalar] : scalar;
 }
-function trySetInput(bid, portIndex, literal, port, dialectPort, graph) {
+function trySetInput(bid, portIndex, literal, port, graph) {
     const encoded = encodeLiteralForPort(literal, port);
-    if (!isDefaultValue(encoded, port, dialectPort)) {
+    if (!isDefaultValue(encoded, port)) {
         graph.setInput(bid, portIndex, encoded);
     }
 }
@@ -101,27 +93,19 @@ function encodeValue(value, port, dialectPort, flowirRegistry) {
     const literal = toLiteral(value);
     if (literal)
         return encodeLiteralForPort(literal, port);
-    if (value.kind === "ident") {
-        if (dialectPort?.enum) {
-            const idx = flowirRegistry
-                .getEnumValues(dialectPort.enum)
-                .indexOf(value.name);
-            if (idx >= 0)
-                return idx;
-        }
-        if (port.enumValues?.length) {
-            const idx = port.enumValues.indexOf(value.name);
-            if (idx >= 0)
-                return idx;
-        }
-    }
-    return null;
+    if (value.kind !== "ident" || !flowirRegistry.isEnum(dialectPort.type))
+        return null;
+    const index = flowirRegistry
+        .getEnumValues(dialectPort.type)
+        .indexOf(value.name);
+    return index >= 0 ? index : null;
 }
 function valueNodeSchema(typeName, backendRegistry) {
     const backendName = valueBackendName(typeName);
-    if (!backendName)
-        return null;
-    return backendRegistry.getSchemaByName(backendName);
+    const schema = backendName ? backendRegistry.getSchemaByName(backendName) : null;
+    if (!schema)
+        throw new Error(`Geometry has no value node for ${typeName}.`);
+    return schema;
 }
 function lowerFloatExpr(expr, ctx) {
     if (expr.kind === "float_lit")
@@ -157,7 +141,7 @@ function lowerFloatExpr(expr, ctx) {
     if (left.kind === "literal") {
         const port = mathFloat.inputs[1];
         if (port)
-            trySetInput(bid, 1, { kind: "float", value: left.value }, port, null, ctx.graph);
+            trySetInput(bid, 1, { kind: "float", value: left.value }, port, ctx.graph);
     }
     else {
         ctx.graph.connect(left.backendNodeId, left.portIndex, bid, 1);
@@ -165,7 +149,7 @@ function lowerFloatExpr(expr, ctx) {
     if (right.kind === "literal") {
         const port = mathFloat.inputs[2];
         if (port)
-            trySetInput(bid, 2, { kind: "float", value: right.value }, port, null, ctx.graph);
+            trySetInput(bid, 2, { kind: "float", value: right.value }, port, ctx.graph);
     }
     else {
         ctx.graph.connect(right.backendNodeId, right.portIndex, bid, 2);
@@ -187,7 +171,7 @@ function lowerVec3Ctor(ctor, targetBid, targetPortIndex, targetPort, ctx) {
         if (result.kind === "literal") {
             const port = combineXyz.inputs[idx];
             if (port)
-                trySetInput(combineBid, idx, { kind: "float", value: result.value }, port, null, ctx.graph);
+                trySetInput(combineBid, idx, { kind: "float", value: result.value }, port, ctx.graph);
         }
         else {
             ctx.graph.connect(result.backendNodeId, result.portIndex, combineBid, idx);
@@ -198,22 +182,19 @@ function lowerVec3Ctor(ctor, targetBid, targetPortIndex, targetPort, ctx) {
 }
 function lowerConst(stmt, ctx) {
     const schema = valueNodeSchema(stmt.typeName, ctx.backendRegistry);
-    if (!schema)
-        return;
     const lit = toLiteral(stmt.value);
     if (!lit)
         return;
     const bid = ctx.graph.addNode(schema.typeId);
     const backendPort = schema.inputs[0];
     if (backendPort)
-        trySetInput(bid, 0, lit, backendPort, null, ctx.graph);
+        trySetInput(bid, 0, lit, backendPort, ctx.graph);
     ctx.paramNodes.set(stmt.name, bid);
     ctx.nodeIds[`const:${stmt.name}`] = bid;
+    ctx.graphExt.nodes[bid] = { flowirSymbol: stmt.name };
 }
 function lowerParam(stmt, ctx) {
     const schema = valueNodeSchema(stmt.typeName, ctx.backendRegistry);
-    if (!schema)
-        return;
     const lit = toLiteral(stmt.value);
     if (!lit)
         return;
@@ -222,17 +203,18 @@ function lowerParam(stmt, ctx) {
         return;
     const gipBid = ctx.graph.addNode(gipSchema.typeId);
     ctx.nodeIds[`param-input:${stmt.name}`] = gipBid;
-    ctx.nodeNames.set(gipBid, astNameToTitle(stmt.name));
+    ctx.graphExt.nodes[gipBid] = { name: astNameToTitle(stmt.name) };
     ctx.graph.setInput(gipBid, 0, stmt.range.min);
     ctx.graph.setInput(gipBid, 1, stmt.range.max);
     ctx.graph.setInput(gipBid, 2, stmt.range.step);
     const bid = ctx.graph.addNode(schema.typeId);
     const backendPort = schema.inputs[0];
     if (backendPort)
-        trySetInput(bid, 0, lit, backendPort, null, ctx.graph);
+        trySetInput(bid, 0, lit, backendPort, ctx.graph);
     ctx.graph.connect(gipBid, 0, bid, 0);
     ctx.paramNodes.set(stmt.name, bid);
     ctx.nodeIds[`param:${stmt.name}`] = bid;
+    ctx.graphExt.nodes[bid] = { flowirSymbol: stmt.name };
 }
 function lowerNodeStmt(stmt, ctx, pending) {
     const schema = resolveBackendSchema(stmt.nodeType, ctx.flowirRegistry, ctx.backendRegistry);
@@ -241,6 +223,7 @@ function lowerNodeStmt(stmt, ctx, pending) {
     const bid = ctx.graph.addNode(schema.typeId);
     ctx.backendIds.set(stmt.id, bid);
     ctx.nodeIds[`node:${stmt.id}`] = bid;
+    ctx.graphExt.nodes[bid] = { flowirSymbol: stmt.id };
     ctx.nodeTypes.set(stmt.id, stmt.nodeType);
     ctx.nodeSchemas.set(stmt.id, schema);
     for (const input of stmt.inputs) {
@@ -272,7 +255,7 @@ function lowerNodeStmt(stmt, ctx, pending) {
         if (input.value.kind === "vec3ctor") {
             const lowered = lowerVec3Ctor(input.value, bid, resolved.index, backendPort, ctx);
             if (lowered !== null &&
-                !isDefaultValue(lowered, backendPort, resolved.port)) {
+                !isDefaultValue(lowered, backendPort)) {
                 ctx.graph.setInput(bid, resolved.index, lowered);
             }
             continue;
@@ -280,7 +263,7 @@ function lowerNodeStmt(stmt, ctx, pending) {
         const encoded = encodeValue(input.value, backendPort, resolved.port, ctx.flowirRegistry);
         if (encoded === null)
             continue;
-        if (isDefaultValue(encoded, backendPort, resolved.port))
+        if (isDefaultValue(encoded, backendPort))
             continue;
         ctx.graph.setInput(bid, resolved.index, encoded);
     }
@@ -337,7 +320,7 @@ export function lower(program, flowirRegistry, backendRegistry) {
         backendIds: new Map(),
         nodeTypes: new Map(),
         nodeSchemas: new Map(),
-        nodeNames: new Map(),
+        graphExt: { nodes: {} },
         nodeIds: {},
     };
     const pending = [];
@@ -358,8 +341,5 @@ export function lower(program, flowirRegistry, backendRegistry) {
         }
     }
     resolvePendingConnections(pending, ctx);
-    const graphExt = {
-        nodes: Object.fromEntries([...ctx.nodeNames.entries()].map(([bid, name]) => [bid, { name }])),
-    };
-    return { graph: graph.toPayload(), graphExt, nodeIds: ctx.nodeIds };
+    return { graph: graph.toPayload(), graphExt: ctx.graphExt, nodeIds: ctx.nodeIds };
 }