js_dependency 0.3.10 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153a609f4227a43182ed6e6a469bcfe466ffe130c5f6d8033771545ca13b4198
-  data.tar.gz: 32cd8dd2ec33e8906b0bad39c8a4a6378e4909285486f52b6c93915891bed8bb
+  metadata.gz: a9b9f351689b4d75a421eda510b534970d54309e031496ed3b1e01e25b0ff0a2
+  data.tar.gz: bc0d1e40069754c33aa375b14dbc4d7e29a4d3ae09125dc330a03d4daf0dc4ab
 SHA512:
-  metadata.gz: 63e3437906da40a60ed9e129dc8b2a3157221a61d34982bce433dfb8f8b3c7ee198cba9c85b6f230079db5a3a08fe9bb1c103d38763ce139a5aed81ecf5c9e10
-  data.tar.gz: cf47aa344e700868b2dd76c67ad4323acc2a47e9f0e4d9736d0ae30a981715bb639c52b4d9322b243122879abaf892b314479d39a3c29e4dba56df848cfbe0a0
+  metadata.gz: 43af3b1752058c11f4d549275a2cb0bc969fc00cf57c00c72ad5af857fc4af321e918e7858fc79677c8822a5a73c9c3d43995239574be5975603fa03f60a9da8
+  data.tar.gz: 931e374285441b95d3a00de41318532e62ce40933969e30a937c8cc175bd1615eb29f5f2e2464db24966bd59ff3ee86f13e103e8f8b61ffe45ee5f0ad8f40938

data/.js_dependency.yml.sample

@@ -1,5 +1,8 @@
 src_path: ./src
 target_path: ./src/App.vue
+target_paths:
+  - ./src/App1.vue
+  - ./src/App2.vue
 child_analyze_level: 2
 parent_analyze_level: 2
 name_level: 1

data/.rubocop_todo.yml

@@ -1,22 +1,22 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2022-08-13 03:35:35 UTC using RuboCop version 1.34.1.
+# `rubocop --auto-gen-config --exclude-limit 1`
+# on 2022-08-14 11:04:22 UTC using RuboCop version 1.35.0.
 # 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: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 33
+  Max: 29
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 19
+  Max: 15
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 19
@@ -26,17 +26,12 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 15
 
 # Offense count: 1
-Style/MultilineBlockChain:
-  Exclude:
-    - 'lib/js_dependency/mermaid/root.rb'
-
-# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.3.13] - 2022-08-14
+
+- Add rspec test.
+
+## [0.3.12] - 2022-08-14
+
+- Add rspec test.
+- Fix script tag contents extraction if script tag has `src` like `<script src="">` .
+
+## [0.3.11] - 2022-08-13
+
+- Add target_paths options in configuration file to use array.
+
 ## [0.3.10] - 2022-08-13
 
 - Add file_config options to specify configuration yaml which user like.

data/Gemfile

@@ -10,6 +10,7 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "codecov", require: false, group: "test"
+gem "debug", ">= 1.0.0"
 gem "rubocop", "~> 1.21"
 gem "simplecov", require: false, group: :test
 gem "yarn"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    js_dependency (0.3.10)
+    js_dependency (0.3.13)
       pathname
       thor
       yaml
@@ -14,8 +14,14 @@ GEM
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
+    debug (1.6.2)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     json (2.6.2)
     parallel (1.22.1)
     parser (3.1.2.1)
@@ -30,6 +36,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -50,14 +58,14 @@ GEM
       rspec (>= 2.13, < 4)
       unparser
     rspec-support (3.11.0)
-    rubocop (1.34.1)
+    rubocop (1.35.0)
       json (~> 2.3)
       parallel (~> 1.10)
       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.20.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.21.0)
@@ -94,6 +102,7 @@ PLATFORMS
 
 DEPENDENCIES
   codecov
+  debug (>= 1.0.0)
   js_dependency!
   rake (~> 13.0)
   rspec (~> 3.0)

