proscenium 0.22.3 → 0.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb4b40b7fedd8ea11b6298c67ad1496933952540cfcc1cbef836b6c3ab3d926
-  data.tar.gz: c4b0a87cfafb3a4971e893479427194c2b7eaae1cd02f3431b03b6c30d27a632
+  metadata.gz: 6fda75c598a47171a1252aa60697a1395322cf1848ac597dc966d0834254c842
+  data.tar.gz: fe8d96e72704c1cbb026e15ef952f00e14d41d675ff905527b3a73c06728bc84
 SHA512:
-  metadata.gz: e484b00544f438bd0db6a0840d857b052646681f9fd676a80f4e0edf8493e2f934d9ec94753d760fc19c0c98a0b9eca88324bd31d362fbe02feea52c91b94608
-  data.tar.gz: 52a9e755b968ebf6b6bac499c0c66097487f08f199c2a002b604dd48052ec0efa321a703aee386f9fc58b999f1525c3c5c435147234ca9e16be54a30eeb01176
+  metadata.gz: 29ceba0dda58ba6593bce53d2fb768e56b6bee04a67856b51fc58cc2bb9c4ace1ef91d876ce7ae2ca61ee7066278f7bcca4c09247395f4f5d89f1605d1a914ab
+  data.tar.gz: 71a830db8253363979d772a160acacd7bb7e0ac32d1061f9de99baf0bb44ebf0f5814ce589717a8fccc7033eb98e478e6ae657c440772096a10b8723fa87111d

data/lib/proscenium/builder.rb

@@ -12,6 +12,12 @@ module Proscenium
              :content_hash, :string
     end
 
+    class ResolveResult < FFI::Struct
+      layout :success, :bool,
+             :url_path, :string,
+             :abs_path, :string
+    end
+
     class CompileResult < FFI::Struct
       layout :success, :bool,
              :messages, :string
