js_regex 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c55b0dded778c8851267d5d6d24c4a1afcbdb64e6d28ef3e48da5ba8acaf4d8
-  data.tar.gz: 71cf3ead5808405c0e32a2fa2dd63a8efa6f5f02df9ef707c12d4238087121a6
+  metadata.gz: 9c6bfe5a3631b78df8e258b46c12f9c89eeabefa5ce0967760cd7cc9c152ca8e
+  data.tar.gz: d05300ee0f1496adbfa455533af89d8a42af7808af14fdb1f6c569bfcde5913f
 SHA512:
-  metadata.gz: d5cb89a802b4c90382146f6a49e2c0fbefa5aed7580d0698e8bd392e05ed172880a713dc619b484e9fa0f28689b1b03c35eb08f9efc6673895ca1a450985723e
-  data.tar.gz: c0c8fda9db5419e5d05b43036190d1fb3d9e44d32c7f57598f21cb6c16d444208dae18ed6cdeb871357188619113475f83deb70c4eef2babfc44a37c27cbbbb9
+  metadata.gz: e7ed1e47c10c775151a4ccfbae673c9d122354841a20b7d18aed2e545b81ce9c87584026b2d7433c83be42d30c5e1c9ca823f7f31186cea4278273d3698c2a12
+  data.tar.gz: 9d1e0e0f2ae0865e69262c8eefef4999cbcf877a270eb642ee7f115a3ff77c10c0ca8c6fdb60093fba5244e54bca0de58c1514ad28a1c6c21378e3c64d00b378

data/lib/js_regex/converter/set_converter.rb

@@ -72,7 +72,11 @@ class JsRegex
         EscapeConverter::ESCAPES_SHARED_BY_RUBY_AND_JS
 
       def full_recalculation
-        content = CharacterSet.of_expression(expression)
+        # Fetch codepoints as if the set was case-sensitive, then re-add
+        # case-insensitivity if needed.
+        # This way we preserve the casing of the original set in cases where the
+        # whole regexp is case-insensitive, e.g. /[ABc]/i => /[ABc]/i.
+        content = original_case_character_set
         if expression.case_insensitive? && !context.case_insensitive_root
           content = content.case_insensitive
         elsif !expression.case_insensitive? && context.case_insensitive_root
@@ -85,6 +89,12 @@ class JsRegex
           content.to_s_with_surrogate_ranges
         end
       end
+
+      def original_case_character_set
+        neutral_set = expression.dup
+        neutral_set.each_expression(true) { |exp| exp.options[:i] = false }
+        CharacterSet.of_expression(neutral_set)
+      end
     end
   end
 end

data/lib/js_regex/converter/type_converter.rb

@@ -8,6 +8,8 @@ class JsRegex
     class TypeConverter < JsRegex::Converter::Base
       HEX_EXPANSION              = '[0-9A-Fa-f]'
       NONHEX_EXPANSION           = '[^0-9A-Fa-f]'
+      I_MODE_HEX_EXPANSION       = '[0-9A-F]'
+      I_MODE_NONHEX_EXPANSION    = '[^0-9A-F]'
       ES2018_HEX_EXPANSION       = '\p{AHex}'
       ES2018_NONHEX_EXPANSION    = '\P{AHex}'
       ES2018_XGRAPHEME_EXPANSION = '[\P{M}\P{Lm}](?:(?:[\u035C\u0361]\P{M}\p{M}*)|\u200d|\p{M}|\p{Lm}|\p{Emoji_Modifier})*'
@@ -44,6 +46,8 @@ class JsRegex
       def hex_expansion
         if context.es_2018_or_higher? && context.enable_u_option
           ES2018_HEX_EXPANSION
+        elsif context.case_insensitive_root
+          I_MODE_HEX_EXPANSION
         else
           HEX_EXPANSION
         end
@@ -52,6 +56,8 @@ class JsRegex
       def nonhex_expansion
         if context.es_2018_or_higher? && context.enable_u_option
           ES2018_NONHEX_EXPANSION
+        elsif context.case_insensitive_root
+          I_MODE_NONHEX_EXPANSION
         else
           NONHEX_EXPANSION
         end

data/lib/js_regex/version.rb

@@ -1,3 +1,3 @@
 class JsRegex
-  VERSION = '3.11.0'
+  VERSION = '3.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2024-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: character_set
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Converts Ruby regexes to JavaScript regexes.