css_modules 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 352a7700216a0f529079aff18c7035208211015e
-  data.tar.gz: 84a4377828e9abae5e54cc2cab1efbf71d695054
+  metadata.gz: ac4a3d14787aa438918ff5b6686f7dc162a2f7fd
+  data.tar.gz: 18c62d5cb744d9efb95ba0c9ce60b9e6e1c5937a
 SHA512:
-  metadata.gz: 0f97e68229bab8c72efa3d9b35606c5b47679c82c2b2ae5ea7533abd624b74ec1353e37612d2f4dcc391518800b66fe9addc99a161dc581d43337baa03a693ab
-  data.tar.gz: 94b85889226a878d04137af172ffc6b8f7d3361328ca856323b9828ebe0389ab68a045d7a7ade68551925e067033ea3e7b0e1bb331bb0dc3daf06b96562076e4
+  metadata.gz: 4ea78e745fc2ff7435ea8bfcc0a83fa5c978a233f133c2c7535d2844bc848eef4b935506d52409e757fc034f361edda430214f57fd58260213dc935c636fdaa1
+  data.tar.gz: 11efd91084b1872e522972223d1afcc5c26501270345e1ea517c55ef8187db4447b2da5887b9dd290019056d6496adf151dda9a473e51f692d259d7ffc02a839

data/lib/css_modules/rewrite.rb

@@ -5,7 +5,7 @@ module CSSModules
   module Rewrite
     # Module Scopes
     # :module(login) { .button {color: red;} }
-    RE_MODULE = /^\:module\((?<module_name>.*?)\)\s+(?<declarations>.*)/
+    RE_MODULE = /^\:module\((?<module_name>.*?)\)/
 
     module_function
     # Take css module code as input, and rewrite it as
@@ -36,7 +36,6 @@ module CSSModules
       # No need to `yield` here since we run _after_ Sass -- it's already flattened.
       # @return [void]
       def visit_rule(node)
-        node.rule = node.rule.map { |r| transform_selector(r) }
         node.parsed_rules = rebuild_parsed_rules(node.parsed_rules)
       end
 
@@ -44,46 +43,72 @@ module CSSModules
 
       def rebuild_parsed_rules(parsed_rules)
         new_members = parsed_rules.members.map do |member_seq|
-          # `member_seq` is actually a deeply-nested array-like thing
-          # but since we're running _after_ Sass itself,
-          # we know all the tricky stuff is already taken care of.
-          # So now we can flatten it and re-parse it, no problem.
-          rule_s = member_seq.to_s
-          transformed_rule_s = transform_selector(rule_s)
-          selector_to_sass(transformed_rule_s)
+          leading_rule = first_selector(member_seq).to_s
+          matches = Rewrite::RE_MODULE.match(leading_rule)
+          if matches
+            module_name = matches[:module_name]
+            deeply_transform(module_name, member_seq)
+          else
+            member_seq
+          end
         end
         Sass::Selector::CommaSequence.new(new_members)
       end
 
-      def selector_to_sass(selector)
-        # This strips off leading whitespace, should I be putting it back on?
-        Sass::SCSS::StaticParser.new(selector.strip, nil, 1).parse_selector
+      # Get the first non-sequence member of `seq`
+      def first_selector(seq)
+        case seq
+        when Sass::Selector::AbstractSequence
+          first_selector(seq.members.first)
+        else
+          seq
+        end
+      end
+
+      # We know this is a modulized rule
+      # now we should transform its ID and classes to modulized
+      def deeply_transform(module_name, seq)
+        case seq
+        when Sass::Selector::AbstractSequence
+          new_members = seq.members.map { |m| deeply_transform(module_name, m) }
+          new_members.compact! # maybe a module selector returned nil
+          clone_sequence(seq, new_members)
+        when Sass::Selector::Id, Sass::Selector::Class
+          modulized_name = Rewrite.modulize_selector(module_name, seq.name)
+          seq.class.new(modulized_name)
+        when Sass::Selector::Pseudo
+          if seq.to_s =~ /:module/
+            nil
+          else
+            seq
+          end
+        else
+          seq
+        end
       end
 
-      # This parses the selector for `:module` definitions or does nothing.
-      def transform_selector(selector)
-        matches = Rewrite::RE_MODULE.match(selector)
-        if matches.nil?
-          selector
+      # Make a new kind of `seq`, containing `new_members`
+      def clone_sequence(seq, new_members)
+        case seq
+        when Sass::Selector::Sequence
+          seq.class.new(new_members)
+        when Sass::Selector::CommaSequence
+          seq.class.new(new_members)
+        when Sass::Selector::SimpleSequence
+          seq.class.new(new_members, seq.subject?, seq.source_range)
         else
-          module_name = matches[:module_name]
-          declaration_parts = matches[:declarations].split(" ")
-          declaration_parts
-            .map { |declaration_or_operator| rebuild_selector(module_name, declaration_or_operator) }
-            .join(" ")
+          raise("Unknown sequence to clone: #{seq.class}")
         end
       end
 
-      # If `selector` is a class or ID, scope it to this module.
-      # If it is a bare element, leave it unscoped.
-      def rebuild_selector(module_name, selector)
-        case selector[0]
-        when "#"
-          "##{Rewrite.modulize_selector(module_name, selector[1..-1])}"
-        when "."
-          ".#{Rewrite.modulize_selector(module_name, selector[1..-1])}"
+      # Debug print-out of a sequence:
+      def deep_print(seq, indent = "")
+        case seq
+        when Sass::Selector::AbstractSequence
+          puts indent + seq.class.name + " => "
+          seq.members.map { |m| deep_print(m, indent + "  ") }
         else
-          selector
+          puts indent + seq.class.name + " (#{seq})"
         end
       end
     end

data/lib/css_modules/version.rb

@@ -1,3 +1,3 @@
 module CSSModules
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_modules
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails