stdlib: migrates switch and conditionals to macro nodes (#80)

flydelabs · Jan 14, 2024 · 27fa7f8 · 27fa7f8
1 parent 2fbef8c
commit 27fa7f8
Show file tree

Hide file tree

Showing 69 changed files with 2,100 additions and 3,417 deletions.
diff --git a/examples/custom-macro-nodes/src/Tester.flyde b/examples/custom-macro-nodes/src/Tester.flyde
@@ -1,18 +1,53 @@
 imports:
   "@flyde/runtime": []
-  "@flyde/stdlib": []
-  InlineValue/InlineValue.flyde.ts:
-    - InlineValue
+  "@flyde/stdlib":
+    - Conditional
+    - Switch
+  InlineValue/InlineValue.flyde.ts: []
 node:
   instances:
     - pos:
-        x: -50
-        y: -40
-      id: anidxl49lu803pvgmkuvpxcy
+        x: 265.3840026855469
+        y: -96.30816650390625
+      id: hwy7whilmh8vycasbdabciko
       inputConfig: {}
-      nodeId: InlineValue__anidxl49lu803pvgmkuvpxcy
-      macroId: InlineValue
-      macroData: ""
+      nodeId: Conditional__hwy7whilmh8vycasbdabciko
+      macroId: Conditional
+      macroData:
+        compareTo:
+          mode: static
+          value: ""
+        propertyPath: ""
+        condition: EQUAL
+        trueValue: input
+        falseValue: input
+    - pos:
+        x: -201.3778076171875
+        y: -181.24053955078125
+      id: v58mbapuga1fs82br1tguo2q
+      inputConfig:
+        name:
+          mode: static
+          value: Some static value
+        age:
+          mode: static
+          value: 9
+      nodeId: Switch__v58mbapuga1fs82br1tguo2q
+      macroId: Switch
+      macroData:
+        inputs:
+          - name
+          - age
+        cases:
+          - name: young
+            conditionExpression: inputs.age < 30
+            outputExpression: "true"
+          - name: queen
+            conditionExpression: inputs.name === "Elizabeth"
+            outputExpression: "true"
+        defaultCase:
+          enabled: true
+          outputExpression: '"NPC"'
   connections: []
   id: DadJoke
   inputs: {}

diff --git a/flow-editor/src/flow-editor/style.scss b/flow-editor/src/flow-editor/style.scss
@@ -10,6 +10,9 @@
   position: relative;
   flex-direction: column;
   background-color: white;
+  color: #000;
+
+  overflow: hidden;
 
   > .visual-node-editor {
     height: 100%;

diff --git a/flow-editor/src/visual-node-editor/MacroInstanceEditor/MacroInstanceEditor.tsx b/flow-editor/src/visual-node-editor/MacroInstanceEditor/MacroInstanceEditor.tsx
@@ -26,6 +26,14 @@ export const MacroInstanceEditor: React.FC<MacroInstanceEditorProps> = (
 
   const [macroData, setMacroData] = React.useState<any>(ins.macroData);
 
+  const macro = useMemo(() => {
+    const macro = deps[ins.macroId];
+    if (!macro || !isMacroNodeDefinition(macro)) {
+      throw new Error(`Macro ${ins.macroId} not found `);
+    }
+    return macro;
+  }, [deps, ins.macroId]);
+
   const EditorComp = useMemo(() => {
     const macro = deps[ins.macroId];
     if (!macro || !isMacroNodeDefinition(macro)) {
@@ -37,7 +45,7 @@ export const MacroInstanceEditor: React.FC<MacroInstanceEditorProps> = (
   return (
     <Dialog
       isOpen={true}
-      title={"Edit Macro Instance"}
+      title={`Edit ${macro.displayName ?? macro.id} Configuration`}
       onClose={props.onCancel}
       className="macro-instance-editor"
     >

diff --git a/flow-editor/src/visual-node-editor/utils.ts b/flow-editor/src/visual-node-editor/utils.ts
@@ -25,6 +25,7 @@ import {
   isMacroNodeDefinition,
   macroNodeInstance,
   MacroNodeDefinition,
+  createInsId,
 } from "@flyde/core";
 import { calcPinPosition } from "./connection-view/calc-pin-position";
 import { Size } from "../utils";
@@ -275,11 +276,17 @@ export const createNewNodeInstance = (
   }, {});
 
   const ins = isMacroNodeDefinition(node)
-    ? macroNodeInstance(createId(), node.id, node.defaultData, inputsConfig, {
-        x: 0,
-        y: 0,
-      })
-    : nodeInstance(createId(), node.id, inputsConfig, { x: 0, y: 0 });
+    ? macroNodeInstance(
+        createInsId(node),
+        node.id,
+        node.defaultData,
+        inputsConfig,
+        {
+          x: 0,
+          y: 0,
+        }
+      )
+    : nodeInstance(createInsId(node), node.id, inputsConfig, { x: 0, y: 0 });
   const width = calcNodeWidth(ins, node);
 
   const { x, y } = lastMousePos;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/resolver/src/resolver/resolve-dependencies/index.ts b/resolver/src/resolver/resolve-dependencies/index.ts
@@ -1,3 +1,3 @@
 export * from "./resolve-dependencies";
 export * from "./resolve-importable-paths";
-export * from "./macro-nodes";
+export * from "./macro-node-to-definition";
diff --git a/...olver/resolve-dependencies/macro-nodes.ts → ...-dependencies/macro-node-to-definition.ts b/...olver/resolve-dependencies/macro-nodes.ts → ...-dependencies/macro-node-to-definition.ts
@@ -1,9 +1,4 @@
-import {
-  CodeNode,
-  MacroNode,
-  MacroNodeDefinition,
-  MacroNodeInstance,
-} from "@flyde/core";
+import { MacroNode, MacroNodeDefinition } from "@flyde/core";
 import { readFileSync } from "fs";
 import { join } from "path";
 
@@ -28,24 +23,3 @@ export function macroNodeToDefinition<T>(
   }
   return macroDef;
 }
-
-export function processMacroNode(
-  namespace: string,
-  macro: MacroNode<any>,
-  instance: MacroNodeInstance
-) {
-  const metaData = macro.definitionBuilder(instance.macroData);
-  const runFn = macro.runFnBuilder(instance.macroData);
-
-  const id = `${namespace}${macro.id}__${instance.id}`;
-
-  const resolvedNode: CodeNode = {
-    ...metaData,
-    displayName: metaData.displayName ?? macro.id,
-    namespace: macro.namespace,
-    id,
-    run: runFn,
-  };
-
-  return resolvedNode;
-}