opal 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d55712831ec604d204ffbd2a92a5478daf36f7c24b8b58f52412fc7b2e2ca5
-  data.tar.gz: 557869c042954fc18a1d48cf93008485471e6e1db5a936b4834ffc9700fac755
+  metadata.gz: 3867be8330f4fc45cb5ea9a759c3a1fd39880c5ea92e3c054cbfb2e8776d3f45
+  data.tar.gz: 9bae6c750966bc7e9551f5c4e6d21ce751ee66fc69862bae5b98b85299de7343
 SHA512:
-  metadata.gz: 8747d6023e6e0e309f622c1f8ad879bd2c5ce2493662f2dc09053ab0cdbc268ad0110291a1b403c9d19272f6ceb2ebed6e15998b9673b6c5aff356898877202d
-  data.tar.gz: 83f23a7651fd6804759f9e22e284c37eaa27aa4dce2db0ee2d9da91bd1533acf853a9b18767787af267201a0e481736f5e5694ca29d5259ebb1bc67772ec62bc
+  metadata.gz: 56d87d05c1c043e165b30181b26a7c761d24d9168474fdcece06ca23ee5b4133d8d58722d9e3446f63db666d15acdc2bbcaf870b237f11673d7c6d810149dd1e
+  data.tar.gz: c7f9ced16e1b43ca58c75d7405319c6a5c8d008fa43db6cc1281d235bae1bce090a617d21234c3807ae5d3663b9b268799a87fb4da30f2afc8587a16d5185f7d

data/.github/workflows/build.yml

@@ -24,12 +24,12 @@ jobs:
           - name: mspec-chrome
             ruby: '3.0'
             command: bin/rake mspec_chrome
-          - name: minitest-firefox
+          - name: mspec-firefox
             env:
               # when changing version, also change it below
               MOZILLA_FIREFOX_BINARY: '/opt/hostedtoolcache/firefox/106.0.4/x64/firefox'
             ruby: '3.0'
-            command: xvfb-run bin/rake minitest_firefox
+            command: xvfb-run bin/rake mspec_firefox
           - name: minitest
             ruby: '3.0'
             command: bin/rake minitest
@@ -59,13 +59,17 @@ jobs:
             command: bundle exec rake mspec_chrome
             ruby: '3.0'
             os: windows-latest
-          - name: windows-minitest-firefox
+          - name: windows-mspec-firefox
             env:
               # when changing version, also change it below and above
               MOZILLA_FIREFOX_BINARY: 'C:/Program Files/Firefox_106.0.4/firefox.exe'
             ruby: '3.0'
-            command: bundle exec rake minitest_firefox
+            command: bundle exec rake mspec_firefox
             os: windows-latest
+          - name: macos-mspec-safari
+            command: bundle exec rake mspec_safari
+            ruby: '3.0'
+            os: 'macos-latest'
           - name: windows-minitest
             command: bundle exec rake minitest
             ruby: '3.0'
@@ -74,6 +78,10 @@ jobs:
             command: bundle exec rake rspec
             ruby: '3.0'
             os: windows-latest
+          - name: macos
+            command: bundle exec rake rspec
+            ruby: '3.0'
+            os: 'macos-latest'
           - name: lint
             command: bin/rake lint
             ruby: '3.0'

data/CHANGELOG.md

@@ -16,7 +16,7 @@ Changes are grouped as follows:
 
 
 
-## [1.7.0](https://github.com/opal/opal/compare/v1.6.1...v1.7.0) - 2022-12-26
+## [1.7.1](https://github.com/opal/opal/compare/v1.7.0...v1.7.1) - 2023-01-06
 
 
 <!--
@@ -29,6 +29,34 @@ Changes are grouped as follows:
 ### Fixed
 -->
 
