triangulum 0.30.2-aarch64-linux-gnu → 0.31.0-aarch64-linux-gnu

data/lib/triangulum/validation.rb

@@ -4,22 +4,12 @@ module Triangulum
   # == Triangulum::Validation
   # This class implements the validation using the typescript package
   class Validation
-    class TriangulumFailed < Triangulum::Error
-    end
-
-    class BunNotFound < Triangulum::Error
-    end
+    include Executor
 
     Result = Struct.new(:valid?, :return_type, :diagnostics, keyword_init: true)
     Diagnostic = Struct.new(:message, :code, :severity, :node_id, :parameter_index, keyword_init: true)
 
     ENTRYPOINT = File.expand_path('js/single-validation.js', __dir__)
-    BUN_EXE = Dir.glob(File.expand_path('../../exe/*/bun', __dir__)).find do |path|
-      platform = Gem::Platform.new(File.basename(File.dirname(path)))
-      Gem::Platform.match_gem?(platform, Gem::Platform.local.to_s)
-    end
-
-    IS_RUBY_PLATFORM_GEM = Dir.glob(File.expand_path('../../exe/*/bun', __dir__)).empty?
 
     attr_reader :flow, :function_definitions, :data_types
 
@@ -32,32 +22,13 @@ module Triangulum
     def validate
       input = serialize_input
 
-      output = run_ts_triangulum(input)
+      output = run_ts_triangulum(ENTRYPOINT, input)
 
       parse_output(output)
     end
 
     private
 
-    def run_ts_triangulum(input)
-      stdout_s, stderr_s, status = Open3.capture3(
-        bun, 'run', ENTRYPOINT,
-        stdin_data: input
-      )
-
-      unless status.success?
-        status_info = if status.signaled?
-                        "SIGNAL: #{status.termsig}"
-                      else
-                        "STATUS: #{status.exitstatus}"
-                      end
-
-        raise TriangulumFailed, "#{status_info}\n\nOUT:\n#{stdout_s}\n\nERR:\n#{stderr_s}"
-      end
-
-      stdout_s
-    end
-
     def serialize_input
       input = []
 
@@ -96,15 +67,5 @@ module Triangulum
         end
       )
     end
-
-    def bun
-      if IS_RUBY_PLATFORM_GEM
-        'bun'
-      else
-        raise BunNotFound, "No bundled bun binary found for #{Gem::Platform.local}" if BUN_EXE.nil?
-
-        BUN_EXE
-      end
-    end
   end
 end

data/lib/triangulum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Triangulum
-  VERSION = '0.30.2'
+  VERSION = '0.31.0'
 end

data/lib/triangulum.rb

@@ -9,4 +9,6 @@ module Triangulum
 end
 
 require_relative 'triangulum/version'
+require_relative 'triangulum/executor'
+require_relative 'triangulum/flow_schema_extraction'
 require_relative 'triangulum/validation'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triangulum
 version: !ruby/object:Gem::Version
-  version: 0.30.2
+  version: 0.31.0
 platform: aarch64-linux-gnu
 authors:
 - Niklas van Schrick
@@ -60,7 +60,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.72
+        version: 0.0.78
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.72
+        version: 0.0.78
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,9 @@ files:
 - README.md
 - exe/aarch64-linux-gnu/bun
 - lib/triangulum.rb
+- lib/triangulum/executor.rb
+- lib/triangulum/flow_schema_extraction.rb
+- lib/triangulum/js/flow-schema-extraction.js
 - lib/triangulum/js/single-validation.js
 - lib/triangulum/validation.rb
 - lib/triangulum/version.rb