data/README.md

@@ -35,6 +35,9 @@ Configuration file is `./.js_dependency.yml`. This file includes parameters for
 ```yaml
 src_path: ./src # Root folder
 target_path: ./src/App.vue # Target file tha you want to analyze
+target_paths: # Target files tha you want to analyze
+  - ./src/App1.vue
+  - ./src/App2.vue
 child_analyze_level: 2 # Output level of child analyze
 parent_analyze_level: 2 # Output level of parent analyze
 name_level: 1 # Output name level

data/lib/js_dependency/cli_utils/config.rb

@@ -10,18 +10,82 @@ module JsDependency
       # @param [Hash] args
       def initialize(options, args)
         @src_path = options[:src_path] || args[:src_path]
-        @target_paths = options[:target_paths] || (args[:target_path].is_a?(String) ? [args[:target_path]] : args[:target_path])
-        @target_path = options[:target_path] || args[:target_path]
+        @target_paths = calc_target_paths(options[:target_path], options[:target_paths], args[:target_path],
+                                          args[:target_paths])
+        @target_path = calc_target_path(options[:target_path], options[:target_paths], args[:target_path],
+                                        args[:target_paths])
         @child_analyze_level = options[:child_analyze_level] || args[:child_analyze_level] || 2
         @parent_analyze_level = options[:parent_analyze_level] || args[:parent_analyze_level] || 2
         @output_path = options[:output_path] || args[:output_path] || nil
         @alias_paths = options[:alias_paths] || args[:alias_paths] || {}
         @name_level = options[:name_level] || args[:name_level] || 1
-        @excludes = if options[:excludes]&.length&.positive?
-                      options[:excludes]
-                    elsif args[:excludes]
-                      args[:excludes]
-                    end
+        @excludes = calc_excludes(options[:excludes], args[:excludes])
+      end
+
+      private
+
+      # @param [String, Array, nil] option_target_path
+      # @param [String, Array, nil] option_target_paths
+      # @param [String, Array, nil] args_target_path
+      # @param [String, Array, nil] args_target_paths
+      # @return [nil, Array]
+      def calc_target_paths(option_target_path, option_target_paths, args_target_path, args_target_paths)
+        [option_target_paths, option_target_path, args_target_paths, args_target_path].each do |obj|
+          return as_array(obj) if present?(obj)
+        end
+
+        nil
+      end
+
+      # @param [String, Array, nil] option_target_path
+      # @param [String, Array, nil] option_target_paths
+      # @param [String, Array, nil] args_target_path
+      # @param [String, Array, nil] args_target_paths
+      # @return [nil, String]
+      def calc_target_path(option_target_path, option_target_paths, args_target_path, args_target_paths)
+        [option_target_path, option_target_paths, args_target_path, args_target_paths].each do |obj|
+          return as_string_or_first(obj) if present?(obj)
+        end
+
+        nil
+      end
+
+      # @param [Object] option_excludes
+      # @param [Object] args_excludes
+      # @return [nil, Array]
+      def calc_excludes(option_excludes, args_excludes)
+        [option_excludes, args_excludes].each do |obj|
+          return as_array(obj) if present?(obj)
+        end
+
+        nil
+      end
+
+      # @param [Array, String, nil] obj
+      # @return [TrueClass, FalseClass]
+      def present?(obj)
+        return false if obj.nil?
+        return false if obj.empty?
+
+        true
+      end
+
+      # @param [Array, String, nil] obj
+      # @return [Array, nil]
+      def as_array(obj)
+        return nil if obj.nil?
+        return obj if obj.is_a?(Array)
+
+        [obj]
+      end
+
+      # @param [Array, String, nil] obj
+      # @return [String, nil]
+      def as_string_or_first(obj)
+        return nil if obj.nil?
+        return obj if obj.is_a?(String)
+
+        return obj.first if obj.is_a?(Array)
       end
     end
   end

data/lib/js_dependency/extractor/extract_script_tag.rb

@@ -15,6 +15,10 @@ module JsDependency
           list << Regexp.last_match(1)
         end
 
+        scripts += str.gsub(%r{<script.+src=".+">(.+)</script>}m).with_object([]) do |_, list|
+          list << Regexp.last_match(1)
+        end
+
         scripts.uniq.sort.join("\n")
       end
 

data/lib/js_dependency/mermaid/nodes_link.rb

@@ -26,10 +26,32 @@ module JsDependency
         mermaid_str(@child, level)
       end
 
+      # @param [String] src_path
+      # @return [JsDependency::Mermaid::NodesLink]
+      def relative_path_from(src_path)
+        NodesLink.new(
+          relative_parent_path(src_path),
+          relative_child_path(src_path)
+        )
+      end
+
       private
 
+      # @param [String] src_path
+      # @return [String]
+      def relative_parent_path(src_path)
+        parent.exist? ? parent.realpath.relative_path_from(Pathname.new(src_path).realpath.to_s).to_s : parent.to_s
+      end
+
+      # @param [String] src_path
+      # @return [String]
+      def relative_child_path(src_path)
+        child.exist? ? child.realpath.relative_path_from(Pathname.new(src_path).realpath.to_s).to_s : child.to_s
+      end
+
       # @param [Pathname] pathname
       # @param [Integer] level
+      # @return [String]
       def mermaid_str(pathname, level = 0)
         "#{parse(pathname).join("_")}[\"#{parse(pathname, level).join("/")}\"]"
       end

data/lib/js_dependency/mermaid/root.rb

@@ -5,6 +5,7 @@ module JsDependency
   module Mermaid
     class Root
       attr_accessor :orientation
+      attr_reader :list
 
       # @param [String] orientation
       def initialize(orientation = "LR")
@@ -35,18 +36,14 @@ module JsDependency
       # @return [Array<String>]
       def export_nodes(name_level: 1, src_path: nil)
         nodes_links = if src_path
-                        src_pathname = Pathname.new(src_path).realpath
-                        @list.map do |nodes_link|
-                          NodesLink.new(nodes_link.parent.exist? ? nodes_link.parent.relative_path_from(src_pathname.to_s) : nodes_link.parent.to_s,
-                                        nodes_link.child.exist? ? nodes_link.child.relative_path_from(src_pathname.to_s) : nodes_link.child.to_s)
-                        end
+                        @list.map { |nodes_link| nodes_link.relative_path_from(src_path) }
                       else
                         @list
                       end
-        nodes_links.uniq do |link|
-          "#{link.parent}__#{link.child}"
-        end.sort_by { |link| "#{link.parent}__#{link.child}" }.map do |link|
-          "#{link.parent_module_name(name_level)} --> #{link.child_module_name(name_level)}"
+        nodes_links = nodes_links.uniq { |nodes_link| "#{nodes_link.parent}__#{nodes_link.child}" }
+        nodes_links = nodes_links.sort_by { |nodes_link| "#{nodes_link.parent}__#{nodes_link.child}" }
+        nodes_links.map do |nodes_link|
+          "#{nodes_link.parent_module_name(name_level)} --> #{nodes_link.child_module_name(name_level)}"
         end
       end
     end

data/lib/js_dependency/version.rb

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

data/lib/js_dependency.rb

@@ -71,7 +71,7 @@ module JsDependency
       nodes += mermaid_root.export_nodes(name_level: name_level, src_path: src_path)
     end
 
-    output = (["flowchart LR"] + nodes.uniq + styles.uniq).join("\n")
+    output = "#{(["flowchart LR"] + nodes.uniq + styles.uniq).join("\n")}\n"
     output_pathname&.write(output)
     output
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_dependency
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.13
 platform: ruby
 authors:
 - junara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pathname