opal-optimizer 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bac974d0150297fd084bdc1a40e9eb41d859f2231545d543294de2e3de0ac073
-  data.tar.gz: 0cda5d5d3ac92adef47a98e7c82b9c1233e7ff18d218e23bd4838cc812b82ae6
+  metadata.gz: 125dd4183eebeaf54651e1888dc9e662693e8f20c0b60f65a5f8dd132475033b
+  data.tar.gz: c8b571477260698fef8d6acbbf1914b2772dcb4c413916eeeff071d38fd3afd2
 SHA512:
-  metadata.gz: cce52551506f12e9bdf5c0f05ee80df69b6c9c1d3887c57a316a019b108abe0441fb5b9f0a70bf02ef2fe2fe5fff637ec06563639b8e295ad4371b4567b8b2a1
-  data.tar.gz: 11460f5faf89d08dc4965d5c788b216b0ef55c16125e0a1ea9a617ac7ce0111d3eb99f8b60334ff0cfc7cedd5f0883573d7583f408087b0f98b35a8e27973d86
+  metadata.gz: 64ca3cc44bce614557ae951e1b1b2d8bc57821d358ea6263a0cf9f587278af9c7150326706eb26f6194265814587c5b58899adf3a0a75f6af9d730611b3f70aa
+  data.tar.gz: ad54442d22a1a162e0d18371890c0dd7d1f15f80ecb1bc83741368b2c315eea3e657b5cae1960621923895c5ea9ae3046634cc7f62baf4a729c7616f26599a59

data/.github/workflows/build.yml

@@ -0,0 +1,63 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+      - "*-stable"
+      - "*/ci-check"
+  pull_request: {}
+
+jobs:
+  rake:
+    name: ${{ matrix.combo.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        combo:
+          - name: Opal-master
+            opal: master
+          - name: Opal-1.4
+            opal: 1.4
+          - name: Opal-1.3
+            opal: 1.3
+          - name: Opal-1.2
+            opal: 1.2
+          - name: Opal-1.1
+            opal: 1.1
+          - name: Opal-1.0
+            opal: '1.0'
+          - name: Ruby-head
+            ruby: head
+          - name: Windows
+            os: windows-latest
+          - name: macOS
+            os: macos-latest
+
+    runs-on: ${{ matrix.combo.os || 'ubuntu-latest' }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: set environment variables
+        run: |
+          echo "OPAL_VERSION=${{ matrix.combo.opal || '1.3' }}" >> $GITHUB_ENV
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.combo.ruby || '3.0' }}
+      - run: bundle lock
+      - uses: actions/cache@v2
+        with:
+          path: ./vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.3' }}-${{ github.ref }}-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.3' }}-${{ github.ref }}
+            ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.3' }}-master
+            ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.3' }}-
+            ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-
+      - name: bundle install
+        run: |
+          bundle config path $PWD/vendor/bundle
+          bundle install --jobs 4 --retry 3
+          bundle clean
+      - run: bundle exec rake
+

data/.gitignore

@@ -7,5 +7,7 @@
 /spec/reports/
 /tmp/
 
+/Gemfile.lock
+
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## v0.1.5
+
+* Opal 1.4 compatibility

data/Gemfile

@@ -3,13 +3,20 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in opal-optimizer.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
+gem "rake"
+gem "rspec"
 
-gem "opal", path: "../opal"
-gem "opal-sprockets", path: "../opal-sprockets"
-gem "opal-browser", path: "../opal-browser"
+case ENV['OPAL_VERSION']
+when nil
+when /\A[0-9.]+\z/
+  gem 'opal', "~> #{ENV['OPAL_VERSION']}.0a"
+else
+  gem 'opal', github: 'opal/opal', ref: ENV['OPAL_VERSION']
+end
+gem "opal-sprockets"
+gem "opal-browser"
 
-gem "rkelly-remix"
+gem "rkelly-turbo"
 
+gem "ruby-prof"
 gem "pry"

data/README.md

