camille 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60434d249fd905789f0c9fd812d097163cda296655c56fde57569269d8188e39
-  data.tar.gz: 422d993e72473270985d6ade710ae39e3ada83ef85942e83291176dc8bff9dcc
+  metadata.gz: 247a0f8bf5424ac104e9c4b71a073c4b7a6e38399434dc57a9a3b13f40b72d0b
+  data.tar.gz: db54f6d86bab52b6f50bc09cc3aa42c4b2b9c00c10a484394de270bc4a1c8351
 SHA512:
-  metadata.gz: 6561b6b4c62f85c22d28b27c9693a1dfe8a3cccaaf95251d3995b50b0457363ea82ef971fa03d10959bcf505ee0188b2189b6de5d3cd984930830bc2a9bdcd3e
-  data.tar.gz: 4266ecec3ab26f2e1af40b83fe60d337ed81b8fa6f953200c14f6e1dfb2ffe9519ea2d0519882b4790cc34cc1c7f84b18fb8481d0ec3cba88636c73236998761
+  metadata.gz: aa084c1032e46b35a3330a5500bdf2a31dd19d57585ca7fd12bbd8c93083d1f2b5f9df1c53c68dd10ab53167d27fe8f4680cf4a7f8f8567f4e9dd3b279d13022
+  data.tar.gz: be8d2cc143b82614cd99ef6d0b38c2fcc756152a9856db840e04595f1d566d97e8c01f51caadcb7ba88ff9d00924f3ff1e048a821b9a08f50a164c3047b8aba5

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 0.5.10
+
+### Added
+
+* Added intersection and boolean literal support to `Camille::Syntax`
+
+## 0.5.9
+
+### Added
+
+* Added intersection type
+* Added #print to Camille::TypeError
+
+### Changed
+
+* Typecheck will no longer remove fields from a hash if those fields are not presented in type schema
+
+### Fixed
+
+* Fixed the wrong literal generated by an array of unions
+
 ## 0.5.8
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.5.8)
+    camille (0.5.10)
       rails (>= 6.1, < 8)
 
 GEM

data/README.md

@@ -153,6 +153,8 @@ params(
   }[]
   # a union type is two types connected by '|'
   union: Number | String,
+  # an intersection type is two types connected by '&'
+  intersection: { id: Number } & { name: String },
   # a tuple type is several types put inside '[]'
   tuple: [Number, String, Boolean],
   # a field followed by '?' is optional, the same as in TypeScript

data/lib/camille/basic_type.rb

@@ -7,6 +7,10 @@ module Camille
       Camille::Types::Union.new(self, other)
     end
 
+    def & other
+      Camille::Types::Intersection.new(self, other)
+    end
+
     def []
       Camille::Types::Array.new(self)
     end
@@ -24,6 +28,10 @@ module Camille
       Camille::Type.instance(self) | other
     end
 
+    def self.& other
+      Camille::Type.instance(self) & other
+    end
+
     def self.[]
       Camille::Type.instance(self)[]
     end

data/lib/camille/syntax.rb

@@ -14,6 +14,10 @@ module Camille
       def | other
         Camille::Types::Union.new(Camille::Types::Object.new(self), other)
       end
+
+      def & other
+        Camille::Types::Intersection.new(Camille::Types::Object.new(self), other)
+      end
     end
 
     refine ::Array do
@@ -71,5 +75,33 @@ module Camille
         Camille::Types::Union.new(Camille::Types::StringLiteral.new(self), other)
       end
     end
+
+    refine TrueClass do
+      def [] key = NULL_VALUE
+        if key == NULL_VALUE
+          Camille::Types::BooleanLiteral.new(true)[]
+        else
+          super
+        end
+      end
+
+      def | other
+        Camille::Types::Union.new(Camille::Types::BooleanLiteral.new(true), other)
+      end
+    end
+
+    refine FalseClass do
+      def [] key = NULL_VALUE
+        if key == NULL_VALUE
+          Camille::Types::BooleanLiteral.new(false)[]
+        else
+          super
+        end
+      end
+
+      def | other
+        Camille::Types::Union.new(Camille::Types::BooleanLiteral.new(false), other)
+      end
+    end
   end
 end

data/lib/camille/type_error.rb

@@ -17,5 +17,9 @@ module Camille
     def basic?
       !!@message
     end
+
+    def print io = STDOUT
+      Camille::TypeErrorPrinter.new(self).print io
+    end
   end
 end

data/lib/camille/types/intersection.rb

@@ -0,0 +1,39 @@
+module Camille
+  module Types
+    class Intersection < Camille::BasicType
+      class ArgumentError < ::ArgumentError; end
+
+      attr_reader :left, :right
+
+      def initialize left, right
+        @left = Camille::Type.instance left
+        @right = Camille::Type.instance right
+      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
+          )
+          [error, nil]
+        else
+          right_error, right_transformed = @right.transform_and_check left_transformed
+          if right_error
+            error = Camille::TypeError.new(
+              'intersection.right' => right_error
+            )
+            [error, nil]
+          else
+            [nil, right_transformed]
+          end
+        end
+      end
+
+      def literal
+        "(#{@left.literal} & #{@right.literal})"
+      end
+
+    end
+  end
+end

data/lib/camille/types/object.rb

@@ -11,12 +11,17 @@ module Camille
 
       def transform_and_check value
         if value.is_a? Hash
-          transform_and_check_results = @fields.map do |key, type|
-            error, transformed = type.transform_and_check(value[key])
-            if @optional_keys.include?(key) && !error && transformed.nil?
-              nil
+          keys = (@fields.keys + value.keys).uniq
+          transform_and_check_results = keys.map do |key|
+            if type = @fields[key]
+              error, transformed = type.transform_and_check(value[key])
+              if @optional_keys.include?(key) && !error && transformed.nil?
+                nil
+              else
+                [key, [error, transformed]]
+              end
             else
-              [key, type.transform_and_check(value[key])]
+              [key, [nil, value[key]]]
             end
           end.compact
 
@@ -63,7 +68,7 @@ module Camille
         def check_case_conversion_safe sym
           str = sym.to_s
           if str != str.camelize.underscore
-            raise ArgumentError.new("Only keys satisfying `key.to_s == key.to_s.caamelize.underscore` can be used.")
+            raise ArgumentError.new("Only keys satisfying `key.to_s == key.to_s.camelize.underscore` can be used.")
           end
         end
     end

data/lib/camille/types/union.rb

@@ -27,7 +27,7 @@ module Camille
       end
 
       def literal
-        "#{@left.literal} | #{@right.literal}"
+        "(#{@left.literal} | #{@right.literal})"
       end
     end
   end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -13,6 +13,7 @@ require_relative "camille/types/object"
 require_relative "camille/types/null"
 require_relative "camille/types/undefined"
 require_relative "camille/types/union"
+require_relative "camille/types/intersection"
 require_relative "camille/types/tuple"
 require_relative "camille/types/any"
 require_relative "camille/types/number_literal"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.10
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,6 +78,7 @@ files:
 - lib/camille/types/array.rb
 - lib/camille/types/boolean.rb
 - lib/camille/types/boolean_literal.rb
+- lib/camille/types/intersection.rb
 - lib/camille/types/null.rb
 - lib/camille/types/number.rb
 - lib/camille/types/number_literal.rb