proscenium 0.19.0.beta17-x86_64-linux → 0.19.0.beta18-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36cfb9372e295822798d0c1ec930398615266b57c78acfbf9ac4055ba82ecb82
-  data.tar.gz: 3083d1ac9309e0c00218adec6f1d4d025d7452b7f1ca8366bd4c48e0463a6924
+  metadata.gz: 4f17b0d37b874ca3a4e868f53015d43a46aecbac32c54f2951cbbfe7515c71d0
+  data.tar.gz: bcf7b35a016537979462b773821a92fa75303ceaec25a1a3c7d47fd73868b43a
 SHA512:
-  metadata.gz: 5065d888c4891db0c06eea0c683004547ee54e4ef59d05142ba2c4990c3bcfcbe9f7c71a8e9bb72a541b177ab569f729e597dcbfd45e1344383ba1cec909a84d
-  data.tar.gz: 2340183a49c82d06d21620cdbc667d2f967bb34535e16c58e954bffe97a2bd407d88e8b9af59a4f492fb0dbba2318d0b98d0db9eac6a75c94693723393b03b92
+  metadata.gz: 07ac98ffc1c912bac704015571d0e702ba30baa6306f5b742b5a9b7e791862613ad64ccbd82f9f9b1ff5e2f06e5abd01bca35c0bf2d0796f21b3f9928117cf1d
+  data.tar.gz: 3730f8710ef0936502ea9fcdf2b9608e571ebcfc0629ba14d52f9c6e75eb4d29ec115a0b0c67735c5210e7c9c22bcfb742bf67f628a0bd071af4fd75db82596f

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

@@ -5,6 +5,7 @@ module Proscenium::CssModule
 
   autoload :Path
   autoload :Transformer
+  autoload :Rewriter
 
   class TransformError < StandardError
     def initialize(name, additional_msg = nil)
@@ -15,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta17
+  version: 0.19.0.beta18
 platform: x86_64-linux
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-27 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -59,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: ruby-next
+  name: require-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0.2'
 description:
 email:
 - joel@developwithstyle.com
@@ -85,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