code-ruby 3.0.13 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6baa3c7c3ef6b602529e2af4a36200029291ed89c115f1c1f3d750a8e815cc03
-  data.tar.gz: aa9c876fb0aff915f895ec3d209d25ac06270e3809eadba8f5e71b37b9cb29db
+  metadata.gz: 2495002bb8e1d284386f2a90ff600370cfe0490a356688426682ec106727fbb3
+  data.tar.gz: e8dffdf7d8d0c0e62a091d2a7d305eae48dc74d024aa26c5a8dc393763147f13
 SHA512:
-  metadata.gz: 444adc5d9b9a5223b82a921a888558a2f23dc40344a12b383137581b910ba4e33ea13873a2e5ce6698dc130ae77775cf9aa5b3e0e23f70947418301831df96b9
-  data.tar.gz: bcf7ecebc28788a2cf7464e3a7b67f32b2bfb86ec3d6365ca58674914d852181d27f3a051b596665807acd67291c2026d227b98d33603260e3122417e04d6a76
+  metadata.gz: 55ceb13028c588110d3adec5539995ddd1f2dc4fd7173fd067a8e009a8093610adb150de78be46dfc57e605dbad0f03dd89e5693820be31c6d61c3440fb129ea
+  data.tar.gz: 6ae82061c1a129f1607eb348e18917e75c7d23accf7dca589da00ed3ae34eccf76af79826e430f5267b4a2011ce7c9df8a1709069f95f660c8dff22d16c0c37a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (3.0.13)
+    code-ruby (3.1.2)
       activesupport
       base64
       bigdecimal
@@ -20,7 +20,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.2)
+    activesupport (8.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -33,11 +33,11 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.9)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     bundler-audit (0.9.3)
       bundler (>= 1.2.0)
       thor (~> 1.0)
@@ -79,7 +79,7 @@ GEM
     dorian-to_struct (2.0.2)
     drb (2.2.3)
     geom2d (0.4.1)
-    git (4.3.1)
+    git (4.3.2)
       activesupport (>= 5.0)
       addressable (~> 2.8)
       process_executer (~> 4.0)
@@ -89,23 +89,20 @@ GEM
       thor
       tilt
     hashdiff (1.2.1)
-    hexapdf (1.6.0)
+    hexapdf (1.8.0)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
       openssl (>= 2.2.1)
       strscan (>= 3.1.2)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    icalendar (2.12.2)
+    icalendar (2.12.3)
       base64
       ice_cube (~> 0.16)
       logger
       ostruct
     ice_cube (0.17.0)
-    json (2.18.1)
-    json-schema (6.1.0)
-      addressable (~> 2.8)
-      bigdecimal (>= 3.1, < 5)
+    json (2.19.5)
     language-ruby (1.2.0)
       dorian-arguments
       zeitwerk
@@ -121,19 +118,16 @@ GEM
       net-imap
       net-pop
       net-smtp
-    mcp (0.7.1)
-      json-schema (>= 4.1)
     mini_mime (1.1.5)
-    mini_racer (0.20.0)
+    mini_racer (0.21.0)
       libv8-node (~> 24.12.0.1)
