sprockets-babel 0.0.6.rc2 → 0.0.6.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71eb44be1f8198118cf8c4067012877c9703c17c
-  data.tar.gz: d7f421c041a41e75c047e057ef979997f0745111
+  metadata.gz: 990ba9c41d55e0fc6b18270c576cd591326394e8
+  data.tar.gz: f47bbc5918f52f160d0931382c742a6394facb27
 SHA512:
-  metadata.gz: 4c50c037ec7844b6c3bcb645bfdfee4167832cb4127c8d245b54d563db5fa93cbf2720643106e6a72b040c844f1fddd19957fc1dc5f185a897bd7c5d3a8000cb
-  data.tar.gz: 7d74eb5d902a9935ccf278fc26a651298a6d0cfebf6368859b52a08174c80bc83485c4ea1effde79d112b79ab5ac0b74b4d787438b674a879e47995665eb18b9
+  metadata.gz: 0114201e425837dd7c3eae621b63b9fc0062c91c0dd35754847d5536f82d002b40e5c10e9eefe67e65d5bf27621f2150b9432a456d326d1c6ed91aeb8be7e34b
+  data.tar.gz: 0aa7a83f1857ce3dade829f766cbf9a08cf853dadcd7155fdcd028a6a5e69210539e7415ab410919cae9c53ee6f4a9c5cc377166aa6bba43a5223ee7630d5c57

data/lib/sprockets/babel/version.rb

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

data/lib/sprockets/babel.rb

@@ -103,9 +103,13 @@ module Sprockets
     private
 
     def self.transform_inline(code, options)
+      module_var = '$__' + ERB::Util.url_encode(options[:moduleId].gsub(/^\.\//, ''))
+        .gsub(/%|-/, '') + '__'
       prefix = <<-JS
-        var #{escape_module_id(options[:moduleId])} = (function() {
+        (function(global) {
           var exports = {};
+          global.#{module_var} = exports;
+
           var define = function(moduleId, importIds, body) {
             var resolveRelativeModuleId = function(targetId) {
               var targetParts = targetId.split(/\\//),
@@ -141,20 +145,19 @@ module Sprockets
               var importId = resolveRelativeModuleId(importIds[i]),
                 variable = '$__' + encodeURIComponent(importId.replace(/^\\.\\//, ''))
                   .replace(/%|-/, '') + '__';
-              imports.push((typeof window === 'undefined') ? global[variable] : window[variable]);
+              imports.push(global[variable]);
             }
-            body.apply(undefined, imports);
+            body.apply(global, imports);
             if (module.exports != null) {
-              exports = module.exports;
+              global.#{module_var} = module.exports;
             }
           };
       JS
+
+      # code transpiled by babel is inserted here
+
       suffix = <<-JS
-          return exports;
-        })();
-        if ((typeof window === 'undefined') && (typeof global !== 'undefined')) {
-          global.#{escape_module_id(options[:moduleId])} = #{escape_module_id(options[:moduleId])};
-        }
+        })(this);
       JS
       prefix + "\n" + code + "\n" + suffix
     end
@@ -178,10 +181,6 @@ module Sprockets
       end
       parts.join('/') + '/' + basename
     end
-
-    def self.escape_module_id(module_id)
-      '$__' + ERB::Util.url_encode(module_id.gsub(/^\.\//, '')).gsub(/%|-/, '') + '__'
-    end
   end
 
   register_engine '.es6', Babel::Template

data/lib/sprockets-babel-inline-module-loader.js

@@ -0,0 +1,48 @@
+(function(global) {
+  global.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;
+    };
+    var toVariableName = function(moduleId) {
+      return '$__' + encodeURIComponent(moduleId.replace(/^\.\//, ''))
+        .replace(/%|-/, '') + '__';
+    };
+
+    importIds.shift();
+    var exports = {},
+      imports = [exports],
+      module = {exports: null};
+    for (var i = 0; i < importIds.length; i++) {
+      if (importIds[i] == 'module') {
+        imports.push(module);
+        continue;
+      }
+
+      var varName = toVariableName(resolveRelativeModuleId(importIds[i]));
+      imports.push(global[varName]);
+    }
+    body.apply(global, imports);
+    if (module.exports != null) {
+      exports = module.exports;
+    }
+    global[toVariableName(moduleId)] = exports;
+  };
+})(this);

data/test/test_es6.rb

@@ -52,23 +52,41 @@ class TestES6 < MiniTest::Test
     assert_equal 'foobar', ctx[:output]
   end
 
+  def test_js_inline_module_loader
+    ctx = TestES6.create_inline_module_loader_context
+    ctx.eval TestES6.compile_js_source 'test/fixtures/test-import.js.es6', 'inline'
+    assert_equal 'foobar', ctx[:output]
+  end
+
+  def test_js_inline_module_loader_relative_import
+    ctx = TestES6.create_inline_module_loader_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
+  def self.create_inline_module_loader_context
+    inline_module_loader = File.read('lib/sprockets-babel-inline-module-loader.js')
+    TestES6.create_test_import_context inline_module_loader, 'amd'
+  end
+
+  def self.create_test_import_context(code = nil, module_format = 'inline')
+    ctx = TestES6.create_js_context code
+    ctx.eval <<-JS
       var output = '', print = function(data) { output += data};
     JS
-    ctx.eval TestES6.compile_js_source 'test/fixtures/lib/Imported1.js.es6', 'inline',
+    ctx.eval TestES6.compile_js_source 'test/fixtures/lib/Imported1.js.es6', module_format,
       'lib/Imported1'
-    ctx.eval TestES6.compile_js_source 'test/fixtures/lib/Imported2.js.es6', 'inline',
+    ctx.eval TestES6.compile_js_source 'test/fixtures/lib/Imported2.js.es6', module_format,
       'lib/Imported2'
     ctx
   end
 
-  def self.create_js_context(code)
+  def self.create_js_context(code = nil)
     ctx = V8::Context.new
-    ctx.eval('var global = {};')
-    ctx.eval(code)
+    ctx.eval(code) unless code.nil?
     ctx
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-babel
 version: !ruby/object:Gem::Version
-  version: 0.0.6.rc2
+  version: 0.0.6.rc3
 platform: ruby
 authors:
 - Brad Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -93,6 +93,7 @@ files:
 - README.md
 - Rakefile
 - lib/babel.rb
+- lib/sprockets-babel-inline-module-loader.js
 - lib/sprockets-babel.rb
 - lib/sprockets/babel.rb
 - lib/sprockets/babel/version.rb