+
+### Added
+
+- Add safari runner ([#2513](https://github.com/opal/opal/pull/2513))
+
+### Fixed
+
+- Fix CLI file reading for macOS ([#2510](https://github.com/opal/opal/pull/2510))
+- Make Date/Time.parse on Firefox more compatible with Chrome and Ruby ([#2506](https://github.com/opal/opal/pull/2506))
+- Safari/WebKit can now parse code compiled with lookbehind regexps, failing at runtime instead ([#2511](https://github.com/opal/opal/pull/2511))
+- Fix `--watch` ignoring some directories (e.g. `tmp`) ([#2509](https://github.com/opal/opal/pull/2509))
+- Fix rake dist not generating libraries correctly for the CDN ([#2515](https://github.com/opal/opal/pull/2515))
+- Prefork: output processed files in a correct, deterministic order ([#2516](https://github.com/opal/opal/pull/2516))
+- Fix the handling of ARGV for the opal executable ([#2518](https://github.com/opal/opal/pull/2518))
+
+### Internal
+
+- Platform specific spec filters ([#2508](https://github.com/opal/opal/pull/2508))
+- Run Firefox specs by default ([#2507](https://github.com/opal/opal/pull/2507))
+- Run Safari specs by default ([#2513](https://github.com/opal/opal/pull/2513))
+- [mspec_opal] Avoid lookbehind Regexp for compatibility with various javascript engines ([#2512](https://github.com/opal/opal/pull/2512))
+
+
+
+
+## [1.7.0](https://github.com/opal/opal/compare/v1.6.1...v1.7.0) - 2022-12-26
+
+
 ### Added
 
 - Update benchmarking and CLI runners, added support for Deno and Firefox (#2490, #2492, #2494, #2495, #2497, #2491, #2496)

data/exe/opal

@@ -2,8 +2,6 @@
 
 # Error codes are taken from /usr/include/sysexits.h
 
-OriginalARGV = ARGV.dup
-
 require 'opal/cli_options'
 options = Opal::CLIOptions.new
 begin
@@ -15,11 +13,7 @@ end
 
 require 'opal/cli'
 options_hash = options.options
-options_hash.merge!(
-  file:     ARGF.file,
-  filename: ARGF.filename,
-  argv:     ARGV.dup
-) unless options_hash[:lib_only]
+options_hash.merge!(argv: ARGV.dup) unless options_hash[:lib_only]
 cli = Opal::CLI.new options_hash
 
 begin
@@ -28,4 +22,8 @@ begin
 rescue Opal::CliRunners::RunnerError => e
   $stderr.puts e.message
   exit 72
+rescue SignalException => e
+  raise unless e.message == 'SIGUSR2'
+
+  exec($0, *ARGV)
 end

data/lib/opal/builder.rb

@@ -197,6 +197,19 @@ module Opal
       processed.map(&:abs_path).compact.select { |fn| File.exist?(fn) }
     end
 
+    def expand_ext(path)
+      abs_path = path_reader.expand(path)
+
+      if abs_path
+        File.join(
+          File.dirname(path),
+          File.basename(abs_path)
+        )
+      else
+        path
+      end
+    end
+
     private
 
     def process_requires(rel_path, requires, autoloads, options)
@@ -261,19 +274,6 @@ module Opal
       end
     end
 
-    def expand_ext(path)
-      abs_path = path_reader.expand(path)
-
-      if abs_path
-        File.join(
-          File.dirname(path),
-          File.basename(abs_path)
-        )
-      else
-        path
-      end
-    end
-
     def expand_path(path)
       return if stub?(path)
       (path_reader.expand(path) || File.expand_path(path)).to_s

data/lib/opal/builder_processors.rb

@@ -148,7 +148,10 @@ module Opal
 
       def compiled
         @compiled ||= begin
-          @source = ::ERB.new(@source.to_s).result
+          erb = ::ERB.new(@source.to_s)
+          erb.filename = @abs_path
+
+          @source = erb.result
 
           compiler = compiler_for(@source, file: @filename)
           compiler.compile
@@ -163,7 +166,10 @@ module Opal
       handles :erb
 
       def source
-        result = ::ERB.new(@source.to_s).result
+        erb = ::ERB.new(@source.to_s)
+        erb.filename = @abs_path
+
+        result = erb.result
         module_name = ::Opal::Compiler.module_name(@filename)
         "Opal.modules[#{module_name.inspect}] = function() {#{result}};"
       end

data/lib/opal/builder_scheduler/prefork.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'etc'
+require 'set'
 
 module Opal
   class BuilderScheduler
@@ -13,12 +14,64 @@ module Opal
           io = @in_fork
           io.send(:new_requires, rel_path, requires, autoloads, options)
         else
-          prefork_reactor(rel_path, requires, autoloads, options)
+          processed = prefork_reactor(rel_path, requires, autoloads, options)
+
+          processed = OrderCorrector.correct_order(processed, requires, builder)
+
+          builder.processed.append(*processed)
         end
       end
 
       private
 
+      # Prefork is not deterministic. This module corrects an order of processed
+      # files so that it would be exactly the same as if building sequentially.
+      # While for Ruby files it usually isn't a problem, because the real order
+      # stems from how `Opal.modules` array is accessed, the JavaScript files
+      # are executed verbatim and their order may be important. Also, having
+      # deterministic output is always a good thing.
+      module OrderCorrector
+        module_function
+
+        def correct_order(processed, requires, builder)
+          # Let's build a hash that maps a filename to an array of files it requires
+          requires_hash = processed.to_h do |i|
+            [i.filename, expand_requires(i.requires, builder)]
+          end
+          # Let's build an array with a correct order of requires
+          order_array = build_require_order_array(expand_requires(requires, builder), requires_hash)
+          # If a key is duplicated, remove the last duplicate
+          order_array = order_array.uniq
+          # Create a hash from this array: [a,b,c] => [a => 0, b => 1, c => 2]
+          order_hash = order_array.each_with_index.to_h
+          # Let's return a processed array that has elements in the order provided
+          processed.sort_by do |asset|
+            # If a filename isn't present somehow in our hash, let's put it at the end
+            order_hash[asset.filename] || order_array.length
+          end
+        end
+
+        # Expand a requires array, so that the requires filenames will be
+        # matching BuilderProcessor#. Builder needs to be passed so that
+        # we can access an `expand_ext` function from its context.
+        def expand_requires(requires, builder)
+          requires.map { |i| builder.expand_ext(i) }
+        end
+
+        def build_require_order_array(requires, requires_hash, built_for = Set.new)
+          array = []
+          requires.each do |name|
+            next if built_for.include?(name)
+            built_for << name
+
+            asset_requires = requires_hash[name]
+            array += build_require_order_array(asset_requires, requires_hash, built_for) if asset_requires
+            array << name
+          end
+          array
+        end
+      end
+
       class ForkSet < Array
         def initialize(count, &block)
           super([])
@@ -192,6 +245,8 @@ module Opal
       def prefork_reactor(rel_path, requires, autoloads, options)
         prefork
 
+        processed = []
+
         first = rel_path
         queue = requires.map { |i| [rel_path, i, autoloads, options] }
 
@@ -206,7 +261,7 @@ module Opal
           idles.each do |io|
             break if queue.empty?
 
-            rel_path, req, autoloads, options = *queue.pop
+            rel_path, req, autoloads, options = *queue.shift
 
             next if builder.already_processed.include?(req)
             awaiting += 1
@@ -225,11 +280,8 @@ module Opal
               asset, = *args
               if !asset
                 # Do nothing, we received a nil which is expected.
-              elsif asset.filename == 'corelib/runtime.js'
-                # Opal runtime should go first... the rest can go their way.
-                builder.processed.unshift(asset)
               else
-                builder.processed << asset
+                processed << asset
               end
               built += 1
               awaiting -= 1
@@ -252,6 +304,8 @@ module Opal
 
           break if awaiting == 0 && queue.empty?
         end
+
+        processed
       ensure
         $stderr.print "\r\e[K\r" if $stderr.tty?
         @forks.close

data/lib/opal/cli.rb

@@ -3,18 +3,25 @@
 require 'opal/requires'
 require 'opal/builder'
 require 'opal/cli_runners'
+require 'stringio'
 
 module Opal
   class CLI
     attr_reader :options, :file, :compiler_options, :evals, :load_paths, :argv,
       :output, :requires, :rbrequires, :gems, :stubs, :verbose, :runner_options,
-      :preload, :filename, :debug, :no_exit, :lib_only, :missing_require_severity,
-      :no_cache
+      :preload, :debug, :no_exit, :lib_only, :missing_require_severity,
+      :filename, :stdin, :no_cache
 
     class << self
       attr_accessor :stdout
     end
 
+    class Evals < StringIO
+      def to_path
+        '-e'
+      end
+    end
+
     def initialize(options = nil)
       options ||= {}
 
@@ -25,7 +32,6 @@ module Opal
       @options     = options
       @sexp        = options.delete(:sexp)
       @repl        = options.delete(:repl)
-      @file        = options.delete(:file)
       @no_exit     = options.delete(:no_exit)
       @lib_only    = options.delete(:lib_only)
       @argv        = options.delete(:argv)       { [] }
@@ -37,10 +43,10 @@ module Opal
       @output      = options.delete(:output)     { self.class.stdout || $stdout }
       @verbose     = options.delete(:verbose)    { false }
       @debug       = options.delete(:debug)      { false }
-      @filename    = options.delete(:filename)   { @file && @file.path }
       @requires    = options.delete(:requires)   { [] }
       @rbrequires  = options.delete(:rbrequires) { [] }
       @no_cache    = options.delete(:no_cache)   { false }
+      @stdin       = options.delete(:stdin)      { $stdin }
 
       @debug_source_map = options.delete(:debug_source_map) { false }
 
@@ -55,9 +61,20 @@ module Opal
         [key, value]
       end.compact.to_h
 
-      raise ArgumentError, 'no libraries to compile' if @lib_only && @requires.empty?
-      raise ArgumentError, 'no runnable code provided (evals or file)' if @evals.empty? && @file.nil? && !@lib_only
-      raise ArgumentError, "can't accept evals or file in `library only` mode" if (@evals.any? || @file) && @lib_only
+      if @lib_only
+        raise ArgumentError, 'no libraries to compile' if @requires.empty?
+        raise ArgumentError, "can't accept evals, file, or extra arguments in `library only` mode" if @argv.any? || @evals.any?
+      elsif @evals.any?
+        @filename = '-e'
+        @file = Evals.new(@evals.join("\n"))
+      elsif @argv.first && @argv.first != '-'
+        @filename = @argv.shift
+        @file = File.open(@filename)
+      else
+        @filename = @argv.shift || '-'
+        @file = @stdin
+      end
+
       raise ArgumentError, "unknown options: #{options.inspect}" unless @options.empty?
     end
 
@@ -93,7 +110,7 @@ module Opal
       require 'opal/repl'
 
       repl = REPL.new
-      repl.run(OriginalARGV)
+      repl.run(argv)
     end
 
     attr_reader :exit_status
@@ -127,7 +144,8 @@ module Opal
       builder.build_str '$DEBUG = true', '(flags)', no_export: true if debug
 
       # --eval / stdin / file
-      evals_or_file { |source, filename| builder.build_str(source, filename) }
+      source = evals_or_file_source
+      builder.build_str(source, filename) if source
 
       # --no-exit
       builder.build_str '::Kernel.exit', '(exit)', no_export: true unless no_exit
@@ -136,27 +154,27 @@ module Opal
     end
 
     def show_sexp
-      evals_or_file do |contents, filename|
-        buffer = ::Opal::Parser::SourceBuffer.new(filename)
-        buffer.source = contents
-        sexp = Opal::Parser.default_parser.parse(buffer)
-        output.puts sexp.inspect
-      end
+      source = evals_or_file_source or return # rubocop:disable Style/AndOr
+
+      buffer = ::Opal::Parser::SourceBuffer.new(filename)
+      buffer.source = source
+      sexp = Opal::Parser.default_parser.parse(buffer)
+      output.puts sexp.inspect
     end
 
     def debug_source_map
-      evals_or_file do |contents, filename|
-        compiler = Opal::Compiler.new(contents, file: filename, **compiler_options)
+      source = evals_or_file_source or return # rubocop:disable Style/AndOr
 
-        compiler.compile
+      compiler = Opal::Compiler.new(source, file: filename, **compiler_options)
 
-        result = compiler.result
-        source_map = compiler.source_map.to_json
+      compiler.compile
 
-        b64 = [result, source_map, contents].map { |i| Base64.strict_encode64(i) }.join(',')
+      result = compiler.result
+      source_map = compiler.source_map.to_json
 
-        output.puts "https://sokra.github.io/source-map-visualization/#base64,#{b64}"
-      end
+      b64 = [result, source_map, contents].map { |i| Base64.strict_encode64(i) }.join(',')
+
+      output.puts "https://sokra.github.io/source-map-visualization/#base64,#{b64}"
     end
 
     def compiler_option_names
@@ -177,29 +195,27 @@ module Opal
 
     # Internal: Yields a string of source code and the proper filename for either
     #           evals, stdin or a filepath.
-    def evals_or_file
-      # --library
-      return if lib_only
-
-      if evals.any?
-        yield evals.join("\n"), '-e'
-      elsif file && (filename != '-' || evals.empty?)
-        return @content if @content
-
-        if file.tty?
-          save = true
-        else
-          begin
-            file.rewind
-          rescue Errno::ESPIPE
-            save = true
-          end
+    def evals_or_file_source
+      return if lib_only # --library
+      return @cached_content if @cached_content
+
+      unless file.tty?
+        begin
+          file.rewind
+          can_read_again = true
+        rescue Errno::ESPIPE # rubocop:disable Lint/HandleExceptions
+          # noop
         end
+      end
 
-        content = yield(file.read, filename)
-        @content = content if save
-        content
+      if @cached_content.nil? || can_read_again
+        # On MacOS file.read is not enough to pick up changes, probably due to some
+        # cache or buffer, unclear if coming from ruby or the OS.
+        content = File.file?(file) ? File.read(file) : file.read
       end
+
+      @cached_content ||= content unless can_read_again
+      content
     end
   end
 end

data/lib/opal/cli_runners/compiler.rb

@@ -52,22 +52,20 @@ class Opal::CliRunners::Compiler
   end
 
   def fail_unrewindable!
-    warn <<~ERROR
+    abort <<~ERROR
       You have specified --watch, but for watch to work, you must specify an
       --output file.
     ERROR
-    exit 1
   end
 
   def fail_no_listen!
-    warn <<~ERROR
+    abort <<~ERROR
       --watch mode requires the `listen` gem present. Please try to run:
 
           gem install listen
 
       Or if you are using bundler, add listen to your Gemfile.
     ERROR
-    exit 1
   end
 
   def watch_compile
@@ -88,10 +86,13 @@ class Opal::CliRunners::Compiler
     $stderr.puts "* Opal v#{Opal::VERSION} successfully compiled your program in --watch mode"
 
     sleep
+  rescue Interrupt
+    $stderr.puts '* Stopping watcher...'
+    @code_listener.stop
   end
 
   def reexec
-    system($0, *OriginalARGV) && exit
+    Process.kill('USR2', Process.pid)
   end
 
   def on_code_change(modified)
@@ -133,7 +134,7 @@ class Opal::CliRunners::Compiler
   def watch_files
     @directories = files_to_directories
 
-    Listen.to(*@directories) do |modified, added, removed|
+    Listen.to(*@directories, ignore!: []) do |modified, added, removed|
       our_modified = @files & (modified + added + removed)
       on_code_change(our_modified) unless our_modified.empty?
     end