js_dependency 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad89bc5047522fc38815da19020c395e7cd92ec262da2dce9dad5f7ddf40526
-  data.tar.gz: dde5992cb4ecf9c27a2e645b064584296809c5dcd26d8d46625d88dbb393b9cb
+  metadata.gz: 201aa2538971ea1e938c32236410e2b31ada21abbcd9f90141b84b08b132e7bb
+  data.tar.gz: fd6c9eb934ea1f884f885e0bce39c989ab2536a10faa33f900bcc95418f41fa6
 SHA512:
-  metadata.gz: 6fc657950c57fe7e6960fae9f4c1f1754ca42f223c2989e664ab686212978dd5cd8eb2ca19f610dc73c3492b6a2a17d5eabf6cca6a47bd7dc4c2e81850e04cb9
-  data.tar.gz: 51f72bb8a23cd36ed25bc3aa9640d244b1c1534347d94d36cda812a7167046aba9c6d68bef5fbe544e9b2f2810fdd21af74ea0c8be0abf79272142b4b458a635
+  metadata.gz: 0641c8506997b0bf21e4ec9cede06096fbc9b523e8e4e39954bb4a63eb73d551772945efa73c7e1098b0481cf70b0fc87eb291140f57db6b7599901b958a1b78
+  data.tar.gz: c0c38b6e23cb29d54a40009aba2290543d9706366eb45a092cbbd4e47817972e161e0830bbc51081e76bbd85899247d02bf851345030126c715e2e4e6e2d6e8e

data/.rubocop_todo.yml

@@ -1,13 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-07-26 23:22:56 UTC using RuboCop version 1.31.2.
+# on 2022-08-11 04:37:50 UTC using RuboCop version 1.34.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 42
 
@@ -17,12 +17,12 @@ Metrics/ClassLength:
   Max: 129
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 18
 
 # Offense count: 9
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 26
 
@@ -32,7 +32,7 @@ Metrics/ParameterLists:
   Max: 9
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 19
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.3.6] - 2022-08-11
+
+- Add src path in script tag for create index.
+
 ## [0.3.5] - 2022-07-27
 
 - Export orphan components list.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    js_dependency (0.3.5)
+    js_dependency (0.3.6)
       pathname
       thor
       yaml
@@ -18,7 +18,7 @@ GEM
     docile (1.4.0)
     json (2.6.2)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     parslet (2.0.0)
     pathname (0.2.0)
@@ -50,17 +50,17 @@ GEM
       rspec (>= 2.13, < 4)
       unparser
     rspec-support (3.11.0)
-    rubocop (1.32.0)
+    rubocop (1.34.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.19.1, < 2.0)
+      rubocop-ast (>= 1.20.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)

data/README.md

@@ -6,6 +6,8 @@ Welcome to your new gem! In this directory, you'll find the files you need to be
 
 Analyze import dependency of JavaScript code and export mermaid format.
 
+"import dependency" is analyzed from import statement of JavaScript code and src path that is added to script tag.
+
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

data/lib/js_dependency/extractor/extract_import_path.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module JsDependency
+  module Extractor
+    class ExtractImportPath
+      # @param [String] str
+      def initialize(str)
+        @str = str
+      end
+
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # @return [Array<String>]
+      def call
+        str = @str
+        # import defaultExport from 'module-name';
+        paths = str.gsub(/import\s+\S+\s+from\s+"([^"]+)"/).with_object([]) { |_, list| list << Regexp.last_match(1) }
+        paths += str.gsub(/import\s+\S+\s+from\s+'([^']+)'/).with_object([]) { |_, list| list << Regexp.last_match(1) }
+
+        # import * as name from \"module-name\";
+        paths += str.gsub(/import\s+\S+\s+as\s+\S+\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths += str.gsub(/import\s+\S+\s+as\s+\S+\s+from\s+'([^']+)'/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
+        # import { export1 } from \"module-name\";
+        # import { export1 as alias1 } from "module-name";
+        # import { export1 , export2 } from "module-name";
+        # import { foo , bar } from "module-name/path/to/specific/un-exported/file";
+        # import { export1 , export2 as alias2 , [...] } from "module-name";
+        paths += str.gsub(/import\s+\{\s+.+\s+\}\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths += str.gsub(/import\s+\{\s+.+\s+\}\s+from\s+'([^']+)'/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
+        # import defaultExport, { export1 [ , [...] ] } from "module-name";
+        paths += str.gsub(/import\s+\S+,\s+\{\s+.+\s+\}\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths += str.gsub(/import\s+\S+,\s+\{\s+.+\s+\}\s+from\s+'([^']+)'/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
+        # import defaultExport, * as name from "module-name";
+        paths += str.gsub(/import\s+\S+,\s+.+\s+as\s+\S+\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths += str.gsub(/import\s+\S+,\s+.+\s+as\s+\S+\s+from\s+'([^']+)'/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
+        # import "module-name";
+        paths += str.gsub(/import\s+"([^"]+)"/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths += str.gsub(/import\s+'([^']+)'/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
+        # var promise = import("module-name");
+        paths += str.gsub(/import\("([^"]+)"\)/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths += str.gsub(/import\('([^']+)'\)/).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+        paths.uniq.sort
+      end
+
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      def self.call(str)
+        new(str).call
+      end
+    end
+  end
+end