-    minitest (6.0.2)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    mustermann (3.0.4)
-      ruby2_keywords (~> 0.0.1)
+    mustermann (3.1.1)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.3)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -142,34 +136,34 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nokogiri (1.19.1-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    openssl (4.0.1)
+    openssl (4.0.2)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (2.1.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
     prism (1.9.0)
-    process_executer (4.0.2)
+    process_executer (4.0.4)
       track_open_instances (~> 0.1)
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
-    rack (3.2.5)
+    rack (3.2.6)
     rack-protection (4.2.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rchardet (1.10.0)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     rexml (3.4.4)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -184,24 +178,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.85.0)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      mcp (~> 0.6)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (2.23.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
@@ -209,7 +202,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.34.3)
+    rubocop-rails (2.35.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -225,11 +218,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
-    ruby-prof (2.0.3)
+    ruby-prof (2.0.4)
       base64
       ostruct
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     securerandom (0.4.1)
     sinatra (4.2.1)
       logger (>= 1.6.0)
@@ -238,7 +230,7 @@ GEM
       rack-protection (= 4.2.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    strscan (3.1.7)
+    strscan (3.1.8)
     syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
     syntax_tree-haml (4.0.3)
@@ -253,7 +245,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 4)
     thor (1.5.0)
     tilt (2.7.0)
-    timeout (0.6.0)
+    timeout (0.6.1)
     track_open_instances (0.1.15)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -264,7 +256,7 @@ GEM
     w_syntax_tree-erb (0.12.0)
       prettier_print (~> 1.2, >= 1.2.0)
       syntax_tree (~> 6.1, >= 6.1.1)
-    webmock (3.26.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/VERSION

@@ -1 +1 @@
-3.0.13
+3.1.2

data/lib/code/format.rb

@@ -11,6 +11,7 @@ class Code
     MAX_INLINE_CALL_ARGUMENTS_LENGTH = 80
     MAX_INLINE_BLOCK_BODY_LENGTH = 40
     CONTINUATION_PADDING = 4
+    BOOLEAN_WORD_OPERATORS = %w[and or].freeze
 
     class << self
       def format(parsed)
@@ -328,13 +329,30 @@ class Code
     end
 
     def format_dictionary_statement_code(statement_code)
-      key = format_nested_statement(statement_code[:statement], indent: 0)
+      key =
+        format_dictionary_statement_key(statement_code[:statement]) ||
+        format_nested_statement(statement_code[:statement], indent: 0)
       return key unless statement_code.key?(:code)
 
       value = format_code_inline(statement_code[:code], indent: 0)
       "#{key}: #{value}"
     end
 
+    def format_dictionary_statement_key(statement)
+      return unless statement.is_a?(Hash) && statement.key?(:string)
+
+      parts = Array(statement[:string])
+      return unless parts.one?
+
+      part = parts.first
+      return unless part.is_a?(Hash) && part.key?(:text)
+
+      text = part[:text].to_s
+      return unless text.match?(/\A[a-z_][a-z0-9_]*\z/)
+
+      text
+    end
+
     def format_call(call, indent:)
       name = call[:name]
       raw_arguments = call[:arguments].presence || []
@@ -444,8 +462,8 @@ class Code
             if right.include?("\n")
               first_line, *rest = right.lines(chomp: true)
               if multiline_operand_statement?(other[:statement]) ||
-                   !%w[and or].include?(operator)
-                [ "#{expression} #{operator} #{first_line.lstrip}", *rest ].join("\n")
+                   !BOOLEAN_WORD_OPERATORS.include?(operator)
+                ["#{expression} #{operator} #{first_line.lstrip}", *rest].join("\n")
               else
                 [
                   "#{expression}\n#{INDENT * (indent + 1)}#{operator} #{first_line.lstrip}",
@@ -456,7 +474,7 @@ class Code
               right_lines =
                 if right.include?("\n")
                   right.lines(chomp: true).map(&:lstrip)
-                elsif %w[and or].include?(operator)
+                elsif BOOLEAN_WORD_OPERATORS.include?(operator)
                   right.split(" #{operator} ")
                 else
                   [right]
@@ -492,7 +510,7 @@ class Code
         expression
           .lines(chomp: true)[1..]
           .to_a
-          .reject { |line| line.strip.empty? || line.strip.match?(/\A[\)\]\}]+\z/) }
+          .reject { |line| line.strip.empty? || line.strip.match?(/\A[\])}]+\z/) }
 
       return false if continuation_lines.empty?
 
@@ -502,7 +520,7 @@ class Code
       continuation_lines.any? do |line|
         next false unless line[/\A */].to_s.length == base_indent
 
-        line.lstrip.match?(/\A(\+|-|\*|\/|%|<<|>>|\||\^|&|and\b|or\b)/)
+        line.lstrip.match?(%r{\A(\+|-|\*|/|%|<<|>>|\||\^|&|and\b|or\b)})
       end
     end
 
@@ -688,7 +706,13 @@ class Code
 
       if operator == "loop"
         body = format_code(while_statement[:body], indent: indent + 1)
-        return "#{INDENT * indent}loop {\n#{body}\n#{INDENT * indent}}"
+        parameters =
+          Array(while_statement[:parameters]).map do |parameter|
+            format_parameter(parameter, indent: indent)
+          end
+        header = parameters.empty? ? "loop {" : "loop { |#{parameters.join(", ")}|"
+
+        return "#{INDENT * indent}#{header}\n#{body}\n#{INDENT * indent}}"
       end
 
       statement =
@@ -713,6 +737,7 @@ class Code
 
       return true if statement.key?(:dictionnary) || statement.key?(:list)
       return true if statement.key?(:call)
