code-ruby 0.11.0 → 0.13.0

data/lib/code/object/nothing.rb

@@ -2,32 +2,14 @@
 
 class Code
   class Object
-    class Nothing < ::Code::Object
-      attr_reader :raw
-
-      def initialize
+    class Nothing < Object
+      def initialize(*_args, **_kargs, &_block)
         @raw = nil
       end
 
-      def self.name
-        "Nothing"
-      end
-
-      def inspect
-        "nothing"
-      end
-
-      def to_s
-        ""
-      end
-
       def truthy?
         false
       end
-
-      def as_json(...)
-        raw.as_json(...)
-      end
     end
   end
 end

data/lib/code/object/parameter.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class Code
+  class Object
+    class Parameter < Object
+      def initialize(*args, **_kargs, &_block)
+        @raw = Dictionary.new(args.first.presence || {})
+      end
+
+      def code_name
+        String.new(raw.code_get(String.new(:name)))
+      end
+
+      def code_keyword
+        Boolean.new(raw.code_get(String.new(:keyword)))
+      end
+
+      def code_regular_splat
+        Boolean.new(raw.code_get(String.new(:regular_splat)))
+      end
+
+      def code_keyword_splat
+        Boolean.new(raw.code_get(String.new(:keyword_splat)))
+      end
+
+      def code_default
+        Code.new(raw.code_get(String.new(:default)))
+      end
+
+      def evaluate(...)
+        default.evaluate(...)
+      end
+
+      def regular?
+        !keyword?
+      end
+
+      def keyword?
+        code_keyword.truthy?
+      end
+
+      def regular_splat?
+        code_regular_splat.truthy?
+      end
+
+      def keyword_splat?
+        code_keyword_splat.truthy?
+      end
+    end
+  end
+end

data/lib/code/object/range.rb

@@ -3,17 +3,14 @@
 class Code
   class Object
     class Range < Object
-      attr_reader :raw, :exclude_end, :left, :right
+      attr_reader :left, :right, :options, :exclude_end
 
-      def initialize(left, right, exclude_end: false)
-        @left = left
-        @right = right
-        @exclude_end = !exclude_end.nil?
-        @raw = ::Range.new(left, right, exclude_end)
-      end
-
-      def self.name
-        "Range"
+      def initialize(*args, **_kargs, &_block)
+        @left = args.first.presence || Integer.new(0)
+        @right = args.second.presence || Integer.new(0)
+        @options = Dictionary.new(args.third.presence || {})
+        @exclude_end = Boolean.new(options.code_get(String.new(:exclude_end)))
+        @raw = ::Range.new(left, right, exclude_end?)
       end
 
       def call(**args)
@@ -45,7 +42,7 @@ class Code
           sig(args) { Function }
           code_select(value, **globals)
         when "step"
-          sig(args) { Number }
+          sig(args) { Integer | Decimal }
           code_step(value)
         when "to_list"
           sig(args)
@@ -102,6 +99,10 @@ class Code
         )
       end
 
+      def exclude_end?
+        exclude_end.truthy?
+      end
+
       def code_step(argument)
         list = List.new
         element = left
@@ -126,22 +127,6 @@ class Code
       def code_to_list
         List.new(raw.to_a)
       end
-
-      def exclude_end?
-        !!exclude_end
-      end
-
-      def inspect
-        to_s
-      end
-
-      def to_s
-        raw.to_s
-      end
-
-      def as_json(...)
-        raw.as_json(...)
-      end
     end
   end
 end

data/lib/code/object/string.rb

@@ -3,15 +3,10 @@
 class Code
   class Object
     class String < Object
-      attr_reader :raw
-
-      def initialize(string)
-        string = string.raw if string.is_a?(String)
-        @raw = string.to_s
-      end
-
-      def self.name
-        "String"
+      def initialize(*args, **_kargs, &_block)
+        raw = args.first || Nothing.new
+        raw = raw.raw if raw.is_a?(Object)
+        @raw = raw.to_s
       end
 
       def call(**args)
@@ -25,7 +20,7 @@ class Code
           sig(args)
           code_to_function(**globals)
         when "*"
-          sig(args) { Number }
+          sig(args) { Integer | Decimal }
           code_multiplication(value)
         when "+"
           sig(args) { Object }
@@ -65,7 +60,7 @@ class Code
       end
 
       def code_to_function(**globals)
