proscenium 0.19.0.beta16 → 0.19.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f9099b0a36f4297deb23000fa59be1f7b42821d0922ead517e0fa743b078079
-  data.tar.gz: eb916375082bb5a3c849eb8374d218866fd05f8b5b57d2d43df607eff6213c1f
+  metadata.gz: 5db88847b4fad16f8c3c4bfd96c5f7f40f59726c65280fd81cf2cdeb0fd09c89
+  data.tar.gz: 4056f395c8f45fda017c334402ce4b7b268b72a2ec75cec47c190c63f565220a
 SHA512:
-  metadata.gz: d24803aca9f34fd5e68a9d0e077e2ec72b9f34e94ae3dcc2bda39a2fa65449d00e9c9f4d7e1c3266af1b92c8b8958bbb302741e2ce094d2526f78c36829ed5b1
-  data.tar.gz: 4c1a2d1dff84baea2578ca25aa58adc18c2c7929d95e975d0c6965749048ea7d9ebfc63c5c44a823f88de600cdc3eddde9a2f975aa779e47646bcda73c1063ae
+  metadata.gz: abde8e210ea532b606bbc66282553491b7e06910e5f4ce48faab5f68518d154e9ce746a4bd3ad9e4e0f5b71b19ad569b345ad9db5b83ea35124e64af3698f416
+  data.tar.gz: dca5b7f3ce4bd5fe17e62c7372e38b86444b75e27999a3c5ad1e10ebb4a910630aa7f2dce922d4a025b0b7bac822a905b26e62bf5463b007fd2f03c5821190da

data/lib/proscenium/builder.rb

@@ -16,7 +16,7 @@ module Proscenium
 
     module Request
       extend FFI::Library
-      ffi_lib ENV.fetch('PROSCENIUM_BIN', Pathname.new(__dir__).join('ext/proscenium').to_s)
+      ffi_lib Pathname.new(__dir__).join('ext/proscenium').to_s
 
       enum :environment, [:development, 1, :test, :production]
 

data/lib/proscenium/css_module/rewriter.rb

@@ -1,44 +1,76 @@
 # frozen_string_literal: true
 
-require 'ruby-next/language'
-require 'proscenium/core_ext/object/css_module_ivars'
+require 'prism'
+require 'require-hooks/setup'
 
 module Proscenium
   module CssModule
-    class Rewriter < RubyNext::Language::Rewriters::Text
-      NAME = 'proscenium-css-module'
+    class Rewriter
+      def self.init(include: [], exclude: [])
+        RequireHooks.source_transform(
+          patterns: include,
+          exclude_patterns: exclude
+        ) do |path, source|
+          source ||= File.read(path)
+          Processor.call(source)
+        end
+      end
+
+      class Processor < Prism::Visitor
+        def self.call(source)
+          visitor = new
+          visitor.visit(Prism.parse(source).value)
+
+          buffer = source.dup
+          annotations = visitor.annotations
+          annotations.sort_by!(&:first)
 
-      def rewrite(source)
-        source = source.gsub(/%i\[((@[\w@ ]+)|([\w@ ]+ @[\w@ ]+))\]/) do |_|
-          arr = ::Regexp.last_match(1).split.map do |x|
-            x.start_with?('@') ? css_module_string(x[1..]) : ":#{x}"
+          annotations.reverse_each do |offset, action|
+            case action
+            when :start
+              buffer.insert(offset, 'class_names(*')
+            when :end
+              buffer.insert(offset, ')')
+            else
+              raise 'Invalid annotation'
+            end
           end
-          "[#{arr.join(',')}]"
+
+          buffer
         end
 
-        source.gsub(/:@([\w]+)/) do |_|
-          context.track!(self)
-          css_module_string(::Regexp.last_match(1))
+        def initialize
+          @annotations = []
         end
-      end
 
-      private
+        PREFIX = '@'
+
+        attr_reader :annotations
+
+        def visit_assoc_node(node)
+          # Skip if the key is not a symbol or string
+          return if %i[symbol_node string_node].exclude?(node.key.type)
 
-      def css_module_string(name)
-        if (path = Pathname.new(context.path).sub_ext('.module.css')).exist?
-          tname = Transformer.new(path).class_name!(name, name.dup).first
-          "Proscenium::CssModule::Name.new(:@#{name}, '#{tname}', #{path})"
-        else
-          "Proscenium::CssModule::Name.new(:@#{name}, css_module(:#{name}), nil)"
+          return if node.key.type == :symbol_node && node.key.value != 'class'
+          return if node.key.type == :string_node && node.key.content != 'class'
+
+          value = node.value
+          type = value.type
+
+          if (type == :symbol_node && value.value.start_with?(PREFIX)) ||
+             (type == :array_node && value.elements.any? { |it| it.value.start_with?(PREFIX) })
+            build_annotation value
+          end
+        end
+
+        def build_annotation(value)
+          location = value.location
+
+          @annotations <<
+            [location.start_character_offset, :start] <<
+            [location.end_character_offset, :end]
         end
       end
     end
   end
 end
