RubyGems - opal-optimizer - Versions diffs - 0.1.4 → 0.1.5 - Mend

opal-optimizer 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml +4 -4
data/.github/workflows/build.yml +63 -0
data/.gitignore +2 -0
data/CHANGELOG.md +3 -0
data/Gemfile +11 -5
data/README.md +7 -4
data/bin/opal-optimizer +1 -5
data/exe/opal-optimizer +6 -0
data/lib/opal/optimizer/step/collapse_stubs.rb +7 -3
data/lib/opal/optimizer/step/tree_shaking.rb +12 -3
data/lib/opal/optimizer/version.rb +1 -1
data/lib/opal/optimizer.rb +5 -1
metadata +7 -4
data/Gemfile.lock +0 -81

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0a82c0ecf5706196abd426721fcf57a7b9ce47a29beed5210799c6f3f0ebb2
-  data.tar.gz: f0175660cc2d670698e85cd8d0b17ee0cde96e601dfcf53d40dfc87fb09a958d
+  metadata.gz: 125dd4183eebeaf54651e1888dc9e662693e8f20c0b60f65a5f8dd132475033b
+  data.tar.gz: c8b571477260698fef8d6acbbf1914b2772dcb4c413916eeeff071d38fd3afd2
 SHA512:
-  metadata.gz: 83c6f036a54074918d249fb9f2a3ddbeb61c42ea017dc4b2694f81fdc7de6ab3b6968eeb04f48f09bd35553af30c3190d960ae2eccf12a2d3563a674ffd3e05a
-  data.tar.gz: 483ad9f4fe3e9d878c4565e912778f791732e9969f1dc8a2dcfdae22e3c7c75b5687591b96f15c5c74f84cf97ad162ee73604e3c87f5ab5dd3016ef8088c882a
+  metadata.gz: 64ca3cc44bce614557ae951e1b1b2d8bc57821d358ea6263a0cf9f587278af9c7150326706eb26f6194265814587c5b58899adf3a0a75f6af9d730611b3f70aa
+  data.tar.gz: ad54442d22a1a162e0d18371890c0dd7d1f15f80ecb1bc83741368b2c315eea3e657b5cae1960621923895c5ea9ae3046634cc7f62baf4a729c7616f26599a59

data/.github/workflows/build.yml ADDED Viewed

@@ -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 CHANGED Viewed

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

data/CHANGELOG.md ADDED Viewed

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

data/Gemfile CHANGED Viewed

@@ -3,14 +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"
+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", path: "../opal-browser"
+gem "opal-browser"
-gem "rkelly-turbo", path: "../rkelly-turbo"
+gem "rkelly-turbo"
 gem "ruby-prof"
 gem "pry"

data/README.md CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -24,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
@@ -77,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

data/lib/opal/optimizer/version.rb CHANGED Viewed

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

data/lib/opal/optimizer.rb CHANGED Viewed

@@ -26,7 +26,11 @@ module Opal
         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);")
-          @opal_version = 1.1
+          if es.include? 'function $prop(object,'
+            @opal_version = 1.4
+          else
+            @opal_version = 1.1
+          end
         end
       end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - hmdne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rkelly-turbo
@@ -40,21 +40,24 @@ dependencies:
         version: 1.0.0
 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

data/Gemfile.lock DELETED Viewed

@@ -1,81 +0,0 @@
-PATH
-  remote: ../opal-browser
-  specs:
-    opal-browser (0.2.0)
-      opal (>= 1.0, < 2.0)
-      paggio
-PATH
-  remote: ../opal
-  specs:
-    opal (1.3.0.alpha1)
-      ast (>= 2.3.0)
-      parser (~> 3.0)
-PATH
-  remote: ../rkelly-turbo
-  specs:
-    rkelly-turbo (0.1.1.20210526224136)
-PATH
-  remote: .
-  specs:
-    opal-optimizer (0.1.4)
-      opal (>= 1.0.0)
-      rkelly-turbo
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    method_source (1.0.0)
-    opal-sprockets (1.0.1)
-      opal (>= 1.0, < 2.0)
-      sprockets (~> 4.0)
-      tilt (>= 1.4)
-    paggio (0.2.6)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rack (2.2.3)
-    rake (12.3.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby-prof (1.4.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-turbo!
-  rspec (~> 3.0)
-  ruby-prof
-BUNDLED WITH
-   2.1.4