@@ -1,8 +1,11 @@
 # Opal::Optimizer
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/opal/optimizer`. To experiment with that code, run `bin/console` for an interactive prompt.
+A utility to optimize the JavaScript output from Opal with a help of RKelly-Turbo JavaScript parser.
 
-TODO: Delete this and the text above, and describe your gem
+As of now it contains two steps:
+
+* Tree shaking for Opal methods - if a named method is not called anywhere in the code, it's removed
+* Collapsing stubs
 
 ## Installation
 
@@ -22,7 +25,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+For Sprockets environments, all you need is to `require "opal/optimizer/sprockets"` in your pipeline.
 
 ## Development
 
@@ -32,7 +35,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/opal-optimizer.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hmdne/opal-optimizer.
 
 
 ## License

data/bin/opal-optimizer

@@ -1,6 +1,2 @@
 #!/usr/bin/env ruby
-
-require "bundler/setup"
-require "opal/optimizer"
-
-print Opal::Optimizer.new(ARGV[0] ? File.read(ARGV[0]) : STDIN.read).optimize
+load __dir__+"/../exe/opal-optimizer"

data/exe/opal-optimizer

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "opal/optimizer"
+
+print Opal::Optimizer.new(ARGF.read).optimize

data/lib/opal/optimizer/step/collapse_stubs.rb

@@ -11,8 +11,12 @@ class CollapseStubs < Step
 
     nodes = corelib_calls["add_stubs"] || []
     nodes.each do |node|
-      stubs += node.arguments.value.first.value.map do |i|
-        i.value.value.gsub(/['"]/, '')
+      if opal_version >= 1.4
+        stubs += node.arguments.value.first.value[1..-2].split(',')
+      else
+        stubs += node.arguments.value.first.value.map do |i|
+          i.value.value.gsub(/['"]/, '')
+        end
       end
 
       node.destroy! "CollapseStubs"
@@ -26,7 +30,7 @@ class CollapseStubs < Step
     stubs -= ["$respond_to_missing?"] if opal_version >= 1.1
 
     new_stub_code = <<~end
-      var stubs = '#{stubs.to_a.join('#')}'.split('#'), stubs_obj = {};
+      var stubs = '#{stubs.to_a.join(',')}'.split(','), stubs_obj = {};
       for (var i = 0; i < stubs.length; i++)
         stubs_obj[stubs[i]] = {value: Opal.stub_for(stubs[i]), enumerable: false, configurable: true, writable: true};
       Object.defineProperties(Opal.BasicObject.$$prototype, stubs_obj);

data/lib/opal/optimizer/step/tree_shaking.rb

@@ -12,6 +12,7 @@ class TreeShaking < Step
     method_defs = corelib_calls["def"] +
                   corelib_calls["defs"] +
                   corelib_calls["defn"] +
+                  corelib_calls["udef"] +
                   aliases.keys
 
     method_calls = Set.new
@@ -23,7 +24,7 @@ class TreeShaking < Step
             StringNode === i.value.accessor &&
             i.value.accessor.value[1] == '$'
         i.value.accessor.value[1..-2]
-      elsif i.value_path?(ResolveNode, "$send")
+      elsif i.value_path?(ResolveNode, ->(i) { %w[$send $send2 $refined_send].include? i })
         old = i.arguments.value[1]
         "$" + old.value[1..-2] if StringNode === old
       end
@@ -44,16 +45,30 @@ class TreeShaking < Step
     method_calls += aliases.values
 
     # Protected methods
-    method_calls += ["$register", "$negative?"]
+    method_calls += []
 
     removed = Set.new
 
     method_defs.each do |m|
       name = m.arguments.value[1]
-      next unless StringNode === name
-
-      name = name.value[1..-2]
-      name = "$" + name if m.value.accessor == "alias"
+      case name
+      when AddNode
+        if StringNode === name.left && StringNode === name.value
+          name = name.left.value[1..-2] + name.value.value[1..-2]
+        else
+          next
+        end
+      when StringNode
+        name = name.value[1..-2]
+        case m.value
+        when ResolveNode
+          name = "$" + name if m.value.value == "$alias"
+        when DotAccessorNode
+          name = "$" + name if m.value.accessor == "alias"
+        end
+      else
+        next
+      end
 
       next if method_calls.include? name
 
@@ -62,8 +77,17 @@ class TreeShaking < Step
     end
 
     corelib_calls["add_stubs"].each do |stubcall|
-      stubcall.arguments.value.first.value.reject! do |i|
-        removed.include? i.value.value[1..-2]
+      if opal_version >= 1.4
+        stubs = stubcall.arguments.value.first.value
+        new_stubs = stubs[1..-2].split(",").reject do |i|
+          removed.include? i
+        end.join(',')
+        new_stubs = "'#{new_stubs}'"
+        stubs.replace(new_stubs)
+      else
+        stubcall.arguments.value.first.value.reject! do |i|
+          removed.include? i.value.value[1..-2]
+        end
       end
     end
 
@@ -73,7 +97,7 @@ class TreeShaking < Step
   def run
     loop do
       removed = shake_methods
-      #$stdout.puts removed.inspect
+      # $stdout.puts removed.inspect
       reload
       break if removed.length == 0
     end

data/lib/opal/optimizer/version.rb

@@ -1,5 +1,5 @@
 module Opal
   class Optimizer
-    VERSION = "0.1.1"
+    VERSION = "0.1.5"
   end
 end

data/lib/opal/optimizer.rb

@@ -14,22 +14,28 @@ module Opal
 
     attr_accessor :exports
 
-    def initialize(code, exports: "")
+    def initialize(code, exports: "", force_corelib: true)
       @ast = parse_js(code)
 
       @corelib = @ast.value.find do |i|
-        es = i.to_ecma
-        if es.start_with?("(function(undefined) {\n  var global_object") &&
-           es.end_with?(").call(this);")
+        es = code[i.range.from.index..i.range.to.index]
+        if es.start_with?("(function(undefined) {\n  // @note\n"\
+                          "  //   A few conventions for the documentation of this file:") &&
+           es.end_with?("TypeError.$$super = Error;\n}).call(this);")
           @opal_version = 1.0
-        elsif es.start_with?("(function(global_object) {\n  \"use strict\";\n"+
-                             "  var console;\n  if(typeof (globalThis) !== "+
-                             "'undefined') {\n") &&
-              es.end_with?(").call(this);")
-          @opal_version = 1.1
+        elsif es.start_with?("(function(global_object) {\n  \"use strict\";\n\n  // @note\n  "\
+                             "//   A few conventions for the documentation of this file:") &&
+              es.end_with?("TypeError.$$super = Error;\n}).call(this);")
+          if es.include? 'function $prop(object,'
+            @opal_version = 1.4
+          else
+            @opal_version = 1.1
+          end
         end
       end
 
+      raise ArgumentError, "Couldn't deduce Opal version based on this content" if force_corelib && !@corelib
+
       @corelib_source = @corelib.value.value.value.value.function_body.value if @corelib
 
       reload
@@ -38,14 +44,15 @@ module Opal
       unless [nil, ""].include?(exports) || exports.start_with?("(function(")
         exports = Opal::Compiler.new(exports).compile
       end
-      @exports = Opal::Optimizer.new(exports, exports: nil) unless exports == nil
+      @exports = Opal::Optimizer.new(exports, exports: nil, force_corelib: false) unless exports == nil
     end
 
     def reload
       @function_calls = ast.pointcut(FunctionCallNode).matches
       @corelib_calls = @function_calls.select do |i|
-        i.value_path?(DotAccessorNode, ResolveNode, "Opal")
-      end.group_by { |i| i.value.accessor }
+        i.value_path?(DotAccessorNode, ResolveNode, "Opal") ||
+        i.value_path?(ResolveNode, /\A\$/)
+      end.group_by { |i| (i.value.value.is_a?(String) ? i.value.value : i.value.accessor).gsub('$', '') }
       @corelib_calls = Hash.new { [] }.merge(@corelib_calls)
     end
 

data/opal-optimizer.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rkelly-remix"
+  spec.add_dependency "rkelly-turbo"
   spec.add_dependency "opal", ">= 1.0.0"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: opal-optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - hmdne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rkelly-remix
+  name: rkelly-turbo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,23 +38,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: 
+description:
 email: []
-executables: []
+executables:
+- opal-optimizer
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/opal-optimizer
 - bin/setup
+- exe/opal-optimizer
 - lib/opal/optimizer.rb
 - lib/opal/optimizer/helpers.rb
 - lib/opal/optimizer/sprockets.rb
@@ -70,7 +73,7 @@ metadata:
   homepage_uri: https://github.com/hmdne/opal-optimizer
   source_code_uri: https://github.com/hmdne/opal-optimizer
   changelog_uri: https://github.com/hmdne/opal-optimizer/commits/master
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Optimize Opal's resulting javascript code
 test_files: []

data/Gemfile.lock

@@ -1,79 +0,0 @@
-PATH
-  remote: ../opal-browser
-  specs:
-    opal-browser (0.2.0)
-      opal (>= 1.0, < 2.0)
-      paggio
-
-PATH
-  remote: ../opal-sprockets
-  specs:
-    opal-sprockets (0.5.0.1.0.4.0)
-      opal (~> 1.0.0)
-      sprockets (~> 4.0)
-      tilt (>= 1.4)
-
-PATH
-  remote: ../opal
-  specs:
-    opal (1.0.0)
-      ast (>= 2.3.0)
-      parser (~> 2.6)
-
-PATH
-  remote: .
-  specs:
-    opal-optimizer (0.1.0)
-      opal (>= 1.0.0)
-      rkelly-remix
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.1)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    method_source (1.0.0)
-    paggio (0.2.6)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rack (2.2.3)
-    rake (12.3.3)
-    rkelly-remix (0.0.7)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    tilt (2.0.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  opal!
-  opal-browser!
-  opal-optimizer!
-  opal-sprockets!
-  pry
-  rake (~> 12.0)
-  rkelly-remix
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.1.4