code-ruby 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c99f4f0ee7e0d6ac477e266434a927ae59acc6cbf0ae50237397801acbd790a9
-  data.tar.gz: a6b1fb15a82837f17482a64d0e03f371b88d9f6fc1a7cd0ce10f37473ed71174
+  metadata.gz: 4457f2b10410f6514df4f0eebb52d52931724e2b448bd8e179650942f78aba9f
+  data.tar.gz: c9a3214b391d5a39aa185dd48ad6bde35bbd537616b93d626ff6686fc341ed9a
 SHA512:
-  metadata.gz: ac6a450e1cdc87c22ce13b834158c50ff3688152f524560c5fa35a3c86fa11f607859208e1fb1cad5333147bbbb5674e862e92c393e70382c4a42dc5e86bd153
-  data.tar.gz: 5cdaa736e54913b5de049fb580ddbef07e5240d9f5de7cb7aa183b5c7abd70601839a74378b779bdcb313de1cf2398d651a34f596afbcb4f3299c885e7ba28ff
+  metadata.gz: 6ba9119d592685a669c174ead2554725ec5586f25bcf41b3c9c418fb95965327cf0e84f1797e3dd83abc7c4cfe4bb9be4ed2f2fbd7fb9e98de94571b83c53647
+  data.tar.gz: e1c928ad8bbeab9b0101af715cea94ebefa8540465ae4482e7a8afa8d5e88436a800b8097e51a44b624bb8171c0940397f1eb4b871269d130eb2453e74fa3da3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.13.1)
+    code-ruby (0.14.0)
       activesupport (~> 7)
       bigdecimal (~> 3)
       json (~> 2)

data/lib/code/object/dictionary.rb

@@ -107,6 +107,9 @@ class Code
         when "merge"
           sig(args) { [Dictionary.repeat, Function.maybe] }
           code_merge(*arguments.raw, **globals)
+        when "merge!"
+          sig(args) { [Dictionary.repeat, Function.maybe] }
+          code_merge!(*arguments.raw, **globals)
         when "nine?"
           sig(args)
           code_nine?
@@ -470,6 +473,40 @@ class Code
         )
       end
 
+      def code_merge!(*arguments, **globals)
+        conflict =
+          (
+            if arguments.last.is_a?(Function) && arguments.size > 1
+              arguments.last
+            end
+          )
+
+        arguments = arguments[..-2] if conflict
+
+        index = 0
+
+        raw.merge!(*arguments.map(&:raw)) do |key, old_value, new_value|
+          if conflict
+            conflict
+              .call(
+                arguments:
+                  List.new(
+                    [key, old_value, new_value, Integer.new(index), self]
+                  ),
+                **globals
+              )
+              .tap { index += 1 }
+          else
+            new_value.tap { index += 1 }
+          end
+        rescue Error::Next => e
+          index += 1
+          e.value || Nothing.new
+        end
+
+        self
+      end
+
       def code_nine?
         code_size.code_nine?
       end

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.14.0")
+Code::Version = Gem::Version.new("0.14.1")

data/spec/code_spec.rb

@@ -270,6 +270,8 @@ RSpec.describe Code do
     %w[1.to_json "1"],
     %w[1.0.to_json '"1.0"'],
     %w[1.1.to_json '"1.1"'],
+    ["a = {} a.merge!(a: 1) a", "{a: 1}"],
+    ["a = {} a.merge(a: 1) a", "{}"],
     ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Dorian Marié