camille 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a179a530118d866cdd0d5baa3b90a454a3d4c2a5c77b47d43b3be4132587b13
-  data.tar.gz: 82341acb5d71fa1209c32c9c2fa09fdde41bbe71890fa13cfe8469b43842489b
+  metadata.gz: 6b37e0a4afe4e40ef39ea0b1ea6ffa523c8b32c731c0574740ecbd47de87e150
+  data.tar.gz: 9af7a11aa04232eee613a8f26c29a8e59c9991a8b8e88e35c730ee2081db4576
 SHA512:
-  metadata.gz: 744ac81f6d267007676d123e4b9111a462989adde5f060e58bde32b749c6204f6912bd2b17fcba298b2aca0ee34f91fc534356ce6d3d3acb01d450e24e839168
-  data.tar.gz: 6bcd20cd62ff6de5c7ffd15666f1f6bf0a4c2d453acc682c109cad901b9cf8e77c488685b97ad8353efbff98ef810e30e4f4286a6e03f9428d11077319989622
+  metadata.gz: f52a3cb7c71e08d927986b4468d61f4814bc9de9534591be21ddb058a94825787daee610cf8be05b532def27e1a873e4408daeb0452adc8c8ee70572c3b5376a
+  data.tar.gz: e02f55abc595ad16ccb23a78320346b1c4d93c7c9127d3d9f19a87581c820f4cf86b7b10a5abf932d3642ac65b4672dcd4feba417eb1aac738608d398740d235

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.6.2
+
+### Added
+
+* Added `Camille::Rendered` to store type-checked JSON string. Using this can skip type-check and JSON rendering.
+* Added `Camille::Checked#render` to generate `Camille::Rendered`.
+
+### Changed
+
+* Use `JSON.dump` instead of ActiveSupport `.to_json`.
+
+## 0.6.1
+
+### Fixed
+
+* Tuple type checking now checks length.
+
 ## 0.6.0
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.5.16)
+    camille (0.6.1)
       rails (>= 6.1, < 8.1)
 
 GEM
@@ -109,7 +109,7 @@ GEM
     marcel (1.0.4)
     mini_mime (1.1.5)
     minitest (5.25.4)
-    net-imap (0.5.1)
+    net-imap (0.5.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -190,7 +190,7 @@ GEM
     securerandom (0.4.0)
     stringio (3.1.2)
     thor (1.3.2)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     useragent (0.16.11)

data/benchmarks/checking_class_of_object.rb

@@ -1,6 +1,9 @@
 require "benchmark/ips"
 
 class A
+  def is_A?
+    true
+  end
 end
 
 a = A.new
@@ -22,5 +25,9 @@ Benchmark.ips do |x|
     a.class.equal?(A)
   end
 
+  x.report("is_A?") do
+    a.is_A?
+  end
+
   x.compare!
 end

data/lib/camille/basic_type.rb

@@ -1,8 +1,30 @@
+require 'digest/md5'
+
 module Camille
   # This class specifies the methods available for all types includeing built-in and custom ones.
   class BasicType
     class InvalidTypeError < ::ArgumentError; end
 
+    module CheckRendered
+      def check value
+        if value.instance_of? Camille::Rendered
+          if @fingerprint == value.fingerprint
+            Camille::Checked.new(@fingerprint, value)
+          else
+            Camille::TypeError.new("Expected `Rendered` object with fingerprint #{@fingerprint}. Got fingerprint #{value.fingerprint}.")
+          end
+        else
+          super
+        end
+      end
+    end
+
+    attr_reader :fingerprint
+
+    def initialize
+      @fingerprint = Digest::MD5.hexdigest self.class.name
+    end
+
     def | other
       Camille::Types::Union.new(self, other)
     end
@@ -15,9 +37,8 @@ module Camille
       Camille::Types::Array.new(self)
     end
 
-    def transform_and_check value
-      transformed = transform value
-      [check(value), transformed]
+    def check value
+      raise NotImplementedError
     end
 
     def transform value
@@ -40,6 +61,10 @@ module Camille
       instance_method(:initialize).arity == 0
     end
 
+    def self.inherited klass
+      klass.prepend CheckRendered
+    end
+
     def self.instance value
       case
       when value.is_a?(::Hash)

data/lib/camille/checked.rb

@@ -0,0 +1,26 @@
+module Camille
+  class Checked
+    attr_reader :fingerprint, :value
+
+    def initialize fingerprint, value
+      @fingerprint = fingerprint
+      @value = value
+    end
+
+    def checked?
+      true
+    end
+
+    def type_error?
+      false
+    end
+
+    def render
+      if @value.instance_of? Camille::Rendered
+        @value
+      else
+        Camille::Rendered.new(@fingerprint, JSON.dump(@value))
+      end
+    end
+  end
+end

data/lib/camille/controller.rb

@@ -19,13 +19,14 @@ module Camille
         if intended_status == 200 || intended_status == :ok
           if render_options.has_key? :json
             value = render_options[:json]
-            error, transformed = endpoint.response_type.transform_and_check(value)
-            if error
+            result = endpoint.response_type.check(value)
+            if result.type_error?
               string_io = StringIO.new
-              Camille::TypeErrorPrinter.new(error).print(string_io)
+              Camille::TypeErrorPrinter.new(result).print(string_io)
               raise TypeError.new("\nType check failed for response.\n#{string_io.string}")
             else
-              super(json: transformed)
+              rendered = result.render.json
+              super(json: rendered)
             end
           else
             raise ArgumentError.new("Expected key :json for `render` call.")

data/lib/camille/intersection_preprocessor.rb

@@ -0,0 +1,61 @@
+module Camille
+  class IntersectionPreprocessor
+    class TypeNotCompatibleError < ArgumentError; end
+
+    class << self
+      def process left, right
+        if left.instance_of?(Camille::Types::Object) && right.instance_of?(Camille::Types::Object)
+          overlapping_keys = left.fields.keys & right.fields.keys
+
+          new_left_fields = []
+          new_left_optional_keys = []
+          new_right_fields = []
+          new_right_optional_keys = []
+
+          (left.fields.keys - overlapping_keys).each do |key|
+            new_left_fields << [key, left.fields[key]]
+            new_left_optional_keys << key if left.optional_keys.include?(key)
+          end
+
+          (right.fields.keys - overlapping_keys).each do |key|
+            new_right_fields << [key, right.fields[key]]
+            new_right_optional_keys << key if right.optional_keys.include?(key)
+          end
+
+          overlapping_keys.map do |key|
+            processed_left, processed_right = IntersectionPreprocessor.process(left.fields[key], right.fields[key])
+            new_left_fields << [key, processed_left]
+            new_right_fields << [key, processed_right]
+
+            if left.optional_keys.include?(key) && right.optional_keys.include?(key)
+              new_left_optional_keys << key
+              new_right_optional_keys << key
+            end
+          end
+
+          [
+            Camille::Types::Object.new(**(apply_optional_to_fields new_left_fields, new_left_optional_keys).to_h),
+            Camille::Types::Object.new(**(apply_optional_to_fields new_right_fields, new_right_optional_keys).to_h)
+          ]
+        else
+          if left.literal == right.literal
+            [left, Camille::Types::Any.new]
+          else
+            raise TypeNotCompatibleError.new "Cannot reconcile type #{left.literal} and type #{right.literal}."
+          end
+        end
+      end
+
+      private
+        def apply_optional_to_fields fields, optional_keys
+          fields.map do |key, type|
+            if optional_keys.include?(key)
+              ["#{key.to_s}?".to_sym, type]
+            else
+              [key, type]
+            end
+          end
+        end
+    end
+  end
+end

data/lib/camille/intersection_solver.rb

@@ -0,0 +1,50 @@
+module Camille
+  class IntersectionSolver
+    class TypeNotCompatibleError < ArgumentError; end
+
+    class << self
+      def solve a, b
+        if a.instance_of?(Camille::Types::Object) && b.instance_of?(Camille::Types::Object)
+          overlapping_keys = a.fields.keys & b.fields.keys
+
+          new_fields = []
+          new_optional_keys = []
+
+          [a, b].each do |x|
+            (x.fields.keys - overlapping_keys).each do |key|
+              new_fields << [key, x.fields[key]]
+              new_optional_keys << key if x.optional_keys.include?(key)
+            end
+          end
+
+          overlapping_keys.map do |key|
+            solved = IntersectionSolver.solve(a.fields[key], b.fields[key])
+            new_fields << [key, solved]
+            if a.optional_keys.include?(key) && b.optional_keys.include?(key)
+              new_optional_keys << key
+            end
+          end
+
+          Camille::Types::Object.new(**(apply_optional_to_fields new_fields, new_optional_keys).to_h)
+        else
+          if a.literal == b.literal
+            a
+          else
+            raise TypeNotCompatibleError.new "Cannot reconcile type #{a.literal} and type #{b.literal}."
+          end
+        end
+      end
+
+      private
+        def apply_optional_to_fields fields, optional_keys
+          fields.map do |key, type|
+            if optional_keys.include?(key)
+              ["#{key.to_s}?".to_sym, type]
+            else
+              [key, type]
+            end
+          end
+        end
+    end
+  end
+end

data/lib/camille/object_hash.rb

@@ -1,11 +1,7 @@
 module Camille
   class ObjectHash < Hash
-    def as_json options = nil
-      transform_keys{|k, _| Camille::KeyConverter.convert_response_key(k)}.as_json
-    end
-
     def to_json options = nil
-      as_json.to_json
+      JSON.dump(transform_keys{|k, _| Camille::KeyConverter.convert_response_key(k)})
     end
   end
 end

data/lib/camille/pick_and_omit.rb

@@ -18,6 +18,11 @@ module Camille
         raise ArgumentError.new("The second argument of #{klass_name} has to be an array of symbols. Got #{keys.inspect}.")
       end
       @keys = keys
+      @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@type.fingerprint}#{@keys.sort}"
+    end
+
+    def check value
+      processed_object.check(value)
     end
 
     def literal

