decoders 2.0.3 → 2.0.5

package/index.js

@@ -2,13 +2,9 @@
 
 exports.__esModule = true
 exports.uuidv4 = exports.uuidv1 = exports.uuid = exports.url = exports.unknown = exports.undefined_ = exports.tuple = exports.truthy = exports.taggedUnion = exports.string = exports.set = exports.regex = exports.prep = exports.positiveNumber = exports.positiveInteger = exports.pojo = exports.poja = exports.optional = exports.oneOf = exports.object = exports.numericBoolean = exports.number = exports.nullable = exports.null_ = exports.nonEmptyString = exports.nonEmptyArray = exports.never = exports.mixed = exports.maybe = exports.mapping = exports.lazy = exports.jsonObject = exports.jsonArray = exports.json = exports.iso8601 = exports.integer = exports.instanceOf = exports.inexact = exports.httpsUrl = exports.hardcoded = exports.fail = exports.exact = exports.email = exports.either = exports.dict = exports.define = exports.date = exports.constant = exports['boolean'] = exports.array = exports.anyNumber = exports.always = void 0
-
 var _Decoder = require('./Decoder')
-
 exports.define = _Decoder.define
-
 var _basics = require('./lib/basics')
-
 exports.always = _basics.always
 exports.constant = _basics.constant
 exports.hardcoded = _basics.hardcoded
@@ -19,43 +15,31 @@ exports.null_ = _basics.null_
 exports.optional = _basics.optional
 exports.undefined_ = _basics.undefined_
 exports.unknown = _basics.unknown
-
 var _arrays = require('./lib/arrays')
-
 exports.array = _arrays.array
 exports.nonEmptyArray = _arrays.nonEmptyArray
 exports.poja = _arrays.poja
 exports.set = _arrays.set
 exports.tuple = _arrays.tuple
-
 var _booleans = require('./lib/booleans')
-
 exports['boolean'] = _booleans['boolean']
 exports.numericBoolean = _booleans.numericBoolean
 exports.truthy = _booleans.truthy
-
 var _dates = require('./lib/dates')
-
 exports.date = _dates.date
 exports.iso8601 = _dates.iso8601
-
 var _objects = require('./lib/objects')
-
 exports.dict = _objects.dict
 exports.exact = _objects.exact
 exports.inexact = _objects.inexact
 exports.mapping = _objects.mapping
 exports.object = _objects.object
 exports.pojo = _objects.pojo
-
 var _unions = require('./lib/unions')
-
 exports.either = _unions.either
 exports.oneOf = _unions.oneOf
 exports.taggedUnion = _unions.taggedUnion
-
 var _strings = require('./lib/strings')
-
 exports.email = _strings.email
 exports.httpsUrl = _strings.httpsUrl
 exports.nonEmptyString = _strings.nonEmptyString
@@ -65,25 +49,19 @@ exports.url = _strings.url
 exports.uuid = _strings.uuid
 exports.uuidv1 = _strings.uuidv1
 exports.uuidv4 = _strings.uuidv4
-
 var _utilities = require('./lib/utilities')
-
 exports.fail = _utilities.fail
 exports.instanceOf = _utilities.instanceOf
 exports.lazy = _utilities.lazy
 exports.never = _utilities.never
 exports.prep = _utilities.prep
-
 var _numbers = require('./lib/numbers')
-
 exports.anyNumber = _numbers.anyNumber
 exports.integer = _numbers.integer
 exports.number = _numbers.number
 exports.positiveInteger = _numbers.positiveInteger
 exports.positiveNumber = _numbers.positiveNumber
-
 var _json = require('./lib/json')
-
 exports.json = _json.json
 exports.jsonObject = _json.jsonObject
 exports.jsonArray = _json.jsonArray

package/lib/arrays.js

@@ -6,38 +6,30 @@ exports.nonEmptyArray = nonEmptyArray
 exports.poja = void 0
 exports.set = set
 exports.tuple = void 0
-
 var _annotate = require('../annotate')
