import_js 0.3.1 → 0.4.0

data/lib/import_js/js_module.rb

@@ -3,12 +3,11 @@ require 'pathname'
 module ImportJS
   # Class that represents a js module found in the file system
   class JSModule
-    attr_reader :import_path
-    attr_reader :lookup_path
-    attr_reader :file_path
-    attr_reader :main_file
-    attr_reader :skip
-    attr_accessor :is_destructured
+    attr_accessor :import_path
+    attr_accessor :lookup_path
+    attr_accessor :file_path
+    attr_accessor :main_file
+    attr_accessor :has_named_exports
 
     # @param lookup_path [String] the lookup path in which this module was found
     # @param relative_file_path [String] a full path to the file, relative to
@@ -17,64 +16,88 @@ module ImportJS
     #   e.g. ['.js', '.jsx']
     # @param make_relative_to [String|nil] a path to a different file which the
     #   resulting import path should be relative to.
-    def initialize(lookup_path: nil,
-                   relative_file_path: nil,
-                   strip_file_extensions: nil,
-                   make_relative_to: nil)
-      @lookup_path = lookup_path
-      @file_path = relative_file_path
-
-      if @lookup_path && @lookup_path.start_with?('.')
-        @lookup_path.sub!(/^\.\/?/, '')
-        @file_path.sub!(/^\.\/?/, '')
-      end
-      if relative_file_path.end_with? '/package.json'
-        @main_file = JSON.parse(File.read(relative_file_path))['main']
-        match = relative_file_path.match(/(.*)\/package\.json/)
-        @import_path = match[1]
-        @skip = !@main_file
-      elsif relative_file_path.match(%r{/index\.js[^/]*$})
-        match = relative_file_path.match(/(.*)\/(index\.js.*)/)
-        @main_file = match[2]
-        @import_path = match[1]
-      else
-        @import_path = relative_file_path
-        strip_file_extensions.each do |ext|
-          if @import_path.end_with?(ext)
-            @import_path = @import_path[0...-ext.length]
-            break
-          end
-        end
-      end
+    def self.construct(lookup_path: nil,
+                       relative_file_path: nil,
+                       strip_file_extensions: nil,
+                       make_relative_to: nil,
+                       strip_from_path: nil)
+      js_module = new
+      js_module.lookup_path = normalize_path(lookup_path)
+      js_module.file_path = normalize_path(relative_file_path)
 
