import_js 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c89c88f08b5caa370d8b929e5448f918b2f2d4
-  data.tar.gz: 5783b944690642d76215f53e7e85cfe36715d018
+  metadata.gz: 86109b8414f1f1331814080ff3de584129f4dd59
+  data.tar.gz: 671e9ed2c481e73f359c70552e4bec13b42cd4f8
 SHA512:
-  metadata.gz: ba11ff91ca83a95ac4bbc0808e435fefc6eebc4dafebfc848d94415c1c7d6401a85f7ff2af32ce3037d94044e8d3274fa03519534761e377ee26a7c161d0a546
-  data.tar.gz: bfd88afddeb5e09b671796067a2d52c2c92fac6f70aee60272e61e20d9e15e5e13891ce3708b0006cda0d8867e6a249702cd5fe5bab46966b59544698d0713e5
+  metadata.gz: 6bd23adbe12eb5db1232d685eee4021955b2c0190a977b844b8cc0b19ffb4d15de1e8dd8d9296e5627b9b1de96962fe8b07ff6a5204a3ca8ddf2e5db2db34917
+  data.tar.gz: 5e6e62dba0ce0f132c2b8bd0e7ab5de8202239195424a3726156235eac0041936fc55cd3ef7781da5b18e0e2052011542d0ba7bf1e0010ca5061a3c5c06bb7ad

data/bin/import-js

@@ -7,7 +7,6 @@ require 'json'
 opts = Slop.parse do |o|
   o.string '-w', '--word', 'a word/variable to import'
   o.bool '--goto', 'instead of importing, just print the path to a module'
-  o.bool '--fix', 'imports all undefined variables, and removes unused imports'
   o.array '--selections', 'a list of resolved selections, e.g. Foo:0,Bar:1'
   o.string '--filename',
     'a path to the file which contents are being passed in as stdin'
@@ -37,10 +36,8 @@ if opts.goto?
   importer.goto
 elsif opts[:word]
   importer.import
-elsif opts.fix?
-  importer.fix_imports
 else
-  importer.import_all
+  importer.fix_imports
 end
 
 if opts.goto?

data/lib/import_js/emacs_editor.rb

@@ -22,6 +22,12 @@ class ImportJS::EmacsEditor
           puts 'import:success'
         when 'goto'
           ImportJS::Importer.new(self).goto
+        when 'fix'
+          ImportJS::Importer.new(self).fix_imports
+          write_file
+          puts 'import:success'
+        else
+          puts "unknown command: #{command}"
         end
       rescue Exception => e
         puts e.inspect
@@ -61,7 +67,7 @@ class ImportJS::EmacsEditor
   #
   # @return [String]
   def current_file_content
-    @file.join('\n')
+    @file.join("\n")
   end
 
   # Reads a line from the file.

data/lib/import_js/importer.rb

@@ -47,36 +47,17 @@ module ImportJS
       @editor.open_file(js_module.file_path) if js_module
     end
 
+    # Removes unused imports and adds imports for undefined variables
     def fix_imports
-      remove_unused_imports
-      import_all
-    end
-
-    # Finds all variables that haven't yet been imported.
-    def import_all
       @config.refresh
-      undefined_variables = run_eslint_command.map do |line|
+      eslint_result = run_eslint_command
+      undefined_variables = eslint_result.map do |line|
         /(["'])([^"']+)\1 is not defined/.match(line) do |match_data|
           match_data[2]
         end
       end.compact.uniq
 
-      return message('No variables to import') if undefined_variables.empty?
-
-      old_imports = find_current_imports
-      undefined_variables.each do |variable|
-        if js_module = find_one_js_module(variable)
-          inject_js_module(variable, js_module, old_imports[:imports])
-        end
-      end
-      replace_imports(old_imports[:newline_count],
-                      old_imports[:imports],
-                      old_imports[:imports_start_at])
-    end
-
-    def remove_unused_imports
-      @config.refresh
-      unused_variables = run_eslint_command.map do |line|
+      unused_variables = eslint_result.map do |line|
         /"([^"]+)" is defined but never used/.match(line) do |match_data|
           match_data[1]
         end
@@ -89,6 +70,13 @@ module ImportJS
         end
         import_statement.variables.empty?
       end
+
+      undefined_variables.each do |variable|
+        if js_module = find_one_js_module(variable)
+          inject_js_module(variable, js_module, new_imports)
+        end
+      end
+
       replace_imports(old_imports[:newline_count],
                       new_imports,
                       old_imports[:imports_start_at])
@@ -105,14 +93,14 @@ module ImportJS
       command = %w[
         eslint
         --stdin
-        --format compact
+        --format unix
         --rule 'no-undef: 2'
         --rule 'no-unused-vars: [2, { "vars": "all", "args": "none" }]'
       ].join(' ')
       out, err = Open3.capture3(command,
                                 stdin_data: @editor.current_file_content)
 
-      if out =~ /Error - Parsing error: / ||
+      if out =~ /Parsing error: / ||
          out =~ /Unrecoverable syntax error/
         fail ImportJS::ParseError.new, out
       end

data/lib/import_js/version.rb

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

metadata

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