code-ruby 0.13.1 → 0.14.1

data/lib/code/object.rb

@@ -4,7 +4,7 @@ class Code
   class Object
     attr_reader :raw
 
-    def initialize(*_args, **_kargs, &_block)
+    def initialize(...)
     end
 
     def self.maybe
@@ -19,20 +19,15 @@ class Code
       Type::Or.new(self, other)
     end
 
-    def self.sig(args, &block)
-      Type::Sig.sig(args, object: self, &block)
-      nil
-    end
-
     def self.call(**args)
       operator = args.fetch(:operator, nil)
-      arguments = args.fetch(:arguments, [])
-      value = arguments.first&.value
+      arguments = args.fetch(:arguments, List.new)
+      value = arguments.code_first
 
       case operator.to_s
       when "new"
         sig(args) { Object.repeat }
-        code_new(*arguments.map(&:value))
+        code_new(*arguments.raw)
       when "!", "not"
         sig(args)
         code_exclamation_point
@@ -60,9 +55,6 @@ class Code
       when "falsy?"
         sig(args)
         Boolean.new(falsy?)
-      when "to_string"
-        sig(args)
-        code_to_string
       when "truthy?"
         sig(args)
         Boolean.new(truthy?)
@@ -110,7 +102,11 @@ class Code
         code_as_json
       when "to_json"
         sig(args) { { pretty: Boolean.maybe } }
-        code_to_json(pretty: value&.code_get(String.new(:pretty)))
+        if arguments.any?
+          code_to_json(pretty: value.code_get(String.new(:pretty)))
+        else
+          code_to_json
+        end
       when /=$/
         sig(args) { Object }
 
@@ -123,8 +119,8 @@ class Code
             self,
             context.code_fetch(self).call(
               **args,
-              operator: operator[..-2],
-              arguments: [Argument.new(value)]
+              operator: operator.chop,
+              arguments: List.new([value])
             )
           )
         end
@@ -133,13 +129,13 @@ class Code
       else
         raise(
           Error::Undefined,
-          "#{operator} not defined on #{inspect}:Class"
+          "#{operator.inspect} not defined on #{inspect}:Class"
         )
       end
     end
 
-    def self.code_new(*arguments)
-      new(*arguments)
+    def self.code_new(*)
+      new(*)
     end
 
     def self.code_and_operator(other)
@@ -178,10 +174,6 @@ class Code
       Boolean.new(self === other)
     end
 
-    def self.code_to_string
-      String.new(to_s)
-    end
-
     def self.falsy?
       !truthy?
     end
@@ -190,8 +182,8 @@ class Code
       keys.map { |key| [key, hash.fetch(key)] }.to_h
     end
 
-    def self.sig(args, &block)
-      Type::Sig.sig(args, object: self, &block)
+    def self.sig(args, &)
+      Type::Sig.sig(args, object: self, &)
       nil
     end
 
@@ -242,12 +234,12 @@ class Code
         other == self
       end
     end
-    alias eql? ==
+    alias_method :eql?, :==
 
     def call(**args)
       operator = args.fetch(:operator, nil)
-      arguments = args.fetch(:arguments, [])
-      value = arguments.first&.value
+      arguments = args.fetch(:arguments, List.new)
+      value = arguments.code_first
 
       case operator.to_s
       when "!", "not"
@@ -277,9 +269,6 @@ class Code
       when "falsy?"
         sig(args)
         Boolean.new(falsy?)
-      when "to_string"
-        sig(args)
-        code_to_string
       when "truthy?"
         sig(args)
         Boolean.new(truthy?)
@@ -327,7 +316,11 @@ class Code
         code_as_json
       when "to_json"
         sig(args) { { pretty: Boolean.maybe } }
-        code_to_json(pretty: value&.code_get(String.new(:pretty)))
+        if arguments.any?
+          code_to_json(pretty: value.code_get(String.new(:pretty)))
+        else
+          code_to_json
+        end
       when /=$/
         sig(args) { Object }
 
@@ -340,8 +333,8 @@ class Code
             self,
             context.code_fetch(self).call(
               **args,
-              operator: operator[..-2],
-              arguments: [Argument.new(value)]
+              operator: operator.chop,
+              arguments: List.new([value])
             )
           )
         end
@@ -375,9 +368,7 @@ class Code
       Range.new(
         self,
         value,
-        Dictionary.new({
-          String.new(:exclude_end) => Boolean.new(true)
-        })
+        Dictionary.new({ String.new(:exclude_end) => Boolean.new(true) })
       )
     end
 
@@ -385,9 +376,7 @@ class Code
       Range.new(
         self,
         value,
-        Dictionary.new({
-          String.new(:exclude_end) => Boolean.new(false)
-        })
+        Dictionary.new({ String.new(:exclude_end) => Boolean.new(false) })
       )
     end
 
@@ -403,10 +392,6 @@ class Code
       Boolean.new(self === other)
     end
 
-    def code_to_string
-      String.new(to_s)
-    end
-
     def falsy?
       !truthy?
     end
@@ -419,8 +404,8 @@ class Code
       keys.map { |key| [key, hash.fetch(key)] }.to_h
     end
 
-    def sig(args, &block)
-      Type::Sig.sig(args, object: self, &block)
+    def sig(args, &)
+      Type::Sig.sig(args, object: self, &)
       nil
     end
 
@@ -457,11 +442,7 @@ class Code
     end
 
     def succ
-      if raw.respond_to?(:succ)
-        self.class.new(raw.succ)
-      else
-        self.class.new(self)
-      end
+      raw.respond_to?(:succ) ? self.class.new(raw.succ) : self.class.new(self)
     end
   end
 end

