Fix missing asset data in generated graph JSON

Author: rycwo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metafold",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Metafold SDK for Node.js",
   "main": "lib/metafold.js",
   "type": "module",

src/func-types.ts

@@ -71,7 +71,10 @@ export type LineNetworkBvhAsset = Asset
 export type Graph = {
   operators: {
     type: string
-    parameters?: object
+    parameters?: {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      [key: string]: any
+    }
   }[]
   edges?: {
     source: number
@@ -89,8 +92,10 @@ export class Func {
   constructor(
     readonly type: string,
     readonly inputs?: { [key: string]: Func },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    readonly assets?: { [key: string]: any },
     readonly parameters?: { [key: string]: any },
+    /* eslint-enable @typescript-eslint/no-explicit-any */
   ) {}
 
   /**
@@ -159,6 +164,9 @@ export class Func {
           })
         )
       }
+      if (func.assets) {
+        operator.parameters = Object.assign(operator.parameters ?? {}, func.assets)
+      }
       const index = g.operators.push(operator) - 1
       indices.set(func, index)
     }
@@ -183,8 +191,10 @@ export class TypedFunc<T> extends Func {
   constructor(
     type: string,
     inputs?: { [key: string]: Func },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    parameters?: { [key: string]: any },
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    readonly assets?: { [key: string]: any },
+    readonly parameters?: { [key: string]: any },
+    /* eslint-enable @typescript-eslint/no-explicit-any */
     // Generic parameters are erased unless they are used in the type
     private returnType?: T,
   ) {

src/func.spec.ts

@@ -7,12 +7,14 @@ import type {
 import {
   CSGIntersect,
   GenerateSamplePoints,
+  LoadVolume,
   Redistance,
   SampleBox,
   SampleSurfaceLattice,
+  SampleVolume,
   Threshold,
 } from "./func.js"
-import type { Graph } from "./func-types.js"
+import type { Graph, VolumeAsset } from "./func-types.js"
 import { POINT_SOURCE } from "./func-types.js"
 
 
@@ -101,5 +103,54 @@ describe("Func", function() {
       )
       assert.deepEqual(f.json(source), want)
     })
+
+    it("should generate a valid shape graph with assets", function() {
+      const volumeAsset: VolumeAsset = {
+        file_type: "Raw",
+        path: "foo.bin",
+      }
+      const volume = LoadVolume(volumeAsset, { resolution: [64, 64, 64] })
+      const f = Threshold(
+        Redistance(
+          SampleVolume(source, volume, {
+            volume_size: [2, 2, 2],
+            volume_offset: [-1, -1, -1],
+          }),
+        ),
+      )
+      assert.deepEqual(f.json(), {
+        operators: [
+          { type: "Threshold" },
+          { type: "Redistance" },
+          {
+            type: "SampleVolume",
+            parameters: {
+              volume_size: [2, 2, 2],
+              volume_offset: [-1, -1, -1],
+            },
+          },
+          {
+            type: "LoadVolume",
+            parameters: {
+              volume_data: volumeAsset,
+              resolution: [64, 64, 64],
+            },
+          },
+          {
+            type: "GenerateSamplePoints",
+            parameters: {
+              size: [2, 2, 2],
+              resolution: [64, 64, 64],
+            },
+          },
+        ],
+        edges: [
+          { source: 1, target: [0, "Samples"] }, //           Redistance -> Threshold
+          { source: 2, target: [1, "Samples"] }, //         SampleVolume -> Redistance
+          { source: 4, target: [2, "Points"] },  // GenerateSamplePoints -> SampleVolume
+          { source: 3, target: [2, "Volume"] },  //           LoadVolume -> SampleVolume
+        ],
+      })
+    })
   })
 })