+
       if statement.key?(:left_operation)
         operation = statement[:left_operation]
         others = Array(operation[:others])
@@ -791,6 +816,8 @@ class Code
       index, token = split
       left = line[0...index]
       right = line[(index + token.length)..]
+      return [line] if token == "." && left.strip.empty?
+
       continuation = "#{indent}#{INDENT}#{right.lstrip}"
 
       first_line =

data/lib/code/node/left_operation.rb

@@ -51,12 +51,20 @@ class Code
 
         @others.reduce(first) do |left, right|
           if right.call?
-            right.statement.evaluate(**args, object: left)
+            right.statement.evaluate(
+              **args,
+              object: left,
+              previous_object: args.fetch(:object)
+            )
           elsif right.safe_call?
             if left.is_an?(Object::Nothing)
               Object::Nothing.new
             else
-              right.statement.evaluate(**args, object: left)
+              right.statement.evaluate(
+                **args,
+                object: left,
+                previous_object: args.fetch(:object)
+              )
             end
           elsif (right.or? && left.truthy?) || (right.and? && left.falsy?)
             left
@@ -76,9 +84,18 @@ class Code
         list = Object::IdentifierList.new([first])
 
         (@others || []).each do |other|
-          list.code_append(
-            other.statement.resolve(**args, object: list.code_last)
-          )
+          resolved =
+            other.statement.resolve(
+              **args,
+              object: list.code_last,
+              previous_object: args.fetch(:object)
+            )
+
+          if resolved.is_a?(Object::IdentifierList)
+            resolved.raw.each { |identifier| list.code_append(identifier) }
+          else
+            list.code_append(resolved)
+          end
         end
 
         list

data/lib/code/node/square_bracket.rb

@@ -13,9 +13,10 @@ class Code
 
       def evaluate(**args)
         left = @left&.evaluate(**args) || Object::Nothing.new
+        index_args = args.merge(object: args.fetch(:previous_object, args.fetch(:object)))
 
         (@statements || []).reduce(left) do |object, statement|
-          object.code_fetch(statement.evaluate(**args))
+          object.code_fetch(statement.evaluate(**index_args))
         end
       end
 
@@ -29,8 +30,10 @@ class Code
             Object::IdentifierList.new([left])
           end
 
+        index_args = args.merge(object: args.fetch(:previous_object, args.fetch(:object)))
+
         (@statements || []).each do |statement|
-          list.code_append(statement.evaluate(**args))
+          list.code_append(statement.evaluate(**index_args))
         end
 
         list

data/lib/code/node/while.rb

@@ -14,6 +14,8 @@ class Code
         @statement = Statement.new(parsed.delete(:statement)) if parsed.key?(
           :statement
         )
+        @parameters = parsed.delete(:parameters) { [] }.presence || []
+        @parameters.map! { |parameter| FunctionParameter.new(parameter) }
         @body = Code.new(parsed.delete(:body).presence)
       end
 
@@ -53,11 +55,15 @@ class Code
 
       def evaluate_infinite_loop(**args)
         last = Object::Nothing.new
+        index = 0
 
         loop do
+          bind_loop_parameters(index, **args)
           last = @body&.evaluate(**args) || Object::Nothing.new
+          index += 1
         rescue Error::Next, Error::Continue => e
           last = e.code_value
+          index += 1
           next
         rescue Error::Retry
           retry
@@ -74,6 +80,21 @@ class Code
 
         condition_truthy ? condition : !condition
       end
+
+      def bind_loop_parameters(index, **args)
+        return if @parameters.blank?
+
+        @parameters.each.with_index do |parameter, parameter_index|
+          value =
+            if parameter_index.zero?
+              Object::Integer.new(index)
+            else
+              Object::Nothing.new
+            end
+
+          args.fetch(:context).code_set(parameter.name, value)
+        end
+      end
     end
   end
 end

data/lib/code/object/dictionary.rb

@@ -134,6 +134,11 @@ class Code
         code_arguments = args.fetch(:arguments, List.new).to_code
         globals = multi_fetch(args, *GLOBALS)
         code_value = code_arguments.code_first
+        stored_value = code_fetch(code_operator)
+
+        if stored_value.is_a?(Function)
+          return stored_value.call(**args, operator: nil, bound_self: self)
+        end
 
         case code_operator.to_s
         when "[]", "at", "get"