data/lib/code/parser/string.rb

@@ -20,7 +20,7 @@ class Code
       end
 
       def backslash
-        str('\\')
+        str("\\")
       end
 
       def opening_curly_bracket

data/lib/code/type/repeat.rb

@@ -21,7 +21,7 @@ class Code
 
       def max_arguments
         max_arguments = max_arguments_of(clazz)
-        max_arguments.nil? || maximum.nil? ? nil : maximum * max_arguments
+        (max_arguments.nil? || maximum.nil?) ? nil : maximum * max_arguments
       end
 
       def name

data/lib/code/type/sig.rb

@@ -40,7 +40,7 @@ class Code
       end
 
       def actual_arguments
-        args.fetch(:arguments, []).map(&:value)
+        args[:arguments]&.raw || []
       end
 
       def operator
@@ -94,8 +94,6 @@ class Code
           Error::ArityError,
           "#{function}: Expected #{expected_count} but got #{actual_count}"
         )
-
-        nil
       end
 
       def valid_for?(expected:, actual:)

data/lib/code/version.rb

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

data/lib/code-ruby.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support"
-require "active_support/core_ext/date/conversions"
-require "active_support/core_ext/numeric/time"
-require "active_support/core_ext/object/json"
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/array/access"
+require "active_support/all"
 require "bigdecimal"
 require "bigdecimal/util"
 require "json"
@@ -19,5 +14,5 @@ loader.ignore("#{__dir__}/code-ruby.rb")
 loader.setup
 
 class Object
-  alias is_an? is_a?
+  alias_method :is_an?, :is_a?
 end

data/lib/code.rb

@@ -18,9 +18,7 @@ class Code
   end
 
   def self.parse(input, timeout: DEFAULT_TIMEOUT)
-    Timeout.timeout(timeout) do
-      Parser.parse(input).to_raw
-    end
+    Timeout.timeout(timeout) { Parser.parse(input).to_raw }
   end
 
   def self.evaluate(

data/spec/code/object/dictionary_spec.rb

@@ -7,20 +7,20 @@ RSpec.describe Code::Object::Dictionary do
 
   [
     [
-      "dictionary.select { |key, value, dictionnary, index| key == :first_name }",
+      "dictionary.select { |key| key == :first_name }",
       "{ first_name: :Dorian }"
     ],
     [
-      "dictionary.select { |key, value, dictionnary, index| value == :Dorian }",
+      "dictionary.select { |_, value| value == :Dorian }",
       "{ first_name: :Dorian }"
     ],
     [
-      "dictionary.select { |key, value, dictionnary, index| dictionnary.two? }",
-      "dictionary"
+      "dictionary.select { |_, _, index, _| index.zero? }",
+      "{ first_name: :Dorian }"
     ],
     [
-      "dictionary.select { |key, value, dictionnary, index| index.zero? }",
-      "{ first_name: :Dorian }"
+      "dictionary.select { |_, _, _, dictionary| dictionary.two? }",
+      "dictionary"
     ],
     [
       "dictionary.fetch(:first_name, :last_name) { :Marié }",

data/spec/code_spec.rb

@@ -3,7 +3,6 @@
 require "spec_helper"
 
 RSpec.describe Code do
-
   %w[
     1.day.ago
     1.day.from_now
@@ -61,9 +60,6 @@ RSpec.describe Code do
     Time.tomorrow
     Code.new
     Parameter.new
-    Argument.new
-    Argument.new(1)
-    Argument.new(1,name:"index")
     IdentifierList.new
     IdentifierList.new([])
   ].each { |input| it(input) { Code.evaluate(input) } }
@@ -270,14 +266,17 @@ RSpec.describe Code do
     ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
     ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
     ['{ "first_name": "Dorian" }.as_json', '{"first_name" => "Dorian"}'],
-    ["nothing.to_json", ":null"],
-    ["1.to_json", ":1"],
-    ["1.0.to_json", ":1"],
-    ["1.1.to_json", %{'"1.1"'}],
+    %w[nothing.to_json :null],
+    %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
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
+      next if Code.evaluate(input).is_a?(Code::Object::Decimal)
       expect(Code.evaluate(input).to_json).to eq(
         Code.evaluate(expected).to_json
       )

data/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-09 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,16 +87,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/bundle-audit
+- bin/bundler-audit
 - bin/code
 - bin/console
+- bin/rspec
+- bin/rubocop
 - code-ruby.gemspec
 - lib/code-ruby.rb
 - lib/code.rb
@@ -130,7 +137,6 @@ files:
 - lib/code/node/unary_minus.rb
 - lib/code/node/while.rb
 - lib/code/object.rb
-- lib/code/object/argument.rb
 - lib/code/object/boolean.rb
 - lib/code/object/class.rb
 - lib/code/object/code.rb
@@ -221,6 +227,7 @@ files:
 - spec/code/type_spec.rb
 - spec/code_spec.rb
 - spec/spec_helper.rb
+- yarn.lock
 homepage: https://github.com/dorianmariecom/code-ruby
 licenses:
 - MIT

data/lib/code/object/argument.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Object
-    class Argument < Object
-      attr_reader :value, :name
-
-      def initialize(*args, **_kargs, &_block)
-        @value = args.first.presence || Nothing.new
-        @name = args.second.present? ? String.new(args.second) : nil
-        @raw = List.new([@value, @name])
-      end
-
-      def keyword?
-        !regular?
-      end
-
-      def name_value
-        [name, value]
-      end
-
-      def regular?
-        !name
-      end
-    end
-  end
-end