data/lib/camille/rendered.rb

@@ -0,0 +1,14 @@
+module Camille
+  class Rendered
+    attr_reader :fingerprint, :json
+
+    def initialize fingerprint, json
+      @fingerprint = fingerprint
+      @json = json
+    end
+
+    def to_json options = nil
+      @json
+    end
+  end
+end

data/lib/camille/type.rb

@@ -11,24 +11,22 @@ module Camille
 
     def self.alias_of type
       underlying = Camille::Type.instance(type)
+      fingerprint = underlying.fingerprint
 
       define_method(:initialize) do
         @underlying = underlying
+        @fingerprint = fingerprint
       end
     end
 
     def check value
-      @underlying.check value
-    end
-
-    def transform_and_check value
-      transformed = transform value
-      @underlying.transform_and_check transformed
+      normalized = transform value
+      @underlying.check normalized
     end
 
     def test value
-      error, _ = transform_and_check value
-      error
+      result = check value
+      result.type_error? ? result : nil
     end
 
     def self.test value

data/lib/camille/type_error.rb

@@ -27,5 +27,13 @@ module Camille
     def to_s
       inspect
     end
+
+    def checked?
+      false
+    end
+
+    def type_error?
+      true
+    end
   end
 end

data/lib/camille/types/any.rb

@@ -2,6 +2,7 @@ module Camille
   module Types
     class Any < Camille::BasicType
       def check value
+        Camille::Checked.new(fingerprint, value)
       end
 
       def literal

data/lib/camille/types/array.rb

@@ -5,25 +5,30 @@ module Camille
 
       def initialize content
         @content = Camille::Type.instance content
+        @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@content.fingerprint}"
       end
 
-      def transform_and_check value
+      def check value
         if value.is_a? ::Array
-          transform_and_check_results = value.map.with_index do |element, index|
-            [index, @content.transform_and_check(element)]
+          results = value.map.with_index do |element, index|
+            [index, @content.check(element)]
           end
-          errors = transform_and_check_results.map do |index, (error, transformed)|
-            ["array[#{index}]", error]
-          end.select{|x| x[1]}
+
+          errors = results.map do |index, result|
+            if result.type_error?
+              ["array[#{index}]", result]
+            else
+              nil
+            end
+          end.compact
 
           if errors.empty?
-            transformed = transform_and_check_results.map{|_, (_, transformed)| transformed}
-            [nil, transformed]
+            Camille::Checked.new(fingerprint, results.map{|_, checked| checked.value})
           else
-            [Camille::TypeError.new(**errors.to_h), nil]
+            Camille::TypeError.new(**errors.to_h)
           end
         else
-          [Camille::TypeError.new("Expected array, got #{value.inspect}."), nil]
+          Camille::TypeError.new("Expected array, got #{value.inspect}.")
         end
       end
 

data/lib/camille/types/boolean.rb

@@ -2,7 +2,9 @@ module Camille
   module Types
     class Boolean < Camille::BasicType
       def check value
-        unless value == false || value == true
+        if value == false || value == true
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected boolean, got #{value.inspect}.")
         end
       end

data/lib/camille/types/boolean_literal.rb

@@ -8,13 +8,16 @@ module Camille
       def initialize value
         if value == true || value == false
           @value = value
+          @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@value}"
         else
           raise ArgumentError.new("Expecting true or false, got #{value.inspect}")
         end
       end
 
       def check value
-        unless value == @value
+        if value == @value
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected boolean literal #{@value.inspect}, got #{value.inspect}.")
         end
       end

data/lib/camille/types/intersection.rb

@@ -8,24 +8,23 @@ module Camille
       def initialize left, right
         @left = Camille::Type.instance left
         @right = Camille::Type.instance right
+        @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{[@left.fingerprint, @right.fingerprint].sort}"
       end
 
-      def transform_and_check value
-        left_error, left_transformed = @left.transform_and_check value
-        if left_error
-          error = Camille::TypeError.new(
-            'intersection.left' => left_error
+      def check value
+        left_result = @left.check value
+        if left_result.type_error?
+          Camille::TypeError.new(
+            'intersection.left' => left_result
           )
-          [error, nil]
         else
-          right_error, right_transformed = @right.transform_and_check left_transformed
-          if right_error
-            error = Camille::TypeError.new(
-              'intersection.right' => right_error
+          right_result = @right.check left_result.value
+          if right_result.type_error?
+            Camille::TypeError.new(
+              'intersection.right' => right_result
             )
-            [error, nil]
           else
-            [nil, right_transformed]
+            Camille::Checked.new(fingerprint, right_result.value)
           end
         end
       end

data/lib/camille/types/null.rb

@@ -2,7 +2,9 @@ module Camille
   module Types
     class Null < Camille::BasicType
       def check value
-        unless value == nil
+        if value == nil
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected nil, got #{value.inspect}.")
         end
       end

data/lib/camille/types/number.rb

@@ -1,9 +1,10 @@
 module Camille
   module Types
     class Number < Camille::BasicType
-
       def check value
-        unless value.is_a?(Integer) || value.is_a?(Float)
+        if value.is_a?(Integer) || value.is_a?(Float)
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected an integer or a float, got #{value.inspect}.")
         end
       end

data/lib/camille/types/number_literal.rb

@@ -8,13 +8,16 @@ module Camille
       def initialize value
         if value.is_a?(Integer) || value.is_a?(Float)
           @value = value
+          @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@value}"
         else
           raise ArgumentError.new("Expecting an integer or a float, got #{value.inspect}")
         end
       end
 
       def check value
-        unless value == @value
+        if value == @value
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected number literal #{@value.inspect}, got #{value.inspect}.")
         end
       end

data/lib/camille/types/object.rb

@@ -7,37 +7,43 @@ module Camille
       def initialize fields
         @optional_keys = []
         @fields = normalize_fields fields
+        @fingerprint = generate_fingerprint
       end
 
-      def transform_and_check value
+      def check value
         if value.is_a? Hash
           keys = (@fields.keys + value.keys).uniq
-          transform_and_check_results = keys.map do |key|
-            if type = @fields[key]
-              if @optional_keys.include?(key) && value[key].nil?
-                nil
-              else
-                [key, type.transform_and_check(value[key])]
-              end
+          keys_to_check, keys_to_skip = keys.partition{|key| @fields[key]}
+
+          results = keys_to_check.map do |key|
+            type = @fields[key]
+            if @optional_keys.include?(key) && value[key].nil?
+              nil
+            else
+              [key, type.check(value[key])]
+            end
+          end.compact
+
+          errors = results.map do |key, result|
+            if result.type_error?
+              [key.to_s, result]
             else
-              [key, [nil, value[key]]]
+              nil
             end
           end.compact
 
-          errors = transform_and_check_results.map do |key, (error, transformed)|
-            [key.to_s, error]
-          end.select{|x| x[1]}
+          skipped_pairs = keys_to_skip.map do |key|
+            [key, value[key]]
+          end
 
           if errors.empty?
-            transformed = transform_and_check_results.map do |key, (error, transformed)|
-              [key, transformed]
-            end.to_h
-            [nil, Camille::ObjectHash[transformed]]
+            object = Camille::ObjectHash[results.map{|key, checked| [key, checked.value]}.concat(skipped_pairs).to_h]
+            Camille::Checked.new(fingerprint, object)
           else
-            [Camille::TypeError.new(**errors.to_h), nil]
+            Camille::TypeError.new(**errors.to_h)
           end
         else
-          [Camille::TypeError.new("Expected hash, got #{value.inspect}."), nil]
+          Camille::TypeError.new("Expected hash, got #{value.inspect}.")
         end
       end
 
@@ -74,6 +80,12 @@ module Camille
             raise ArgumentError.new("Only keys satisfying `key == key.to_s.camelize.underscore` can be used.")
           end
         end
+
+        def generate_fingerprint
+          sorted_fields = @fields.sort_by{|k, v| k}.map{|k, v| [k, v.fingerprint]}
+          sorted_optional_keys = @optional_keys.sort
+          Digest::MD5.hexdigest "#{self.class.name}#{sorted_fields}#{sorted_optional_keys}"
+        end
     end
   end
 end

data/lib/camille/types/omit.rb

@@ -1,9 +1,6 @@
 module Camille
   module Types
     class Omit < PickAndOmit
-      def transform_and_check value
-        processed_object.transform_and_check(value)
-      end
 
       private
         def klass_name

data/lib/camille/types/pick.rb

@@ -1,9 +1,6 @@
 module Camille
   module Types
     class Pick < PickAndOmit
-      def transform_and_check value
-        processed_object.transform_and_check(value)
-      end
 
       private
         def klass_name

data/lib/camille/types/record.rb

@@ -7,27 +7,31 @@ module Camille
       def initialize key, value
         @key = Camille::Type.instance key
         @value = Camille::Type.instance value
+        @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@key.fingerprint}#{@value.fingerprint}"
       end
 
