opal 1.3.0.alpha1 → 1.3.0.rc1

data/lib/opal/compiler.rb

@@ -477,6 +477,12 @@ module Opal
       @required_trees ||= []
     end
 
+    # An array of things (requires, trees) which don't need to success in
+    # loading compile-time.
+    def autoloads
+      @autoloads ||= []
+    end
+
     # The last sexps in method bodies, for example, need to be returned
     # in the compiled javascript. Due to syntax differences between
     # javascript any ruby, some sexps need to be handled specially. For
@@ -573,13 +579,13 @@ module Opal
     def marshal_dump
       [@options, @option_values, @source_map ||= source_map.cache,
        @magic_comments, @result,
-       @required_trees, @requires]
+       @required_trees, @requires, @autoloads]
     end
 
     def marshal_load(src)
       @options, @option_values, @source_map,
       @magic_comments, @result,
-      @required_trees, @requires = src
+      @required_trees, @requires, @autoloads = src
     end
   end
 end

data/lib/opal/config.rb

@@ -93,6 +93,11 @@ module Opal
     # @return [true, false]
     config_option :freezing_stubs_enabled, true, compiler_option: :freezing
 
+    # Build ECMAScript modules, instead of legacy JS
+    #
+    # @return [true, false]
+    config_option :esm, false, compiler_option: :esm
+
     # Set the error severity for when a require can't be parsed at compile time.
     #
     # @example

data/lib/opal/nodes/call.rb

@@ -287,11 +287,17 @@ module Opal
       end
 
       add_special :autoload do |compile_default|
-        if scope.class_scope?
-          str = DependencyResolver.new(compiler, arglist.children[1]).resolve
-          compiler.requires << str unless str.nil?
-          compile_default.call
+        args = arglist.children
+        if args.length == 2 && args[0].type == :sym
+          str = DependencyResolver.new(compiler, args[1], :ignore).resolve
+          if str.nil?
+            compiler.warning "File for autoload of constant '#{args[0].children[0]}' could not be bundled!"
+          else
+            compiler.requires << str
+            compiler.autoloads << str
+          end
         end
+        compile_default.call
       end
 
       add_special :require_tree do |compile_default|
@@ -329,6 +335,10 @@ module Opal
         end
       end
 
+      add_special :__dir__ do
+        push File.dirname(Opal::Compiler.module_name(compiler.file)).inspect
+      end
+
       # Refinements support
       add_special :using do |compile_default|
         if scope.accepts_using? && arglist.children.count == 1
@@ -428,42 +438,51 @@ module Opal
       end
 
       class DependencyResolver
-        def initialize(compiler, sexp)
+        def initialize(compiler, sexp, missing_dynamic_require = nil)
           @compiler = compiler
           @sexp = sexp
+          @missing_dynamic_require = missing_dynamic_require || @compiler.dynamic_require_severity
         end
 
         def resolve
           handle_part @sexp
         end
 
-        def handle_part(sexp)
-          type = sexp.type
-
-          if type == :str
-            return sexp.children[0]
-          elsif type == :send
-            recv, meth, *args = sexp.children
-
-            parts = args.map { |s| handle_part s }
-
-            if recv.is_a?(::Opal::AST::Node) && recv.type == :const && recv.children.last == :File
-              if meth == :expand_path
-                return expand_path(*parts)
-              elsif meth == :join
-                return expand_path parts.join('/')
-              elsif meth == :dirname
-                return expand_path parts[0].split('/')[0...-1].join('/')
+        def handle_part(sexp, missing_dynamic_require = @missing_dynamic_require)
+          if sexp
+            case sexp.type
+            when :str
+              return sexp.children[0]
+            when :dstr
+              return sexp.children.map { |i| handle_part i }.join
+            when :begin
+              return handle_part sexp.children[0] if sexp.children.length == 1
+            when :send
+              recv, meth, *args = sexp.children
+
+              parts = args.map { |s| handle_part(s, :ignore) }
+
+              return nil if parts.include? nil
+
+              if recv.is_a?(::Opal::AST::Node) && recv.type == :const && recv.children.last == :File
+                if meth == :expand_path
+                  return expand_path(*parts)
+                elsif meth == :join
+                  return expand_path parts.join('/')
+                elsif meth == :dirname
+                  return expand_path parts[0].split('/')[0...-1].join('/')
+                end
+              elsif meth == :__dir__
+                return File.dirname(Opal::Compiler.module_name(@compiler.file))
               end
             end
           end
 
