remap 2.2.34 → 2.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864996caad52b60c1bd199bf1289950f1f9992d4b0501e7e772bf1ebae7dc204
-  data.tar.gz: 922aafbe39603c7fbdcac19bfb20188b98426a6542b61fd8becee587dc3fc7a0
+  metadata.gz: 8fdfe8ed64a781f1239e1738a2e71b99acc864e60508353fc7d22c848b128cbb
+  data.tar.gz: 654613c35e8d8294a94f748ca170da5bd19199dc66ba33c8ec055333e1deaf98
 SHA512:
-  metadata.gz: d1534113f0ac7ce2919ba0247fe4c4d36dcc2f3bff526a13c6f1886a326e91480d284a1d49534967d73a7e43c6f50ac0ab3e60e05bc44f76f358dc96b04e07d3
-  data.tar.gz: ca3dcd403d881f29c30cb2aaefc5e711b5729bb5a43f053acbbf340ce4c8edc3e3f89beb33f8465b707c5343052e30c4a457377065fce75fd71d19a56a6f41f8
+  metadata.gz: a56c3113747f8efc8721bf3d2731c0292c4c54e6570969b72f774433be0f7c64874af9fbb448bfe146978cc39d31725cde491e3a682d684e5e28909fa7a3e3ca
+  data.tar.gz: b753d26605bdca1201be84826f4c352b426c4b853c687cc997ba964786827305268c805d6c6e85ee15e284becee4a8deaec9998dda35ff1e3431f919abe903e9

data/lib/remap/compiler.rb

@@ -308,12 +308,12 @@ module Remap
     #
     # @return [Rule::Each]]
     # @raise [ArgumentError] if no block given
-    def each(&block)
+    def each(backtrace: caller, &block)
       unless block_given?
         raise ArgumentError, "#each requires a block"
       end
 
-      add rule(all, &block)
+      add rule(all, backtrace: backtrace, &block)
     end
 
     # Wraps output in type

data/lib/remap/notice/error.rb

@@ -25,8 +25,13 @@ module Remap
       end
 
       def traced(backtrace)
-        tap { _1.set_backtrace(backtrace) }
+        e = Traced.new(notice: notice)
+        e.set_backtrace(backtrace)
+        e
       end
     end
+
+    class Traced < Error
+    end
   end
 end

data/lib/remap/rule/block.rb

@@ -23,11 +23,15 @@ module Remap
           return state.except(:value)
         end
 
-        rules.map do |rule|
-          rule.call(state) do |failure|
+        rules.reduce(state.except(:value)) do |s1, rule|
+          result = rule.call(state) do |failure|
             return error[failure]
           end
-        end.reduce(&:combine)
+
+          s1.combine(result)
+        rescue Notice::Fatal => e
+          raise e.traced(rule.backtrace)
+        end
       end
     end
   end

data/lib/remap/state/extension.rb

@@ -132,7 +132,7 @@ module Remap
               list1 + list2
             in [:value, left, right]
               fatal!(
-                "Could not merge [%p] (%s) with [%p] (%s)",
+                "Could not merge [%s] (%s) with [%s] (%s)",
                 left.formatted,
                 left.class,
                 right.formatted,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remap
 version: !ruby/object:Gem::Version
-  version: 2.2.34
+  version: 2.2.38
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport