more fixes

flydelabs · Sep 30, 2024 · 6cf8201 · 6cf8201
1 parent 330bb6d
commit 6cf8201
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 24 deletions.
diff --git a/core/src/index.ts b/core/src/index.ts
@@ -1,5 +1,6 @@
 export * from "./common";
 import { Pos, OMap } from "./common";
+import { FlydeFlow } from "./flow-schema";
 import {
   VisualNode,
   CustomNode,
@@ -38,3 +39,13 @@ export interface NodeLibraryGroup {
 export interface NodeLibraryData {
   groups: NodeLibraryGroup[];
 }
+
+export type ImportablesResult = {
+  importables: Record<string, NodesDefCollection>;
+  errors: { path: string; message: string }[];
+};
+
+export interface FlowJob {
+  flow: FlydeFlow;
+  id: string;
+}
diff --git a/dev-server/src/runner/runFlow.host.ts b/dev-server/src/runner/runFlow.host.ts
@@ -2,7 +2,7 @@
 import { fork } from "child_process";
 import { join } from "path";
 import { runFlow } from "./runFlow";
-import { FlowJob } from "./shared";
+import type { FlowJob } from "@flyde/core";
 import { onMessage, sendMessage } from "./typedProcessMessage";
 
 export function forkRunFlow(data: {

diff --git a/dev-server/src/runner/runFlow.ts b/dev-server/src/runner/runFlow.ts
@@ -1,5 +1,4 @@
-import { FlydeFlow } from "@flyde/core";
-import { FlowJob } from "./shared";
+import { FlowJob, FlydeFlow } from "@flyde/core";
 import { createId } from "@paralleldrive/cuid2";
 import { loadFlowFromContent } from "@flyde/runtime";
 

diff --git a/dev-server/src/runner/shared.ts b/dev-server/src/runner/shared.ts
diff --git a/dev-server/src/service/scan-importable-nodes.ts b/dev-server/src/service/scan-importable-nodes.ts
@@ -12,6 +12,7 @@ import {
   isBaseNode,
   isMacroNode,
   NodesDefCollection,
+  ImportablesResult,
 } from "@flyde/core";
 import { scanFolderStructure } from "./scan-folders-structure";
 import { FlydeFile } from "../fs-helper/shared";
@@ -25,11 +26,6 @@ export interface CorruptScannedNode {
   error: string;
 }
 
-export type ImportablesResult = {
-  importables: Record<string, NodesDefCollection>;
-  errors: { path: string; message: string }[];
-};
-
 export async function scanImportableNodes(
   rootPath: string,
   filename: string

diff --git a/flow-editor/package.json b/flow-editor/package.json
@@ -19,7 +19,6 @@
     "@blueprintjs/icons": "^5.1.5",
     "@blueprintjs/select": "^5.0.1",
     "@flyde/core": "workspace:*",
-    "@flyde/dev-server": "workspace:*",
     "@flyde/remote-debugger": "workspace:*",
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-brands-svg-icons": "^6.4.2",

diff --git a/flow-editor/src/flow-editor/DependenciesContext.tsx b/flow-editor/src/flow-editor/DependenciesContext.tsx
@@ -3,16 +3,10 @@ import {
   ImportableSource,
   Pos,
   NodeLibraryData,
+  ImportablesResult,
 } from "@flyde/core";
-import type { ImportablesResult } from "@flyde/dev-server";
 import { createContext, useContext } from "react";
 
-// TODO - merge this interface with the one from the dev-server
-export interface LocalImportableResult {
-  importables: ImportableSource[];
-  errors: ImportablesResult["errors"];
-}
-
 export interface DependenciesContextData {
   resolvedDependencies: ResolvedDependenciesDefinitions;
   onImportNode: (
@@ -23,7 +17,7 @@ export interface DependenciesContextData {
       connectTo?: { insId: string; outputId: string };
     }
   ) => Promise<ResolvedDependenciesDefinitions>;
-  onRequestImportables: () => Promise<LocalImportableResult>;
+  onRequestImportables: () => Promise<ImportablesResult>;
   libraryData: NodeLibraryData;
 }
 

diff --git a/flow-editor/src/flow-editor/ports/ports.ts b/flow-editor/src/flow-editor/ports/ports.ts
@@ -5,8 +5,9 @@ import {
   NodeLibraryData,
   ResolvedDependenciesDefinitions,
   noop,
+  FlowJob,
+  ImportablesResult,
 } from "@flyde/core";
-import { FlowJob, ImportablesResult } from "@flyde/dev-server";
 import { ReportEvent } from "./analytics";
 import { toastMsg } from "../../toaster";