-          msg = 'Cannot handle dynamic require'
-          case @compiler.dynamic_require_severity
+          case missing_dynamic_require
           when :error
-            @compiler.error msg, @sexp.line
+            @compiler.error 'Cannot handle dynamic require', @sexp.line
           when :warning
-            @compiler.warning msg, @sexp.line
+            @compiler.warning 'Cannot handle dynamic require', @sexp.line
           end
         end
 

data/lib/opal/nodes/helpers.rb

@@ -19,7 +19,7 @@ module Opal
       # have a '.' prefix (for dot-calling), otherwise it will be
       # wrapped in brackets to use reference notation calling.
       def mid_to_jsid(mid)
-        if %r{\=|\+|\-|\*|\/|\!|\?|<|\>|\&|\||\^|\%|\~|\[} =~ mid.to_s
+        if %r{\=|\+|\-|\*|\/|\!|\?|<|\>|\&|\||\^|\%|\~|\[|`} =~ mid.to_s
           "['$#{mid}']"
         else
           '.$' + mid

data/lib/opal/nodes/top.rb

@@ -46,19 +46,16 @@ module Opal
       end
 
       def opening
-        as = ""
-        if await_encountered
-          as = "async "
-        end
+        async_prefix = "async " if await_encountered
 
         if compiler.requirable?
-          unshift "Opal.modules[#{Opal::Compiler.module_name(compiler.file).inspect}] = #{as}function(Opal) {"
+          unshift "Opal.modules[#{Opal::Compiler.module_name(compiler.file).inspect}] = #{async_prefix}function(Opal) {"
         elsif compiler.eval?
-          unshift "(#{as}function(Opal, self) {"
+          unshift "(#{async_prefix}function(Opal, self) {"
         elsif compiler.esm?
-          unshift "export default Opal.queue(#{as}function(Opal) {"
+          unshift "export default Opal.queue(#{async_prefix}function(Opal) {"
         else
-          unshift "Opal.queue(#{as}function(Opal) {"
+          unshift "Opal.queue(#{async_prefix}function(Opal) {"
         end
       end
 

data/lib/opal/rewriters/rubyspec/filters_rewriter.rb

@@ -47,6 +47,14 @@ module Opal
           ensure
             @specs_stack.pop
           end
+        elsif method_name == :fixture
+          # We want to expand the fixture paths before autoload happens.
+          if args.all? { |i| i.type == :str }
+            as = args.map { |i| i.children.first }
+            s(:str, fixture(*as))
+          else
+            super
+          end
         else
           super
         end
@@ -63,6 +71,14 @@ module Opal
       def current_spec_name
         @specs_stack.join(' ')
       end
+
+      # Adapted from: spec/mspec/lib/mspec/helpers/fixture.rb
+      def fixture(file, *args)
+        path = File.dirname(file)
+        path = path[0..-7] if path[-7..-1] == '/shared'
+        fixtures = path[-9..-1] == '/fixtures' ? '' : 'fixtures'
+        File.join(path, fixtures, args)
+      end
     end
   end
 end

data/lib/opal/simple_server.rb

@@ -36,7 +36,7 @@ class Opal::SimpleServer
 
   def call(env)
     case env['PATH_INFO']
-    when %r{\A/#{@prefix}/(.*)\.js\z}
+    when %r{\A/#{@prefix}/(.*)\.m?js\z}
       path, _cache_invalidator = Regexp.last_match(1).split('?', 2)
       call_js(path)
     else call_index
@@ -65,7 +65,12 @@ class Opal::SimpleServer
   end
 
   def javascript_include_tag(path)
-    %{<script src="/#{@prefix}/#{path}.js#{cache_invalidator}"></script>}
+    case Opal::Config.esm
+    when true
+      %{<script src="/#{@prefix}/#{path}.mjs#{cache_invalidator}" type="module"></script>}
+    when false
+      %{<script src="/#{@prefix}/#{path}.js#{cache_invalidator}"></script>}
+    end
   end
 
   def cache_invalidator

data/lib/opal/util.rb

@@ -15,7 +15,7 @@ module Opal
     # @param str [String] string to minify
     # @return [String]
     def uglify(source)
-      sh 'bin/yarn -s run uglifyjs -c', data: source
+      sh 'bin/yarn -s run terser -c', data: source
     end
 
     # Gzip code to check file size.

data/lib/opal/version.rb

@@ -3,5 +3,5 @@
 module Opal
   # WHEN RELEASING:
   # Remember to update RUBY_ENGINE_VERSION in opal/corelib/constants.rb too!
-  VERSION = '1.3.0.alpha1'
+  VERSION = '1.3.0.rc1'
 end

data/opal/corelib/complex/base.rb

@@ -0,0 +1,15 @@
+module Kernel
+  def Complex(real, imag = nil)
+    if imag
+      Complex.new(real, imag)
+    else
+      Complex.new(real, 0)
+    end
+  end
+end
+
+class String
+  def to_c
+    Complex.from_string(self)
+  end
+end

data/opal/corelib/complex.rb

@@ -1,4 +1,5 @@
 require 'corelib/numeric'
+require 'corelib/complex/base'
 
 class Complex < Numeric
   def self.rect(real, imag = 0)
@@ -291,23 +292,10 @@ class Complex < Numeric
   end
 
   I = new(0, 1)
-end
-
-module Kernel
-  def Complex(real, imag = nil)
-    if imag
-      Complex.new(real, imag)
-    else
-      Complex.new(real, 0)
-    end
-  end
-end
 
-class String
-  def to_c
+  def self.from_string(str)
     %x{
-      var str = self,
-          re = /[+-]?[\d_]+(\.[\d_]+)?(e\d+)?/,
+      var re = /[+-]?[\d_]+(\.[\d_]+)?(e\d+)?/,
           match = str.match(re),
           real, imag, denominator;
 

data/opal/corelib/constants.rb

@@ -1,8 +1,8 @@
 RUBY_PLATFORM       = 'opal'
 RUBY_ENGINE         = 'opal'
 RUBY_VERSION        = '3.0.2'
-RUBY_ENGINE_VERSION = '1.3.0.alpha1'
-RUBY_RELEASE_DATE   = '2021-09-29'
+RUBY_ENGINE_VERSION = '1.3.0.rc1'
+RUBY_RELEASE_DATE   = '2021-10-20'
 RUBY_PATCHLEVEL     = 0
 RUBY_REVISION       = '0'
 RUBY_COPYRIGHT      = 'opal - Copyright (C) 2013-2021 Adam Beynon and the Opal contributors'

data/opal/corelib/error.rb

@@ -74,7 +74,7 @@ class Exception < `Error`
 
       var backtrace = self.stack;
 
-      if (backtrace.$$is_string) {
+      if (typeof(backtrace) !== 'undefined' && backtrace.$$is_string) {
         return self.backtrace = correct_backtrace(backtrace.split("\n").slice(0, 15));
       }
       else if (backtrace) {

data/opal/corelib/helpers.rb

@@ -94,6 +94,16 @@ module Opal
     name
   end
 
+  def self.const_name?(const_name)
+    %x{
+      if (typeof const_name !== 'string') {
+        #{const_name = Opal.coerce_to!(const_name, String, :to_str)}
+      }
+
+      return #{const_name}[0] === #{const_name}[0].toUpperCase()
+    }
+  end
+
   def self.const_name!(const_name)
     const_name = Opal.coerce_to!(const_name, String, :to_str)
 

data/opal/corelib/io.rb

@@ -20,6 +20,10 @@ class IO
     end
   end
 
+  def fileno
+    @fd
+  end
+
   def tty?
     `self.tty == true`
   end

data/opal/corelib/kernel.rb

@@ -252,9 +252,11 @@ module Kernel
   def inspect
     ivs = ''
     instance_variables.each do |i|
-      ivs += " #{i}=#{instance_variable_get(i)}"
+      ivs += " #{i}=#{instance_variable_get(i).inspect}"
     end
     "#<#{self.class}:0x#{__id__.to_s(16)}#{ivs}>"
+  rescue
+    "#<#{self.class}:0x#{__id__.to_s(16)}>"
   end
 
   def instance_of?(klass)
@@ -628,8 +630,14 @@ module Kernel
   Opal.pristine(self, :respond_to?, :respond_to_missing?)
 
   def require(file)
-    file = Opal.coerce_to!(file, String, :to_str)
-    `Opal.require(#{file})`
+    %x{
+      // As Object.require refers to Kernel.require once Kernel has been loaded the String
+      // class may not be available yet, the coercion requires both  String and Array to be loaded.
+      if (typeof #{file} !== 'string' && Opal.String && Opal.Array) {
+        #{file = Opal.coerce_to!(file, String, :to_str) }
+      }
+      Opal.require(#{file})
+    }
   end
 
   def require_relative(file)
@@ -640,7 +648,7 @@ module Kernel
   end
 
   # `path` should be the full path to be found in registered modules (`Opal.modules`)
-  def require_tree(path)
+  def require_tree(path, autoload: false)
     %x{
       var result = [];
 
@@ -649,7 +657,11 @@ module Kernel
       if (path === '.') path = '';
       for (var name in Opal.modules) {
         if (#{`name`.start_with?(path)}) {
-          result.push([name, Opal.require(name)]);
+          if(!#{autoload}) {
+            result.push([name, Opal.require(name)]);
+          } else {
+            result.push([name, true]); // do nothing, delegated to a autoloading
+          }
         }
       }
 
@@ -735,5 +747,9 @@ module Kernel
 end
 
 class Object
+  # Object.require has been set to runtime.js Opal.require
+  # Now we have Kernel loaded, make sure Object.require refers to Kernel.require
+  # which is what ruby does and allows for overwriting by autoloaders
+  `delete Opal.Object.$$prototype.$require`
   include Kernel
 end

data/opal/corelib/main.rb

@@ -6,6 +6,10 @@ def self.include(mod)
   Object.include mod
 end
 
+def self.autoload(*args)
+  Object.autoload(*args)
+end
+
 # Compiler overrides this method
 def self.using(mod)
   raise 'main.using is permitted only at toplevel'

data/opal/corelib/method.rb

@@ -32,6 +32,10 @@ class Method
     }
   end
 
+  def curry(arity = undefined)
+    @method.curry(arity)
+  end
+
   alias [] call
   alias === call
 

data/opal/corelib/module.rb

@@ -191,9 +191,38 @@ class Module
 
   def autoload(const, path)
     %x{
-      if (self.$$autoload == null) self.$$autoload = {};
-      Opal.const_cache_version++;
-      self.$$autoload[#{const}] = #{path};
+      if (!#{Opal.const_name?(const)}) {
+        #{raise NameError, "autoload must be constant name: #{const}"}
+      }
+
+      if (path == "") {
+        #{raise ArgumentError, 'empty file name'}
+      }
+
+      if (!self.$$const.hasOwnProperty(#{const})) {
+        if (!self.$$autoload) {
+          self.$$autoload = {};
+        }
+        Opal.const_cache_version++;
+        self.$$autoload[#{const}] = { path: #{path}, loaded: false, required: false, success: false, exception: false };
+      }
+      return nil;
+    }
+  end
+
+  def autoload?(const)
+    %x{
+      if (self.$$autoload && self.$$autoload[#{const}] && !self.$$autoload[#{const}].required && !self.$$autoload[#{const}].success) {
+        return self.$$autoload[#{const}].path;
+      }
+
+      var ancestors = self.$ancestors();
+
+      for (var i = 0, length = ancestors.length; i < length; i++) {
+        if (ancestors[i].$$autoload && ancestors[i].$$autoload[#{const}] && !ancestors[i].$$autoload[#{const}].required && !ancestors[i].$$autoload[#{const}].success) {
+          return ancestors[i].$$autoload[#{const}].path;
+        }
+      }
       return nil;
     }
   end
@@ -283,7 +312,13 @@ class Module
 
       for (i = 0, ii = modules.length; i < ii; i++) {
         module = modules[i];
-        if (module.$$const[name] != null) {
+        if (module.$$const[#{name}] != null) { return true; }
+        if (
+          module.$$autoload &&
+          module.$$autoload[#{name}] &&
+          !module.$$autoload[#{name}].required &&
+          !module.$$autoload[#{name}].success
+        ) {
           return true;
         }
       }
@@ -317,18 +352,6 @@ class Module
   end
 
   def const_missing(name)
-    %x{
-      if (self.$$autoload) {
-        var file = self.$$autoload[name];
-
-        if (file) {
-          self.$require(file);
-
-          return #{const_get name};
-        }
-      }
-    }
-
     full_const_name = self == Object ? name : "#{self}::#{name}"
 
     raise NameError.new("uninitialized constant #{full_const_name}", name)

data/opal/corelib/pattern_matching/base.rb

@@ -0,0 +1,35 @@
+class Array
+  def deconstruct
+    self
+  end
+end
+
+class Hash
+  def deconstruct_keys(_)
+    self
+  end
+end
+
+class Struct
+  alias deconstruct to_a
+  # This function is specified in a very weird way...
+  def deconstruct_keys(keys)
+    return to_h if keys.nil?
+    raise TypeError, 'expected Array or nil' unless Array === keys
+    return {} if keys.length > values.length
+    out = {}
+    keys.each do |key|
+      should_break = case key
+                     when Integer
+                       values.length < key
+                     when Symbol # Or String? Doesn't matter, we're in Opal.
+                       !members.include?(key)
+                     end
+      break if should_break
+      out[key] = self[key]
+    end
+    out
+  end
+end
+
+class NoMatchingPatternError < StandardError; end

data/opal/corelib/pattern_matching.rb

@@ -1,3 +1,5 @@
+require 'corelib/pattern_matching/base'
+
 # A "userland" implementation of pattern matching for Opal
 
 class PatternMatching
@@ -121,39 +123,3 @@ class PatternMatching
     end
   end
 end
-
-class Array
-  def deconstruct
-    self
-  end
-end
-
-class Hash
-  def deconstruct_keys(_)
-    self
-  end
-end
-
-class Struct
-  alias deconstruct to_a
-  # This function is specified in a very weird way...
-  def deconstruct_keys(keys)
-    return to_h if keys.nil?
-    raise TypeError, 'expected Array or nil' unless Array === keys
-    return {} if keys.length > values.length
-    out = {}
-    keys.each do |key|
-      should_break = case key
-                     when Integer
-                       values.length < key
-                     when Symbol # Or String? Doesn't matter, we're in Opal.
-                       !members.include?(key)
-                     end
-      break if should_break
-      out[key] = self[key]
-    end
-    out
-  end
-end
-
-class NoMatchingPatternError < StandardError; end

data/opal/corelib/process/base.rb

@@ -0,0 +1,9 @@
+class Signal
+  def self.trap(*)
+  end
+end
+
+class GC
+  def self.start
+  end
+end

data/opal/corelib/process.rb

@@ -1,4 +1,4 @@
-class Process
+module Process
   @__clocks__ = []
   def self.__register_clock__(name, func)
     const_set name, @__clocks__.size
@@ -55,13 +55,3 @@ class Process
     }
   end
 end
-
-class Signal
-  def self.trap(*)
-  end
-end
-
-class GC
-  def self.start
-  end
-end

data/opal/corelib/random.rb

@@ -1,5 +1,7 @@
 # helpers: falsy
 
+require 'corelib/random/formatter'
+
 class Random
   attr_reader :seed, :state
 
@@ -88,3 +90,5 @@ class Random
     end
   end
 end
+
+require 'corelib/random/mersenne_twister'

data/opal/corelib/rational/base.rb

@@ -0,0 +1,11 @@
+module Kernel
+  def Rational(numerator, denominator = 1)
+    Rational.convert(numerator, denominator)
+  end
+end
+
+class String
+  def to_r
+    Rational.from_string(self)
+  end
+end