@@ -146,11 +151,11 @@ class Code
           sig(args)
           code_clear
         when "compact!"
-          sig(args)
-          code_compact!
+          sig(args) { (Function | Class).maybe }
+          code_compact!(code_value, **globals)
         when "compact"
-          sig(args)
-          code_compact
+          sig(args) { (Function | Class).maybe }
+          code_compact(code_value, **globals)
         when "delete"
           sig(args) { Object.repeat(1) }
           code_delete(*code_arguments.raw, **globals)
@@ -571,9 +576,13 @@ class Code
                 )
                 .truthy?
                 .tap { index += 1 }
+            rescue Error::Next => e
+              e.code_value.truthy?.tap { index += 1 }
             end
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_clear
@@ -581,13 +590,50 @@ class Code
         self
       end
 
-      def code_compact
-        Dictionary.new(raw.dup.delete_if { |_, value| value.falsy? })
+      def code_compact(argument = nil, **globals)
+        code_argument = argument.to_code
+
+        Dictionary.new(
+          raw.reject.with_index do |(key, value), index|
+            if code_argument.nothing?
+              value.nothing?
+            elsif code_argument.is_a?(Class)
+              value.is_a?(code_argument.raw)
+            else
+              code_argument.call(
+                arguments: List.new([value, key, Integer.new(index), self]),
+                **globals
+              ).truthy?
+            end
+          rescue Error::Next => e
+            e.code_value.truthy?
+          end
+        )
+      rescue Error::Break => e
+        e.code_value
       end
 
-      def code_compact!
-        raw.delete_if { |_, value| value.falsy? }
+      def code_compact!(argument = nil, **globals)
+        code_argument = argument.to_code
+
+        raw.reject!.with_index do |(key, value), index|
+          if code_argument.nothing?
+            value.nothing?
+          elsif code_argument.is_a?(Class)
+            value.is_a?(code_argument.raw)
+          else
+            code_argument.call(
+              arguments: List.new([value, key, Integer.new(index), self]),
+              **globals
+            ).truthy?
+          end
+        rescue Error::Next => e
+          e.code_value.truthy?
+        end
+
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_delete(*arguments, index: 0, **globals)
@@ -612,6 +658,8 @@ class Code
                 **globals
               )
             end
+          rescue Error::Next => e
+            e.code_value
           end
         else
           Dictionary.new(
@@ -638,6 +686,8 @@ class Code
               .to_h
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_delete_if(argument, **globals)
@@ -652,10 +702,14 @@ class Code
                 List.new([code_key, code_value, Integer.new(index), self]),
               **globals
             ).truthy?
+          rescue Error::Next => e
+            e.code_value.truthy?
           end
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_delete_unless(argument, **globals)
@@ -669,10 +723,14 @@ class Code
               arguments: List.new([key, value, Integer.new(index), self]),
               **globals
             ).falsy?
+          rescue Error::Next => e
+            e.code_value.falsy?
           end
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_dig(*arguments)
@@ -697,9 +755,13 @@ class Code
             arguments: List.new([key, value, Integer.new(index), self]),
             **globals
           )
+        rescue Error::Next => e
+          e.code_value
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_empty?
@@ -733,6 +795,8 @@ class Code
                 **globals
               )
             end
+          rescue Error::Next => e
+            e.code_value
           end
         else
           Dictionary.new(
@@ -759,6 +823,8 @@ class Code
               .to_h
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_fetch_values(*arguments)
@@ -803,10 +869,14 @@ class Code
               arguments: List.new([key, value, Integer.new(index), self]),
               **globals
             ).truthy?
+          rescue Error::Next => e
+            e.code_value.truthy?
           end
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_keep_unless(argument, **globals)
@@ -826,6 +896,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_key(value, function = nil, **globals)
@@ -838,7 +910,7 @@ class Code
           raw.key(code_value) ||
             function.call(arguments: List.new([code_value, self]), **globals)
         end
-      rescue Error::Next => e
+      rescue Error::Next, Error::Break => e
         e.code_value
       end
 
@@ -883,6 +955,8 @@ class Code
             e.code_value.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_merge!(*arguments, **globals)
@@ -922,6 +996,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select!(argument, **globals)
@@ -942,6 +1018,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select(argument, **globals)
@@ -964,6 +1042,8 @@ class Code
             end
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_set(key, value)
@@ -1007,6 +1087,8 @@ class Code
             end
             .to_h
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_values