js_regex 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8365bf02c61518e8db07367f1501e31ac8599f709b0cfb80847803d7aa4f17b1
-  data.tar.gz: f6840ad243194ad82ff589a9cd3f11c3db11b6f2a0f471b50dbb0b3510ebcc08
+  metadata.gz: c133491821c27a1ce87f58e59c828e92cef7e1f7f9be99b015e79e55ded6874e
+  data.tar.gz: 7ea0268f1e0d8cf48c6a56b635d8189dfb1c2f0ad969902eb0d2a9380d01f03a
 SHA512:
-  metadata.gz: 163fdc6a6011088e22804a0bb2174d30c5c053afec187964aac9f6cfaf1dfecd93719a824971f6820b25c54e6ac521e2cd2ca7b5be13463ab7461fb1f1ac794d
-  data.tar.gz: f0f6efbf118747f79211caec3335b8b34f5f69b69c7d0c78db5b0edb77812a2663dba6bd78e0b074efe2b27d58542c504e18239f78d5b25d40942f21b1486e15
+  metadata.gz: 2f31af53ed6fd3213839df7ece799dc951a0f979cf9858cce47ae8151c167de5a5c5464de3d7355782a8bd56f6d142c5d152d4e381ffed9e26f7f51b13c445b1
+  data.tar.gz: 46525b2bb74b11189495f831fa860980291c9be05c5d546e7fc1ed1bee335d4cb29059b6ba1ffb008528c78309c4e75e2f9088570d7691565180821b912ffc96

data/lib/js_regex.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # JsRegex converts ::Regexp instances to JavaScript.
 #
 # Usage:
@@ -10,6 +8,7 @@
 #
 class JsRegex
   require_relative File.join('js_regex', 'conversion')
+  require_relative File.join('js_regex', 'error')
   require_relative File.join('js_regex', 'version')
   require 'json'
 
@@ -30,4 +29,15 @@ class JsRegex
   def to_s
     "/#{source.empty? ? '(?:)' : source}/#{options}"
   end
+
+  def self.new!(ruby_regex, options: nil)
+    js_regex = new(ruby_regex, options: options)
+    if js_regex.warnings.any?
+      raise StandardError.new(
+        "Could not fully convert the given regex #{ruby_regex.inspect}:\n" +
+        js_regex.warnings.join("\n")
+      ).extend(JsRegex::Error)
+    end
+    js_regex
+  end
 end

data/lib/js_regex/conversion.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class JsRegex
   #
   # This class acts as a facade, passing a regex to the converters.
@@ -9,6 +7,7 @@ class JsRegex
   class Conversion
     require 'regexp_parser'
     require_relative 'converter'
+    require_relative 'error'
     require_relative 'node'
     require_relative 'second_pass'
 
@@ -27,6 +26,8 @@ class JsRegex
         converted_tree = Converter.convert(tree, context)
         final_tree = SecondPass.call(converted_tree)
         [final_tree.to_s, context.warnings]
+      rescue Regexp::Parser::Error => e
+        raise e.extend(JsRegex::Error)
       end
 
       def convert_options(input, custom_options)

data/lib/js_regex/converter.rb

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 class JsRegex
   module Converter
-    Dir[File.join(File.dirname(__FILE__), 'converter', '*.rb')].each do |file|
+    Dir[File.join(__dir__, 'converter', '*.rb')].sort.each do |file|
       require file
     end
 

data/lib/js_regex/converter/anchor_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/assertion_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 require_relative 'group_converter'
 

data/lib/js_regex/converter/backreference_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class JsRegex
   module Converter
     #

data/lib/js_regex/converter/conditional_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/context.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class JsRegex
   module Converter
     #

data/lib/js_regex/converter/escape_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 require_relative 'literal_converter'
 

data/lib/js_regex/converter/freespace_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/group_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/literal_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/meta_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/property_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 require 'character_set'
 

data/lib/js_regex/converter/set_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 require_relative 'escape_converter'
 require_relative 'type_converter'
@@ -37,9 +35,7 @@ class JsRegex
 
       def all_children_directly_compatible?
         # note that #each_expression is recursive
-        expression.each_expression do |exp|
-          return unless child_directly_compatible?(exp)
-        end
+        expression.each_expression.all? { |ch| child_directly_compatible?(ch) }
       end
 
       def child_directly_compatible?(exp)

data/lib/js_regex/converter/subexpression_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/type_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/converter/unsupported_token_converter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 class JsRegex

data/lib/js_regex/error.rb

@@ -0,0 +1,5 @@
+class JsRegex
+  # This is mixed into errors, e.g. those thrown by the parser,
+  # allowing to `rescue JsRegex::Error`.
+  module Error; end
+end

data/lib/js_regex/node.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
 class JsRegex
   #
   # Converter#convert result. Represents a branch or leaf node with an optional
   # quantifier as well as type and reference annotations for SecondPass.
   #
   class Node
+    require_relative 'error'
+
     attr_reader :children, :quantifier, :reference, :type
 
     TYPES = %i[
@@ -49,7 +49,9 @@ class JsRegex
       when :backref_num, :captured_group, :plain
         children.join << quantifier.to_s
       else
-        raise TypeError, "#{type} must be substituted before stringification"
+        raise TypeError.new(
+          "#{type} must be substituted before stringification"
+        ).extend(JsRegex::Error)
       end
     end
 

data/lib/js_regex/second_pass.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class JsRegex
   #
   # After conversion of a full Regexp::Expression tree, this
@@ -61,7 +59,7 @@ class JsRegex
 
       def condition_permutations(conditions)
         (0..(conditions.length)).inject([]) do |arr, n|
-          arr += conditions.combination(n).to_a
+          arr + conditions.combination(n).to_a
         end
       end
 

data/lib/js_regex/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class JsRegex
-  VERSION = '3.6.0'
+  VERSION = '3.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: character_set
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: regexp_property_values
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.12
+- !ruby/object:Gem::Dependency
+  name: gouteur
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: JsRegex converts Ruby's native regular expressions for JavaScript, taking
   care of various incompatibilities and returning warnings for unsolvable differences.
 email:
@@ -135,6 +163,7 @@ files:
 - lib/js_regex/converter/subexpression_converter.rb
 - lib/js_regex/converter/type_converter.rb
 - lib/js_regex/converter/unsupported_token_converter.rb
+- lib/js_regex/error.rb
 - lib/js_regex/node.rb
 - lib/js_regex/second_pass.rb
 - lib/js_regex/version.rb
@@ -157,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Converts Ruby regexes to JavaScript regexes.