react-manifest-rails 0.2.16 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe8b2c7c5aa432ddc840c97ed52cefc7672d5d46ee6abc07e37cf20d9f6032ab
-  data.tar.gz: 16448f82cee7e775111cc883820c14ff37065382452f90acd2b76abf33f807c7
+  metadata.gz: d200b72fea50e032cb2b8d812482ae6c65550029e129455d0ef7b81ff14b1077
+  data.tar.gz: 4a22e1b28aef9c55e8a081b7874bc70104cd4dabec4a236f168b909bd2bebeb8
 SHA512:
-  metadata.gz: 841fadadd182db285f3528d571bc0210178233d6da3854da67c3dc70b159110a08744e98bf52547c7f6358a3eed09d5a2ee78fed91103cdd5afa3707b0929f9b
-  data.tar.gz: 8352ee157c4288263bee93f86bcf01d718ef1794990f2dc76b441a9e0911b50311d12b9404eb9949f3353a2646dc350dc4a1b24e32a96b4802d6f64122dadbc1
+  metadata.gz: 7e065d309bd9ad9e3f8ebeb25dbb22b6cea11771d27283efafd85fe9f16d5ee186753118906fa38f20e86441e334540bb332e2aea31c48e4d537ecf3f1748fe0
+  data.tar.gz: 6d094eb1f61e1f3b67929b64fb1a7c99e0fa9e9386db1dcaabcb010f9a88b143508af4e4ffc36870cee4c7fc175460bf6d29ba9c2bbd07b60a35a06708621cb6

data/lib/react_manifest/scanner.rb

@@ -15,6 +15,7 @@ module ReactManifest
   #   and produces per-controller lists of referenced shared files.
   #
   # Phase 3 — emits non-fatal warnings.
+  # rubocop:disable Metrics/ClassLength
   class Scanner
     # Patterns to detect symbol definitions (CommonJS and ES module style)
     DEFINITION_PATTERNS = [
@@ -56,21 +57,24 @@ module ReactManifest
       Object Array String Number Boolean Symbol Map Set WeakMap
     ].freeze
 
-    Result = Struct.new(:symbol_index, :controller_usages, :warnings, keyword_init: true)
+    Result = Struct.new(:symbol_index, :controller_usages, :warnings, :shared_violations, keyword_init: true)
 
     def initialize(config = ReactManifest.configuration)
       @config = config
     end
 
+    # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/PerceivedComplexity
     def scan(classification)
       warnings      = []
       symbol_index  = {}
 
       # Phase 1a: index symbols from shared dirs
+      shared_file_paths = {} # file_path => relative_require_path for all shared files
       classification.shared_dirs.each do |shared_dir|
         js_files_in(shared_dir[:path]).each do |file_path|
           relative = relative_require_path(file_path)
-          symbols  = extract_definitions(file_path)
+          shared_file_paths[file_path] = relative
+          symbols = extract_definitions(file_path)
           symbols.each do |sym|
             if symbol_index.key?(sym)
               warnings << "Duplicate symbol '#{sym}' in #{relative} (already from #{symbol_index[sym]})"
@@ -98,8 +102,24 @@ module ReactManifest
         symbol_index[sym] = require_path
       end
 
+      # Phase 1d: build controller (app-dir) symbol index for violation detection
+      controller_symbol_index = {}
+      classification.controller_dirs.each do |ctrl|
+        js_files_in(ctrl[:path]).each do |file_path|
+          extract_definitions(file_path).each do |sym|
+            controller_symbol_index[sym] ||= {
+              file: relative_require_path(file_path),
+              controller: ctrl[:name]
+            }
+          end
+        end
+      end
+
       $stdout.puts "[ReactManifest] Shared symbol index: #{symbol_index.size} symbols indexed" if @config.verbose?
 
+      # Phase 1e: detect shared files that use app-dir (controller) symbols
+      shared_violations = detect_shared_violations(shared_file_paths, controller_symbol_index, warnings)
+
       # Phase 2: scan controller dirs for usage
       controller_usages = {}
 
@@ -126,9 +146,11 @@ module ReactManifest
       Result.new(
         symbol_index: symbol_index,
         controller_usages: controller_usages,
-        warnings: warnings
+        warnings: warnings,
+        shared_violations: shared_violations
       )
     end
+    # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/PerceivedComplexity
 
     private
 
@@ -177,8 +199,38 @@ module ReactManifest
                   "'#{ctrl_name}_<action>.js.jsx' naming convention"
     end
 
+    def detect_shared_violations(shared_file_paths, controller_symbol_index, warnings)
+      violations = []
+      shared_file_paths.each do |file_path, relative|
+        content = begin
+          File.read(file_path, encoding: "utf-8")
+        rescue Errno::ENOENT, Errno::EACCES, Encoding::InvalidByteSequenceError
+          next
+        end
+
+        local_syms = Set.new
+        DEFINITION_PATTERNS.each { |p| content.scan(p) { |m| local_syms << m[0] } }
+
+        [PASCAL_TOKEN_PATTERN, HOOK_TOKEN_PATTERN].each do |pattern|
+          content.scan(pattern) do |match|
+            sym = match[0]
+            next if local_syms.include?(sym)
+            next unless controller_symbol_index.key?(sym)
+
+            info = controller_symbol_index[sym]
+            violations << { shared_file: relative, symbol: sym,
+                            controller: info[:controller], app_file: info[:file] }
+            warnings << "Shared file '#{relative}' uses app-dir symbol '#{sym}' " \
+                        "(from ux/app/#{info[:controller]}). " \
+                        "Move '#{sym}' to a shared dir or the shared file will be incomplete."
+          end
+        end
+      end
+      violations
+    end
+
+    # Count how many controllers use each shared file
     def emit_fanout_warnings(controller_usages, warnings)
-      # Count how many controllers use each shared file
       fanout = Hash.new(0)
       controller_usages.each_value do |files|
         files.each { |f| fanout[f] += 1 }
@@ -270,4 +322,5 @@ module ReactManifest
       Rails.root.join(path).to_s
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/react_manifest/version.rb

@@ -1,3 +1,3 @@
 module ReactManifest
-  VERSION = "0.2.16".freeze
+  VERSION = "0.2.18".freeze
 end

data/lib/react_manifest/view_helpers.rb

@@ -21,6 +21,10 @@ module ReactManifest
       bundles = ReactManifest.resolve_bundles(ctrl)
       return "".html_safe if bundles.empty?
 
+      # Record emitted bundles so react_component doesn't re-emit them.
+      emitted = (@_react_manifest_emitted_bundles ||= [])
+      bundles.each { |b| emitted << b unless emitted.include?(b) }
+
       asset_names = bundles.map { |bundle| "#{bundle}.js" }
       javascript_include_tag(*asset_names, extname: false, **html_options)
     end

metadata

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