progress

flydelabs · Sep 29, 2024 · 49cb11f · 49cb11f
1 parent 602135b
commit 49cb11f
Show file tree

Hide file tree

Showing 15 changed files with 240 additions and 600 deletions.
diff --git a/core/src/node/macro-node.ts b/core/src/node/macro-node.ts
@@ -1,5 +1,6 @@
 import { CodeNode, CodeNodeDefinition, NodeMetadata } from "./node";
 import type React from "react";
+import { MacroNodeInstance } from "./node-instance";
 
 export type MacroEditorFieldDefinitionType =
   | "string"
@@ -162,3 +163,25 @@ export const isMacroNodeDefinition = (
     return editorConfig?.type === "structured";
   }
 };
+
+export function processMacroNodeInstance(
+  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,
+    defaultStyle: metaData.defaultStyle ?? macro.defaultStyle,
+    displayName: metaData.displayName ?? macro.id,
+    namespace: macro.namespace,
+    id,
+    run: runFn,
+  };
+
+  return resolvedNode;
+}
diff --git a/playground/stdlib-bundle/inline-macros.ts b/playground/stdlib-bundle/inline-macros.ts
diff --git a/playground/types/@flyde-core.d.ts b/playground/types/@flyde-core.d.ts
@@ -711,6 +711,9 @@ declare module '@flyde/core/node/macro-node' {
     }
     export interface JsonFieldDefinition extends BaseFieldDefinition {
             type: "json";
+            typeData?: {
+                    helperText?: string;
+            };
     }
     export interface LongTextFieldDefinition extends BaseFieldDefinition {
             type: "longtext";

diff --git a/resolver/src/resolver/resolve-dependencies/process-macro-node-instance.ts b/resolver/src/resolver/resolve-dependencies/process-macro-node-instance.ts
@@ -1,23 +1 @@
 import { MacroNode, MacroNodeInstance, CodeNode } from "@flyde/core";
-
-export function processMacroNodeInstance(
-  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,
-    defaultStyle: metaData.defaultStyle ?? macro.defaultStyle,
-    displayName: metaData.displayName ?? macro.id,
-    namespace: macro.namespace,
-    id,
-    run: runFn,
-  };
-
-  return resolvedNode;
-}
diff --git a/resolver/src/resolver/resolve-dependencies/resolve-dependencies.ts b/resolver/src/resolver/resolve-dependencies/resolve-dependencies.ts
@@ -16,7 +16,7 @@ import {
   MacroNodeDefinition,
   isMacroNodeInstance,
   isBaseNode,
-  Node,
+  processMacroNodeInstance,
 } from "@flyde/core";
 import { existsSync, readFileSync } from "fs";
 import _ = require("lodash");
@@ -29,7 +29,6 @@ import * as _StdLib from "@flyde/stdlib/dist/all";
 
 import requireReload from "require-reload";
 import { macroNodeToDefinition } from "./macro-node-to-definition";
-import { processMacroNodeInstance } from "./process-macro-node-instance";
 
 const StdLib = Object.values(_StdLib).reduce<Record<string, any>>(
   (acc, curr) => {