-
-RubyNext::Language.send :include_patterns=, []
-RubyNext::Language.include_patterns << "#{Rails.root.join('app', 'components')}/*.rb"
-RubyNext::Language.include_patterns << "#{Rails.root.join('app', 'views')}/*.rb"
-RubyNext::Language.rewriters = [Proscenium::CssModule::Rewriter]
-
-require 'ruby-next/language/runtime'

data/lib/proscenium/css_module.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 module Proscenium::CssModule
+  extend ActiveSupport::Autoload
+
+  autoload :Path
+  autoload :Transformer
+  autoload :Rewriter
+
   class TransformError < StandardError
     def initialize(name, additional_msg = nil)
       msg = "Failed to transform CSS module `#{name}`"
@@ -10,24 +16,6 @@ module Proscenium::CssModule
     end
   end
 
-  class Name
-    attr_reader :path
-
-    def initialize(name, transform, path = nil)
-      @name = name
-      @transform = transform
-      @path = path
-    end
-
-    def to_s
-      @transform
-    end
-
-    def to_sym
-      @name
-    end
-  end
-
   # Accepts one or more CSS class names, and transforms them into CSS module names.
   #
   # @param name [String,Symbol,Array<String,Symbol>]

data/lib/proscenium/middleware.rb

@@ -2,9 +2,15 @@
 
 module Proscenium
   class Middleware
+    extend ActiveSupport::Autoload
+
     # Error when the build command fails.
     class BuildError < StandardError; end
 
+    autoload :Base
+    autoload :Esbuild
+    autoload :RubyGems
+
     def initialize(app)
       @app = app
 

data/lib/proscenium/phlex.rb

@@ -4,6 +4,12 @@ require 'phlex-rails'
 
 module Proscenium
   class Phlex < ::Phlex::HTML
+    extend ActiveSupport::Autoload
+
+    autoload :CssModules
+    autoload :ReactComponent
+    autoload :AssetInclusions
+
     include Proscenium::SourcePath
     include CssModules
     include AssetInclusions

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.19.0.beta16'
+  VERSION = '0.19.0.beta18'
 end

data/lib/proscenium.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'zeitwerk'
-require 'proscenium/railtie'
-
-loader = Zeitwerk::Loader.for_gem
-loader.ignore "#{__dir__}/proscenium/core_ext/object/css_module_ivars.rb"
-loader.setup
+require 'active_support'
 
 module Proscenium
+  extend ActiveSupport::Autoload
+
   FILE_EXTENSIONS = ['js', 'mjs', 'ts', 'jsx', 'tsx', 'css', 'js.map', 'mjs.map', 'jsx.map',
                      'ts.map', 'tsx.map', 'css.map'].freeze
 
@@ -23,6 +20,21 @@ module Proscenium
   # Environment variables that should always be passed to the builder.
   DEFAULT_ENV_VARS = Set['RAILS_ENV', 'NODE_ENV'].freeze
 
+  autoload :SourcePath
+  autoload :Utils
+  autoload :Monkey
+  autoload :Middleware
+  autoload :EnsureLoaded
+  autoload :SideLoad
+  autoload :CssModule
+  autoload :ReactComponentable
+  autoload :Phlex
+  autoload :Helper
+  autoload :Builder
+  autoload :Importer
+  autoload :Resolver
+  autoload :BundledGems
+
   class Deprecator
     def deprecation_warning(name, message, _caller_backtrace = nil)
       msg = "`#{name}` is deprecated and will be removed in a near future release of Proscenium"
@@ -52,3 +64,5 @@ module Proscenium
     end
   end
 end
+
+require 'proscenium/railtie'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta16
+  version: 0.19.0.beta18
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-26 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,53 +39,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-next
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: require-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '0.2'
 description:
 email:
 - joel@developwithstyle.com
@@ -99,7 +99,6 @@ files:
 - lib/proscenium.rb
 - lib/proscenium/builder.rb
 - lib/proscenium/bundled_gems.rb
-- lib/proscenium/core_ext/object/css_module_ivars.rb
 - lib/proscenium/css_module.rb
 - lib/proscenium/css_module/path.rb
 - lib/proscenium/css_module/rewriter.rb

data/lib/proscenium/core_ext/object/css_module_ivars.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Object
-  def instance_variable_get(name)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym) : super
-  end
-
-  def instance_variable_set(name, obj)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym, obj) : super
-  end
-
-  def instance_variable_defined?(name)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym) : super
-  end
-
-  def remove_instance_variable(name)
-    name.is_a?(::Proscenium::CssModule::Name) ? super(name.to_sym) : super
-  end
-end