opal 1.7.4 → 1.8.0.beta1

data/stdlib/native.rb

@@ -1,3 +1,6 @@
+# backtick_javascript: true
+# helpers: hash_put
+
 # Provides a complete set of tools to wrap native JavaScript
 # into nice Ruby objects.
 #
@@ -535,68 +538,65 @@ unless Hash.method_defined? :_initialize
   class Hash
     alias _initialize initialize
 
+    %x{
+      function $hash_convert_and_put_value(hash, key, value) {
+        if (value &&
+          (value.constructor === undefined ||
+            value.constructor === Object ||
+            value instanceof Map)) {
+         $hash_put(hash, key, #{Hash.new(`value`)});
+       } else if (value && value.$$is_array) {
+         value = value.map(function(item) {
+           if (item &&
+              (item.constructor === undefined ||
+               item.constructor === Object ||
+               value instanceof Map)) {
+             return #{Hash.new(`item`)};
+           }
+           return #{Native(`item`)};
+         });
+         $hash_put(hash, key, value)
+       } else {
+         $hash_put(hash, key, #{Native(`value`)});
+       }
+      }
+    }
+
     def initialize(defaults = undefined, &block)
       %x{
-        if (defaults != null &&
-             (defaults.constructor === undefined ||
-               defaults.constructor === Object)) {
-          var smap = self.$$smap,
-              keys = self.$$keys,
-              key, value;
-
-          for (key in defaults) {
-            value = defaults[key];
-
-            if (value &&
-                 (value.constructor === undefined ||
-                   value.constructor === Object)) {
-              smap[key] = #{Hash.new(`value`)};
-            } else if (value && value.$$is_array) {
-              value = value.map(function(item) {
-                if (item &&
-                     (item.constructor === undefined ||
-                       item.constructor === Object)) {
-                  return #{Hash.new(`item`)};
-                }
-
-                return #{Native(`item`)};
-              });
-              smap[key] = value
-            } else {
-              smap[key] = #{Native(`value`)};
+        if (defaults != null) {
+          if (defaults.constructor === undefined ||
+              defaults.constructor === Object) {
+            var key, value;
+
+            for (key in defaults) {
+              value = defaults[key];
+              $hash_convert_and_put_value(self, key, value);
             }
 
-            keys.push(key);
+            return self;
+          } else if (defaults instanceof Map) {
+            Opal.hash_each(defaults, false, function(key, value) {
+              $hash_convert_and_put_value(self, key, value);
+              return [false, false];
+            });
           }
-
-          return self;
         }
 
         return #{_initialize(defaults, &block)};
       }
     end
 
-    # @return a JavaScript object with the same keys but calling #to_n on
-    # all values.
+    # @return a JavaScript Map but calling #to_n on
+    # all keys and values.
     def to_n
       %x{
-        var result = {},
-            keys = self.$$keys,
-            smap = self.$$smap,
-            key, value;
-
-        for (var i = 0, length = keys.length; i < length; i++) {
-          key = keys[i];
-
-          if (key.$$is_string) {
-            value = smap[key];
-          } else {
-            key = key.key;
-            value = key.value;
-          }
+        var result = new Map();
 
-          result[key] = #{Native.try_convert(`value`, `value`)};
-        }
+        Opal.hash_each(self, false, function(key, value) {
+          result.set(#{Native.try_convert(`key`, `key`)} , #{Native.try_convert(`value`, `value`)});
+          return [false, false];
+        });
 
         return result;
       }

data/stdlib/nodejs/base.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 module NodeJS
   VERSION = `process.version`
 end

data/stdlib/nodejs/dir.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 class Dir
   @__glob__ = `require('glob')`
   @__fs__ = `require('fs')`

data/stdlib/nodejs/env.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 ENV = Object.new
 
 class << ENV

data/stdlib/nodejs/file.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'corelib/file'
 
 %x{

data/stdlib/nodejs/fileutils.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 module FileUtils
   extend self
   `var __fs__ = #{File}.__fs__`

data/stdlib/nodejs/io.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'nodejs/file'
 
 %x{

data/stdlib/nodejs/js-yaml-3-6-1.js

@@ -3848,7 +3848,7 @@ module.exports = new Type('tag:yaml.org,2002:timestamp', {
 var yaml = require('./lib/js-yaml.js');
 
 
-module.exports = yaml;
+module.exports = globalThis.jsyaml = yaml;
 
 },{"./lib/js-yaml.js":1}]},{},[])("/")
 });

data/stdlib/nodejs/kernel.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'buffer'
 require 'corelib/process/status'
 

data/stdlib/nodejs/open-uri.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 module OpenURI
   @__xmlhttprequest__ = `require('unxhr')`
   `var __XMLHttpRequest__ = #{@__xmlhttprequest__}.XMLHttpRequest`

data/stdlib/nodejs/pathname.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'pathname'
 
 class Pathname

data/stdlib/nodejs/require.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'opal-parser'
 
 module Kernel

data/stdlib/nodejs/yaml.rb

@@ -1,12 +1,18 @@
+# backtick_javascript: true
+
 require 'native'
-require_relative './js-yaml-3-6-1'
+require 'nodejs/js-yaml-3-6-1'
 
 module YAML
-  @__yaml__ = `jsyaml`
+  @__yaml__ = `globalThis.jsyaml`
   `var __yaml__ = #{@__yaml__}`
 
   def self.load_path(path)
-    loaded = `__yaml__.safeLoad(#{File}.__fs__.readFileSync(#{path}, 'utf8'))`
+    load(`#{File}.__fs__.readFileSync(#{path}, 'utf8')`)
+  end
+
+  def self.load(data)
+    loaded = `__yaml__.safeLoad(data)`
     loaded = Hash.new(loaded) if native?(loaded)
     loaded
   end

data/stdlib/opal/miniracer.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 `/* global opalminiracer */`
 
 # Compatibility utilities for the API we provide in

data/stdlib/opal-parser.rb

@@ -1,3 +1,6 @@
+# helpers: call, raise
+# backtick_javascript: true
+
 # parser uses String#unpack
 require 'corelib/string/unpack'
 
@@ -10,7 +13,9 @@ module Kernel
     str = ::Opal.coerce_to!(str, String, :to_str)
     default_eval_options = { file: file || '(eval)', eval: true }
     compiling_options = __OPAL_COMPILER_CONFIG__.merge(default_eval_options)
-    code = `Opal.compile(str, compiling_options)`
+    compiler = Opal::Compiler.new(str, compiling_options)
+    code = compiler.compile
+    code += compiler.source_map.to_data_uri_comment unless compiling_options[:no_source_map]
     if binding
       binding.js_eval(code)
     else
@@ -33,6 +38,8 @@ module Kernel
 end
 
 %x{
+  var $has_own = Object.hasOwn || $call.bind(Object.prototype.hasOwnProperty);
+
   Opal.compile = function(str, options) {
     try {
       str = #{::Opal.coerce_to!(`str`, String, :to_str)}

data/stdlib/opal-platform.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 `/* global Java, GjsFileImporter, Deno */`
 
 browser          = `typeof(document) !== "undefined"`

data/stdlib/opal-replutils.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'pp'
 require 'stringio'
 

data/stdlib/open-uri.rb

@@ -1,5 +1,8 @@
-# Copied from https://raw.githubusercontent.com/ruby/ruby/373babeaac8c3e663e1ded74a9f06ac94a671ed9/lib/open-uri.rb
 # frozen_string_literal: true
+# backtick_javascript: true
+
+# Copied from https://raw.githubusercontent.com/ruby/ruby/373babeaac8c3e663e1ded74a9f06ac94a671ed9/lib/open-uri.rb
+
 require 'stringio'
 require 'corelib/array/pack'
 

data/stdlib/ostruct.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 class OpenStruct
   def initialize(hash = nil)
     @table = {}
@@ -62,8 +64,8 @@ class OpenStruct
     @table.eql? other.instance_variable_get(:@table)
   end
 
-  def to_h
-    @table.dup
+  def to_h(&block)
+    block_given? ? @table.to_h(&block) : @table.dup
   end
 
   def to_n

data/stdlib/pathname.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'corelib/comparable'
 
 # Portions from Author:: Tanaka Akira <akr@m17n.org>
@@ -75,7 +77,7 @@ class Pathname
   end
 
   def hash
-    @path
+    @path.hash
   end
 
   def expand_path

data/stdlib/pp.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# backtick_javascript: true
 
 # Opal: load stdlib/thread.rb
 require 'thread'

data/stdlib/promise/v2.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 # {Promise} is used to help structure asynchronous code.
 #
 # It is available in the Opal standard library, and can be required in any Opal
@@ -142,6 +144,7 @@ class PromiseV2 < `Promise`
       `Promise.resolve(#{value})`.tap do |prom|
         prom.instance_variable_set(:@type, :resolve)
         prom.instance_variable_set(:@realized, :resolve)
+        prom.instance_variable_set(:@value_set, true)
         prom.instance_variable_set(:@value, value)
       end
     end
@@ -150,6 +153,7 @@ class PromiseV2 < `Promise`
       `Promise.reject(#{value})`.tap do |prom|
         prom.instance_variable_set(:@type, :reject)
         prom.instance_variable_set(:@realized, :reject)
+        prom.instance_variable_set(:@value_set, true)
         prom.instance_variable_set(:@value, value)
       end
     end
@@ -197,6 +201,7 @@ class PromiseV2 < `Promise`
   def resolve(value = nil)
     nativity_check!
     raise ArgumentError, 'this promise was already resolved' if @realized
+    @value_set = true
     @value = value
     @realized = :resolve
     @resolve_proc.call(value)
@@ -206,6 +211,7 @@ class PromiseV2 < `Promise`
   def reject(value = nil)
     nativity_check!
     raise ArgumentError, 'this promise was already resolved' if @realized
+    @value_set = true
     @value = value
     @realized = :reject
     @reject_proc.call(value)
@@ -216,6 +222,7 @@ class PromiseV2 < `Promise`
     prom = nil
     blk = gen_tracing_proc(block) do |val|
       prom.instance_variable_set(:@realized, :resolve)
+      prom.instance_variable_set(:@value_set, true)
       prom.instance_variable_set(:@value, val)
     end
     prom = `self.then(#{blk})`
@@ -234,6 +241,7 @@ class PromiseV2 < `Promise`
     prom = nil
     blk = gen_tracing_proc(block) do |val|
       prom.instance_variable_set(:@realized, :resolve)
+      prom.instance_variable_set(:@value_set, true)
       prom.instance_variable_set(:@value, val)
     end
     prom = `self.catch(#{blk})`
@@ -252,9 +260,10 @@ class PromiseV2 < `Promise`
     prom = nil
     blk = gen_tracing_proc(block) do |val|
       prom.instance_variable_set(:@realized, :resolve)
+      prom.instance_variable_set(:@value_set, true)
       prom.instance_variable_set(:@value, val)
     end
-    prom = `self.finally(#{blk})`
+    prom = `self.finally(function() { return blk(self.$value_internal()); })`
     prom.instance_variable_set(:@prev, self)
     prom.instance_variable_set(:@type, :always)
     (@next ||= []) << prom
@@ -310,11 +319,7 @@ class PromiseV2 < `Promise`
 
   def value
     if resolved?
-      if PromiseV2 === @value
-        @value.value
-      else
-        @value
-      end
+      value_internal
     end
   end
 
@@ -364,7 +369,7 @@ class PromiseV2 < `Promise`
       result += " >> #{@next.inspect}"
     end
 
-    result += ": #{@value.inspect}" if @value
+    result += ": #{value.inspect}"
     result += '>'
 
     result
@@ -384,4 +389,16 @@ class PromiseV2 < `Promise`
   alias resolve! resolve
   alias to_n itself
   alias to_v2 itself
+
+  private
+
+  def value_internal
+    if PromiseV2 === @value
+      @value.value
+    elsif @value_set
+      @value
+    elsif @prev
+      @prev.value
+    end
+  end
 end

data/stdlib/quickjs/io.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 %x{
   Opal.gvars.stdout.write_proc = function(s) {
     std.out.printf("%s", s);

data/stdlib/quickjs/kernel.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 ARGV = `scriptArgs`
 
 `Opal.exit = std.exit`

data/stdlib/quickjs.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 `/* global std, scriptArgs */`
 
 require 'quickjs/io'

data/stdlib/securerandom.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'corelib/random/formatter'
 
 module SecureRandom

data/stdlib/stringio.rb

@@ -1,4 +1,6 @@
 class StringIO < IO
+  VERSION = "0"
+
   def self.open(string = "", mode = nil, &block)
     io  = new(string, mode)
     res = block.call(io)

data/stdlib/strscan.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 class StringScanner
   attr_reader :pos, :matched
 

data/stdlib/time.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 class Time
   def self.parse(str)
     %x{

data/stdlib/uri.rb

@@ -1,3 +1,4 @@
+# backtick_javascript: true
 # frozen_string_literal: true
 
 module URI

data/tasks/performance/optimization_status.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 klasses = [
   Array,
   Class,

data/tasks/testing.rake

@@ -36,6 +36,7 @@ module Testing
         mspec/commands/mspec-run
         etc
         rubygems
+        zlib
       ]
     end
 
@@ -334,7 +335,6 @@ platforms.each do |platform|
         includes = "-Itest/cruby/test"
         files = %w[
           benchmark/test_benchmark.rb
-          ruby/test_call.rb
           opal/test_keyword.rb
           opal/test_base64.rb
           opal/test_openuri.rb
@@ -389,6 +389,7 @@ node_platforms.each do |platform|
       nodejs/test_opal_builder.rb
       nodejs/test_string.rb
       nodejs/test_await.rb
+      nodejs/test_yaml.rb
     ]
 
     filename = "tmp/minitest_node_nodejs.rb"
@@ -426,17 +427,21 @@ task :smoke_test do
       begin
         require 'rspec/expectations'
         extend RSpec::Matchers
-        expect(actual_output.lines[0]).to    eq("..\n")
-        expect(actual_output.lines[1]).to    eq("\n")
-        expect(actual_output.lines[2]).to match(%r{Top 2 slowest examples \(\d+\.\d+ seconds, \d+\.\d+% of total time\):\n})
-        expect(actual_output.lines[4]).to match(%r{    \[1m\d+\.\d+\[0m \[1mseconds\[0m .*deprecations_spec\.rb:7\n})
-        expect(actual_output.lines[6]).to match(%r{    \[1m\d+\.\d+\[0m \[1mseconds\[0m .*deprecations_spec\.rb:12\n})
-        expect(actual_output.lines[7]).to    eq("\n")
-        expect(actual_output.lines[8]).to match(%r{^Finished in \d+\.\d+ seconds \(files took \d+\.\d+ seconds to load\)\n$})
-        expect(actual_output.lines[9]).to    eq("2 examples, 0 failures\n")
+        expect(actual_output.lines[0]).to    eq("\n")
+        expect(actual_output.lines[1]).to    eq("Opal::Deprecations\n")
+        expect(actual_output.lines[2]).to    eq("\e[32m  defaults to warn\e[0m\n")
+        expect(actual_output.lines[3]).to    eq("\e[32m  can be set to raise\e[0m\n")
+        expect(actual_output.lines[4]).to    eq("\n")
+
+        expect(actual_output.lines[5]).to match(%r{Top 2 slowest examples \(\d+\.\d+ seconds, \d+\.\d+% of total time\):\n})
+        expect(actual_output.lines[7]).to match(%r{    \[1m\d+\.\d+\[0m \[1mseconds\[0m .*deprecations_spec\.rb:7\n})
+        expect(actual_output.lines[9]).to match(%r{    \[1m\d+\.\d+\[0m \[1mseconds\[0m .*deprecations_spec\.rb:12\n})
+        expect(actual_output.lines[10]).to    eq("\n")
+        expect(actual_output.lines[11]).to match(%r{^Finished in \d+\.\d+ seconds \(files took \d+\.\d+ seconds to load\)\n$})
+        expect(actual_output.lines[12]).to    eq("2 examples, 0 failures\n")
         expect([
-          actual_output.lines[3],
-          actual_output.lines[5],
+          actual_output.lines[6],
+          actual_output.lines[8],
         ]).to contain_exactly(
           "  Opal::Deprecations defaults to warn\n",
           "  Opal::Deprecations can be set to raise\n",

data/test/nodejs/test_await.rb

@@ -173,6 +173,7 @@ class TestAwait < Test::Unit::TestCase
     test_autoawait_instance_exec_await: [<<~RUBY, 2*3*5*7*11*13],
       #{autoawaitheader}
       # await: *await*
+      # backtick_javascript: true
       $taval = 1
       module AutoawaitTemporary1
         $block_with_module_self = proc do

data/test/nodejs/test_dir.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 # Copied from cruby and modified to skip unsupported syntaxes
 require 'test/unit'
 require 'nodejs'

data/test/nodejs/test_error.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'test/unit'
 require 'nodejs'
 

data/test/nodejs/test_file.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 # Copied from cruby and modified to skip unsupported syntaxes
 require 'test/unit'
 require 'nodejs'

data/test/nodejs/test_string.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require 'test/unit'
 require 'nodejs'
 

data/test/nodejs/test_yaml.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'nodejs'
+require 'nodejs/yaml'
+
+class TestYAML < Test::Unit::TestCase
+  YAMLDOC = <<~YAML
+    ---
+    string: hello world
+    array: [1,2,3]
+  YAML
+
+  YAMLSTRUCT = {
+    "string" => "hello world",
+    "array" => [1,2,3]
+  }
+
+  def test_should_parse_yaml
+    assert_equal(YAML.load(YAMLDOC), YAMLSTRUCT)
+  end
+end

data/test/opal/promisev2/test_always.rb

@@ -60,4 +60,18 @@ class TestPromiseAlways < Test::Unit::TestCase
 
     assert_raise(ArgumentError) { p.always! {} }
   end
+
+  def test_gets_the_value_from_the_previous_successful_block
+    PromiseV2.value(23)
+      .then { 123 }
+      .rescue { 234 }
+      .always { |v| assert_equal(123, v) }
+  end
+
+  def test_gets_the_value_from_the_previous_rescued_block
+    PromiseV2.reject(23)
+      .then { 123 }
+      .rescue { 234 }
+      .always { |v| assert_equal(234, v) }
+  end
 end

data/test/opal/unsupported_and_bugs.rb

@@ -30,14 +30,6 @@ class TestBase64
   bug :test_urlsafe_decode64_unpadded
 end
 
-class TestCall
-  # They work fine if `"a".sub! "b"` is replaced by `[].slice 1`
-  unsupported :test_safe_call_block_command
-  unsupported :test_safe_call_block_call
-  unsupported :test_safe_call_block_call_brace
-  unsupported :test_safe_call_block_call_command
-end
-
 class TestBenchmark
   # sleep is unsupported if not awaited
   unsupported :test_realtime_output