Adding SubFlow logic

entrypoint/mapper.ts

@@ -7,6 +7,8 @@ import {
     NodeParameter,
     NodeParameterValue,
     ParameterDefinition,
+    SubFlowValue,
+    SubFlowValueSetting,
 } from "@code0-tech/sagittarius-graphql-types";
 import {
     DefinitionDataType,
@@ -16,6 +18,8 @@ import {
     ParameterDefinition as TucanaParameterDefinition,
     FlowSetting as TucanaFlowSetting,
     ValidationFlow,
+    SubFlow as TucanaSubFlow,
+    SubFlowSetting as TucanaSubFlowSetting,
 } from "@code0-tech/tucana/shared";
 import {toAllowedValue} from "@code0-tech/tucana/helpers";
 
@@ -55,15 +59,15 @@ function mapFlow(flow: ValidationFlow): Flow {
 function mapFlowSetting(flowSetting: TucanaFlowSetting): FlowSetting {
     return {
         __typename: "FlowSetting",
-        id: gid('FlowSetting', flowSetting.databaseId) as FlowSetting['id'],
+        id: gid('FlowSetting', flowSetting.databaseId!) as FlowSetting['id'],
         flowSettingIdentifier: flowSetting.flowSettingId,
         value: flowSetting.value ? toAllowedValue(flowSetting.value) : null,
     }
 }
 
 function mapNodeFunction(nodeFunction: TucanaNodeFunction): NodeFunction {
     return {
-        id: gid('NodeFunction', nodeFunction.databaseId) as NodeFunction['id'],
+        id: gid('NodeFunction', nodeFunction.databaseId!) as NodeFunction['id'],
         functionDefinition: {
             identifier: nodeFunction.runtimeFunctionId
         },
@@ -102,11 +106,8 @@ function mapNodeParameter(nodeParameter: TucanaNodeParameter): NodeParameter {
             value.parameterIndex = Number(target.inputType.parameterIndex)
             value.inputIndex = Number(target.inputType.inputIndex)
         }
-    } else if (nodeParameterValue?.oneofKind === 'nodeFunctionId') {
-        value = {
-            __typename: 'NodeFunctionIdWrapper',
-            id: gid('NodeFunction', nodeParameterValue.nodeFunctionId) as NodeFunction['id']
-        }
+    } else if (nodeParameterValue?.oneofKind === 'subFlow') {
+        value = mapSubFlow(nodeParameterValue.subFlow);
     }
 
     return {
@@ -131,6 +132,34 @@ function mapParameterDefinition(parameterDefinition: TucanaParameterDefinition):
     }
 }
 
+function mapSubFlow(subFlow: TucanaSubFlow): SubFlowValue {
+    const value: SubFlowValue = {
+        __typename: 'SubFlowValue',
+        signature: subFlow.signature,
+        settings: subFlow.settings.map(mapSubFlowSetting)
+    };
+
+    if (subFlow.executionReference.oneofKind === 'startingNodeId') {
+        value.startingNodeId = gid('NodeFunction', subFlow.executionReference.startingNodeId) as NodeFunction['id'];
+    } else if (subFlow.executionReference.oneofKind === 'functionIdentifier') {
+        value.functionDefinition = {
+            identifier: subFlow.executionReference.functionIdentifier
+        } as FunctionDefinition;
+    }
+
+    return value;
+}
+
+function mapSubFlowSetting(setting: TucanaSubFlowSetting): SubFlowValueSetting {
+    return {
+        __typename: 'SubFlowValueSetting',
+        identifier: setting.identifier,
+        defaultValue: setting.defaultValue ? toAllowedValue(setting.defaultValue) : null,
+        optional: setting.optional,
+        hidden: setting.hidden
+    };
+}
+
 function mapDataType(dataType: DefinitionDataType): DataType {
     return {
         identifier: dataType.identifier,

entrypoint/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@code0-tech/triangulum": "file:../",
-    "@code0-tech/tucana": "0.0.68",
+    "@code0-tech/tucana": "0.0.72",
     "@protobuf-ts/runtime": "^2.11.1"
   },
   "devDependencies": {

gem/Gemfile.lock

@@ -101,7 +101,7 @@ GEM
     rubyzip (2.4.1)
     stringio (3.2.0)
     tsort (0.2.0)
-    tucana (0.0.67)
+    tucana (0.0.72)
       grpc (~> 1.64)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)

gem/spec/support/protobuf_factories.rb

@@ -29,7 +29,11 @@ def reference_node(node_id:, paths: [])
   end
 
   def node_function_value(node_id)
-    Tucana::Shared::NodeValue.new(node_function_id: node_id)
+    Tucana::Shared::NodeValue.new(
+      sub_flow: Tucana::Shared::SubFlow.new(
+        starting_node_id: node_id
+      )
+    )
   end
 
   def node(id:, function_id:, parameters: [], next_node_id: nil)

gem/triangulum.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'base64', '~> 0.3'
   spec.add_dependency 'json', '~> 2.19'
   spec.add_dependency 'open3', '~> 0.2'
-  spec.add_dependency 'tucana', '~> 0.0', '>= 0.0.67'
+  spec.add_dependency 'tucana', '~> 0.0', '>= 0.0.72'
 
   spec.add_development_dependency 'irb', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 13.0'

package.json

@@ -23,7 +23,7 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2531971636-6b64e2c0adb50c5e7b78390e5fcd72c807e694b9",
+    "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2554302654-2b34b39821c688ebf0e1067f2aee8b42274e2a44",
     "@types/node": "^25.6.0",
     "@typescript/vfs": "^1.6.4",
     "typescript": "^6.0.3",
@@ -33,7 +33,7 @@
     "lossless-json": "^4.3.0"
   },
   "peerDependencies": {
-    "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2531971636-6b64e2c0adb50c5e7b78390e5fcd72c807e694b9",
+    "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2554302654-2b34b39821c688ebf0e1067f2aee8b42274e2a44",
     "@typescript/vfs": "^1.6.4",
     "typescript": "^5.9.3 || ^6.0.2",
     "lossless-json": "^4.3.0"

src/utils.ts

@@ -4,9 +4,9 @@ import {
     Flow,
     FunctionDefinition,
     NodeFunction,
-    NodeFunctionIdWrapper,
+    SubFlowValue,
     NodeParameter,
-    ReferenceValue
+    ReferenceValue, Maybe
 } from "@code0-tech/sagittarius-graphql-types";
 import ts from "typescript";
 import {createSystem, createVirtualTypeScriptEnvironment, VirtualTypeScriptEnvironment} from "@typescript/vfs"
@@ -109,20 +109,20 @@ export function generateFlowSourceCode(
 ): string {
     const nodes = flow?.nodes?.nodes || [];
     const funcMap = new Map(functions?.map(f => [f.identifier, f]));
-    const visited = new Set<string>();
+    const visited = new Set<NodeFunction['id']>();
 
-    const generateNodeCode = (nodeId: string, indent: string = ""): string => {
-        const node = nodes.find(n => n?.id === nodeId);
+    const generateNodeCode = (id: NodeFunction['id'] | FunctionDefinition['identifier'], indent: string = ""): string => {
+        const node = nodes.find(n => n?.id === id);
         if (!node || !node.functionDefinition) return "";
-        visited.add(nodeId);
+        if (id?.includes("NodeFunction")) visited.add(id as NodeFunction['id']);
 
         const funcDef = funcMap.get(node.functionDefinition.identifier);
         if (!funcDef) return `${indent}// Error: Function ${node.functionDefinition.identifier} not found\n`;
 
         const params = (node.parameters?.nodes as NodeParameter[]) || [];
         const args = params.map((p, index) => {
             const val = p.value;
-            if (!val) return isForInference ? `/* @pos ${nodeId} ${index} */ {}` : `/* @pos ${nodeId} ${index} */ undefined`;
+            if (!val) return isForInference ? `/* @pos ${id} ${index} */ {}` : `/* @pos ${id} ${index} */ undefined`;
             if (val.__typename === "ReferenceValue") {
                 const ref = val as ReferenceValue;
                 let refCode = typeof ref.inputIndex === "number"
@@ -131,19 +131,19 @@ export function generateFlowSourceCode(
                 ref.referencePath?.forEach(pathObj => {
                     refCode += `?.${pathObj.path}`;
                 });
-                return `/* @pos ${nodeId} ${index} */ ${refCode}`;
+                return `/* @pos ${id} ${index} */ ${refCode}`;
             }
             if (val.__typename === "LiteralValue") {
                 const jsonString = stringify(val?.value)
-                return `/* @pos ${nodeId} ${index} */ ${jsonString}`;
+                return `/* @pos ${id} ${index} */ ${jsonString}`;
             }
-            if (val.__typename === "NodeFunctionIdWrapper") {
-                const wrapper = val as NodeFunctionIdWrapper;
-                const lambdaArgName = `p_${sanitizeId(nodeId)}_${index}`;
-                const subTreeCode = generateNodeCode(wrapper.id!, indent + "    ");
-                return `/* @pos ${nodeId} ${index} */ (...${lambdaArgName}) => {\n${subTreeCode}${indent}}`;
+            if (val.__typename === "SubFlowValue") {
+                const wrapper = val as SubFlowValue;
+                const lambdaArgName = `p_${sanitizeId(id as string)}_${index}`;
+                const subTreeCode = generateNodeCode(wrapper.startingNodeId || wrapper.functionDefinition?.id!, indent + "    ");
+                return `/* @pos ${id} ${index} */ (...${lambdaArgName}) => {\n${subTreeCode}${indent}}`;
             }
-            return isForInference ? `/* @pos ${nodeId} ${index} */ {}` : `/* @pos ${nodeId} ${index} */ undefined`;
+            return isForInference ? `/* @pos ${id} ${index} */ {}` : `/* @pos ${id} ${index} */ undefined`;
         });
 
         const varName = `node_${sanitizeId(node.id!)}`;
@@ -155,21 +155,21 @@ export function generateFlowSourceCode(
         let code = `${indent}`;
 
         if (node.functionDefinition.identifier === "std::control::return") {
-            code += `return /* @pos ${nodeId} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
+            code += `return /* @pos ${id} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
         } else if (node.functionDefinition.identifier === "std::control::if") {
-            code += `const ${varName} = /* @pos ${nodeId} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
+            code += `const ${varName} = /* @pos ${id} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
             code += `if(${args[0]}) {
-                ${generateNodeCode((node.parameters?.nodes?.[1]?.value as NodeFunctionIdWrapper)?.id!, indent + "    ")}
+                ${generateNodeCode(((node.parameters?.nodes?.[1]?.value as SubFlowValue)?.startingNodeId || (node.parameters?.nodes?.[1]?.value as SubFlowValue)?.functionDefinition?.identifier), indent + "    ")}
             }`
         } else if (node.functionDefinition.identifier === "std::control::if_else") {
-            code += `const ${varName} = /* @pos ${nodeId} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
+            code += `const ${varName} = /* @pos ${id} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
             code += `if(${args[0]}) {
-                ${generateNodeCode((node.parameters?.nodes?.[1]?.value as NodeFunctionIdWrapper)?.id!, indent + "    ")}
+                ${generateNodeCode(((node.parameters?.nodes?.[1]?.value as SubFlowValue)?.startingNodeId || (node.parameters?.nodes?.[1]?.value as SubFlowValue)?.functionDefinition?.identifier), indent + "    ")}
             } else {
-                ${generateNodeCode((node.parameters?.nodes?.[2]?.value as NodeFunctionIdWrapper)?.id!, indent + "    ")}
+                ${generateNodeCode(((node.parameters?.nodes?.[2]?.value as SubFlowValue)?.startingNodeId || (node.parameters?.nodes?.[2]?.value as SubFlowValue)?.functionDefinition?.identifier), indent + "    ")}
             }`
         } else {
-            code += `const ${varName} = /* @pos ${nodeId} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
+            code += `const ${varName} = /* @pos ${id} null */ ${funcName}(${args.join(", ")})${needsAnyCast ? "" : ""} ;\n`
         }
 
         if (node.nextNodeId) code += generateNodeCode(node.nextNodeId, indent);
@@ -181,9 +181,9 @@ export function generateFlowSourceCode(
     const funcDeclarations = functions?.map(f => `declare function fn_${f.identifier?.replace(/::/g, '_')}${f.signature}`).join('\n');
 
     const nextNodeIds = new Set(nodes.map(n => n?.nextNodeId).filter(id => !!id));
-    const subTreeIds = new Set<string>();
-    nodes.forEach(n => n?.parameters?.nodes?.forEach((p: any) => {
-        if (p?.value?.__typename === "NodeFunctionIdWrapper" && p.value.id) subTreeIds.add(p.value.id);
+    const subTreeIds = new Set<NodeFunction['id'] | FunctionDefinition['id']>();
+    nodes.forEach(n => n?.parameters?.nodes?.forEach((p: Maybe<NodeParameter>) => {
+        if (p?.value?.__typename === "SubFlowValue" && (p.value.startingNodeId || p.value.functionDefinition?.id)) subTreeIds.add(p.value.startingNodeId || p.value.functionDefinition?.id);
     }));
 
     const flowCode = flow ? `const flow_${sanitizeId(flow.id ?? "")} = /* @pos null null */ flow(${flow.settings?.nodes?.map((setting, index) => `/* @pos null ${index} */ ${stringify(setting?.value)}`).join(", ") ?? ""});` : ""