Skip to content

Commit

Permalink
Merge pull request #107 from eregon/graaljs-runtime-ready
Browse files Browse the repository at this point in the history
Add runtime using GraalJS on TruffleRuby
  • Loading branch information
byroot committed Oct 19, 2021
2 parents 642fd30 + 8d4412a commit 39118e2
Show file tree
Hide file tree
Showing 6 changed files with 154 additions and 4 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ '3.0', '2.7', '2.6', '2.5', 'jruby', 'truffleruby' ]
ruby: [ '3.0', '2.7', '2.6', '2.5', 'jruby', 'truffleruby', 'truffleruby+graalvm' ]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -18,12 +18,17 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}

- name: Update Rubygems
run: gem update --system
- name: Install bundler
run: gem install bundler -v '2.2.16'
- name: Install dependencies
run: bundle install

- name: Set TRUFFLERUBYOPT
run: echo "TRUFFLERUBYOPT=--jvm --polyglot" >> $GITHUB_ENV
if: startsWith(matrix.ruby, 'truffleruby+graalvm')
- name: Run test
run: rake
- name: Install gem
Expand Down
2 changes: 1 addition & 1 deletion lib/execjs/encoding.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def encode(string)
end
else
def encode(string)
string.encode('UTF-8')
string.encode(::Encoding::UTF_8)
end
end
end
Expand Down
142 changes: 142 additions & 0 deletions lib/execjs/graaljs_runtime.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
require "execjs/runtime"

module ExecJS
class GraalJSRuntime < Runtime
class Context < Runtime::Context
def initialize(runtime, source = "", options = {})
@context = Polyglot::InnerContext.new
@context.eval('js', 'delete this.console')
@js_object = @context.eval('js', 'Object')

source = encode(source)
unless source.empty?
translate do
eval_in_context(source)
end
end
end

def exec(source, options = {})
source = encode(source)
source = "(function(){#{source}})()" if /\S/.match?(source)

translate do
eval_in_context(source)
end
end

def eval(source, options = {})
source = encode(source)
source = "(#{source})" if /\S/.match?(source)

translate do
eval_in_context(source)
end
end

def call(source, *args)
source = encode(source)
source = "(#{source})" if /\S/.match?(source)

translate do
function = eval_in_context(source)
function.call(*convert_ruby_to_js(args))
end
end

private

def translate
convert_js_to_ruby yield
rescue ::RuntimeError => e
if e.message.start_with?('SyntaxError:')
error_class = ExecJS::RuntimeError
else
error_class = ExecJS::ProgramError
end

backtrace = e.backtrace.map { |line| line.sub('(eval)', '(execjs)') }
raise error_class, e.message, backtrace
end

def convert_js_to_ruby(value)
case value
when true, false, Integer, Float
value
else
if value.nil?
nil
elsif value.respond_to?(:call)
nil
elsif value.respond_to?(:to_str)
value.to_str
elsif value.respond_to?(:to_ary)
value.to_ary.map do |e|
if e.respond_to?(:call)
nil
else
convert_js_to_ruby(e)
end
end
else
object = value
h = {}
object.instance_variables.each do |member|
v = object[member]
unless v.respond_to?(:call)
h[member.to_s] = convert_js_to_ruby(v)
end
end
h
end
end
end

def convert_ruby_to_js(value)
case value
when nil, true, false, Integer, Float, String
value
when Array
value.map { |e| convert_ruby_to_js(e) }
when Hash
h = @js_object.new
value.each_pair do |k,v|
h[convert_ruby_to_js(k)] = convert_ruby_to_js(v)
end
h
else
raise TypeError, "Unknown how to convert to JS: #{value.inspect}"
end
end

class_eval <<-'RUBY', "(execjs)", 1
def eval_in_context(code); @context.eval('js', code); end
RUBY
end

def name
"GraalVM (Graal.js)"
end

def available?
return @available if defined?(@available)

unless RUBY_ENGINE == "truffleruby"
return @available = false
end

unless defined?(Polyglot::InnerContext)
warn "TruffleRuby #{RUBY_ENGINE_VERSION} does not have support for inner contexts, use a more recent version", uplevel: 0 if $VERBOSE
return @available = false
end

unless Polyglot.languages.include? "js"
warn "The language 'js' is not available, you likely need to `export TRUFFLERUBYOPT='--jvm --polyglot'`", uplevel: 0 if $VERBOSE
warn "Note that you need TruffleRuby+GraalVM and not just the TruffleRuby standalone to use #{self.class}", uplevel: 0 if $VERBOSE
return @available = false
end

@available = true
end
end
end
4 changes: 4 additions & 0 deletions lib/execjs/runtimes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
require "execjs/external_runtime"
require "execjs/ruby_rhino_runtime"
require "execjs/mini_racer_runtime"
require "execjs/graaljs_runtime"

module ExecJS
module Runtimes
Expand All @@ -13,6 +14,8 @@ module Runtimes

RubyRhino = RubyRhinoRuntime.new

GraalJS = GraalJSRuntime.new

MiniRacer = MiniRacerRuntime.new

Node = ExternalRuntime.new(
Expand Down Expand Up @@ -82,6 +85,7 @@ def self.names
def self.runtimes
@runtimes ||= [
RubyRhino,
GraalJS,
Duktape,
MiniRacer,
Node,
Expand Down
1 change: 0 additions & 1 deletion lib/execjs/support/jsc_runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
}, function(program) {
var output;
try {
delete this.console;
delete this.console;
delete this.setTimeout;
delete this.setInterval;
Expand Down
2 changes: 1 addition & 1 deletion test/test_execjs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def test_context_call_missing_function
assert_output value, ExecJS.eval("#{json_value}")
end

define_method("test_strinigfy_value_#{index}") do
define_method("test_stringify_value_#{index}") do
context = ExecJS.compile("function json(obj) { return JSON.stringify(obj); }")
assert_output json_value, context.call("json", value)
end
Expand Down

0 comments on commit 39118e2

Please sign in to comment.