import_js 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c2841cf4974c8a53e788a4ec74e78091948e470
-  data.tar.gz: 97e8905dc410a022a31522585054fda588a622c9
+  metadata.gz: 8482eba183609eed41a5a8a9564c4d81f8047875
+  data.tar.gz: 4c4b4d506a28dcbeab5ee3f29b21be24afa67750
 SHA512:
-  metadata.gz: a0c6a2f736161c17bf7ad89b0921c36295618930f1b598c565e748e25ea74837662b78d835c9801464ced440bb8c2e52461942e75c598c3a80294229b5858603
-  data.tar.gz: 9695778534d541cf215728512635f7d78b01e4f2c72ab315021e2d5b2900170e5db7379a4205e06b9ec7c1393b2ca31527519235a7a167670f31267e7856411d
+  metadata.gz: 73dd6ae7d9b26f4c03aa2cb37160bcb3eb48f1f7d27aa2642a830a7e83a5081290ea62bbda3865ea9ac99ab2561efcde9125182e53b699dfadd1592a827f4746
+  data.tar.gz: a991d45c0496e466fb36a13abfdfb006157e444a835b872b44373a5bda1a5a9fbecaecda4ebb754a78054358a3f7361677f293a1f3cf51f13c45fc0aee0cf752

data/lib/import_js/import_statement.rb

@@ -71,7 +71,7 @@ module ImportJS
     # @param value [String]
     def set_default_variable(value)
       @default_variable = value
-      @original_import_string = nil # clear import string cache if there was one
+      clear_import_string_cache
     end
 
     # Injects a new variable into an already existing set of destructured
@@ -82,7 +82,7 @@ module ImportJS
       destructured_variables << variable_name
       destructured_variables.sort!.uniq!
 
-      @original_import_string = nil # clear import string cache if there was one
+      clear_import_string_cache
     end
 
     # Deletes a variable from an already existing default variable or set of
@@ -92,7 +92,7 @@ module ImportJS
       @default_variable = nil if default_variable == variable_name
       @destructured_variables.delete(variable_name) unless destructured_variables.nil?
 
-      @original_import_string = nil # clear import string cache if there was one
+      clear_import_string_cache
     end
 
     # @return [Boolean] true if there are destructured variables
@@ -156,6 +156,22 @@ module ImportJS
       end
     end
 
+    # Merge another ImportStatement into this one.
+    # @param import_statement [ImportJS::ImportStatement]
+    def merge(import_statement)
+      unless import_statement.default_variable.nil?
+        @default_variable = import_statement.default_variable
+        clear_import_string_cache
+      end
+
+      if import_statement.destructured?
+        @destructured_variables ||= []
+        @destructured_variables.concat(import_statement.destructured_variables)
+        @destructured_variables.sort!.uniq!
+        clear_import_string_cache
+      end
+    end
+
     private
 
     # @return [String]
@@ -176,5 +192,9 @@ module ImportJS
         "#{declaration} #{value}"
       end
     end
+
+    def clear_import_string_cache
+      @original_import_string = nil
+    end
   end
 end

data/lib/import_js/importer.rb

@@ -212,16 +212,7 @@ module ImportJS
         if imports[import_statement.path]
           # Import already exists, so this line is likely one of a destructuring
           # pair. Combine it into the same ImportStatement.
-          unless import_statement.default_variable.nil?
-            imports[import_statement.path].default_variable =
-              import_statement.default_variable
-          end
-
-          if import_statement.destructured?
-            imports[import_statement.path].destructured_variables ||= []
-            imports[import_statement.path].destructured_variables
-              .concat(import_statement.destructured_variables)
-          end
+          imports[import_statement.path].merge(import_statement)
         else
           # This is a new import, so we just add it to the hash.
           imports[import_statement.path] = import_statement

data/lib/import_js/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module ImportJS
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: import_js
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Henric Trotzig