@@ -32,7 +38,7 @@ module Proscenium
       attach_function :resolve, [
         :string, # path or entry point
         :pointer # Config as JSON.
-      ], Result.by_value
+      ], ResolveResult.by_value
 
       attach_function :compile, [
         :pointer # Config as JSON.
@@ -115,9 +121,9 @@ module Proscenium
       ActiveSupport::Notifications.instrument('resolve.proscenium', identifier: path) do
         result = Request.resolve(path, @request_config)
 
-        raise ResolveError.new(path, result[:response]) unless result[:success]
+        raise ResolveError.new(path, result[:url_path]) unless result[:success]
 
-        result[:response]
+        [result[:url_path], result[:abs_path]]
       end
     end
 

data/lib/proscenium/css_module/transformer.rb

@@ -66,23 +66,14 @@ module Proscenium
         raise Proscenium::CssModule::TransformError.new(original_name, 'CSS module path not given')
       end
 
-      manifest_path, non_manifest_path = Resolver.resolve(path.to_s, as_array: true)
-      digest = Importer.import(manifest_path || non_manifest_path, digest: lambda {
-        Utils.digest non_manifest_path
-      })
+      digest = Importer.import(path.to_s)
 
-      transformed_path = ''
-      if Rails.env.development?
-        transformed_path = "__#{non_manifest_path[1..].gsub(%r{[@/.+]}, '-')}"
-      end
       transformed_name = name.to_s
-      transformed_name = if transformed_name.start_with?('_')
-                           "_#{transformed_name[1..]}-#{digest}#{transformed_path}"
-                         else
-                           "#{transformed_name}-#{digest}#{transformed_path}"
-                         end
-
-      [transformed_name, non_manifest_path]
+      if transformed_name.start_with?('_')
+        "_#{transformed_name[1..]}_#{digest}"
+      else
+        "#{transformed_name}_#{digest}"
+      end
     end
   end
 end

data/lib/proscenium/css_module.rb

@@ -21,7 +21,7 @@ module Proscenium::CssModule
       path ||= respond_to?(:css_module_path) ? css_module_path : path
 
       cssm = Transformer.new(path)
-      cssm.class_names(*names, require_prefix: false).map { |name, _| name }.join(' ')
+      cssm.class_names(*names, require_prefix: false).join(' ')
     end
 
     def class_names(*names, path: nil)
@@ -29,7 +29,7 @@ module Proscenium::CssModule
       names = names.flatten.compact
 
       cssm = Transformer.new(path)
-      cssm.class_names(*names).map { |name, _| name }.join(' ') unless names.empty?
+      cssm.class_names(*names).join(' ') unless names.empty?
     end
   end
 
@@ -44,7 +44,7 @@ module Proscenium::CssModule
   # @return [String] the transformed CSS module names concatenated as a string.
   def css_module(*names, path: nil)
     transformer = path.nil? ? cssm : Transformer.new(path)
-    transformer.class_names(*names, require_prefix: false).map { |name, _| name }.join(' ')
+    transformer.class_names(*names, require_prefix: false).join(' ')
   end
 
   # @param name [String,Symbol,Array<String,Symbol>]
@@ -53,7 +53,7 @@ module Proscenium::CssModule
   def class_names(*names, path: nil)
     names = names.flatten.compact
     transformer = path.nil? ? cssm : Transformer.new(path)
-    transformer.class_names(*names).map { |name, _| name }.join(' ') unless names.empty?
+    transformer.class_names(*names).join(' ') unless names.empty?
   end
 
   private

data/lib/proscenium/ext/proscenium.h

@@ -28,6 +28,11 @@ struct Result {
 	char* response;
 	char* contentHash;
 	};
+struct ResolveResult {
+	int success;
+	char* urlPath;
+	char* absPath;
+};
 struct CompileResult {
 	int success;
 	char* messages;
@@ -109,7 +114,7 @@ extern struct Result build_to_string(char* filePath, char* configJson);
 // - path - The path to build relative to `root`.
 // - config
 //
-extern struct Result resolve(char* filePath, char* configJson);
+extern struct ResolveResult resolve(char* filePath, char* configJson);
 
 // Compile assets using the given `config`.
 //

data/lib/proscenium/helper.rb

@@ -27,8 +27,7 @@ module Proscenium
     # @return [String] the transformed CSS module names concatenated as a string.
     def css_module(*names, path: nil)
       path ||= Pathname.new(@lookup_context.find(@virtual_path).identifier).sub_ext('')
-      CssModule::Transformer.new(path).class_names(*names, require_prefix: false)
-                            .map { |name, _| name }.join(' ')
+      CssModule::Transformer.new(path).class_names(*names, require_prefix: false).join(' ')
     end
 
     def include_assets

data/lib/proscenium/importer.rb

@@ -27,31 +27,45 @@ module Proscenium
       def import(filepath = nil, sideloaded: false, **)
         self.imported ||= {}
 
-        filepath = "/node_modules/#{filepath}" if filepath.start_with?('@rubygems/')
-        css_module = filepath.match?(/\.module(-\$[a-z0-9]+\$)?\.css$/i)
+        return if self.imported.key?(filepath)
+
+        digest = nil
+
+        if filepath.end_with?('.module.css')
+          manifest_path, non_manifest_path, abs_path = Resolver.resolve(filepath, as_array: true)
+          digest = Utils.css_module_digest(abs_path)
+          filepath = Array(manifest_path || non_manifest_path)[0]
 
-        unless self.imported.key?(filepath)
           if sideloaded
             ActiveSupport::Notifications.instrument 'sideload.proscenium', identifier: filepath,
                                                                            sideloaded: do
               self.imported[filepath] = { ** }
-              self.imported[filepath][:digest] ||= Utils.digest(filepath) if css_module
-
-              if self.imported[filepath][:digest].is_a?(Proc)
-                self.imported[filepath][:digest] = self.imported[filepath][:digest].call
-              end
+              self.imported[filepath][:digest] = digest
             end
           else
             self.imported[filepath] = { ** }
-            self.imported[filepath][:digest] ||= Utils.digest(filepath) if css_module
+            self.imported[filepath][:digest] = digest
+          end
 
-            if self.imported[filepath][:digest].is_a?(Proc)
-              self.imported[filepath][:digest] = self.imported[filepath][:digest].call
+          transformed_path = ''
+          if Rails.env.development?
+            rel_path = Pathname.new(abs_path).relative_path_from(Rails.root).sub_ext('')
+            transformed_path = "_#{rel_path.to_s.gsub(%r{[@/.+]}, '-')}"
+          end
+
+          "#{digest}#{transformed_path}"
+        else
+          Array(Resolver.resolve(filepath)).each do |fp|
+            if sideloaded
+              ActiveSupport::Notifications.instrument 'sideload.proscenium', identifier: fp,
+                                                                             sideloaded: do
+                self.imported[fp] = { ** }
+              end
+            else
+              self.imported[fp] = { ** }
             end
           end
         end
-
-        css_module ? self.imported[filepath][:digest] : nil
       end
 
       # Sideloads JS and CSS assets for the given Ruby filepath.
@@ -96,7 +110,6 @@ module Proscenium
       # @param filepath [Pathname] Absolute file system path of the Ruby file to sideload.
       # @param extensions [Array<String>] Supported file extensions to sideload.
       # @param options [Hash] Options to pass to `import`.
-      # @return [Array<String>] The imported file paths.
       # @raise [ArgumentError] if `filepath` is not an absolute file system path.
       private def _sideload(filepath, extensions, **options) # rubocop:disable Style/AccessModifierDeclarations
         return unless Proscenium.config.side_load
@@ -108,24 +121,11 @@ module Proscenium
         # Ensures extensions with more than one dot are handled correctly.
         filepath = filepath.sub_ext('').sub_ext('')
 
-        sideloaded = []
-
         extensions.find do |x|
           next unless (fp = filepath.sub_ext(x)).exist?
 
-          sideloaded << if extensions.include?('.module.css')
-                          manifest_path, non_manifest_path = Resolver.resolve(fp.to_s,
-                                                                              as_array: true)
-                          import(manifest_path || non_manifest_path,
-                                 sideloaded: filepath,
-                                 digest: -> { Utils.digest non_manifest_path },
-                                 **options)
-                        else
-                          import(Resolver.resolve(fp.to_s), sideloaded: filepath, **options)
-                        end
+          import(fp.to_s, sideloaded: filepath, **options)
         end
-
-        sideloaded
       end
 
       def each_stylesheet(delete: false)

data/lib/proscenium/manifest.rb

@@ -31,7 +31,10 @@ module Proscenium
                  ep.delete_prefix(Rails.root.to_s)
                end
 
-          manifest[ep] = "/#{outpath}"
+          manifest[ep] = [
+            "/#{outpath}",
+            details['cssBundle']&.delete_prefix(public_path)
+          ].compact
         end
       end
 

data/lib/proscenium/react_componentable.rb

@@ -45,7 +45,7 @@ module Proscenium
 
     class_methods do
       def sideload(options)
-        Importer.import Resolver.resolve(manager.to_s), **options, js: { type: 'module' }
+        Importer.import manager.to_s, sideloaded: true, **options, js: { type: 'module' }
       end
     end
 
@@ -58,7 +58,7 @@ module Proscenium
 
     # The absolute URL path to the javascript component.
     def virtual_path
-      @virtual_path ||= Resolver.resolve self.class.source_path.sub_ext('.jsx').to_s
+      @virtual_path ||= Resolver.resolve(self.class.source_path.sub_ext('.jsx').to_s)[0]
     end
 
     def props

data/lib/proscenium/resolver.rb

@@ -9,10 +9,12 @@ module Proscenium
 
     # Resolve the given `path` to a fully qualified URL path.
     #
+    # TODO: cache this across requests in production.
+    #
     # @param path [String] URL path, file system path, or bare specifier (ie. NPM package).
-    # @param as_array [Boolean] whether or not to return both the manifest path and
-    #   non-manifest path as an array. Only returns the resolved path if false (default).
-    # @return [String] URL path.
+    # @param as_array [Boolean] whether or not to return the manifest path, non-manifest path, and
+    #   absolute file system path as an array. Only returns the resolved path if false (default).
+    # @return [String, Array<String>]
     def self.resolve(path, as_array: false)
       self.resolved ||= {}
 
@@ -22,12 +24,12 @@ module Proscenium
 
       self.resolved[path] ||= if (gem = BundledGems.paths.find { |_, v| path.start_with? "#{v}/" })
                                 vpath = path.sub(/^#{gem.last}/, "@rubygems/#{gem.first}")
-                                [Proscenium::Manifest[vpath], "/node_modules/#{vpath}"]
+                                [Proscenium::Manifest[vpath], "/node_modules/#{vpath}", path]
                               elsif path.start_with?("#{Rails.root}/")
                                 vpath = path.delete_prefix(Rails.root.to_s)
-                                [Proscenium::Manifest[vpath], vpath]
+                                [Proscenium::Manifest[vpath], vpath, path]
                               else
-                                [Proscenium::Manifest[path], Builder.resolve(path)]
+                                [Proscenium::Manifest[path], *Builder.resolve(path)]
                               end
 
       as_array ? self.resolved[path] : self.resolved[path][0] || self.resolved[path][1]

data/lib/proscenium/utils.rb

@@ -4,9 +4,12 @@ module Proscenium
   module Utils
     module_function
 
-    # @param value [#to_s] The value to create the digest from. This will usually be a `Pathname`.
+    # Returns a short digest for the given `value`, intended for CSS module class name suffixes.
+    #
+    # @param value [#to_s] The value to create the digest from. This will usually be the absolute
+    #   file system file path.
     # @return [String] digest of the given value.
-    def digest(value)
+    def css_module_digest(value)
       Digest::SHA1.hexdigest(value.to_s)[..7]
     end
 

data/lib/proscenium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.22.4
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 2025-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi