opal 1.2.0 → 1.3.0.alpha1

data/lib/opal/cache.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'opal/paths'
+require 'digest/sha2' unless RUBY_ENGINE == 'opal'
+
+if RUBY_ENGINE != 'opal'
+  require 'opal/cache/file_cache'
+end
+
+module Opal
+  # A Sprockets-compatible cache, for example an instance of
+  # Opal::Cache::FileCache or Opal::Cache::NullCache.
+  singleton_class.attr_writer :cache
+
+  def self.cache
+    @cache ||=
+      if RUBY_ENGINE == 'opal' || ENV['OPAL_CACHE_DISABLE'] || !Cache::FileCache.find_dir
+        Cache::NullCache.new
+      else
+        Cache::FileCache.new
+      end
+  end
+
+  module Cache
+    class NullCache
+      def fetch(*)
+        yield
+      end
+    end
+
+    module_function
+
+    def fetch(cache, key, &block)
+      # Extension to the Sprockets API of Cache, if a cache responds
+      # to #fetch, then we call it instead of using #get and #set.
+      return cache.fetch(key, &block) if cache.respond_to? :fetch
+
+      key = digest(key.join('/')) + '-' + runtime_key
+
+      data = cache.get(key)
+
+      data || begin
+                compiler = yield
+                cache.set(key, compiler)
+                compiler
+              end
+    end
+
+    def runtime_key
+      @runtime_key ||= begin
+        # We want to ensure the compiler and any Gemfile/gemspec (for development)
+        # stays untouched
+        opal_path = File.expand_path('..', Opal.gem_dir)
+        files = Dir["#{opal_path}/{Gemfile*,*.gemspec,lib/**/*}"]
+
+        # Also check if parser wasn't changed:
+        files += $LOADED_FEATURES.grep(%r{lib/(parser|ast)})
+
+        digest [
+          files.sort.map { |f| "#{f}:#{File.size(f)}:#{File.mtime(f).to_f}" },
+          RUBY_VERSION,
+          RUBY_PATCHLEVEL
+        ].join('/')
+      end
+    end
+
+    def digest(string)
+      ::Digest::SHA256.hexdigest(string)[-32..-1].to_i(16).to_s(36)
+    end
+  end
+end

data/lib/opal/cli.rb

@@ -8,7 +8,8 @@ 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
+      :preload, :filename, :debug, :no_exit, :lib_only, :missing_require_severity,
+      :no_cache
 
     class << self
       attr_accessor :stdout
@@ -23,6 +24,7 @@ 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)
@@ -38,6 +40,9 @@ module Opal
       @filename    = options.delete(:filename)   { @file && @file.path }
       @requires    = options.delete(:requires)   { [] }
       @rbrequires  = options.delete(:rbrequires) { [] }
+      @no_cache    = options.delete(:no_cache)   { false }
+
+      @debug_source_map = options.delete(:debug_source_map) { false }
 
       @missing_require_severity = options.delete(:missing_require_severity) { Opal::Config.missing_require_severity }
 
@@ -60,6 +65,9 @@ module Opal
 
     def run
       return show_sexp if @sexp
+      return debug_source_map if @debug_source_map
+      return run_repl if @repl
+
       @exit_status = runner.call(
         options: runner_options,
         output: output,
@@ -73,6 +81,13 @@ module Opal
         raise(ArgumentError, "unknown runner: #{@runner_type.inspect}")
     end
 
+    def run_repl
+      require 'opal/repl'
+
+      repl = REPL.new
+      repl.run(OriginalARGV)
+    end
+
     attr_reader :exit_status
 
     def builder
@@ -88,6 +103,9 @@ module Opal
         missing_require_severity: missing_require_severity,
       )
 
+      # --no-cache
+      builder.cache = Opal::Cache::NullCache.new if no_cache
+
       # --include
       builder.append_paths(*load_paths)
 
@@ -124,6 +142,21 @@ module Opal
       end
     end
 
+    def debug_source_map
+      evals_or_file do |contents, filename|
+        compiler = Opal::Compiler.new(contents, file: filename, **compiler_options)
+
+        compiler.compile
+
+        result = compiler.result
+        source_map = compiler.source_map.to_json
+
+        b64 = [result, source_map, contents].map { |i| Base64.strict_encode64(i) }.join(',')
+
+        output.puts "https://sokra.github.io/source-map-visualization/#base64,#{b64}"
+      end
+    end
+
     def compiler_option_names
       %w[
         method_missing
@@ -135,6 +168,7 @@ module Opal
         enable_source_location
         use_strict
         parse_comments
+        esm
       ]
     end
 

