js_regex 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8971658980813740deb03ece3c5af5bfdfd7412f0630fc4a3f172e4c06b11c52
-  data.tar.gz: bdafa3639a230b1ec1ac4661828050d99339eb18ec1768fa2a6f1b5e69d95f1b
+  metadata.gz: 4710feb6c1da4ea2665ec125ab16bf92c35117ee028b2c6986ec9ebe61cc5eea
+  data.tar.gz: 7152f08cbea846150bc370cb2aeb2d9a99f7e7c18b8b448e080845a54fbbe05d
 SHA512:
-  metadata.gz: 13abdf7b41485194f05cce79751ca60e8b1f9fc864b17f58294650df9f9e485a889b9571d847bf564aa12b709fd572c53f27a5a2900e3dc8bfa765f522b58e62
-  data.tar.gz: 31941c0d7a4842fdea84d5f649f3df30c54e8da24e6dbf722cff3e48661ae89646117f66f33ee419c0fc0e393b11f284cb565751b4f77aa5eb0bbbc8d38d903d
+  metadata.gz: cee471265231e58c04d682a707184c5d8a468481eff5f2e0df498b7323fe75ee245b95e1d2ca69016fa83e9378faecaa95541e70af07711773bcd7cbe4bdae57
+  data.tar.gz: '0924f4a4f73f2786c8dcac578588f04fb3c6d86913ce6c8f1ac74169e8e226f6e4b993ee43a100e7e913ade4062cb18d6e53ac87573aeaabe3780c6f75beb0d0'

data/lib/js_regex/converter/backreference_converter.rb

@@ -41,14 +41,19 @@ class JsRegex
       end
 
       def convert_call
-        if expression.respond_to?(:number) && expression.number.equal?(0)
-          return warn_of_unsupported_feature('whole-pattern recursion')
+        if context.recursions(expression) >= 5
+          warn_of("Recursion for '#{expression}' curtailed at 5 levels")
+          return ''
         end
+
+        context.count_recursion(expression)
         context.increment_local_capturing_group_count
         target_copy = expression.referenced_expression.unquantified_clone
         # avoid "Duplicate capture group name" error in JS
         target_copy.token = :capture if target_copy.is?(:named, :group)
-        convert_expression(target_copy)
+        result = convert_expression(target_copy)
+        # wrap in group if it is a full-pattern recursion
+        expression.reference == 0 ? Node.new('(?:', result, ')') : result
       end
     end
   end

data/lib/js_regex/converter/context.rb

@@ -14,6 +14,7 @@ class JsRegex
       def initialize(case_insensitive_root: false, target: nil)
         self.added_capturing_groups_after_group = Hash.new(0)
         self.capturing_group_count = 0
+        self.recursions_per_expression = {}
         self.warnings = []
         self.required_options_hash = {}
 
@@ -62,6 +63,18 @@ class JsRegex
         capture_group
       end
 
+      def recursions(exp)
+        recursions_per_expression[recursion_id(exp)] || 0
+      end
+
+      def count_recursion(exp)
+        recursions_per_expression[recursion_id(exp)] = recursions(exp) + 1
+      end
+
+      def recursion_id(exp)
+        [exp.class, exp.starts_at]
+      end
+
       # takes and returns 1-indexed group positions.
       # new is different from old if capturing groups were added in between.
       def new_capturing_group_position(old_position)
@@ -79,6 +92,7 @@ class JsRegex
       private
 
       attr_accessor :added_capturing_groups_after_group,
+                    :recursions_per_expression,
                     :required_options_hash,
                     :target
 

data/lib/js_regex/converter/type_converter.rb

@@ -6,11 +6,12 @@ class JsRegex
     # Template class implementation.
     #
     class TypeConverter < JsRegex::Converter::Base
-      HEX_EXPANSION           = '[0-9A-Fa-f]'
-      NONHEX_EXPANSION        = '[^0-9A-Fa-f]'
-      ES2018_HEX_EXPANSION    = '\p{AHex}'
-      ES2018_NONHEX_EXPANSION = '\P{AHex}'
-      LINEBREAK_EXPANSION     = '(?:\r\n|[\n\v\f\r\u0085\u2028\u2029])'
+      HEX_EXPANSION              = '[0-9A-Fa-f]'
+      NONHEX_EXPANSION           = '[^0-9A-Fa-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})*'
+      LINEBREAK_EXPANSION        = '(?:\r\n|[\n\v\f\r\u0085\u2028\u2029])'
 
       def self.directly_compatible?(expression)
         case expression.token
@@ -28,6 +29,7 @@ class JsRegex
         when :hex then hex_expansion
         when :nonhex then nonhex_expansion
         when :linebreak then LINEBREAK_EXPANSION
+        when :xgrapheme then xgrapheme
         when :digit, :space, :word
           return pass_through if self.class.directly_compatible?(expression)
           set_substitution
@@ -68,6 +70,14 @@ class JsRegex
       def character_set
         CharacterSet.of_expression(expression)
       end
+
+      def xgrapheme
+        if context.es_2018_or_higher? && context.enable_u_option
+          ES2018_XGRAPHEME_EXPANSION
+        else
+          warn_of_unsupported_feature
+        end
+      end
     end
   end
 end

data/lib/js_regex/version.rb

@@ -1,3 +1,3 @@
 class JsRegex
-  VERSION = '3.8.0'
+  VERSION = '3.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: character_set
@@ -28,16 +28,22 @@ dependencies:
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: regexp_property_values
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Converts Ruby regexes to JavaScript regexes.