Fix #401: Error with subgraphs due to accidentally proxying undefined…

… values Update deps to fix build
newcat · Mar 20, 2024 · b928560 · b928560
1 parent dafc905
commit b928560
Show file tree

Hide file tree

Showing 11 changed files with 306 additions and 117 deletions.
diff --git a/package.json b/package.json
@@ -16,8 +16,8 @@
         "packages/*"
     ],
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^7.2.0",
-        "@typescript-eslint/parser": "^7.2.0",
+        "@typescript-eslint/eslint-plugin": "^7.3.1",
+        "@typescript-eslint/parser": "^7.3.1",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-vue": "^9.23.0",
@@ -27,7 +27,7 @@
         "prettier-eslint": "^16.3.0",
         "rimraf": "^5.0.5",
         "typedoc": "^0.25.12",
-        "typescript": "^5.4.2",
+        "typescript": "^5.4.3",
         "vitepress": "^1.0.0-rc.45",
         "vue-eslint-parser": "^9.4.2"
     },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -37,7 +37,7 @@
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "typedoc": "^0.25.12",
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/core/src/graphNode.ts b/packages/core/src/graphNode.ts
@@ -19,6 +19,22 @@ export function getGraphNodeTypeString(template: GraphTemplate): string {
     return GRAPH_NODE_TYPE_PREFIX + template.id;
 }
 
+/** Properties that should not be proxied to the original interface */
+const PROXY_INTERFACE_SKIP_PROPERTIES: Array<string | symbol> = [
+    "component",
+    "connectionCount",
+    "events",
+    "hidden",
+    "hooks",
+    "id",
+    "isInput",
+    "name",
+    "nodeId",
+    "port",
+    "templateId",
+    "value",
+] satisfies Array<keyof NodeInterface>;
+
 export function createGraphNodeType(template: GraphTemplate): new () => AbstractNode & IGraphNode {
     return class GraphNode extends AbstractNode implements IGraphNode {
         public type = getGraphNodeTypeString(template);
@@ -161,7 +177,11 @@ export function createGraphNodeType(template: GraphTemplate): new () => Abstract
             return new Proxy(newInterface, {
                 get: (target, prop) => {
                     // we can't proxy the "__v_isRef" property, otherwise we get a maximum stack size exceeded error
-                    if (prop in target || (typeof prop === "string" && prop.startsWith("__v_"))) {
+                    if (
+                        PROXY_INTERFACE_SKIP_PROPERTIES.includes(prop) ||
+                        prop in target ||
+                        (typeof prop === "string" && prop.startsWith("__v_"))
+                    ) {
                         return Reflect.get(target, prop);
                     }
                     // try to find the interface connected to our graph input

diff --git a/packages/engine/package.json b/packages/engine/package.json
@@ -35,7 +35,7 @@
         "rimraf": "^5.0.5",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -28,6 +28,6 @@
         "url": "https://github.com/newcat/baklavajs/issues"
     },
     "devDependencies": {
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.3"
     }
 }
diff --git a/packages/full/package.json b/packages/full/package.json
@@ -37,6 +37,6 @@
     },
     "devDependencies": {
         "esbuild": "^0.20.2",
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.3"
     }
 }
diff --git a/packages/interface-types/package.json b/packages/interface-types/package.json
@@ -36,7 +36,7 @@
         "rimraf": "^5.0.5",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/renderer-vue/package.json b/packages/renderer-vue/package.json
@@ -44,11 +44,11 @@
         "rollup-plugin-visualizer": "^5.12.0",
         "rollup-plugin-vue": "^6.0.0",
         "sass": "^1.72.0",
-        "typescript": "^5.4.2",
-        "vite": "^5.1.6",
+        "typescript": "^5.4.3",
+        "vite": "^5.2.2",
         "vite-plugin-dts": "^3.7.3",
         "vue": "^3.4.21",
-        "vue-tsc": "^2.0.6"
+        "vue-tsc": "^2.0.7"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/themes/package.json b/packages/themes/package.json
@@ -23,7 +23,7 @@
         "rimraf": "^5.0.5",
         "sass": "^1.72.0",
         "ts-node": "^10.9.2",
-        "typescript": "^5.4.2"
+        "typescript": "^5.4.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,6 @@
         "esModuleInterop": true,
         "allowSyntheticDefaultImports": true,
         "declaration": true,
-        "baseUrl": ".",
         "skipLibCheck": true
     },
     "exclude": ["node_modules"]