proscenium 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16db506d3fd893f4571ad6ffd54383a168263907c859941e2d9915dc0115cb1a
-  data.tar.gz: 997471670509f50518233b195fae64fb4ddff122a36091750a11bac2ae72ac5b
+  metadata.gz: 668df327ee285da0fb15524bf35d4dcd777d206c6745843cbf42c848fdc4f868
+  data.tar.gz: 88b129da486755fc965873347fef0e89ef4ce8b81b776b1595453772a7e08ec6
 SHA512:
-  metadata.gz: 26005960b8699c1127f63e54ec293fa5da1a1f39b92e34893126a9d6f1e1a3730c563fc44ade829c51c238706602e44ea6aab7444d056528ab30fccad5ad0cf2
-  data.tar.gz: afea4b975a576b6ac2a43e7a92930d293a2dac73cd9d1fd99908a48e3debaa5a15733c4e7027f6ce232e46f2bfd16df6dfdfbcf240ba7f5c99136dc3f64a6fd2
+  metadata.gz: 2f4302c5caa08bcb73d79de27caca6feef9709f0103e848abece9508d9902a6d627dae32fa340c349dc59b98d3002a0d9b5804ae4d687b3cc8bbe6aa98b4e6c6
+  data.tar.gz: 510c35503a64b92d62f9225907888ecb325a2f9e37e72ae4f3e61e00d525595ace3922e4f7b3958e28e41a4521cc60bab1b5a808a9a1e308a7ce069439fa5424

data/lib/proscenium/css_module/transformer.rb

@@ -33,31 +33,22 @@ module Proscenium
     #   class_names "mypackage/button@large"
     #   class_names "@scoped/package/button@small"
     #
+    # When a block is given, it is yielded once per input name with
+    # `(transformed_name, side_load_path)`. `side_load_path` is the exact string passed to
+    # `Importer.import` for that name, or `nil` for names that did not trigger a side-load (plain
+    # class names with `require_prefix: true`). The return value is unchanged — callers that don't
+    # need the path can keep ignoring the block.
+    #
     # @param names [String,Symbol,Array<String,Symbol>]
     # @param require_prefix: [Boolean] whether or not to require the `@` prefix.
+    # @yieldparam transformed_name [String]
+    # @yieldparam side_load_path [String, nil]
     # @return [Array<String>] the transformed CSS module names.
     def class_names(*names, require_prefix: true)
       names.map do |name|
-        original_name = name.dup
-        name = name.to_s if name.is_a?(Symbol)
-
-        if name.include?('/')
-          if name.start_with?('@')
-            # Scoped bare specifier (eg. "@scoped/package/lib/button@default").
-            _, path, name = name.split('@')
-            path = "@#{path}"
-          else
-            # Local path (eg. /some/path/to/button@default") or bare specifier (eg.
-            # "mypackage/lib/button@default").
-            path, name = name.split('@')
-          end
-
-          class_name! name, original_name, path: "#{path}#{FILE_EXT}"
-        elsif name.start_with?('@')
-          class_name! name[1..], original_name
-        else
-          require_prefix ? name : class_name!(name, original_name)
-        end
+        transformed, path = transform_class_name(name, require_prefix: require_prefix)
+        yield(transformed, path) if block_given?
+        transformed
       end
     end
 
@@ -75,5 +66,38 @@ module Proscenium
         "#{transformed_name}_#{digest}"
       end
     end
+
+    private
+
+    # Returns `[transformed_name, side_load_path]` for a single class-name reference.
+    # `side_load_path` is the exact string that `class_name!` passed to `Importer.import`, or
+    # `nil` if the name did not trigger a side-load. Extracted so `#class_names` can yield paths
+    # to consumers (e.g. proscenium-phlex's `resolved_css_module_paths` replay registry) without
+    # re-parsing names.
+    def transform_class_name(name, require_prefix:)
+      original_name = name.dup
+      name = name.to_s if name.is_a?(Symbol)
+
+      if name.include?('/')
+        if name.start_with?('@')
+          # Scoped bare specifier (eg. "@scoped/package/lib/button@default").
+          _, path, name = name.split('@')
+          path = "@#{path}"
+        else
+          # Local path (eg. /some/path/to/button@default") or bare specifier (eg.
+          # "mypackage/lib/button@default").
+          path, name = name.split('@')
+        end
+
+        module_path = "#{path}#{FILE_EXT}"
+        [class_name!(name, original_name, path: module_path), module_path]
+      elsif name.start_with?('@')
+        [class_name!(name[1..], original_name), @source_path&.to_s]
+      elsif require_prefix
+        [name, nil]
+      else
+        [class_name!(name, original_name), @source_path&.to_s]
+      end
+    end
   end
 end

data/lib/proscenium/importer.rb

@@ -30,9 +30,9 @@ module Proscenium
         digest = nil
 
         if filepath.end_with?('.module.css')
-          if self.imported.key?(filepath)
-            digest = self.imported[filepath][:digest]
-            abs_path = self.imported[filepath][:abs_path]
+          if imported.key?(filepath)
+            digest = imported[filepath][:digest]
+            abs_path = imported[filepath][:abs_path]
           else
             manifest_path, non_manifest_path, abs_path = Resolver.resolve(filepath, as_array: true)
             digest = Utils.css_module_digest(abs_path)
@@ -41,14 +41,14 @@ module Proscenium
             if sideloaded
               ActiveSupport::Notifications.instrument 'sideload.proscenium', identifier: filepath,
                                                                              sideloaded: do
-                self.imported[filepath] = { ** }
-                self.imported[filepath][:digest] = digest
-                self.imported[filepath][:abs_path] = abs_path
+                imported[filepath] = { ** }
+                imported[filepath][:digest] = digest
+                imported[filepath][:abs_path] = abs_path
               end
             else
-              self.imported[filepath] = { ** }
-              self.imported[filepath][:digest] = digest
-              self.imported[filepath][:abs_path] = abs_path
+              imported[filepath] = { ** }
+              imported[filepath][:digest] = digest
+              imported[filepath][:abs_path] = abs_path
             end
           end
 
@@ -60,16 +60,16 @@ module Proscenium
 
           "#{digest}#{transformed_path}"
         else
-          return if self.imported.key?(filepath)
+          return if imported.key?(filepath)
 
           Array(Resolver.resolve(filepath)).each do |fp|
             if sideloaded
               ActiveSupport::Notifications.instrument 'sideload.proscenium', identifier: fp,
                                                                              sideloaded: do
-                self.imported[fp] = { ** }
+                imported[fp] = { ** }
               end
             else
-              self.imported[fp] = { ** }
+              imported[fp] = { ** }
             end
           end
         end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.24.0'
+  VERSION = '0.24.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Joel Moss