data/lib/js_dependency/extractor/extract_script_tag.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module JsDependency
+  module Extractor
+    class ExtractScriptTag
+      # @param [String] str
+      def initialize(str)
+        @str = str
+      end
+
+      # @return [Array<String>]
+      def call
+        str = @str
+        scripts = str.gsub(%r{<script>(.+)</script>}m).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
+        scripts.uniq.sort.join("\n")
+      end
+
+      # @param [String] str
+      # @return [String]
+      def self.call(str)
+        new(str).call
+      end
+    end
+  end
+end

data/lib/js_dependency/extractor/extract_src_path.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module JsDependency
+  module Extractor
+    class ExtractSrcPath
+      # @param [String] str
+      def initialize(str)
+        @str = str
+      end
+
+      # Extract JavaScript file (.js) in src path
+      # @return [Array<String>]
+      def call
+        str = @str
+        # <script src="module-name.js">
+        paths = str.gsub(/<script\s+src="([^']+)">/).with_object([]) { |_, list| list << Regexp.last_match(1) }
+        paths += str.gsub(/<script\s+src='([^']+)'>/).with_object([]) { |_, list| list << Regexp.last_match(1) }
+
+        filter_javascript_paths(paths).uniq.sort
+      end
+
+      def self.call(str)
+        new(str).call
+      end
+
+      private
+
+      # Filter JavaScript file (.js) from Array of String
+      # @param [Array<String>] paths
+      # @return [Array<String>]
+      def filter_javascript_paths(paths)
+        paths.filter do |path|
+          path.end_with?(".js")
+        end
+      end
+    end
+  end
+end

data/lib/js_dependency/index_creator.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "extract_script_tag"
-require_relative "extract_import_path"
+require_relative "extractor/extract_script_tag"
+require_relative "extractor/extract_import_path"
+require_relative "extractor/extract_src_path"
 require_relative "replace_path_alias"
 require_relative "pathname_utility"
 
@@ -45,6 +46,7 @@ module JsDependency
 
       src_pathname.glob(pattern).each_with_object({}) do |component_pathname, obj|
         import_pathnames = import_pathnames_from(component_pathname, alias_paths)
+        import_pathnames += src_javascript_pathnames_from(component_pathname, alias_paths)
 
         obj[component_pathname.to_s] = import_pathnames.map(&:to_s)
         if component_pathname.basename.to_s == "index.js"
@@ -60,11 +62,22 @@ module JsDependency
     def import_pathnames_from(component_pathname, alias_paths)
       component_dirname = component_pathname.dirname
       script_str = extract_script_string(component_pathname)
-      JsDependency::ExtractImportPath.call(script_str).map do |import_path|
+      JsDependency::Extractor::ExtractImportPath.call(script_str).map do |import_path|
         standardize_path(import_path, alias_paths, component_dirname)
       end
     end
 
