import_js 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6adff72ccc7afa4dc2e926b56398d666942449
-  data.tar.gz: 1190a25ee2e7e0af64a7de229ab279bebded2951
+  metadata.gz: b839cb49fbb3b2162281bfc7dd5d8302aaec49d8
+  data.tar.gz: 28c0680aca73df347201d7e1e2e8271ef7d618f1
 SHA512:
-  metadata.gz: f6d1a84089692701188e7cd7c18131e980f7f81ed8c9c785c1552fdcd625c006a8cd3ab4b89407e71370a47b5e1eba6f61d2076c43bac362da0262e3f791084d
-  data.tar.gz: 576275490822799e44ad5427c4512169a7f279876c56dac305739fa4bde0ce7dce0de0aee5c7984a8e2aa88ebe311c4825e7c09137ce5f6b8441c8b582fca48e
+  metadata.gz: 674ac79c69f71c4131f21f1ce82e0e4dae5650321d90b5823d21439514f93d83f007643c8becae2b188857f89e2c31bece2d4a6db8bc1f0fb643f98ce42e63a4
+  data.tar.gz: 7a4ad17523e23d16574152f241734b37cdf62747ae82d85b35db9580d3a5f3ad4bc7ecd64ecd82acf4b3ff94f67c862864b5ad9ab765e9edd22e990f2fdd1615

data/lib/import_js/configuration.rb

@@ -9,8 +9,10 @@ module ImportJS
     'aliases' => {},
     'declaration_keyword' => 'import',
     'named_exports' => {},
+    'environments' => [],
     'eslint_executable' => 'eslint',
     'excludes' => [],
+    'group_imports' => true,
     'ignore_package_prefixes' => [],
     'import_dev_dependencies' => false,
     'import_function' => 'require',
@@ -87,6 +89,55 @@ module ImportJS
       end.compact.flatten
     end
 
+    ENVIRONMENT_CORE_MODULES = {
+      # As listed in https://github.com/nodejs/node/tree/master/lib
+      'node' => %w[
+        assert
+        buffer
+        child_process
+        cluster
+        console
+        constants
+        crypto
+        dgram
+        dns
+        domain
+        events
+        fs
+        http
+        https
+        module
+        net
+        os
+        path
+        process
+        punycode
+        querystring
+        readline
+        repl
+        stream
+        string_decoder
+        sys
+        timers
+        tls
+        tty
+        url
+        util
+        v8
+        vm
+        zlib
+      ],
+    }.freeze
+
+    # @return [Array<String>]
+    def environment_core_modules
+      result = []
+      get('environments').map do |environment|
+        result.concat(ENVIRONMENT_CORE_MODULES[environment])
+      end
+      result
+    end
+
     private
 
     # @param file [File]

data/lib/import_js/import_statement.rb

@@ -75,7 +75,7 @@ module ImportJS
         named_imports = dest_match[:named].split(/,\s*/).map(&:strip)
       else
         default_import = match[:assignment]
-        return unless default_import =~ /\A[^\s]+\Z/
+        return unless default_import =~ /\A\S+\Z/
       end
 
       new(

data/lib/import_js/import_statements.rb

@@ -11,12 +11,14 @@ module ImportJS
     # Order is significant here
     STYLES = [STYLE_IMPORT, STYLE_CONST, STYLE_VAR, STYLE_CUSTOM].freeze
 
+    PATH_TYPE_CORE_MODULE = :core_module
     PATH_TYPE_PACKAGE = :package
     PATH_TYPE_NON_RELATIVE = :non_relative
     PATH_TYPE_RELATIVE = :relative
 
     # Order is significant here
     PATH_TYPES = [
+      PATH_TYPE_CORE_MODULE,
       PATH_TYPE_PACKAGE,
       PATH_TYPE_NON_RELATIVE,
       PATH_TYPE_RELATIVE,
@@ -121,11 +123,16 @@ module ImportJS
         !import_statement.parsed_and_untouched?
       end.flatten.uniq(&:to_normalized).sort_by(&:to_normalized)
 
+      return [partitioned] unless @config.get('group_imports')
+
       package_dependencies = @config.package_dependencies
+      core_modules = @config.environment_core_modules
       partitioned.each do |import_statement|
         # Figure out what group to put this import statement in
         group_index = import_statement_group_index(
-          import_statement, package_dependencies)
+          import_statement,
+          package_dependencies,
+          core_modules)
 
         # Add the import statement to the group
         groups[group_index] ||= []
@@ -138,11 +145,14 @@ module ImportJS
 
     # @param import_statement [ImportJS::ImportStatement]
     # @param package_dependencies [Array<String>]
+    # @param core_modules [Array<String>]
     # @return [Number]
-    def import_statement_group_index(import_statement, package_dependencies)
+    def import_statement_group_index(import_statement,
+                                     package_dependencies,
+                                     core_modules)
       style = import_statement_style(import_statement)
       path_type = import_statement_path_type(
-        import_statement, package_dependencies)
+        import_statement, package_dependencies, core_modules)
 
       GROUPINGS["#{style} #{path_type}"]
     end
@@ -164,10 +174,19 @@ module ImportJS
     # Determine import path type
     # @param import_statement [ImportJS::ImportStatement]
     # @param package_dependencies [Array<String>]
+    # @param core_modules [Array<String>]
     # @return [String] 'package, 'non-relative', 'relative'
-    def import_statement_path_type(import_statement, package_dependencies)
-      path = import_statement.path
-      return PATH_TYPE_RELATIVE if path.start_with?('.')
+    def import_statement_path_type(import_statement,
+                                   package_dependencies,
+                                   core_modules)
+
+      return PATH_TYPE_RELATIVE if import_statement.path.start_with?('.')
+      return PATH_TYPE_CORE_MODULE if core_modules.include?(import_statement.path)
+      #
+      # If there is a slash in the path, remove that and everything after it.
+      # This is so that imports for modules inside package dependencies end up
+      # in the right group (PATH_TYPE_PACKAGE).
+      path = import_statement.path.sub(%r{\A(.*?)/.*\Z}, '\1')
       return PATH_TYPE_PACKAGE if package_dependencies.include?(path)
       PATH_TYPE_NON_RELATIVE
     end

data/lib/import_js/importer.rb

@@ -244,6 +244,16 @@ module ImportJS
       old_imports_range.each do
         @editor.delete_line(old_imports_range.first)
       end
+
+      if import_strings.empty? &&
+         @editor.read_line(old_imports_range.first).empty?
+        # We have no newlines to write back to the file. Clearing out potential
+        # whitespace where the imports used to be leaves the file in a better
+        # state.
+        @editor.delete_line(old_imports_range.first)
+        return
+      end
+
       import_strings.reverse_each do |import_string|
         # We need to add each line individually because the Vim buffer will
         # convert newline characters to `~@`.
@@ -374,6 +384,12 @@ module ImportJS
         matched_modules << js_module if js_module
       end
 
+      @config.environment_core_modules.each do |dep|
+        next unless dep.casecmp(variable_name) == 0
+
+        matched_modules << JSModule.new(import_path: dep)
+      end
+
       # If you have overlapping lookup paths, you might end up seeing the same
       # module to import twice. In order to dedupe these, we remove the module
       # with the longest path

data/lib/import_js/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module ImportJS
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

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