-      def transform_and_check value
+      def check value
         if value.is_a? ::Hash
 
-          transform_and_check_results = value.map.with_index do |(k, v), index|
-            [index, transform_and_check_pair(k, v)]
+          results = value.map.with_index do |(k, v), index|
+            [index, check_pair(k, v)]
           end
 
-          errors = transform_and_check_results.map do |index, (error, transformed)|
-            ["record[#{index}]", error]
-          end.select{|x| x[1]}
+          errors = results.map do |index, result|
+            if result.instance_of?(Camille::TypeError)
+              ["record[#{index}]", result]
+            else
+              nil
+            end
+          end.compact
 
           if errors.empty?
-            transformed = transform_and_check_results.map{|_, (_, transformed)| transformed}.to_h
-            [nil, transformed]
+            Camille::Checked.new(fingerprint, results.map{|_, result| [result[0].value, result[1].value]}.to_h)
           else
-            [Camille::TypeError.new(**errors.to_h), nil]
+            Camille::TypeError.new(**errors.to_h)
           end
         else
-          [Camille::TypeError.new("Expected hash, got #{value.inspect}."), nil]
+          Camille::TypeError.new("Expected hash, got #{value.inspect}.")
         end
       end
 
@@ -40,17 +44,16 @@ module Camille
       end
 
       private
-        def transform_and_check_pair key, value
-          key_error, key_transformed = @key.transform_and_check key
-          value_error, value_transformed = @value.transform_and_check value
+        def check_pair key, value
+          key_result = @key.check key
+          value_result = @value.check value
 
-          if key_error.nil? && value_error.nil?
-            [nil, [key_transformed, value_transformed]]
+          if key_result.checked? && value_result.checked?
+            [key_result, value_result]
           else
-            errors = [['record.key', key_error], ['record.value', value_error]].select{|x| x[1]}.to_h
+            errors = [['record.key', key_result], ['record.value', value_result]].select{|x| x[1].type_error?}.to_h
 
-            error = Camille::TypeError.new(**errors)
-            [error, nil]
+            Camille::TypeError.new(**errors)
           end
         end
     end

data/lib/camille/types/string.rb

@@ -2,7 +2,9 @@ module Camille
   module Types
     class String < Camille::BasicType
       def check value
-        unless value.is_a?(::String) || value.is_a?(Symbol)
+        if value.is_a?(::String) || value.is_a?(Symbol)
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected string, got #{value.inspect}.")
         end
       end

data/lib/camille/types/string_literal.rb

@@ -8,6 +8,7 @@ module Camille
       def initialize value
         if value.is_a?(::String)
           @value = value
+          @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@value}"
         else
           raise ArgumentError.new("Expecting a string, got #{value.inspect}")
         end
@@ -15,7 +16,9 @@ module Camille
 
       def check value
         transformed = value.is_a?(Symbol) ? value.to_s : value
-        unless transformed == @value
+        if transformed == @value
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected string literal #{@value.inspect}, got #{value.inspect}.")
         end
       end

data/lib/camille/types/tuple.rb

@@ -5,26 +5,30 @@ module Camille
 
       def initialize elements
         @elements = elements.map{|e| Camille::Type.instance e}
+        @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{@elements.map(&:fingerprint)}"
       end
 