+    # @param [Pathname] component_pathname
+    # @param [Array<String>] alias_paths
+    # @return [Array<Pathname>]
+    def src_javascript_pathnames_from(component_pathname, alias_paths)
+      component_dirname = component_pathname.dirname
+      str = component_pathname.read
+      JsDependency::Extractor::ExtractSrcPath.call(str).map do |src_path|
+        standardize_path(src_path, alias_paths, component_dirname)
+      end
+    end
+
     # @param [String] import_path
     # @param [Array<String>] alias_paths
     # @param [Pathname] component_dirname
@@ -91,7 +104,7 @@ module JsDependency
       extname = pathname.extname
       return str unless extname == ".vue"
 
-      JsDependency::ExtractScriptTag.call(str)
+      JsDependency::Extractor::ExtractScriptTag.call(str)
     end
 
     # @param [String] path

data/lib/js_dependency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsDependency
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_dependency
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - junara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pathname
@@ -159,8 +159,9 @@ files:
 - js_dependency.gemspec
 - lib/js_dependency.rb
 - lib/js_dependency/cli.rb
-- lib/js_dependency/extract_import_path.rb
-- lib/js_dependency/extract_script_tag.rb
+- lib/js_dependency/extractor/extract_import_path.rb
+- lib/js_dependency/extractor/extract_script_tag.rb
+- lib/js_dependency/extractor/extract_src_path.rb
 - lib/js_dependency/index_creator.rb
 - lib/js_dependency/mermaid/nodes_link.rb
 - lib/js_dependency/mermaid/root.rb

data/lib/js_dependency/extract_import_path.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-module JsDependency
-  class ExtractImportPath
-    # @param [String] str
-    def initialize(str)
-      @str = str
-    end
-
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    # @return [Array<String>]
-    def call
-      str = @str
-      # import defaultExport from 'module-name';
-      paths = str.gsub(/import\s+\S+\s+from\s+"([^"]+)"/).with_object([]) { |_, list| list << Regexp.last_match(1) }
-      paths += str.gsub(/import\s+\S+\s+from\s+'([^']+)'/).with_object([]) { |_, list| list << Regexp.last_match(1) }
-
-      # import * as name from \"module-name\";
-      paths += str.gsub(/import\s+\S+\s+as\s+\S+\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths += str.gsub(/import\s+\S+\s+as\s+\S+\s+from\s+'([^']+)'/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-
-      # import { export1 } from \"module-name\";
-      # import { export1 as alias1 } from "module-name";
-      # import { export1 , export2 } from "module-name";
-      # import { foo , bar } from "module-name/path/to/specific/un-exported/file";
-      # import { export1 , export2 as alias2 , [...] } from "module-name";
-      paths += str.gsub(/import\s+\{\s+.+\s+\}\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths += str.gsub(/import\s+\{\s+.+\s+\}\s+from\s+'([^']+)'/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-
-      # import defaultExport, { export1 [ , [...] ] } from "module-name";
-      paths += str.gsub(/import\s+\S+,\s+\{\s+.+\s+\}\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths += str.gsub(/import\s+\S+,\s+\{\s+.+\s+\}\s+from\s+'([^']+)'/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-
-      # import defaultExport, * as name from "module-name";
-      paths += str.gsub(/import\s+\S+,\s+.+\s+as\s+\S+\s+from\s+"([^"]+)"/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths += str.gsub(/import\s+\S+,\s+.+\s+as\s+\S+\s+from\s+'([^']+)'/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-
-      # import "module-name";
-      paths += str.gsub(/import\s+"([^"]+)"/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths += str.gsub(/import\s+'([^']+)'/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-
-      # var promise = import("module-name");
-      paths += str.gsub(/import\("([^"]+)"\)/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths += str.gsub(/import\('([^']+)'\)/).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-      paths.uniq.sort
-    end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
-
-    def self.call(str)
-      new(str).call
-    end
-  end
-end

data/lib/js_dependency/extract_script_tag.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module JsDependency
-  class ExtractScriptTag
-    # @param [String] str
-    def initialize(str)
-      @str = str
-    end
-
-    # @return [Array<String>]
-    def call
-      str = @str
-      scripts = str.gsub(%r{<script>(.+)</script>}m).with_object([]) do |_, list|
-        list << Regexp.last_match(1)
-      end
-
-      scripts.uniq.sort.join("\n")
-    end
-
-    # @param [String] str
-    # @return [String]
-    def self.call(str)
-      new(str).call
-    end
-  end
-end