react-manifest-rails 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78103a797d9951bb67d7e9cd4fcbb0fbf5a6589cd5995f52f745de079b3d6824
-  data.tar.gz: 229244d4844f0accdc1c23538f0a5ec8965a35e5246a62abc91dfae3ce16676d
+  metadata.gz: 9c85309337765f3f24fae46e4cf3895e11e4a3a59b5cbfb96fa90f296f3ba48e
+  data.tar.gz: b0f320a6ebf2a4210a4fac89d04f5609bd3d261a458f2db26fb92dd814b45465
 SHA512:
-  metadata.gz: 43ba51a2daca72844e5d6606fa4e6c15dda1cef4b42582ab2db4d2a49037675157814a20030e41f60d9bc6c395dd2681f548f0244884b733104f37b66996c8a2
-  data.tar.gz: 01a71eda1dc257b0e0c151e34ac227323a2349c02c8d7709edd619975ba9051c9f759f89b440e317e6575d1e37edfba0c9da20ed2f306d57b587ddd239162ca1
+  metadata.gz: 85edbe32bf32f739097e60779a34874d1c792db5ea40ed41e671e8b0552718d4549dfddb9b120d74bcce42a15bbc598ed0384c7e609cb6f0d4044fb80900098c
+  data.tar.gz: d2728828f1fd930cd702aa35fb4ab5ab88b4219dff1fe996fa5cdb8491888b15bb25b0fd1d44c84aa9c0707cd80b87d3d3c2554b15f0723fd979bf484db4b3f1

data/lib/react_manifest/scanner.rb

@@ -41,6 +41,9 @@ module ReactManifest
     # Patterns to detect usage in controller files
     JSX_ELEMENT_PATTERN      = %r{<([A-Z][A-Za-z0-9_]*)[\s/>]}
     REACT_CREATE_PATTERN     = /React\.createElement\(\s*([A-Z][A-Za-z0-9_]*)[\s,)]/
+    JSX_PROP_COMPONENT_PATTERN = /[A-Za-z_][A-Za-z0-9_]*\s*=\s*\{\s*([A-Z][A-Za-z0-9_]*)\s*\}/
+    OBJECT_COMPONENT_PATTERN = /:\s*([A-Z][A-Za-z0-9_]*)\b/
+    ARRAY_COMPONENT_LIST_PATTERN = /\[\s*([A-Z][A-Za-z0-9_]*(?:\s*,\s*[A-Z][A-Za-z0-9_]*)*\s*,?)\s*\]/
     HOOK_CALL_PATTERN        = /\b(use[A-Z][A-Za-z0-9_]*)\s*\(/
     # Lib calls matched against known lib symbols to reduce false positives
     LIB_CALL_PATTERN         = /\b([a-z][A-Za-z0-9_]{2,})\s*\(/
@@ -93,41 +96,10 @@ module ReactManifest
 
         files.each do |file_path|
           validate_naming(file_path, ctrl[:name], warnings)
-          begin
-            content = File.read(file_path, encoding: "utf-8")
-          rescue Errno::ENOENT, Errno::EACCES => e
-            warnings << "Skipping #{file_path}: #{e.message}"
-            next
-          rescue Encoding::InvalidByteSequenceError
-            warnings << "Skipping #{file_path}: not valid UTF-8"
-            next
-          end
-
-          # JSX element usage: <PrimaryButton (JSX tag syntax)
-          content.scan(JSX_ELEMENT_PATTERN) do |match|
-            sym = match[0]
-            used << symbol_index[sym] if symbol_index.key?(sym)
-          end
-
-          # React.createElement(PrimaryButton, ...) (non-JSX style)
-          content.scan(REACT_CREATE_PATTERN) do |match|
-            sym = match[0]
-            used << symbol_index[sym] if symbol_index.key?(sym)
-          end
-
-          # Hook calls: useFetch(
-          content.scan(HOOK_CALL_PATTERN) do |match|
-            sym = match[0]
-            used << symbol_index[sym] if symbol_index.key?(sym)
-          end
+          content = read_controller_file(file_path, warnings)
+          next unless content
 
-          # Lib function calls: formatDate( — filtered against lib symbol index
-          content.scan(LIB_CALL_PATTERN) do |match|
-            sym = match[0]
-            next if JS_BUILTINS.include?(sym)
-
-            used << symbol_index[sym] if symbol_index.key?(sym)
-          end
+          used.merge(extract_used_shared_paths(content, symbol_index))
         end
 
         controller_usages[ctrl[:name]] = used.to_a.sort
@@ -204,5 +176,56 @@ module ReactManifest
         end
       end
     end
+
+    def read_controller_file(file_path, warnings)
+      File.read(file_path, encoding: "utf-8")
+    rescue Errno::ENOENT, Errno::EACCES => e
+      warnings << "Skipping #{file_path}: #{e.message}"
+      nil
+    rescue Encoding::InvalidByteSequenceError
+      warnings << "Skipping #{file_path}: not valid UTF-8"
+      nil
+    end
+
+    def extract_used_shared_paths(content, symbol_index)
+      used = Set.new
+
+      scan_component_usage(content, JSX_ELEMENT_PATTERN, symbol_index, used)
+      scan_component_usage(content, REACT_CREATE_PATTERN, symbol_index, used)
+      scan_component_usage(content, JSX_PROP_COMPONENT_PATTERN, symbol_index, used)
+      scan_component_usage(content, OBJECT_COMPONENT_PATTERN, symbol_index, used)
+      scan_array_component_usage(content, symbol_index, used)
+      scan_component_usage(content, HOOK_CALL_PATTERN, symbol_index, used)
+
+      content.scan(LIB_CALL_PATTERN) do |match|
+        sym = match[0]
+        next if JS_BUILTINS.include?(sym)
+        next unless symbol_index.key?(sym)
+
+        used << symbol_index[sym]
+      end
+
+      used
+    end
+
+    def scan_component_usage(content, pattern, symbol_index, used)
+      content.scan(pattern) do |match|
+        sym = match[0]
+        next unless symbol_index.key?(sym)
+
+        used << symbol_index[sym]
+      end
+    end
+
+    def scan_array_component_usage(content, symbol_index, used)
+      content.scan(ARRAY_COMPONENT_LIST_PATTERN) do |match|
+        list = match[0]
+        list.split(/\s*,\s*/).each do |sym|
+          next unless symbol_index.key?(sym)
+
+          used << symbol_index[sym]
+        end
+      end
+    end
   end
 end

data/lib/react_manifest/version.rb

@@ -1,3 +1,3 @@
 module ReactManifest
-  VERSION = "0.2.13".freeze
+  VERSION = "0.2.14".freeze
 end

data/lib/react_manifest.rb

@@ -169,6 +169,11 @@ module ReactManifest
 
       content.scan(ReactManifest::Scanner::JSX_ELEMENT_PATTERN) { |m| symbols << m[0] }
       content.scan(ReactManifest::Scanner::REACT_CREATE_PATTERN) { |m| symbols << m[0] }
+      content.scan(ReactManifest::Scanner::JSX_PROP_COMPONENT_PATTERN) { |m| symbols << m[0] }
+      content.scan(ReactManifest::Scanner::OBJECT_COMPONENT_PATTERN) { |m| symbols << m[0] }
+      content.scan(ReactManifest::Scanner::ARRAY_COMPONENT_LIST_PATTERN) do |m|
+        m[0].split(/\s*,\s*/).each { |sym| symbols << sym }
+      end
 
       symbols.uniq
     rescue Errno::ENOENT, Errno::EACCES, Encoding::InvalidByteSequenceError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-manifest-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Oliver Noonan