glyphs 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245c7101b5dad69bf73859eea7a5d7c9027f1573d4e1b4ccbcde2bed3e61266f
-  data.tar.gz: 585c169414705979b1c45bf02ad87de324c5e6a16fb6a8ddb0e631961820e533
+  metadata.gz: 8c8e883474d143ec14502ef27013e1a264c0a89d76b7dd24ef29d2025d96ad5c
+  data.tar.gz: afad4dcca3bda0162be398c66a7a7bb65c36af8facb9c4b5eb13f5d4d29a1d2c
 SHA512:
-  metadata.gz: c5dfa80d58dbf2cc918f7a0ea2b74937156356137abca9c7297f0a974c1ee079176f335b6a5d33599f81f9d6af8f8efe324d9ab841f52126750bc80fb01abb38
-  data.tar.gz: 4a6b23ac1e990068f529e2ad7ed54fa078391256894d59b8a2390b5a9e773fd26a0dc55b11dcd3bfb00e13548791e80bcf1a5659bdd2ca82d26a5db1495893f1
+  metadata.gz: a9c94ace100a67479cb24e793dfd7bc9c71238bfd472f2d29be37076410c27e0cc69d48b2952fad4574bac1e5184770d0b19542284c06edb520fece72d6c1526
+  data.tar.gz: 8d2cb2a5ca53b92884b28de6a2813326796b034754d5b6f14ab37b4fb7f54c1d49b6deb61dc53d75c0c668e8908447e9a5fdfd8bb71fbb5440c22a5bd9c15b61

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- **Declaration harvest unwraps trailing `.freeze`.** `ICONS = { "x" => :car }.freeze`
+  (and `%i[a b].freeze`) used to yield a Prism `CallNode`, so hash/array values
+  were never collected. Cross-file dynamics (`PhosphorIcon(@icon)` in a shared
+  component + names only in a frozen `ICONS` map) then lost those icons at
+  `glyphs:prune_icons`. `collect_declaration` now unwraps zero-arg `.freeze`
+  (and parentheses) before walking the value.
+
 ### Added
 
 - **Dynamic icon calls are now resolved from source.** `SourceScanner` no longer
@@ -13,7 +22,8 @@
   - _declaration-based_: literals in icon-declaration positions anywhere (a hash
     pair keyed `/icon/i`, or a constant named `/ICON/`) are kept for every
     dynamically-rendered library, closing the cross-file gap (e.g. a notifier
-    `ICON = :bell` constant rendered from a view).
+    `ICON = :bell` constant rendered from a view). Frozen maps
+    (`ICONS = { … }.freeze`) are included — see Fixed above.
 
   This makes `keep_icons` a last-resort escape hatch (DB/ENV/gem-chrome names)
   rather than the primary mechanism. Only literals are harvested, so the scanner

data/README.md

@@ -133,9 +133,9 @@ The scanner resolves them from source, so you rarely need `keep_icons` at all:
   ternaries (`@open ? "caret-up" : "caret-down"`), `case/when`, and locals.
 - **Declaration-based** — literals in icon-declaration positions *anywhere* — a
   hash pair keyed like an icon (`icon: :gear`, `menu_icon: "house"`) or a
-  constant named like one (`ICON = :bell`, `STATUS_ICONS = { .. => :warning }`) —
-  are kept for every dynamically-rendered library, so a name declared in one
-  file and rendered from another survives.
+  constant named like one (`ICON = :bell`, `STATUS_ICONS = { .. => :warning }`,
+  including trailing `.freeze`) — are kept for every dynamically-rendered
+  library, so a name declared in one file and rendered from another survives.
 
 Only literals are harvested, so the scanner never invents a reference; the
 worst case is keeping a coincidentally icon-named string, which the post-prune

data/lib/glyphs/source_scanner.rb

@@ -346,7 +346,11 @@ module Glyphs
 
       # Harvests icon names from a declaration value: a bare literal, an array of
       # literals (`ICON = %i[a b]`), or a hash's values (`{ "sms" => :device }`).
+      # Trailing `.freeze` is unwrapped so `ICONS = { … }.freeze` still harvests —
+      # without this, cross-file dynamics (`PhosphorIcon(@icon)` + names only in a
+      # frozen `ICONS` hash) lose those names at prune.
       def collect_declaration(value_node)
+        value_node = unwrap_declaration_wrappers(value_node)
         case value_node
         when Prism::SymbolNode, Prism::StringNode
           collect_literal(@declaration_literals, value_node)
@@ -356,6 +360,37 @@ module Glyphs
           value_node.elements.grep(Prism::AssocNode).each { |assoc| collect_declaration(assoc.value) }
         end
       end
+
+      # Peel zero-arg `.freeze` and parentheses so the underlying Hash/Array/literal
+      # is what declaration harvest walks.
+      def unwrap_declaration_wrappers(value_node)
+        loop do
+          case value_node
+          when Prism::CallNode
+            break unless freeze_call?(value_node)
+
+            value_node = value_node.receiver
+          when Prism::ParenthesesNode
+            value_node = value_node.body
+          when Prism::StatementsNode
+            # `(expr)` → StatementsNode with one child; multi-statement bodies are
+            # not valid constant values, so take the sole statement when present.
+            break unless value_node.body.size == 1
+
+            value_node = value_node.body.first
+          else
+            break
+          end
+        end
+        value_node
+      end
+
+      # `receiver.freeze` with no args — the common immutable-constant pattern.
+      def freeze_call?(node)
+        node.name == :freeze &&
+          node.receiver &&
+          (node.arguments.nil? || node.arguments.arguments.empty?)
+      end
     end
   end
 end

data/lib/glyphs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Glyphs
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glyphs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mikael Henriksson