data/lib/opal/cli_options.rb

@@ -32,6 +32,10 @@ module Opal
         exit
       end
 
+      on('--repl', 'Run the Opal REPL') do
+        options[:repl] = true
+      end
+
       on('-h', '--help', 'Show this message') do
         puts self
         exit
@@ -86,6 +90,10 @@ module Opal
         options[:sexp] = true
       end
 
+      on('--debug-source-map', 'Debug source map') do
+        options[:debug_source_map] = true
+      end
+
       on('-c', '--compile', 'Compile to JavaScript') do
         options[:runner] = :compiler
       end
@@ -149,6 +157,11 @@ module Opal
         options[:runner_options][:map_file] = file
       end
 
+      on('--no-source-map', "Don't append source map to a compiled file") do
+        options[:runner_options] ||= {}
+        options[:runner_options][:no_source_map] = true
+      end
+
       on('-F', '--file FILE', 'Set filename for compiled code') do |file|
         options[:file] = file
       end
@@ -176,6 +189,14 @@ module Opal
         options[:parse_comments] = true
       end
 
+      on('--no-cache', 'Disable filesystem cache') do
+        options[:no_cache] = true
+      end
+
+      on('--esm', 'Wraps compiled bundle as for ES6 module(requires -c or -L)') do
+        options[:esm] = true
+      end
+
       separator ''
     end
 

data/lib/opal/cli_runners/chrome.rb

@@ -8,7 +8,7 @@ require 'tmpdir'
 module Opal
   module CliRunners
     class Chrome
-      SCRIPT_PATH = File.expand_path('chrome.js', __dir__).freeze
+      SCRIPT_PATH = File.expand_path('chrome_cdp_interface.js', __dir__).freeze
 
       DEFAULT_CHROME_HOST = 'localhost'
       DEFAULT_CHROME_PORT = 9222
@@ -16,7 +16,6 @@ module Opal
       def self.call(data)
         runner = new(data)
         runner.run
-        runner.exit_status
       end
 
       def initialize(data)
@@ -37,23 +36,24 @@ module Opal
       def run
         mktmpdir do |dir|
           with_chrome_server do
+            # This has to be moved to some generator.
+            system(%{bundle exec opal -r opal/cli_runners/source-map-support-node } +
+                   %{-cE #{__dir__}/chrome_cdp_interface.rb > "#{SCRIPT_PATH}"}
+)
+
+            prepare_files_in(dir)
+
             cmd = [
               'env',
               "CHROME_HOST=#{chrome_host}",
               "CHROME_PORT=#{chrome_port}",
               'node',
-              '--require', "#{__dir__}/source-map-support",
-              SCRIPT_PATH
+              SCRIPT_PATH,
+              dir,
             ]
 
-            prepare_files_in(dir)
-
-            IO.popen(cmd, 'w', out: output) do |io|
-              io.write dir
-            end
+            Kernel.exec(*cmd)
           end
-
-          @exit_status = $?.exitstatus
         end
       end
 
@@ -108,11 +108,11 @@ module Opal
         raise 'Chrome server can be started only on localhost' if chrome_host != DEFAULT_CHROME_HOST
 
         # Disable web security with "--disable-web-security" flag to be able to do XMLHttpRequest (see test_openuri.rb)
-        chrome_server_cmd = "#{chrome_executable} \
+        chrome_server_cmd = %{"#{chrome_executable}" \
           --headless \
           --disable-web-security \
           --remote-debugging-port=#{chrome_port} \
-          #{ENV['CHROME_OPTS']}"
+          #{ENV['CHROME_OPTS']}}
 
         chrome_pid = Process.spawn(chrome_server_cmd)
 
@@ -144,13 +144,20 @@ module Opal
         ENV['GOOGLE_CHROME_BINARY'] ||
           case RbConfig::CONFIG['host_os']
           when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            raise 'Headless chrome is supported only by Mac OS and Linux'
+            [
+              'C:/Program Files/Google/Chrome Dev/Application/chrome.exe',
+              'C:/Program Files/Google/Chrome/Application/chrome.exe'
+            ].each do |path|
+              next unless File.exist? path
+              return path
+            end
           when /darwin|mac os/
             '/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome'
           when /linux/
             %w[
               google-chrome-stable
               chromium
+              chromium-freeworld
               chromium-browser
             ].each do |name|
               next unless system('sh', '-c', "command -v #{name.shellescape}", out: '/dev/null')