camille 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8f26b87f7ddf2f3c951a19a24610abfe1bfac4f4da041568883cc371090895
-  data.tar.gz: bbecf051c37ec9da1eae0920a6ec42c09d159feef1f2be734beaef2871af7410
+  metadata.gz: 9d5030e35bf654863f03d80dbd09f8adb03b335f3f66d52c745404f6344e7efc
+  data.tar.gz: 7cc7a7000f5ce205f8edabfa31046933b7c7e04a71b18a270a8a080b37ed0c71
 SHA512:
-  metadata.gz: 53bb5fd170e71b21687dadba5ab1ce6c5a81bcb1a4ede09e280103cd81693fb8e9f41a3a15af630b2d48b62f150f29c1f222d8308fff2636135c5653d9ca3da3
-  data.tar.gz: 47c9621bfdeb542e625f2115eb96b7d1d14fdecfd5f6cefe62bd6f92be2703d7e3e7518e96df26af3c692fb5887ac08ebe26db38eaeae8a8cfb059eeb07de839
+  metadata.gz: 746548d7942f95c217ad8763add318a2dab939dbe2fb1abbd26d88b3c7da76023f58946a5622b15d5e3107ea7a88bfb919c78526eac78dbd6f9520d4f6e11469
+  data.tar.gz: 5460ccaaa044c4a4a1255b68d3df78e1f251931a725b26ff36155dd29695c0422097287c07efb0f405d2928aa088022c03fd8bbf64ed652c64f450a688c9d1c1

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.5.11
+
+### Changed
+
+* Optional fields are now preserved in generated TypeScript as having `?` suffix
+
+## 0.5.10
+
+### Added
+
+* Added intersection and boolean literal support to `Camille::Syntax`
+
 ## 0.5.9
 
 ### Added

data/Gemfile.lock

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

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/types/object.rb

@@ -14,11 +14,10 @@ module Camille
           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?
+              if @optional_keys.include?(key) && value[key].nil?
                 nil
               else
-                [key, [error, transformed]]
+                [key, type.transform_and_check(value[key])]
               end
             else
               [key, [nil, value[key]]]
@@ -43,7 +42,7 @@ module Camille
       end
 
       def literal
-        "{#{@fields.map{|k,v| "#{ActiveSupport::Inflector.camelize k.to_s, false}: #{v.literal}"}.join(', ')}}"
+        "{#{@fields.map{|k,v| "#{literal_key k}: #{v.literal}"}.join(', ')}}"
       end
 
       private
@@ -54,7 +53,7 @@ module Camille
             if key.end_with?('?')
               new_key = remove_question_mark(key)
               @optional_keys << new_key
-              [new_key, type | Camille::Types::Undefined.new]
+              [new_key, type]
             else
               [key, type]
             end
@@ -65,6 +64,10 @@ module Camille
           sym.to_s.gsub(/\?$/, '').to_sym
         end
 
+        def literal_key key
+          "#{ActiveSupport::Inflector.camelize key.to_s, false}#{@optional_keys.include?(key) ? '?' : ''}"
+        end
+
         def check_case_conversion_safe sym
           str = sym.to_s
           if str != str.camelize.underscore

data/lib/camille/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails