import_js 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8482eba183609eed41a5a8a9564c4d81f8047875
-  data.tar.gz: 4c4b4d506a28dcbeab5ee3f29b21be24afa67750
+  metadata.gz: b5855fcda8dcbe929e0aecbd16b9b940cb6fa80a
+  data.tar.gz: 458cbb3e52b3358ec99b5c8891f9ae54b06769b9
 SHA512:
-  metadata.gz: 73dd6ae7d9b26f4c03aa2cb37160bcb3eb48f1f7d27aa2642a830a7e83a5081290ea62bbda3865ea9ac99ab2561efcde9125182e53b699dfadd1592a827f4746
-  data.tar.gz: a991d45c0496e466fb36a13abfdfb006157e444a835b872b44373a5bda1a5a9fbecaecda4ebb754a78054358a3f7361677f293a1f3cf51f13c45fc0aee0cf752
+  metadata.gz: e4a57078bbd9ebf4a07fe2f09c6e666fcd118f223c8ac35d54ca8538648a5d920f5ed7883170d905bf40a96969a74aae46aa4b4fc4d424f1451fcae6a0b82f10
+  data.tar.gz: 2722de373880d2530db9eb769543248dc341067fba8cf7791ddac1fc5380cd9fde64b548fc0fbcc8e0d5ea0f51938758da8a4ec62d8c2d7c8a2b4847e0a8c2a7

data/lib/import_js/import_statement.rb

@@ -90,7 +90,7 @@ module ImportJS
     # @param variable_name [String]
     def delete_variable(variable_name)
       @default_variable = nil if default_variable == variable_name
-      @destructured_variables.delete(variable_name) unless destructured_variables.nil?
+      @destructured_variables.delete(variable_name) if destructured?
 
       clear_import_string_cache
     end
@@ -124,42 +124,32 @@ module ImportJS
       if declaration_keyword == 'import'
         # ES2015 Modules (ESM) syntax can support default values and
         # destructuring on the same line.
-        declaration = declaration_keyword
         if destructured?
-          declaration += " #{default_variable}," if default_variable
-          declaration += " #{destructured_string}"
+          [destructured_import_string(declaration_keyword, max_line_length, tab)]
         else
-          declaration += " #{default_variable}"
+          [default_import_string(declaration_keyword, max_line_length, tab)]
         end
-        declaration += ' from'
-
-        [wrap_import(declaration, "'#{path}';", max_line_length, tab)]
       else # const/let/var
-        value = "require('#{path}');"
-
-        if destructured? && !default_variable.nil?
-          # We have both a default variable and a destructuring to do, so we
-          # need to generate 2 lines for CommonJS style syntax.
-          default_declaration = "#{declaration_keyword} #{default_variable} ="
-          destructured_declaration = "#{declaration_keyword} #{destructured_string} ="
-
-          return [
-            wrap_import(default_declaration, value, max_line_length, tab),
-            wrap_import(destructured_declaration, value, max_line_length, tab)
-          ]
+        strings = []
+
+        if default_variable
+          strings <<
+            default_import_string(declaration_keyword, max_line_length, tab)
+        end
+
+        if destructured?
+          strings <<
+            destructured_import_string(declaration_keyword, max_line_length, tab)
         end
 
-        declaration_assignment =
-          destructured? ? destructured_string : default_variable
-        declaration = "#{declaration_keyword} #{declaration_assignment} ="
-        [wrap_import(declaration, value, max_line_length, tab)]
+        strings
       end
     end
 
     # Merge another ImportStatement into this one.
     # @param import_statement [ImportJS::ImportStatement]
     def merge(import_statement)
-      unless import_statement.default_variable.nil?
+      if import_statement.default_variable
         @default_variable = import_statement.default_variable
         clear_import_string_cache
       end
@@ -174,23 +164,48 @@ module ImportJS
 
     private
 
-    # @return [String]
-    def destructured_string
-      "{ #{destructured_variables.join(', ')} }"
+    # @param line [String]
+    # @param max_line_length [Number] where to cap lines at
+    # @return [Boolean]
+    def line_too_long?(line, max_line_length)
+      max_line_length && line.length > max_line_length
     end
 
-    # @param declaration [String]
-    # @param value [String]
+    # @param declaration_keyword [String] e.g. 'import'
+    # @return [Array]
+    def equals_and_value(declaration_keyword)
+      return ['from', "'#{path}';"] if declaration_keyword == 'import'
+      ['=', "require('#{path}');"]
+    end
+
+    # @param declaration_keyword [String]
     # @param max_line_length [Number] where to cap lines at
     # @param tab [String] e.g. '  ' (two spaces)
     # @return [String] import statement, wrapped at max line length if necessary
-    def wrap_import(declaration, value, max_line_length, tab)
-      if max_line_length &&
-         "#{declaration} #{value}".length > max_line_length
-        "#{declaration}\n#{tab}#{value}"
-      else
-        "#{declaration} #{value}"
+    def default_import_string(declaration_keyword, max_line_length, tab)
+      equals, value = equals_and_value(declaration_keyword)
+      line = "#{declaration_keyword} #{default_variable} #{equals} #{value}"
+      return line unless line_too_long?(line, max_line_length)
+
+      "#{declaration_keyword} #{default_variable} #{equals}\n#{tab}#{value}"
+    end
+
+    # @param declaration_keyword [String]
+    # @param max_line_length [Number] where to cap lines at
+    # @param tab [String] e.g. '  ' (two spaces)
+    # @return [String] import statement, wrapped at max line length if necessary
+    def destructured_import_string(declaration_keyword, max_line_length, tab)
+      equals, value = equals_and_value(declaration_keyword)
+      if declaration_keyword == 'import' && default_variable
+        prefix = "#{default_variable}, "
       end
+
+      destructured = "{ #{destructured_variables.join(', ')} }"
+      line = "#{declaration_keyword} #{prefix}#{destructured} #{equals} #{value}"
+      return line unless line_too_long?(line, max_line_length)
+
+      destructured = "{\n#{tab}#{destructured_variables.join(",\n#{tab}")},\n}"
+      "#{declaration_keyword} #{prefix}#{destructured} #{equals} #{value}"
     end
 
     def clear_import_string_cache

data/lib/import_js/version.rb

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

metadata

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