fixes isMacroNodeDefinition

flydelabs · Feb 24, 2024 · f795db3 · f795db3
1 parent 4f626ac
commit f795db3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/core/src/node/macro-node.ts b/core/src/node/macro-node.ts
@@ -109,3 +109,21 @@ export type ConfigurableInputDynamic = {
 export type ConfigurableInput<T> =
   | ConfigurableInputStatic<T>
   | ConfigurableInputDynamic;
+
+export const isMacroNode = (p: any): p is MacroNode<any> => {
+  return p && typeof (p as MacroNode<any>).runFnBuilder === "object";
+};
+
+export const isMacroNodeDefinition = (
+  p: any
+): p is MacroNodeDefinition<any> => {
+  const { editorConfig } = (p ?? {}) as MacroNodeDefinition<any>;
+  if (editorConfig?.type === "custom") {
+    return (
+      typeof (editorConfig as MacroEditorConfigCustomDefinition)
+        .editorComponentBundleContent === "string"
+    );
+  } else {
+    return editorConfig?.type === "structured";
+  }
+};
diff --git a/core/src/node/node.ts b/core/src/node/node.ts
@@ -19,7 +19,7 @@ import {
   nodeOutput,
 } from "./node-pins";
 import { ImportedNode } from "../flow-schema";
-import { MacroNode, MacroNodeDefinition } from "./macro-node";
+import { MacroNodeDefinition } from "./macro-node";
 
 export type NodesCollection = OMap<Node>;
 
@@ -218,10 +218,6 @@ export const isCodeNode = (p: Node | NodeDefinition | any): p is CodeNode => {
   return isBaseNode(p) && typeof (p as CodeNode).run === "function";
 };
 
-export const isMacroNode = (p: any): p is MacroNode<any> => {
-  return p && typeof (p as MacroNode<any>).runFnBuilder === "function";
-};
-
 export const extractMetadata: <N extends NodeMetadata>(
   node: N
 ) => NodeMetadata = (node) => {
@@ -243,12 +239,6 @@ export const extractMetadata: <N extends NodeMetadata>(
   };
 };
 
-export const isMacroNodeDefinition = (
-  p: any
-): p is MacroNodeDefinition<any> => {
-  return p && typeof (p as MacroNode<any>).definitionBuilder === "undefined";
-};
-
 export const isVisualNode = (p: Node | NodeDefinition): p is VisualNode => {
   return !!(p as VisualNode).instances;
 };

diff --git a/flow-editor/src/visual-node-editor/instance-view/InstanceView.tsx b/flow-editor/src/visual-node-editor/instance-view/InstanceView.tsx
@@ -55,7 +55,7 @@ import {
   Dialog,
   Classes,
 } from "@blueprintjs/core";
-import ReactDOM from "react-dom";
+
 import { NodeStyleMenu } from "./NodeStyleMenu";
 import { useDarkMode } from "../../flow-editor/DarkModeContext";