remap 2.2.48 → 2.2.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a564dcf130adbf8c40eb089d14f498f993362b74823728ec8ad44b98014034e6
-  data.tar.gz: 3dcac97cd1e4c630ec55ccdbdb6c43922f2ce5367d770e471ebaa77f5ae3fc8c
+  metadata.gz: b08b87634002b0cae7bb2cd048e0ec99cfcec6769fdd583f9aabed3f350bdec4
+  data.tar.gz: de61b4d83778f29f4580a41a4e6eda80f5817ade7fbda0dddd7a6192034270e9
 SHA512:
-  metadata.gz: 237c0305757a4a12e5d3c24358fd9ed6295d0159baf0bb5786a9b019e3b50c98bd163334b35b04bab99ef1f19adeb232aec234a2aed76ad16ade778c3950606e
-  data.tar.gz: 1c6637383207baf0bd32fd6398f34dc935a5237e2fa67eafa2fccaa1db0d1f9d3f569c6f0695f9c148e737b1c4de15a974a09ba193d0af55ffaf3bef21bad07d
+  metadata.gz: e52d7bca5b4304ce6dd05fc7d868c49af4a0db0ccd9616a851c0ed0daa66425807f50baa6fbba9fcd4b1a8f5fcb177895c0b9bcb87fc3d1f34fee051c07fc172
+  data.tar.gz: 100f753a963b91ae5b8eca6ef7c480b19704e848efab92de313ffbd7c9048daf9db30a1422b4a65e7029c905def26b0690dd12c7279f4dd23c0eb8b4784ae805

data/lib/remap/rule/map/required.rb

@@ -16,7 +16,7 @@ module Remap
             end
 
             s3 = s2.then(&path.output)
-            s4 = s3.set(path: state.path)
+            s4 = s3.merge(path: state.path)
 
             s4.except(:key)
           end

data/lib/remap/state/extension.rb

@@ -223,6 +223,8 @@ module Remap
             state.merge!(notices: notices + [notice])
           in [{value:}, {mapper:}]
             state.merge!(scope: value, mapper: mapper)
+          in [{path: p1}, {path: p2}]
+            state.merge!(path: p1 + p2)
           in [{path:}, {key:, value:}]
             state.merge!(path: path + [key], key: key, value: value)
           in [{path:}, {key:}]
@@ -289,39 +291,33 @@ module Remap
         #
         # @return [State<U>]
         def execute(&block)
-          bind do |value|
-            result = catch :done do
-              tail_path = catch :ignore do
-                names = block.parameters.reduce([]) do |acc, (type, name)|
-                  case type
-                  in :keyreq
-                    acc + [name]
-                  else
-                    acc
-                  end
-                end
-
-                r = Proc.new(&block).call(value, **only(*names), **options.only(*names)) do |reason|
-                  ignore!(reason)
-                end
-                throw :done, r
-              rescue NameError => e
-                fatal!(e.message)
-              rescue KeyError => e
-                [e.key]
-              rescue IndexError
-                []
+          value = fetch(:value) { return self }
+
+          path = catch :ignore do
+            names = block.parameters.reduce([]) do |acc, (type, name)|
+              case type
+              in :keyreq
+                acc + [name]
+              else
+                acc
               end
-
-              set(path: path + tail_path).ignore!("Undefined path")
             end
 
-            if result.equal?(Dry::Core::Constants::Undefined)
-              ignore!("Undefined returned, skipping!")
+            n1 = options.only(*names)
+            n2 = only(*names)
+
+            result = block[value, **n2, **n1] do |reason|
+              return ignore!(reason)
             end
 
-            set(result)
+            return set(result)
           end
+
+          set(path: path).ignore!("Undefined path")
+        rescue KeyError => e
+          set(path: [e.key]).ignore!(e.message)
+        rescue IndexError => e
+          ignore!(e.message)
         end
 
         # Passes {#value} to block and returns {self}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remap
 version: !ruby/object:Gem::Version
-  version: 2.2.48
+  version: 2.2.49
 platform: ruby
 authors:
 - Linus Oleander