sprockets-babel 0.0.6.rc1 → 0.0.6.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d545a87648a7a523571ad139b3903245c303814
-  data.tar.gz: eb3a4c49ae9f33492931a5b2053916a3282923a7
+  metadata.gz: 71eb44be1f8198118cf8c4067012877c9703c17c
+  data.tar.gz: d7f421c041a41e75c047e057ef979997f0745111
 SHA512:
-  metadata.gz: 0c1dd528760ce57a4a6a38716add8956fad69b9a674763784f02b4ce15fd279d27a823a6ee946d7c5c6cf6f8bdf71aff036c35a2380bf20a723a995241d6f2f9
-  data.tar.gz: 0ba51ca9ab660bfc6c1418ddf40a3f561b9d545f2eafe35348d15383402c58cc3acfd31a3606132932fb5f9e91075396595fd3d2caf0ab499bd03c5729647fd0
+  metadata.gz: 4c50c037ec7844b6c3bcb645bfdfee4167832cb4127c8d245b54d563db5fa93cbf2720643106e6a72b040c844f1fddd19957fc1dc5f185a897bd7c5d3a8000cb
+  data.tar.gz: 7d74eb5d902a9935ccf278fc26a651298a6d0cfebf6368859b52a08174c80bc83485c4ea1effde79d112b79ab5ac0b74b4d787438b674a879e47995665eb18b9

data/lib/sprockets/babel.rb

@@ -103,64 +103,60 @@ module Sprockets
     private
 
     def self.transform_inline(code, options)