-      def transform_and_check value
-        if value.is_a? ::Array
-          transform_and_check_results = @elements.map.with_index do |type, index|
-            [index, type.transform_and_check(value[index])]
+      def check value
+        if value.is_a?(::Array) && value.size == @elements.size
+          results = @elements.map.with_index do |type, index|
+            [index, type.check(value[index])]
           end
 
-          errors = transform_and_check_results.map do |index, (error, transformed)|
-            ["tuple[#{index}]", error]
-          end.select{|x| x[1]}
+          errors = results.map do |index, result|
+            if result.type_error?
+              ["tuple[#{index}]", result]
+            else
+              nil
+            end
+          end.compact
 
           if errors.empty?
-            transformed = transform_and_check_results.map{|index, (error, transformed)| transformed}
-            [nil, transformed]
+            Camille::Checked.new(fingerprint, results.map{|_, checked| checked.value})
           else
-            [Camille::TypeError.new(**errors.to_h), nil]
+            Camille::TypeError.new(**errors.to_h)
           end
         else
-          [Camille::TypeError.new("Expected array, got #{value.inspect}."), nil]
+          Camille::TypeError.new("Expected array of size #{@elements.size}, got #{value.inspect}.")
         end
       end
 

data/lib/camille/types/undefined.rb

@@ -2,7 +2,9 @@ module Camille
   module Types
     class Undefined < Camille::BasicType
       def check value
-        unless value == nil
+        if value == nil
+          Camille::Checked.new(fingerprint, value)
+        else
           Camille::TypeError.new("Expected nil, got #{value.inspect}.")
         end
       end

data/lib/camille/types/union.rb

@@ -6,23 +6,23 @@ module Camille
       def initialize left, right
         @left = Camille::Type.instance left
         @right = Camille::Type.instance right
+        @fingerprint = Digest::MD5.hexdigest "#{self.class.name}#{[@left.fingerprint, @right.fingerprint].sort}"
       end
 
-      def transform_and_check value
-        left_error, left_transformed = @left.transform_and_check value
-        if left_error
-          right_error, right_transformed = @right.transform_and_check value
-          if right_error
-            error = Camille::TypeError.new(
-              'union.left' => left_error,
-              'union.right' => right_error
+      def check value
+        left_result = @left.check value
+        if left_result.type_error?
+          right_result = @right.check value
+          if right_result.type_error?
+            Camille::TypeError.new(
+              'union.left' => left_result,
+              'union.right' => right_result
             )
-            [error, nil]
           else
-            [nil, right_transformed]
+            Camille::Checked.new(fingerprint, right_result.value)
           end
         else
-          [nil, left_transformed]
+          Camille::Checked.new(fingerprint, left_result.value)
         end
       end
 

data/lib/camille/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Camille
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/lib/camille.rb

@@ -4,6 +4,8 @@ require "active_support"
 
 require_relative "camille/version"
 require_relative "camille/object_hash"
+require_relative "camille/rendered"
+require_relative "camille/checked"
 require_relative "camille/basic_type"
 require_relative "camille/types"
 require_relative "camille/types/number"
@@ -14,6 +16,8 @@ require_relative "camille/types/object"
 require_relative "camille/types/null"
 require_relative "camille/types/undefined"
 require_relative "camille/types/union"
+require_relative "camille/intersection_solver"
+require_relative "camille/intersection_preprocessor"
 require_relative "camille/types/intersection"
 require_relative "camille/types/tuple"
 require_relative "camille/types/any"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - merely
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,7 @@ files:
 - gemfiles/rails-8.0
 - lib/camille.rb
 - lib/camille/basic_type.rb
+- lib/camille/checked.rb
 - lib/camille/code_generator.rb
 - lib/camille/configuration.rb
 - lib/camille/controller.rb
@@ -65,6 +66,8 @@ files:
 - lib/camille/generators/templates/schema_template.erb
 - lib/camille/generators/templates/type_template.erb
 - lib/camille/generators/type_generator.rb
+- lib/camille/intersection_preprocessor.rb
+- lib/camille/intersection_solver.rb
 - lib/camille/key_converter.rb
 - lib/camille/line.rb
 - lib/camille/loader.rb
@@ -72,6 +75,7 @@ files:
 - lib/camille/object_hash.rb
 - lib/camille/pick_and_omit.rb
 - lib/camille/railtie.rb
+- lib/camille/rendered.rb
 - lib/camille/schema.rb
 - lib/camille/schemas.rb
 - lib/camille/syntax.rb