@@ -14,6 +14,7 @@ const boolCasesBasic: Case<
1414 Format . Values . BoolValue ,
1515 never
1616> [ ] = [
17+ boolFromBoolean , //needed due to strictBooleans mode
1718 boolFromString ,
1819 boolFromBoxedPrimitive ,
1920 boolFromCodecBoolValue ,
@@ -27,10 +28,30 @@ export const boolCases: Case<
2728 Format . Types . BoolType ,
2829 Format . Values . BoolValue ,
2930 never
30- > [ ] = [
31- boolFromTypeValueInput ,
32- ...boolCasesBasic
33- ] ;
31+ > [ ] = [ boolFromTypeValueInput , ...boolCasesBasic ] ;
32+
33+ function * boolFromBoolean (
34+ dataType : Format . Types . BoolType ,
35+ input : unknown ,
36+ wrapOptions : WrapOptions
37+ ) : Generator < never , Format . Values . BoolValue , WrapResponse > {
38+ if ( typeof input !== "boolean" ) {
39+ throw new TypeMismatchError (
40+ dataType ,
41+ input ,
42+ wrapOptions . name ,
43+ 1 ,
44+ "Input was not a boolean"
45+ ) ;
46+ }
47+ return {
48+ type : dataType ,
49+ kind : "value" as const ,
50+ value : {
51+ asBoolean : input
52+ }
53+ } ;
54+ }
3455
3556function * boolFromString (
3657 dataType : Format . Types . BoolType ,
@@ -46,8 +67,21 @@ function* boolFromString(
4667 "Input was not a string"
4768 ) ;
4869 }
49- //strings are true unless they're falsy or the case-insensitive string "false"
50- const asBoolean = Boolean ( input ) && input . toLowerCase ( ) !== "false" ;
70+ const lowerCasedInput = input . toLowerCase ( ) ;
71+ if (
72+ wrapOptions . strictBooleans &&
73+ ! [ "true" , "false" , "1" , "0" ] . includes ( lowerCasedInput )
74+ ) {
75+ throw new TypeMismatchError (
76+ dataType ,
77+ input ,
78+ wrapOptions . name ,
79+ 5 ,
80+ "Input was not 'true', 'false', '1', or '0'"
81+ ) ;
82+ }
83+ //strings are true unless they're falsy or the case-insensitive strings "false" or "0"
84+ const asBoolean = Boolean ( input ) && ! [ "false" , "0" ] . includes ( lowerCasedInput ) ;
5185 return {
5286 type : dataType ,
5387 kind : "value" as const ,
@@ -72,7 +106,12 @@ function* boolFromBoxedPrimitive(
72106 ) ;
73107 }
74108 //unbox and try again
75- return yield * wrapWithCases ( dataType , input . valueOf ( ) , wrapOptions , boolCases ) ;
109+ return yield * wrapWithCases (
110+ dataType ,
111+ input . valueOf ( ) ,
112+ wrapOptions ,
113+ boolCases
114+ ) ;
76115}
77116
78117function * boolFromCodecBoolValue (
@@ -215,9 +254,7 @@ function* boolFromCodecUdvtValue(
215254 "Input was not a wrapped result"
216255 ) ;
217256 }
218- if (
219- input . type . typeClass !== "userDefinedValueType"
220- ) {
257+ if ( input . type . typeClass !== "userDefinedValueType" ) {
221258 throw new TypeMismatchError (
222259 dataType ,
223260 input ,
@@ -252,9 +289,7 @@ function* boolFromCodecUdvtError(
252289 "Input was not a wrapped result"
253290 ) ;
254291 }
255- if (
256- input . type . typeClass !== "userDefinedValueType"
257- ) {
292+ if ( input . type . typeClass !== "userDefinedValueType" ) {
258293 throw new TypeMismatchError (
259294 dataType ,
260295 input ,
@@ -282,7 +317,11 @@ function* boolFromCodecUdvtError(
282317 Messages . errorResultMessage
283318 ) ;
284319 }
285- return yield * boolFromCodecBoolError ( dataType , input . error . error , wrapOptions ) ;
320+ return yield * boolFromCodecBoolError (
321+ dataType ,
322+ input . error . error ,
323+ wrapOptions
324+ ) ;
286325}
287326
288327function * boolFromOther (
@@ -315,6 +354,16 @@ function* boolFromOther(
315354 "Input was a type/value pair"
316355 ) ;
317356 }
357+ //...and also we don't do this case if strictBooleans is turned on
358+ if ( wrapOptions . strictBooleans ) {
359+ throw new TypeMismatchError (
360+ dataType ,
361+ input ,
362+ wrapOptions . name ,
363+ 2 ,
364+ "Input was neither a boolean nor a boolean string"
365+ ) ;
366+ }
318367 const asBoolean = Boolean ( input ) ;
319368 return {
320369 type : dataType ,
0 commit comments