-
 var _Decoder = require('../Decoder')
 
 var poja = (0, _Decoder.define)(function (blob, ok, err) {
   if (!Array.isArray(blob)) {
     return err('Must be an array')
   }
-
   return ok(blob.slice())
 })
 
 exports.poja = poja
-
 function all(items, blobs, ok, err) {
   var results = []
-
   for (var index = 0; index < items.length; ++index) {
     var result = items[index]
-
     if (result.ok) {
       results.push(result.value)
     } else {
       var ann = result.error
-
       var clone = [].concat(blobs)
       clone.splice(index, 1, (0, _annotate.annotate)(ann, ann.text ? ann.text + ' (at index ' + index + ')' : 'index ' + index))
       return err((0, _annotate.annotate)(clone))
     }
   }
-
   return ok(results)
 }
 
@@ -59,7 +51,6 @@ function set(decoder) {
     return new Set(items)
   })
 }
-
 var ntuple = function ntuple(n) {
   return poja.refine(function (arr) {
     return arr.length === n
@@ -70,13 +61,11 @@ function _tuple() {
   for (var _len = arguments.length, decoders = new Array(_len), _key = 0; _key < _len; _key++) {
     decoders[_key] = arguments[_key]
   }
-
   return ntuple(decoders.length).then(function (blobs, ok, err) {
     var allOk = true
     var rvs = decoders.map(function (decoder, i) {
       var blob = blobs[i]
       var result = decoder.decode(blob)
-
       if (result.ok) {
         return result.value
       } else {
@@ -84,7 +73,6 @@ function _tuple() {
         return result.error
       }
     })
-
     if (allOk) {
       return ok(rvs)
     } else {

package/lib/arrays.mjs

@@ -5,27 +5,22 @@ export var poja = define(function (blob, ok, err) {
   if (!Array.isArray(blob)) {
     return err('Must be an array')
   }
-
   return ok(blob.slice())
 })
 
 function all(items, blobs, ok, err) {
   var results = []
-
   for (var index = 0; index < items.length; ++index) {
     var result = items[index]
-
     if (result.ok) {
       results.push(result.value)
     } else {
       var ann = result.error
-
       var clone = [].concat(blobs)
       clone.splice(index, 1, annotate(ann, ann.text ? ann.text + ' (at index ' + index + ')' : 'index ' + index))
       return err(annotate(clone))
     }
   }
-
   return ok(results)
 }
 
@@ -47,7 +42,6 @@ export function set(decoder) {
     return new Set(items)
   })
 }
-
 var ntuple = function ntuple(n) {
   return poja.refine(function (arr) {
     return arr.length === n
@@ -58,13 +52,11 @@ function _tuple() {
   for (var _len = arguments.length, decoders = new Array(_len), _key = 0; _key < _len; _key++) {
     decoders[_key] = arguments[_key]
   }
-
   return ntuple(decoders.length).then(function (blobs, ok, err) {
     var allOk = true
     var rvs = decoders.map(function (decoder, i) {
       var blob = blobs[i]
       var result = decoder.decode(blob)
-
       if (result.ok) {
         return result.value
       } else {
@@ -72,7 +64,6 @@ function _tuple() {
         return result.error
       }
     })
-
     if (allOk) {
       return ok(rvs)
     } else {

package/lib/basics.js

@@ -4,9 +4,7 @@ exports.__esModule = true
 exports.always = always
 exports.constant = constant
 exports.unknown = exports.undefined_ = exports.optional = exports.nullable = exports.null_ = exports.mixed = exports.maybe = exports.hardcoded = void 0
-
 var _Decoder = require('../Decoder')
-
 var _unions = require('./unions')
 
 var null_ = (0, _Decoder.define)(function (blob, ok, err) {
@@ -21,16 +19,12 @@ exports.undefined_ = undefined_
 var undefined_or_null = (0, _Decoder.define)(function (blob, ok, err) {
   return blob === undefined || blob === null ? ok(blob) : err('Must be undefined or null')
 })
-
 function _maybeish(emptyCase) {
   function _inner(decoder) {
     var rv = (0, _unions.either)(emptyCase, decoder)
-
     if (arguments.length >= 2) {
       var _defaultValue = arguments[1]
-
       var _defaultValue2 = typeof _defaultValue === 'function' ? _defaultValue() : _defaultValue
-
       return rv.transform(function (value) {
         return value != null ? value : _defaultValue2
       })
@@ -38,22 +32,18 @@ function _maybeish(emptyCase) {
       return rv
     }
   }
-
   return _inner
 }
 
 var nullable = _maybeish(null_)
 
 exports.nullable = nullable
-
 var optional = _maybeish(undefined_)
 
 exports.optional = optional
-
 var maybe = _maybeish(undefined_or_null)
 
 exports.maybe = maybe
-
 function constant(value) {
   return (0, _Decoder.define)(function (blob, ok, err) {
     return blob === value ? ok(value) : err('Must be constant ' + String(value))
@@ -63,20 +53,10 @@ function constant(value) {
 function always(value) {
   return (0, _Decoder.define)(
     typeof value === 'function'
-      ? function (
-          blob,
-
-          ok,
-          _
-        ) {
+      ? function (blob, ok, _) {
           return ok(value())
         }
-      : function (
-          blob,
-
-          ok,
-          _
-        ) {
+      : function (blob, ok, _) {
           return ok(value)
         }
   )

package/lib/basics.mjs

@@ -11,16 +11,12 @@ export var undefined_ = define(function (blob, ok, err) {
 var undefined_or_null = define(function (blob, ok, err) {
   return blob === undefined || blob === null ? ok(blob) : err('Must be undefined or null')
 })
-
 function _maybeish(emptyCase) {
   function _inner(decoder) {
     var rv = either(emptyCase, decoder)
-
     if (arguments.length >= 2) {
       var _defaultValue = arguments[1]
-
       var _defaultValue2 = typeof _defaultValue === 'function' ? _defaultValue() : _defaultValue
-
       return rv.transform(function (value) {
         return value != null ? value : _defaultValue2
       })
@@ -28,7 +24,6 @@ function _maybeish(emptyCase) {
       return rv
     }
   }
-
   return _inner
 }
 
@@ -47,20 +42,10 @@ export function constant(value) {
 export function always(value) {
   return define(
     typeof value === 'function'
-      ? function (
-          blob,
-
-          ok,
-          _
-        ) {
+      ? function (blob, ok, _) {
           return ok(value())
         }
-      : function (
-          blob,
-
-          ok,
-          _
-        ) {
+      : function (blob, ok, _) {
           return ok(value)
         }
   )

package/lib/booleans.js

@@ -2,9 +2,7 @@
 
 exports.__esModule = true
 exports.truthy = exports.numericBoolean = exports['boolean'] = void 0
-
 var _Decoder = require('../Decoder')
-
 var _numbers = require('./numbers')
 
 var _boolean = (0, _Decoder.define)(function (blob, ok, err) {
@@ -17,9 +15,7 @@ var truthy = (0, _Decoder.define)(function (blob, ok, _) {
 })
 
 exports.truthy = truthy
-
 var numericBoolean = _numbers.number.transform(function (n) {
   return !!n
 })
-
 exports.numericBoolean = numericBoolean

package/lib/dates.js

@@ -2,11 +2,8 @@
 
 exports.__esModule = true
 exports.iso8601 = exports.date = void 0
-
 var _utils = require('../_utils')
-
 var _Decoder = require('../Decoder')
-
 var _strings = require('./strings')
 var iso8601_re = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/
 
@@ -18,11 +15,9 @@ var date = (0, _Decoder.define)(function (blob, ok, err) {
 exports.date = date
 var iso8601 = (0, _strings.regex)(iso8601_re, 'Must be ISO8601 format').transform(function (value) {
   var date = new Date(value)
-
   if (isNaN(date.getTime())) {
     throw new Error('Must be valid date/time value')
   }
-
   return date
 })
 exports.iso8601 = iso8601

package/lib/dates.mjs

@@ -10,10 +10,8 @@ export var date = define(function (blob, ok, err) {
 
 export var iso8601 = regex(iso8601_re, 'Must be ISO8601 format').transform(function (value) {
   var date = new Date(value)
-
   if (isNaN(date.getTime())) {
     throw new Error('Must be valid date/time value')
   }
-
   return date
 })

package/lib/json.js

@@ -2,21 +2,13 @@
 
 exports.__esModule = true
 exports.jsonObject = exports.jsonArray = exports.json = void 0
-
 var _arrays = require('./arrays')
-
 var _booleans = require('./booleans')
-
 var _objects = require('./objects')
-
 var _unions = require('./unions')
-
 var _utilities = require('./utilities')
-
 var _basics = require('./basics')
-
 var _numbers = require('./numbers')
-
 var _strings = require('./strings')
 
 var jsonObject = (0, _utilities.lazy)(function () {

package/lib/numbers.d.ts

@@ -21,11 +21,11 @@ export const number: Decoder<number>;
 export const integer: Decoder<number>;
 
 /**
- * Accepts only positive finite numbers.
+ * Accepts only non-negative (zero or positive) finite numbers.
  */
 export const positiveNumber: Decoder<number>;
 
 /**
- * Accepts only positive finite whole numbers.
+ * Accepts only non-negative (zero or positive) finite whole numbers.
  */
 export const positiveInteger: Decoder<number>;

package/lib/numbers.js

@@ -2,7 +2,6 @@
 
 exports.__esModule = true
 exports.positiveNumber = exports.positiveInteger = exports.number = exports.integer = exports.anyNumber = void 0
-
 var _Decoder = require('../Decoder')
 
 var anyNumber = (0, _Decoder.define)(function (blob, ok, err) {
@@ -20,12 +19,16 @@ var integer = number.refine(function (n) {
 }, 'Number must be an integer')
 
 exports.integer = integer
-var positiveNumber = number.refine(function (n) {
-  return n >= 0
-}, 'Number must be positive')
+var positiveNumber = number
+  .refine(function (n) {
+    return n >= 0
+  }, 'Number must be positive')
+  .transform(Math.abs)
 
 exports.positiveNumber = positiveNumber
-var positiveInteger = integer.refine(function (n) {
-  return n >= 0
-}, 'Number must be positive')
+var positiveInteger = integer
+  .refine(function (n) {
+    return n >= 0
+  }, 'Number must be positive')
+  .transform(Math.abs)
 exports.positiveInteger = positiveInteger

package/lib/numbers.js.flow

@@ -32,17 +32,15 @@ export const integer: Decoder<number> = number.refine(
 );
 
 /**
- * Accepts only positive finite numbers.
+ * Accepts only non-negative (zero or positive) finite numbers.
  */
-export const positiveNumber: Decoder<number> = number.refine(
-    (n) => n >= 0,
-    'Number must be positive',
-);
+export const positiveNumber: Decoder<number> = number
+    .refine((n) => n >= 0, 'Number must be positive')
+    .transform(Math.abs); // Just here to handle the -0 case
 
 /**
- * Accepts only positive finite whole numbers.
+ * Accepts only non-negative (zero or positive) finite whole numbers.
  */
-export const positiveInteger: Decoder<number> = integer.refine(
-    (n) => n >= 0,
-    'Number must be positive',
-);
+export const positiveInteger: Decoder<number> = integer
+    .refine((n) => n >= 0, 'Number must be positive')
+    .transform(Math.abs); // Just here to handle the -0 case

package/lib/numbers.mjs

@@ -12,10 +12,14 @@ export var integer = number.refine(function (n) {
   return Number.isInteger(n)
 }, 'Number must be an integer')
 
-export var positiveNumber = number.refine(function (n) {
-  return n >= 0
-}, 'Number must be positive')
+export var positiveNumber = number
+  .refine(function (n) {
+    return n >= 0
+  }, 'Number must be positive')
+  .transform(Math.abs)
 
-export var positiveInteger = integer.refine(function (n) {
-  return n >= 0
-}, 'Number must be positive')
+export var positiveInteger = integer
+  .refine(function (n) {
+    return n >= 0
+  }, 'Number must be positive')
+  .transform(Math.abs)

package/lib/objects.js

@@ -7,11 +7,8 @@ exports.inexact = inexact
 exports.mapping = mapping
 exports.object = object
 exports.pojo = void 0
-
 var _annotate = require('../annotate')
-
 var _Decoder = require('../Decoder')
-
 var _utils = require('../_utils')
 
 var pojo = (0, _Decoder.define)(function (blob, ok, err) {
@@ -19,12 +16,10 @@ var pojo = (0, _Decoder.define)(function (blob, ok, err) {
 })
 
 exports.pojo = pojo
-
 function object(decodersByKey) {
   var knownKeys = new Set(Object.keys(decodersByKey))
   return pojo.then(function (plainObj, ok, err) {
     var actualKeys = new Set(Object.keys(plainObj))
-
     var missingKeys = (0, _utils.subtract)(knownKeys, actualKeys)
     var record = {}
     var errors = null
@@ -32,37 +27,29 @@ function object(decodersByKey) {
       var decoder = decodersByKey[key]
       var rawValue = plainObj[key]
       var result = decoder.decode(rawValue)
-
       if (result.ok) {
         var value = result.value
-
         if (value !== undefined) {
           record[key] = value
         }
-
         missingKeys['delete'](key)
       } else {
         var ann = result.error
-
         if (rawValue === undefined) {
           missingKeys.add(key)
         } else {
           if (errors === null) {
             errors = {}
           }
-
           errors[key] = ann
         }
       }
     })
-
     if (errors || missingKeys.size > 0) {
       var objAnn = (0, _annotate.annotateObject)(plainObj)
-
       if (errors) {
         objAnn = (0, _annotate.merge)(objAnn, errors)
       }
-
       if (missingKeys.size > 0) {
         var errMsg = Array.from(missingKeys)
           .map(function (key) {
@@ -72,23 +59,19 @@ function object(decodersByKey) {
         var pluralized = missingKeys.size > 1 ? 'keys' : 'key'
         objAnn = (0, _annotate.updateText)(objAnn, 'Missing ' + pluralized + ': ' + errMsg)
       }
-
       return err(objAnn)
     }
-
     return ok(record)
   })
 }
 
 function exact(decodersByKey) {
   var allowedKeys = new Set(Object.keys(decodersByKey))
-
   var checked = pojo.reject(function (plainObj) {
     var actualKeys = new Set(Object.keys(plainObj))
     var extraKeys = (0, _utils.subtract)(actualKeys, allowedKeys)
     return extraKeys.size > 0 ? 'Unexpected extra keys: ' + Array.from(extraKeys).join(', ') : null
   })
-
   return checked.then(object(decodersByKey).decode)
 }
 
@@ -97,7 +80,6 @@ function inexact(decodersByKey) {
     var allkeys = new Set(Object.keys(plainObj))
     var decoder = object(decodersByKey).transform(function (safepart) {
       var safekeys = new Set(Object.keys(decodersByKey))
-
       safekeys.forEach(function (k) {
         return allkeys.add(k)
       })
@@ -105,7 +87,6 @@ function inexact(decodersByKey) {
       allkeys.forEach(function (k) {
         if (safekeys.has(k)) {
           var value = safepart[k]
-
           if (value !== undefined) {
             rv[k] = value
           }
@@ -126,22 +107,18 @@ function dict(decoder) {
     Object.keys(plainObj).forEach(function (key) {
       var value = plainObj[key]
       var result = decoder.decode(value)
-
       if (result.ok) {
         if (errors === null) {
           rv[key] = result.value
         }
       } else {
         rv = {}
-
         if (errors === null) {
           errors = {}
         }
-
         errors[key] = result.error
       }
     })
-
     if (errors !== null) {
       return err((0, _annotate.merge)((0, _annotate.annotateObject)(plainObj), errors))
     } else {