-      result = remove_use_strict(code).sub(/\Adefine\((.+?), function \(([^)]+)\) \{\n/m) do
-        raw_import_names = Regexp.last_match[1]
-        raw_import_vars = Regexp.last_match[2]
-        import_names = raw_import_names.gsub(/['"\[\]]/, '').split(', ')
-        import_vars = raw_import_vars.split(', ')
-        import_statements = ''
-        import_names.each_with_index { |item, i|
-          next if i == 0
-          next if item == 'exports' || item == 'module'
-          import_module_id = escape_module_id(resolve_relative_module_id(options[:moduleId], item))
-          import_statements += 'var ' + import_vars[i - 1] + ' = ' + import_module_id + ';'
+      prefix = <<-JS
+        var #{escape_module_id(options[:moduleId])} = (function() {
+          var exports = {};
+          var define = function(moduleId, importIds, body) {
+            var resolveRelativeModuleId = function(targetId) {
+              var targetParts = targetId.split(/\\//),
+                basename = targetParts.pop();
+              if ((targetParts.length == 0) || (targetParts[0] != '.' && targetParts[0] != '..')) {
+                return targetId;
+              }
+              if (targetParts[0] == '.') {
+                targetParts.shift();
+              }
+
+              var fromParts = moduleId.split(/\\//);
+              fromParts.pop();
+              while (targetParts.length > 0 && targetParts[0] == '..') {
+                targetParts.shift();
+                if (fromParts.length > 0) {
+                  fromParts.pop();
+                }
+              }
+              var parts = fromParts.concat(targetParts);
+              return (parts.length == 0) ? basename : parts.join('/') + '/' + basename;
+            };
+
+            importIds.shift();
+            var imports = [exports],
+              module = {exports: null};
+            for (var i = 0; i < importIds.length; i++) {
+              if (importIds[i] == 'module') {
+                imports.push(module);
+                continue;
+              }
+
+              var importId = resolveRelativeModuleId(importIds[i]),
+                variable = '$__' + encodeURIComponent(importId.replace(/^\\.\\//, ''))
+                  .replace(/%|-/, '') + '__';
+              imports.push((typeof window === 'undefined') ? global[variable] : window[variable]);
+            }
+            body.apply(undefined, imports);
+            if (module.exports != null) {
+              exports = module.exports;
+            }
+          };
+      JS
+      suffix = <<-JS
+          return exports;
+        })();
+        if ((typeof window === 'undefined') && (typeof global !== 'undefined')) {
+          global.#{escape_module_id(options[:moduleId])} = #{escape_module_id(options[:moduleId])};
         }
-        "var exports = {}, module = {};\n" + import_statements
-      end
-
-      # deal with trailing stuff (such as source maps)
-      index = find_closing_brace result
-      stripped = result[0..index - 4] # - 4 to remove the closing });
-      trailing_text = result[index..-1]
-
-      'var ' + escape_module_id(options[:moduleId]) + " = (function() {\n" +
-        "'use strict';\n" +
-        stripped + "\n" +
-        'return (typeof module.exports === \'undefined\') ? exports : module.exports;' +
-        "})();\n" + trailing_text + "\n"
-    end
-
-    # Detect the closing });
-    def self.find_closing_brace(code)
-      curr = code.length - 1
-      last_line_break = curr
-      line_comment = false
-      block_comment = false
-      while curr > 0
-        if code[curr] == "\n"
-          if line_comment
-            last_line_break = curr
-            line_comment = false
-          elsif !block_comment
-            # first line without a comment found
-            return last_line_break
-          end
-        end
-
-        if code[curr - 1, 2] == '//'
-          line_comment = true
-        end
-        if code[curr - 1, 2] == '*/'
-          block_comment = true
-        end
-        if code[curr - 1, 2] == '/*'
-          line_comment = true
-          block_comment = false
-          last_line_break = curr - 2
-        end
-        curr -= 1
-      end
-      last_line_break
+      JS
+      prefix + "\n" + code + "\n" + suffix
     end
 
     def self.resolve_relative_module_id(source_module_id, target_module_id)
@@ -183,10 +179,6 @@ module Sprockets
       parts.join('/') + '/' + basename
     end
 
-    def self.remove_use_strict(code)
-      code.gsub(/['"]use strict['"];\n/m, '')
-    end
-
     def self.escape_module_id(module_id)
       '$__' + ERB::Util.url_encode(module_id.gsub(/^\.\//, '')).gsub(/%|-/, '') + '__'
     end

data/lib/sprockets/babel/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Babel
-    VERSION = '0.0.6.rc1'
+    VERSION = '0.0.6.rc2'
   end
 end

data/test/fixtures/lib/Imported1.js.es6

@@ -0,0 +1,7 @@
+export default class Imported1 {
+
+  static foo() {
+    return 'foo';
+  }
+
+}

data/test/fixtures/lib/Imported2.js.es6

@@ -0,0 +1,7 @@
+export class Imported2 {
+
+  static bar() {
+    return 'bar';
+  }
+
+}

data/test/fixtures/lib2/test-relative-import.js.es6

@@ -0,0 +1,5 @@
+import Imported1 from '../lib/Imported1';
+import {Imported2} from '../lib/Imported2';
+
+print(Imported1.foo());
+print(Imported2.bar());

data/test/fixtures/test-import.js.es6

@@ -0,0 +1,5 @@
+import Imported1 from './lib/Imported1';
+import {Imported2} from './lib/Imported2';
+
+print(Imported1.foo());
+print(Imported2.bar());

data/test/test_es6.rb

@@ -1,7 +1,5 @@
 require 'minitest/autorun'
-require 'sprockets'
 require 'sprockets/babel'
-require 'babel'
 
 class Environment
   def paths
@@ -19,14 +17,14 @@ class TestES6 < MiniTest::Test
   def test_transform_arrow_function
     ctx = TestES6.create_js_context TestES6.compile_js_source('test/fixtures/math.js.es6')
     square = ctx[:square]
-    assert_equal square.call(2), 4
+    assert_equal 4, square.call(2)
   end
 
   def test_transform_large_file
     ctx = TestES6.create_js_context TestES6.compile_js_source('test/fixtures/Regions.js.es6')
     regions = ctx[:Regions]
-    assert_equal regions.keys.length, 103
-    assert_equal regions['CA'][7]['name'], 'Ontario'
+    assert_equal 103, regions.keys.length
+    assert_equal 'Ontario', regions['CA'][7]['name']
   end
 
   def test_transform_empty_file
@@ -41,17 +39,45 @@ class TestES6 < MiniTest::Test
     assert !ctx['$__empty2__'].nil?
   end
 
+  def test_import_export
+    ctx = TestES6.create_test_import_context
+    ctx.eval TestES6.compile_js_source 'test/fixtures/test-import.js.es6', 'inline'
+    assert_equal 'foobar', ctx[:output]
+  end
+
+  def test_relative_import
+    ctx = TestES6.create_test_import_context
+    ctx.eval TestES6.compile_js_source 'test/fixtures/lib2/test-relative-import.js.es6', 'inline',
+      'lib2/test-relative-import'
+    assert_equal 'foobar', ctx[:output]
+  end
+
+  private
+
+  def self.create_test_import_context
+    ctx = TestES6.create_js_context <<-JS
+      var output = '', print = function(data) { output += data};
+    JS
+    ctx.eval TestES6.compile_js_source 'test/fixtures/lib/Imported1.js.es6', 'inline',
+      'lib/Imported1'
+    ctx.eval TestES6.compile_js_source 'test/fixtures/lib/Imported2.js.es6', 'inline',
+      'lib/Imported2'
+    ctx
+  end
+
   def self.create_js_context(code)
     ctx = V8::Context.new
+    ctx.eval('var global = {};')
     ctx.eval(code)
     ctx
   end
 
-  def self.compile_js_source(path, modules = 'ignore')
+  def self.compile_js_source(path, modules = 'ignore', name = '')
     es6_source = File.read(path)
     Babel.options[:modules] = modules
 
-    template = Sprockets::Babel::Template.new(File.basename(path), 1) { es6_source }
+    name = name.empty? ? File.basename(path) : name
+    template = Sprockets::Babel::Template.new(name, 1) { es6_source }
     template.render(Scope.new)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-babel
 version: !ruby/object:Gem::Version
-  version: 0.0.6.rc1
+  version: 0.0.6.rc2
 platform: ruby
 authors:
 - Brad Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -100,7 +100,11 @@ files:
 - test/fixtures/Regions.js.es6
 - test/fixtures/empty.js.es6
 - test/fixtures/empty2.js.es6
+- test/fixtures/lib/Imported1.js.es6
+- test/fixtures/lib/Imported2.js.es6
+- test/fixtures/lib2/test-relative-import.js.es6
 - test/fixtures/math.js.es6
+- test/fixtures/test-import.js.es6
 - test/test_es6.rb
 homepage: https://github.com/70mainstreet/sprockets-babel
 licenses:
@@ -130,5 +134,9 @@ test_files:
 - test/fixtures/Regions.js.es6
 - test/fixtures/empty.js.es6
 - test/fixtures/empty2.js.es6
+- test/fixtures/lib/Imported1.js.es6
+- test/fixtures/lib/Imported2.js.es6
+- test/fixtures/lib2/test-relative-import.js.es6
 - test/fixtures/math.js.es6
+- test/fixtures/test-import.js.es6
 - test/test_es6.rb