-        Code::Node::Code.new(
+        Node::Code.new(
           [
             {
               function: {
@@ -89,22 +84,6 @@ class Code
           ]
         ).evaluate(**globals)
       end
-
-      def inspect
-        raw.inspect
-      end
-
-      def succ
-        String.new(raw.succ)
-      end
-
-      def to_s
-        raw
-      end
-
-      def as_json(...)
-        raw.as_json(...)
-      end
     end
   end
 end

data/lib/code/object/time.rb

@@ -5,17 +5,11 @@ class Code
     class Time < Object
       DEFAULT_ZONE = "Etc/UTC"
 
-      attr_reader :raw
-
-      def initialize(time)
+      def initialize(*args, **_kargs, &_block)
         ::Time.zone ||= DEFAULT_ZONE
-        time = time.raw if time.is_a?(Time)
-        time = time.to_s if time.is_a?(::Time)
-        @raw = ::Time.zone.parse(time)
-      end
-
-      def self.name
-        "Time"
+        raw = args.first.presence || ::Time.zone.now
+        raw = raw.raw if raw.is_an?(Object)
+        @raw = ::Time.zone.parse(raw.to_s)
       end
 
       def self.call(**args)
@@ -28,6 +22,9 @@ class Code
         when "tomorrow"
           sig(args)
           code_tomorrow
+        when "yesterday"
+          sig(args)
+          code_yesterday
         else
           super
         end
@@ -35,12 +32,17 @@ class Code
 
       def self.code_tomorrow
         ::Time.zone ||= DEFAULT_ZONE
-        new(::Time.zone.tomorrow.beginning_of_day)
+        new(::Time.zone.tomorrow)
+      end
+
+      def self.code_yesterday
+        ::Time.zone ||= DEFAULT_ZONE
+        new(::Time.zone.yesterday)
       end
 
       def self.code_now
         ::Time.zone ||= DEFAULT_ZONE
-        new(::Time.zone.now.beginning_of_day)
+        new(::Time.zone.now)
       end
 
       def call(**args)
@@ -83,18 +85,6 @@ class Code
       def code_future?
         code_after?
       end
-
-      def inspect
-        to_s
-      end
-
-      def to_s
-        raw.to_s
-      end
-
-      def as_json(...)
-        raw.as_json(...)
-      end
     end
   end
 end

data/lib/code/object.rb

@@ -2,12 +2,13 @@
 
 class Code
   class Object
-    def self.maybe
-      Type::Maybe.new(self)
+    attr_reader :raw
+
+    def initialize(*_args, **_kargs, &_block)
     end
 
-    def self.name
-      "Object"
+    def self.maybe
+      Type::Maybe.new(self)
     end
 
     def self.repeat(minimum = 0, maximum = nil)
@@ -29,6 +30,9 @@ class Code
       value = arguments.first&.value
 
       case operator.to_s
+      when "new"
+        sig(args) { Object.repeat }
+        code_new(*arguments.map(&:value))
       when "!", "not"
         sig(args)
         code_exclamation_point
@@ -65,6 +69,48 @@ class Code
       when "||", "or"
         sig(args) { Object }
         code_or_operator(value)
+      when "to_boolean"
+        sig(args)
+        Boolean.new(self)
+      when "to_class"
+        sig(args)
+        Class.new(self)
+      when "to_date"
+        sig(args)
+        Date.new(self)
+      when "to_decimal"
+        sig(args)
+        Decimal.new(self)
+      when "to_dictionary"
+        sig(args)
+        Dictionary.new(self)
+      when "to_duration"
+        sig(args)
+        Duration.new(self)
+      when "to_integer"
+        sig(args)
+        Integer.new(self)
+      when "to_list"
+        sig(args)
+        List.new(self)
+      when "to_nothing"
+        sig(args)
+        Nothing.new(self)
+      when "to_range"
+        sig(args)
+        Range.new(self)
+      when "to_string"
+        sig(args)
+        String.new(self)
+      when "to_time"
+        sig(args)
+        Time.new(self)
+      when "as_json"
+        sig(args)
+        code_as_json
+      when "to_json"
+        sig(args) { { pretty: Boolean.maybe } }
+        code_to_json(pretty: value&.code_get(String.new(:pretty)))
       when /=$/
         sig(args) { Object }
 
@@ -86,12 +132,16 @@ class Code
         context.code_fetch(self)
       else
         raise(
-          Code::Error::Undefined,
+          Error::Undefined,
           "#{operator} not defined on #{inspect}:Class"
         )
       end
     end
 
+    def self.code_new(*arguments)
+      new(*arguments)
+    end
+
     def self.code_and_operator(other)
       truthy? ? other : self
     end
@@ -145,10 +195,6 @@ class Code
       nil
     end
 
-    def self.name
-      "Object"
-    end
-
     def self.to_s
       name
     end
@@ -161,6 +207,26 @@ class Code
       true
     end
 
+    def self.to_json(...)
+      as_json(...).to_json(...)
+    end
+
+    def self.as_json(...)
+      name.as_json(...)
+    end
+
+    def self.code_to_json(pretty: nil)
+      if Boolean.new(pretty).truthy?
+        String.new(::JSON.pretty_generate(self))
+      else
+        String.new(to_json)
+      end
+    end
+
+    def self.code_as_json
+      Json.to_code(as_json)
+    end
+
     def <=>(other)
       if respond_to?(:raw)
         raw <=> (other.respond_to?(:raw) ? other.raw : other)
@@ -220,6 +286,48 @@ class Code
       when "||", "or"
         sig(args) { Object }
         code_or_operator(value)
+      when "to_boolean"
+        sig(args)
+        Boolean.new(self)
+      when "to_class"
+        sig(args)
+        Class.new(self)
+      when "to_date"
+        sig(args)
+        Date.new(self)
+      when "to_decimal"
+        sig(args)
+        Decimal.new(self)
+      when "to_duration"
+        sig(args)
+        Duration.new(self)
+      when "to_dictionary"
+        sig(args)
+        Dictionary.new(self)
+      when "to_integer"
+        sig(args)
+        Integer.new(self)
+      when "to_list"
+        sig(args)
+        List.new(self)
+      when "to_nothing"
+        sig(args)
+        Nothing.new(self)
+      when "to_range"
+        sig(args)
+        Range.new(self)
+      when "to_string"
+        sig(args)
+        String.new(self)
+      when "to_time"
+        sig(args)
+        Time.new(self)
+      when "as_json"
+        sig(args)
+        code_as_json
+      when "to_json"
+        sig(args) { { pretty: Boolean.maybe } }
+        code_to_json(pretty: value&.code_get(String.new(:pretty)))
       when /=$/
         sig(args) { Object }
 
@@ -241,8 +349,8 @@ class Code
         context.code_fetch(self)
       else
         raise(
-          Code::Error::Undefined,
-          "#{operator} not defined on #{inspect}:#{self.class.name}"
+          Error::Undefined,
+          "#{operator.inspect} not defined on #{inspect}:#{self.class.name}"
         )
       end
     end
@@ -264,11 +372,23 @@ class Code
     end
 
     def code_exclusive_range(value)
-      Range.new(self, value, exclude_end: true)
+      Range.new(
+        self,
+        value,
+        Dictionary.new({
+          String.new(:exclude_end) => Boolean.new(true)
+        })
+      )
     end
 
     def code_inclusive_range(value)
-      Range.new(self, value, exclude_end: false)
+      Range.new(
+        self,
+        value,
+        Dictionary.new({
+          String.new(:exclude_end) => Boolean.new(false)
+        })
+      )
     end
 
     def code_or_operator(other)
@@ -317,11 +437,31 @@ class Code
     end
 
     def to_json(...)
-      as_json(...).to_json
+      as_json(...).to_json(...)
     end
 
     def as_json(...)
-      raw.as_json
+      raw.as_json(...)
+    end
+
+    def code_to_json(pretty: nil)
+      if Boolean.new(pretty).truthy?
+        String.new(::JSON.pretty_generate(self))
+      else
+        String.new(to_json)
+      end
+    end
+
+    def code_as_json
+      Json.to_code(as_json)
+    end
+
+    def succ
+      if raw.respond_to?(:succ)
+        self.class.new(raw.succ)
+      else
+        self.class.new(self)
+      end
     end
   end
 end

data/lib/code/parser.rb

@@ -2,7 +2,7 @@
 
 class Code
   class Parser
-    class Error < ::Code::Error
+    class Error < Error
     end
 
     def initialize(input)

data/lib/code/type.rb

@@ -2,8 +2,16 @@
 
 class Code
   class Type
-    def name
-      "Type"
+    def maybe
+      Maybe.new(self)
+    end
+
+    def repeat(minimum = 0, maximum = nil)
+      Repeat.new(self, minimum:, maximum:)
+    end
+
+    def |(other)
+      Or.new(self, other)
     end
 
     def valid?(_argument)

data/lib/code/version.rb

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

data/lib/code-ruby.rb

@@ -5,7 +5,9 @@ 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 "bigdecimal"
+require "bigdecimal/util"
 require "json"
 require "language-ruby"
 require "stringio"
@@ -15,3 +17,7 @@ require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")
 loader.setup
+
+class Object
+  alias is_an? is_a?
+end

data/lib/code.rb

@@ -17,6 +17,12 @@ class Code
     @context = Object::Context.new
   end
 
+  def self.parse(input, timeout: DEFAULT_TIMEOUT)
+    Timeout.timeout(timeout) do
+      Parser.parse(input).to_raw
+    end
+  end
+
   def self.evaluate(
     input,
     output: StringIO.new,
@@ -28,11 +34,8 @@ class Code
 
   def evaluate
     Timeout.timeout(timeout) do
-      Node::Code.new(::Code::Parser.parse(input).to_raw).evaluate(
-        context:,
-        output:,
-        error:
-      )
+      parsed = Code.parse(input)
+      Node::Code.new(parsed).evaluate(context:, output:, error:)
     end
   end
 

data/spec/code/object/dictionary_spec.rb

@@ -76,10 +76,8 @@ RSpec.describe Code::Object::Dictionary do
     ["{ a: nothing }.compact", "{}"],
     ["{ age: 31 }.delete_unless { |key| key == :age }", "{ age: 31 }"],
     ["{ age: 31 }.delete_unless(Integer)", "{ age: 31 }"],
-    ["{ age: 31 }.delete_unless(Number)", "{ age: 31 }"],
     ["{ age: 31 }.keep_unless { |key| key == :age }", "{}"],
     ["{ age: 31 }.keep_unless(Integer)", "{}"],
-    ["{ age: 31 }.keep_unless(Number)", "{}"],
     ["{ first_name: :Dorian } < dictionary", "true"],
     ["{ first_name: :Dorian }.any? { |_, value| value == :Dorian }", "true"],
     ["{ first_name: :Dorian }.delete_if { |_, value| value == :Dorian }", "{}"],