Merge pull request #30 from code0-tech/renovate/code0-tech-tucana-0.x

Taucher2003 · web-flow · commit 22a927204fbd · 2026-04-05T23:28:24.000+02:00
Update dependency @code0-tech/tucana to v0.0.67
diff --git a/entrypoint/mapper.ts b/entrypoint/mapper.ts
@@ -3,15 +3,17 @@ import {
     DataType,
     Flow,
     FunctionDefinition,
-    LiteralValue,
     NodeFunction,
     NodeParameter,
-    NodeParameterValue, ParameterDefinition,
+    NodeParameterValue,
+    ParameterDefinition,
 } from "@code0-tech/sagittarius-graphql-types";
 import {
     DefinitionDataType,
     NodeFunction as TucanaNodeFunction,
-    NodeParameter as TucanaNodeParameter, RuntimeFunctionDefinition, RuntimeParameterDefinition,
+    NodeParameter as TucanaNodeParameter,
+    FunctionDefinition as TucanaFunctionDefinition,
+    ParameterDefinition as TucanaParameterDefinition,
     ValidationFlow,
 } from "@code0-tech/tucana/shared";
 import {toAllowedValue} from "@code0-tech/tucana/helpers";
@@ -38,8 +40,7 @@ function mapFlow(flow: ValidationFlow): Flow {
     return {
         __typename: "Flow",
         id: gid('Flow', flow.flowId) as Flow['id'],
-        inputType: flow.inputType,
-        returnType: flow.returnType,
+        signature: flow.signature,
         startingNodeId: gid('NodeFunction', flow.startingNodeId) as NodeFunction['id'],
         nodes: {
             nodes: flow.nodeFunctions.map(mapNodeFunction)
@@ -101,17 +102,17 @@ function mapNodeParameter(nodeParameter: TucanaNodeParameter): NodeParameter {
     }
 }
 
-function mapFunctionDefinition(functionDefinition: RuntimeFunctionDefinition): FunctionDefinition {
+function mapFunctionDefinition(functionDefinition: TucanaFunctionDefinition): FunctionDefinition {
     return {
         identifier: functionDefinition.runtimeName,
         signature: functionDefinition.signature,
         parameterDefinitions: {
-            nodes: functionDefinition.runtimeParameterDefinitions.map(mapParameterDefinition)
+            nodes: functionDefinition.parameterDefinitions.map(mapParameterDefinition)
         }
     }
 }
 
-function mapParameterDefinition(parameterDefinition: RuntimeParameterDefinition): ParameterDefinition {
+function mapParameterDefinition(parameterDefinition: TucanaParameterDefinition): ParameterDefinition {
     return {
         identifier: parameterDefinition.runtimeName,
     }
diff --git a/entrypoint/package-lock.json b/entrypoint/package-lock.json
diff --git a/entrypoint/package.json b/entrypoint/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@code0-tech/triangulum": "file:../",
-    "@code0-tech/tucana": "0.0.62",
+    "@code0-tech/tucana": "0.0.67",
     "@protobuf-ts/runtime": "^2.11.1"
   },
   "devDependencies": {
diff --git a/entrypoint/readSingle.ts b/entrypoint/readSingle.ts
@@ -1,12 +1,12 @@
 import {
     DefinitionDataType,
-    RuntimeFunctionDefinition,
+    FunctionDefinition,
     ValidationFlow
 } from "@code0-tech/tucana/shared";
 
 export type SingleValidationInputData = {
     flow?: ValidationFlow,
-    functions: RuntimeFunctionDefinition[],
+    functions: FunctionDefinition[],
     dataTypes: DefinitionDataType[]
 };
 
@@ -28,7 +28,7 @@ export async function readSingleValidation(input: AsyncIterable<string>) {
         if(parsingState === 0) {
             data.flow = ValidationFlow.fromBinary(message);
         } else if(parsingState === 1) {
-            data.functions.push(RuntimeFunctionDefinition.fromBinary(message));
+            data.functions.push(FunctionDefinition.fromBinary(message));
         } else if(parsingState === 2) {
             data.dataTypes.push(DefinitionDataType.fromBinary(message));
         }
diff --git a/gem/Gemfile.lock b/gem/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       base64 (~> 0.3)
       json (~> 2.19)
       open3 (~> 0.2)
-      tucana (~> 0.0, >= 0.0.62)
+      tucana (~> 0.0, >= 0.0.67)
 
 GEM
   remote: https://rubygems.org/
@@ -101,7 +101,7 @@ GEM
     rubyzip (2.4.1)
     stringio (3.2.0)
     tsort (0.2.0)
-    tucana (0.0.62)
+    tucana (0.0.67)
       grpc (~> 1.64)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
diff --git a/gem/README.md b/gem/README.md
@@ -28,11 +28,11 @@ bundle lock --add-platform x86_64-linux-gnu
 ## Usage
 
 ```ruby
-result = Triangulum::Validation.new(flow, runtime_function_definitions, data_types).validate
+result = Triangulum::Validation.new(flow, function_definitions, data_types).validate
 
-result.valid?       # => true / false
-result.return_type  # => "void"
-result.diagnostics  # => [Triangulum::Validation::Diagnostic, ...]
+result.valid? # => true / false
+result.return_type # => "void"
+result.diagnostics # => [Triangulum::Validation::Diagnostic, ...]
 ```
 
 The arguments are [Tucana](https://github.com/code0-tech/tucana) protobuf objects:
diff --git a/gem/lib/triangulum/validation.rb b/gem/lib/triangulum/validation.rb
@@ -21,11 +21,11 @@ class BunNotFound < Triangulum::Error
 
     IS_RUBY_PLATFORM_GEM = Dir.glob(File.expand_path('../../exe/*/bun', __dir__)).empty?
 
-    attr_reader :flow, :runtime_function_definitions, :data_types
+    attr_reader :flow, :function_definitions, :data_types
 
     def initialize(flow, runtime_function_definitions, data_types)
       @flow = flow
-      @runtime_function_definitions = runtime_function_definitions
+      @function_definitions = runtime_function_definitions
       @data_types = data_types
     end
 
@@ -56,7 +56,7 @@ def serialize_input
       input << Base64.strict_encode64(flow.to_proto)
       input << ''
 
-      runtime_function_definitions.each do |rfd|
+      function_definitions.each do |rfd|
         input << Base64.strict_encode64(rfd.to_proto)
       end
 
diff --git a/gem/spec/spec_helper.rb b/gem/spec/spec_helper.rb
@@ -12,6 +12,10 @@
   config.disable_monkey_patching!
   config.include ProtobufFactories
 
+  config.define_derived_metadata do |metadata|
+    metadata[:aggregate_failures] = true
+  end
+
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
diff --git a/gem/spec/support/protobuf_factories.rb b/gem/spec/support/protobuf_factories.rb
@@ -8,7 +8,8 @@ def build_flow(node_functions:, starting_node_id: 1)
       type: 'test',
       starting_node_id: starting_node_id,
       node_functions: node_functions,
-      project_slug: 'test'
+      project_slug: 'test',
+      signature: '(): void'
     )
   end
 
@@ -61,19 +62,19 @@ def default_data_types
 
   def default_functions
     [
-      Tucana::Shared::RuntimeFunctionDefinition.new(
+      Tucana::Shared::FunctionDefinition.new(
         runtime_name: 'std::math::add',
         signature: '(a: NUMBER, b: NUMBER): NUMBER'
       ),
-      Tucana::Shared::RuntimeFunctionDefinition.new(
+      Tucana::Shared::FunctionDefinition.new(
         runtime_name: 'std::list::at',
         signature: '<R>(list: LIST<R>, index: NUMBER): R'
       ),
-      Tucana::Shared::RuntimeFunctionDefinition.new(
+      Tucana::Shared::FunctionDefinition.new(
         runtime_name: 'std::control::for_each',
         signature: '<R>(list: LIST<R>, consumer: CONSUMER<R>): void'
       ),
-      Tucana::Shared::RuntimeFunctionDefinition.new(
+      Tucana::Shared::FunctionDefinition.new(
         runtime_name: 'std::control::return',
         signature: '<R>(value: R): R'
       )
diff --git a/gem/spec/triangulum/validation_spec.rb b/gem/spec/triangulum/validation_spec.rb
@@ -100,6 +100,7 @@
       result = described_class.new(flow, functions, data_types).validate
 
       expect(result.valid?).to be true
+      expect(result.diagnostics).to be_empty
     end
 
     it 'returns diagnostics with node_id and parameter_index' do
diff --git a/gem/triangulum.gemspec b/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.62'
+  spec.add_dependency 'tucana', '~> 0.0', '>= 0.0.67'
 
   spec.add_development_dependency 'irb', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,15 +25,17 @@
   "devDependencies": {
     "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2430052572-f89aa9d01636e56a17463920775d073b09dd132b",
     "@types/node": "^25.5.0",
+    "@typescript/vfs": "^1.6.4",
     "typescript": "^6.0.2",
     "vite": "^8.0.3",
     "vite-plugin-dts": "^4.5.4",
     "vitest": "^4.1.2",
-    "@typescript/vfs": "^1.6.4"
+    "lossless-json": "^4.3.0"
   },
   "peerDependencies": {
     "@code0-tech/sagittarius-graphql-types": "0.0.0-experimental-2430052572-f89aa9d01636e56a17463920775d073b09dd132b",
+    "@typescript/vfs": "^1.6.4",
     "typescript": "^5.9.3 || ^6.0.2",
-    "@typescript/vfs": "^1.6.4"
+    "lossless-json": "^4.3.0"
   }
 }
diff --git a/src/extraction/getTypeFromValue.ts b/src/extraction/getTypeFromValue.ts
@@ -1,6 +1,7 @@
 import ts from "typescript";
 import {createCompilerHost, getSharedTypeDeclarations} from "../utils";
 import {DataType, LiteralValue} from "@code0-tech/sagittarius-graphql-types";
+import {stringify} from "lossless-json";
 
 /**
  * Uses the TypeScript compiler to generate a precise type string from any runtime value.
@@ -9,8 +10,10 @@ export const getTypeFromValue = (
     value?: LiteralValue | null,
     dataTypes?: DataType[]
 ): string => {
+
+
     // 1. Serialize value to a JSON string for embedding in source code.
-    const literal = JSON.stringify(value?.value);
+    const literal = stringify(value?.value)
 
     if (!literal) return "any"
 
diff --git a/src/utils.ts b/src/utils.ts
@@ -12,6 +12,7 @@ import ts from "typescript";
 import {createSystem, createVirtualTypeScriptEnvironment, VirtualTypeScriptEnvironment} from "@typescript/vfs"
 import {DataTypeVariant, getTypeVariant} from "./extraction/getTypeVariant";
 import {getTypesFromFunction} from "./extraction/getTypesFromFunction";
+import {stringify} from "lossless-json";
 
 /**
  * Result of a node or flow validation.
@@ -125,7 +126,10 @@ export function generateFlowSourceCode(
                 });
                 return `/* @pos ${nodeId} ${paramIdx} */ ${refCode}`;
             }
-            if (val.__typename === "LiteralValue") return `/* @pos ${nodeId} ${paramIdx} */ ${JSON.stringify(val.value)}`;
+            if (val.__typename === "LiteralValue") {
+                const jsonString = stringify(val?.value)
+                return `/* @pos ${nodeId} ${paramIdx} */ ${jsonString}`;
+            }
             if (val.__typename === "NodeFunctionIdWrapper") {
                 const wrapper = val as NodeFunctionIdWrapper;
                 return generateNodeCall(wrapper.id!, nodeId, paramIdx);
@@ -172,7 +176,10 @@ export function generateFlowSourceCode(
                 });
                 return `/* @pos ${nodeId} ${index} */ ${refCode}`;
             }
-            if (val.__typename === "LiteralValue") return `/* @pos ${nodeId} ${index} */ ${JSON.stringify(val.value)}`;
+            if (val.__typename === "LiteralValue") {
+                const jsonString = stringify(val?.value)
+                return `/* @pos ${nodeId} ${index} */ ${jsonString}`;
+            }
             if (val.__typename === "NodeFunctionIdWrapper") {
                 const wrapper = val as NodeFunctionIdWrapper;
 
@@ -218,7 +225,7 @@ export function generateFlowSourceCode(
         if (p?.value?.__typename === "NodeFunctionIdWrapper" && p.value.id) subTreeIds.add(p.value.id);
     }));
 
-    const flowCode = flow ? `const flow_${sanitizeId(flow.id ?? "")} = flow(${flow.settings?.nodes?.map((setting, index) => `/* @pos undefined ${index} */ ${JSON.stringify(setting?.value)}`).join(", ") ?? ""});` : ""
+    const flowCode = flow ? `const flow_${sanitizeId(flow.id ?? "")} = flow(${flow.settings?.nodes?.map((setting, index) => `/* @pos undefined ${index} */ ${stringify(setting?.value)}`).join(", ") ?? ""});` : ""
 
     const executionCode = nodes
         .filter(n => n?.id && !nextNodeIds.has(n.id) && !subTreeIds.has(n.id))
diff --git a/src/validation/getValueValidation.ts b/src/validation/getValueValidation.ts
@@ -1,18 +1,21 @@
 import ts from "typescript";
 import {DataType, LiteralValue} from "@code0-tech/sagittarius-graphql-types";
 import {createCompilerHost, getSharedTypeDeclarations, ValidationResult} from "../utils";
+import { stringify } from 'lossless-json'
+
 
 export const getValueValidation = (
     type?: string,
     value?: LiteralValue,
     dataTypes?: DataType[]
 ): ValidationResult => {
-    const valueAsCode = JSON.stringify(value?.value);
+
+    const jsonString = stringify(value?.value)
 
     // 1. Construct the source code for validation.
     const sourceCode = `
         ${getSharedTypeDeclarations(dataTypes)}
-        const testValue: ${type} = ${valueAsCode};
+        const testValue: ${type} = ${jsonString};
     `;
 
     const fileName = "index.ts";
diff --git a/test/getReferenceSuggestions.test.ts b/test/getReferenceSuggestions.test.ts
@@ -125,8 +125,6 @@ describe('getReferenceSuggestions', () => {
 
         const suggestions = getReferenceSuggestions(flow, "gid://sagittarius/NodeFunction/4", 0, FUNCTION_SIGNATURES, DATA_TYPES);
 
-        console.log(suggestions)
-
         //expect(suggestions.some(s => !s.nodeFunctionId)).toBe(true);
     });
 
diff --git a/test/valueFromType.test.ts b/test/valueFromType.test.ts
diff --git a/test/valueValidation.test.ts b/test/valueValidation.test.ts
