@bian-womp/spark-graph 0.1.22 → 0.1.24

package/lib/cjs/index.cjs

@@ -121,8 +121,8 @@ class Registry {
             nonTransitive: !!opts?.nonTransitive,
         });
         // If both source and target have array variants, add derived array->array coercion
-        const fromArr = `${fromTypeId}[]`;
-        const toArr = `${toTypeId}[]`;
+        const fromArr = fromTypeId === "base.object" ? fromTypeId : `${fromTypeId}[]`;
+        const toArr = toTypeId === "base.object" ? toTypeId : `${toTypeId}[]`;
         const arrKey = `${fromArr}->${toArr}`;
         if (this.types.has(fromArr) && this.types.has(toArr)) {
             if (!this.coercions.has(arrKey) && !this.asyncCoercions.has(arrKey)) {
@@ -147,8 +147,8 @@ class Registry {
             nonTransitive: !!opts?.nonTransitive,
         });
         // If both source and target have array variants, add derived array->array async coercion
-        const fromArr = `${fromTypeId}[]`;
-        const toArr = `${toTypeId}[]`;
+        const fromArr = fromTypeId === "base.object" ? fromTypeId : `${fromTypeId}[]`;
+        const toArr = toTypeId === "base.object" ? toTypeId : `${toTypeId}[]`;
         const arrKey = `${fromArr}->${toArr}`;
         if (this.types.has(fromArr) && this.types.has(toArr)) {
             if (!this.coercions.has(arrKey) && !this.asyncCoercions.has(arrKey)) {
@@ -1950,7 +1950,7 @@ function setupBasicGraphRegistry() {
             return String(v);
         }
     });
-    registry.registerCoercion("base.vec3", "base.json", (v) => {
+    registry.registerCoercion("base.vec3", "base.object", (v) => {
         try {
             return v ? JSON.stringify(v) : undefined;
         }
@@ -1958,7 +1958,7 @@ function setupBasicGraphRegistry() {
             return undefined;
         }
     });
-    registry.registerCoercion("base.json", "base.vec3", (v) => {
+    registry.registerCoercion("base.object", "base.vec3", (v) => {
         try {
             const result = JSON.parse(v);
             if (result.length === 3 &&
@@ -1973,7 +1973,7 @@ function setupBasicGraphRegistry() {
     });
     // Enums: Math Operation
     registry.registerEnum({
-        id: "base.enum:math.operation",
+        id: "enum:base.math.operation",
         options: [
             { value: 0, label: "Add" },
             { value: 1, label: "Subtract" },
@@ -1983,11 +1983,20 @@ function setupBasicGraphRegistry() {
             { value: 5, label: "Max" },
             { value: 6, label: "Modulo" },
             { value: 7, label: "Power" },
+            // Unary / aggregate operations on A only
+            { value: 8, label: "Round" },
+            { value: 9, label: "Floor" },
+            { value: 10, label: "Ceil" },
+            { value: 11, label: "Abs" },
+            { value: 12, label: "Sum" },
+            { value: 13, label: "Avg" },
+            { value: 14, label: "MinAll" },
+            { value: 15, label: "MaxAll" },
         ],
     });
     // Enums: Compare Operation
     registry.registerEnum({
-        id: "base.enum:compare.operation",
+        id: "enum:base.compare.operation",
         options: [
             { value: 0, label: "LessThan" },
             { value: 1, label: "LessThanOrEqual" },
@@ -2112,7 +2121,7 @@ function setupBasicGraphRegistry() {
         id: "base.math",
         categoryId: "compute",
         inputs: {
-            Operation: "base.enum:math.operation",
+            Operation: "enum:base.math.operation",
             A: "base.float[]",
             B: "base.float[]",
         },
@@ -2123,8 +2132,34 @@ function setupBasicGraphRegistry() {
             // Gracefully handle missing inputs by treating them as zeros
             const a = ins.A === undefined ? [] : asArray(ins.A);
             const b = ins.B === undefined ? [] : asArray(ins.B);
-            const len = Math.max(a.length, b.length);
             const op = Number(ins.Operation ?? 0) | 0;
+            // Unary ops on A
+            if (op === 8)
+                return { Result: a.map((x) => Math.round(Number(x))) };
+            if (op === 9)
+                return { Result: a.map((x) => Math.floor(Number(x))) };
+            if (op === 10)
+                return { Result: a.map((x) => Math.ceil(Number(x))) };
+            if (op === 11)
+                return { Result: a.map((x) => Math.abs(Number(x))) };
+            // Aggregate ops on A -> single-element array
+            if (op === 12)
+                return { Result: [a.reduce((s, x) => s + Number(x || 0), 0)] };
+            if (op === 13) {
+                const sum = a.reduce((s, x) => s + Number(x || 0), 0);
+                const avg = a.length ? sum / a.length : 0;
+                return { Result: [avg] };
+            }
+            if (op === 14)
+                return {
+                    Result: [a.length ? Math.min(...a.map((x) => Number(x))) : 0],
+                };
+            if (op === 15)
+                return {
+                    Result: [a.length ? Math.max(...a.map((x) => Number(x))) : 0],
+                };
+            // Binary ops A (broadcast) B
+            const len = Math.max(a.length, b.length);
             const ops = [
                 (x, y) => x + y,
                 (x, y) => x - y,
@@ -2149,7 +2184,7 @@ function setupBasicGraphRegistry() {
         id: "base.compare",
         categoryId: "compute",
         inputs: {
-            Operation: "base.enum:compare.operation",
+            Operation: "enum:base.compare.operation",
             A: "base.float[]",
             B: "base.float[]",
         },
@@ -2169,6 +2204,122 @@ function setupBasicGraphRegistry() {
             return { Result: a.map((x, i) => fn(Number(x), Number(b[i] ?? 0))) };
         },
     });
+    // Logic
+    registry.registerNode({
+        id: "base.logic",
+        categoryId: "compute",
+        inputs: { Operation: "base.string", A: "base.bool", B: "base.bool" },
+        outputs: { Result: "base.bool" },
+        impl: (ins) => {
+            const op = String(ins.Operation || "not").toLowerCase();
+            const a = !!ins.A;
+            const b = !!ins.B;
+            if (op === "not")
+                return { Result: !a };
+            if (op === "and")
+                return { Result: a && b };
+            if (op === "or")
+                return { Result: a || b };
+            return { Result: false };
+        },
+    });
+    // Strings
+    registry.registerNode({
+        id: "base.string.length",
+        categoryId: "compute",
+        inputs: { Text: "base.string" },
+        outputs: { Length: "base.float" },
+        impl: (ins) => ({
+            Length: String(ins.Text || "").length,
+        }),
+    });
+    registry.registerNode({
+        id: "base.string.op",
+        categoryId: "compute",
+        inputs: { Op: "base.string", Text: "base.string" },
+        outputs: { Text: "base.string" },
+        impl: (ins) => {
+            const op = String(ins.Op || "trim").toLowerCase();
+            const t = String(ins.Text || "");
+            if (op === "lower")
+                return { Text: t.toLowerCase() };
+            if (op === "upper")
+                return { Text: t.toUpperCase() };
+            return { Text: t.trim() };
+        },
+    });
+    registry.registerNode({
+        id: "base.string.split",
+        categoryId: "compute",
+        inputs: { Text: "base.string", Sep: "base.string" },
+        outputs: { Parts: "base.string[]" },
+        impl: (ins) => {
+            const t = String(ins.Text || "");
+            const sep = String(ins.Sep || ",");
+            return { Parts: t.split(sep) };
+        },
+    });
+    registry.registerNode({
+        id: "base.string.join",
+        categoryId: "compute",
+        inputs: { Parts: "base.string[]", Sep: "base.string" },
+        outputs: { Text: "base.string" },
+        impl: (ins) => {
+            const parts = Array.isArray(ins.Parts) ? ins.Parts.map(String) : [];
+            const sep = String(ins.Sep || "");
+            return { Text: parts.join(sep) };
+        },
+    });
+    registry.registerNode({
+        id: "base.string.replace",
+        categoryId: "compute",
+        inputs: {
+            Text: "base.string",
+            Search: "base.string",
+            Replace: "base.string",
+        },
+        outputs: { Text: "base.string" },
+        impl: (ins) => {
+            const t = String(ins.Text || "");
+            const s = String(ins.Search || "");
+            const r = String(ins.Replace || "");
+            return { Text: t.split(s).join(r) };
+        },
+    });
+    // Arrays (carried as base.object)
+    registry.registerNode({
+        id: "base.array.length",
+        categoryId: "compute",
+        inputs: { Items: "base.object" },
+        outputs: { Length: "base.float" },
+        impl: (ins) => ({
+            Length: Array.isArray(ins.Items) ? ins.Items.length : 0,
+        }),
+    });
+    registry.registerNode({
+        id: "base.array.slice",
+        categoryId: "compute",
+        inputs: { Items: "base.object", Start: "base.float", End: "base.float" },
+        outputs: { Result: "base.object" },
+        impl: (ins) => {
+            const arr = Array.isArray(ins.Items) ? ins.Items : [];
+            const s = Math.trunc(Number(ins.Start ?? 0));
+            const e = Number.isFinite(Number(ins.End))
+                ? Math.trunc(Number(ins.End))
+                : undefined;
+            return { Result: arr.slice(s, e) };
+        },
+    });
+    // Select
+    registry.registerNode({
+        id: "base.select",
+        categoryId: "compute",
+        inputs: { Cond: "base.bool", Then: "base.object", Else: "base.object" },
+        outputs: { Result: "base.object" },
+        impl: (ins) => ({
+            Result: ins.Cond ? ins.Then : ins.Else,
+        }),
+    });
     // Combine XYZ
     registry.registerNode({
         id: "base.compareXYZ",
@@ -2309,7 +2460,7 @@ function setupBasicGraphRegistry() {
     });
     // ------------------------- JSON/object utilities -------------------------
     registry.registerNode({
-        id: "base.objectGet",
+        id: "base.object.get",
         categoryId: "compute",
         inputs: { Object: "base.object", Pointers: "base.string[]" },
         outputs: { Values: "base.object" },
@@ -2323,7 +2474,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.objectSet",
+        id: "base.object.set",
         categoryId: "compute",
         inputs: {
             Object: "base.object",
@@ -2353,7 +2504,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.objectRemove",
+        id: "base.object.remove",
         categoryId: "compute",
         inputs: { Object: "base.object", Pointers: "base.string[]" },
         outputs: { Result: "base.object" },
@@ -2366,7 +2517,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.objectMerge",
+        id: "base.object.merge",
         categoryId: "compute",
         inputs: { A: "base.object", B: "base.object" },
         outputs: { Result: "base.object" },
@@ -2375,7 +2526,7 @@ function setupBasicGraphRegistry() {
         }),
     });
     registry.registerNode({
-        id: "base.objectKeys",
+        id: "base.object.keys",
         categoryId: "compute",
         inputs: { Object: "base.object" },
         outputs: { Keys: "base.string[]" },
@@ -2390,7 +2541,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.objectValues",
+        id: "base.object.values",
         categoryId: "compute",
         inputs: { Object: "base.object" },
         outputs: { Values: "base.object" },
@@ -2405,7 +2556,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.objectPatch",
+        id: "base.object.patch",
         categoryId: "compute",
         inputs: { Object: "base.object", Ops: "base.object" },
         outputs: { Result: "base.object" },
@@ -2441,7 +2592,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.arrayConcat",
+        id: "base.array.concat",
         categoryId: "compute",
         inputs: { A: "base.object", B: "base.object" },
         outputs: { Result: "base.object" },
@@ -2452,7 +2603,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.arrayFlatten",
+        id: "base.array.flatten",
         categoryId: "compute",
         inputs: { Objects: "base.object" },
         outputs: { Result: "base.object" },
@@ -2469,7 +2620,7 @@ function setupBasicGraphRegistry() {
         },
     });
     registry.registerNode({
-        id: "base.arraySortBy",
+        id: "base.array.sortBy",
         categoryId: "compute",
         inputs: { Objects: "base.object", Pointers: "base.string[]" },
         outputs: { Result: "base.object" },