-      if @lookup_path
-        @import_path.sub!(/^#{Regexp.escape(@lookup_path)}\//, '')
-        if make_relative_to
-          make_import_path_relative_to(make_relative_to)
-        end
+      import_path, main_file = resolve_import_path_and_main(
+        js_module.file_path, strip_file_extensions)
+
+      return unless import_path
+
+      import_path = import_path.sub(
+        %r{^#{Regexp.escape(js_module.lookup_path)}/}, '')
+
+      js_module.import_path = import_path
+      js_module.main_file = main_file
+      js_module.make_relative_to(make_relative_to) if make_relative_to
+      js_module.strip_from_path(strip_from_path) unless make_relative_to
+      js_module
+    end
+
+    # @param path [String]
+    # @return [String]
+    def self.normalize_path(path)
+      return unless path
+      path.sub(%r{^\./?}, '')
+    end
+
+    # @param file_path [String]
+    # @param strip_file_extensions [Array]
+    # @return [String, String]
+    def self.resolve_import_path_and_main(file_path, strip_file_extensions)
+      if file_path.end_with? '/package.json'
+        main_file = JSON.parse(File.read(file_path))['main']
+        return [nil, nil] unless main_file
+        match = file_path.match(%r{(.*)/package\.json})
+        return match[1], main_file
       end
+
+      match = file_path.match(%r{(.*)/(index\.js[^/]*)$})
+      return match[1], match[2] if match
+
+      extensions = strip_file_extensions.map { |str| Regexp.escape(str) }
+      import_path = file_path.sub(/(?:#{extensions.join('|')})$/, '')
+      [import_path, nil]
+    end
+
+    # @param import_path [String]
+    def initialize(import_path: nil)
+      self.import_path = import_path
     end
 
     # @param make_relative_to [String]
-    def make_import_path_relative_to(make_relative_to)
+    def make_relative_to(make_relative_to)
+      return unless lookup_path
       # First, strip out any absolute path up until the current directory
-      make_relative_to = make_relative_to.sub(Dir.pwd + "\/", '')
+      make_relative_to = make_relative_to.sub("#{Dir.pwd}/", '')
 
       # Ignore if the file to relate to is part of a different lookup_path
-      return unless make_relative_to.start_with? @lookup_path
+      return unless make_relative_to.start_with? lookup_path
 
       # Strip out the lookup_path
-      make_relative_to.sub!(/^#{Regexp.escape(@lookup_path)}\//, '')
+      make_relative_to = make_relative_to.sub(
+        %r{^#{Regexp.escape(lookup_path)}/}, '')
 
-      path = Pathname.new(@import_path).relative_path_from(
+      path = Pathname.new(import_path).relative_path_from(
         Pathname.new(File.dirname(make_relative_to))
       ).to_s
 
-      unless path.start_with?('.')
-        # `Pathname.relative_path_from` will not add "./" automatically
-        path = './' + path
-      end
-      @import_path = path
+      # `Pathname.relative_path_from` will not add "./" automatically
+      path = './' + path unless path.start_with?('.')
+
+      self.import_path = path
+    end
+
+    # @param prefix [String]
+    def strip_from_path(prefix)
+      return unless prefix
+      self.import_path = import_path.sub(/^#{Regexp.escape(prefix)}/, '')
     end
 
     # @return [String] a readable description of the module
@@ -84,16 +107,36 @@ module ImportJS
       parts.join('')
     end
 
+    # @param path_to_current_file [String]
+    # @return [String]
+    def open_file_path(path_to_current_file)
+      if file_path && file_path.end_with?('/package.json')
+        return file_path.sub(/package\.json$/, main_file)
+      end
+      return file_path if file_path
+
+      if import_path.start_with?('.')
+        return File.expand_path(import_path, File.dirname(path_to_current_file))
+      end
+
+      import_path
+    end
+
     # @param variable_name [String]
+    # @param config [ImportJS::Configuration]
     # @return [ImportJS::ImportStatement]
-    def to_import_statement(variable_name)
+    def to_import_statement(variable_name, config)
       ImportJS::ImportStatement.new.tap do |statement|
-        if is_destructured
-          statement.inject_destructured_variable(variable_name)
+        if has_named_exports
+          statement.inject_named_import(variable_name)
         else
-          statement.default_variable = variable_name
+          statement.default_import = variable_name
         end
         statement.path = import_path
+        statement.declaration_keyword = config.get('declaration_keyword',
+                                                   from_file: file_path)
+        statement.import_function = config.get('import_function',
+                                               from_file: file_path)
       end
     end
   end

data/lib/import_js/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Defines the gem version.
 module ImportJS
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'.freeze
 end

data/lib/import_js/vim_editor.rb

@@ -145,13 +145,13 @@ module ImportJS
     # @param name [String]
     # @return [Number?]
     def get_number(name)
-      exists?(name) ? VIM.evaluate("#{name}").to_i : nil
+      exists?(name) ? VIM.evaluate(name).to_i : nil
     end
 
     # @param name [String]
     # @return [Boolean?]
     def get_bool(name)
-      exists?(name) ? VIM.evaluate("#{name}").to_i != 0 : nil
+      exists?(name) ? VIM.evaluate(name).to_i != 0 : nil
     end
 
     # @return [Boolean?]

data/lib/import_js.rb

@@ -6,6 +6,14 @@ module ImportJS
   class ParseError < StandardError
     # Error thrown when a JS file can't be parsed
   end
+
+  class FindError < StandardError
+    # Error thrown when the find command fails
+  end
+
+  class ClientTooOldError < StandardError
+    # Error thrown when the client is too old to handle the config
+  end
 end
 
 require_relative 'import_js/command_line_editor'

metadata

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