decoders 2.0.3 → 2.0.5

package/lib/objects.mjs

@@ -10,7 +10,6 @@ export 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 = subtract(knownKeys, actualKeys)
     var record = {}
     var errors = null
@@ -18,37 +17,29 @@ export 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 = annotateObject(plainObj)
-
       if (errors) {
         objAnn = merge(objAnn, errors)
       }
-
       if (missingKeys.size > 0) {
         var errMsg = Array.from(missingKeys)
           .map(function (key) {
@@ -58,23 +49,19 @@ export function object(decodersByKey) {
         var pluralized = missingKeys.size > 1 ? 'keys' : 'key'
         objAnn = updateText(objAnn, 'Missing ' + pluralized + ': ' + errMsg)
       }
-
       return err(objAnn)
     }
-
     return ok(record)
   })
 }
 
 export 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 = subtract(actualKeys, allowedKeys)
     return extraKeys.size > 0 ? 'Unexpected extra keys: ' + Array.from(extraKeys).join(', ') : null
   })
-
   return checked.then(object(decodersByKey).decode)
 }
 
@@ -83,7 +70,6 @@ export 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)
       })
@@ -91,7 +77,6 @@ export function inexact(decodersByKey) {
       allkeys.forEach(function (k) {
         if (safekeys.has(k)) {
           var value = safepart[k]
-
           if (value !== undefined) {
             rv[k] = value
           }
@@ -112,22 +97,18 @@ export 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(merge(annotateObject(plainObj), errors))
     } else {

package/lib/strings.js

@@ -4,14 +4,11 @@ exports.__esModule = true
 exports.nonEmptyString = exports.httpsUrl = exports.email = void 0
 exports.regex = regex
 exports.uuidv4 = exports.uuidv1 = exports.uuid = exports.url = exports.string = void 0
-
 var _Decoder = require('../Decoder')
-
 var _unions = require('./unions')
-
 var _utilities = require('./utilities')
 
-var url_re = /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,\w]*)?(?:#[.,!/\w]*)?)?$/
+var url_re = /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,/\w]*)?(?:#[.,!/\w]*)?)?$/
 
 var string = (0, _Decoder.define)(function (blob, ok, err) {
   return typeof blob === 'string' ? ok(blob) : err('Must be string')
@@ -21,7 +18,6 @@ exports.string = string
 var nonEmptyString = regex(/\S/, 'Must be non-empty string')
 
 exports.nonEmptyString = nonEmptyString
-
 function regex(regex, msg) {
   return string.refine(function (s) {
     return regex.test(s)

package/lib/strings.js.flow

@@ -13,7 +13,7 @@ import type { Decoder } from '../Decoder';
  * \5 - the path (optional)
  */
 const url_re =
-    /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,\w]*)?(?:#[.,!/\w]*)?)?$/;
+    /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,/\w]*)?(?:#[.,!/\w]*)?)?$/;
 
 /**
  * Accepts and returns strings.

package/lib/strings.mjs

@@ -2,7 +2,7 @@ import { define } from '../Decoder.mjs'
 import { either } from './unions.mjs'
 import { instanceOf } from './utilities.mjs'
 
-var url_re = /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,\w]*)?(?:#[.,!/\w]*)?)?$/
+var url_re = /^([A-Za-z]{3,9}(?:[+][A-Za-z]{3,9})?):\/\/(?:([-;:&=+$,\w]+)@)?(?:([A-Za-z0-9.-]+)(?::([0-9]{2,5}))?)(\/(?:[-+~%/.,\w]*)?(?:\?[-+=&;%@.,/\w]*)?(?:#[.,!/\w]*)?)?$/
 
 export var string = define(function (blob, ok, err) {
   return typeof blob === 'string' ? ok(blob) : err('Must be string')

package/lib/unions.js

@@ -4,15 +4,10 @@ exports.__esModule = true
 exports.either = void 0
 exports.oneOf = oneOf
 exports.taggedUnion = taggedUnion
-
 var _Decoder = require('../Decoder')
-
 var _utils = require('../_utils')
-
 var _objects = require('./objects')
-
 var _utilities = require('./utilities')
-
 var EITHER_PREFIX = 'Either:\n'
 
 function itemize(s) {
@@ -27,24 +22,19 @@ function _either() {
   for (var _len = arguments.length, decoders = new Array(_len), _key = 0; _key < _len; _key++) {
     decoders[_key] = arguments[_key]
   }
-
   if (decoders.length === 0) {
     throw new Error('Pass at least one decoder to either()')
   }
-
   return (0, _Decoder.define)(function (blob, _, err) {
     var errors = []
-
     for (var _i = 0; _i < decoders.length; _i++) {
       var result = decoders[_i].decode(blob)
-
       if (result.ok) {
         return result
       } else {
         errors.push(result.error)
       }
     }
-
     var text =
       EITHER_PREFIX +
       errors
@@ -59,17 +49,14 @@ function _either() {
 var either = _either
 
 exports.either = either
-
 function oneOf(constants) {
   return (0, _Decoder.define)(function (blob, ok, err) {
     var winner = constants.find(function (c) {
       return c === blob
     })
-
     if (winner !== undefined) {
       return ok(winner)
     }
-
     return err(
       'Must be one of ' +
         constants
@@ -83,7 +70,6 @@ function oneOf(constants) {
 
 function taggedUnion(field, mapping) {
   var _object
-
   var base = (0, _objects.object)(((_object = {}), (_object[field] = (0, _utilities.prep)(String, oneOf(Object.keys(mapping)))), _object)).transform(function (o) {
     return o[field]
   })

package/lib/unions.mjs

@@ -16,24 +16,19 @@ function _either() {
   for (var _len = arguments.length, decoders = new Array(_len), _key = 0; _key < _len; _key++) {
     decoders[_key] = arguments[_key]
   }
-
   if (decoders.length === 0) {
     throw new Error('Pass at least one decoder to either()')
   }
-
   return define(function (blob, _, err) {
     var errors = []
-
     for (var _i = 0; _i < decoders.length; _i++) {
       var result = decoders[_i].decode(blob)
-
       if (result.ok) {
         return result
       } else {
         errors.push(result.error)
       }
     }
-
     var text =
       EITHER_PREFIX +
       errors
@@ -52,11 +47,9 @@ export function oneOf(constants) {
     var winner = constants.find(function (c) {
       return c === blob
     })
-
     if (winner !== undefined) {
       return ok(winner)
     }
-
     return err(
       'Must be one of ' +
         constants
@@ -70,7 +63,6 @@ export function oneOf(constants) {
 
 export function taggedUnion(field, mapping) {
   var _object
-
   var base = object(((_object = {}), (_object[field] = prep(String, oneOf(Object.keys(mapping)))), _object)).transform(function (o) {
     return o[field]
   })

package/lib/utilities.js

@@ -6,9 +6,7 @@ exports.instanceOf = instanceOf
 exports.lazy = lazy
 exports.never = never
 exports.prep = prep
-
 var _annotate = require('../annotate')
-
 var _Decoder = require('../Decoder')
 
 function instanceOf(klass) {
@@ -26,13 +24,11 @@ function lazy(decoderFn) {
 function prep(mapperFn, decoder) {
   return (0, _Decoder.define)(function (originalInput, _, err) {
     var blob
-
     try {
       blob = mapperFn(originalInput)
     } catch (e) {
       return err((0, _annotate.annotate)(originalInput, e.message))
     }
-
     var r = decoder.decode(blob)
     return r.ok ? r : err((0, _annotate.annotate)(originalInput, r.error.text))
   })

package/lib/utilities.mjs

@@ -16,13 +16,11 @@ export function lazy(decoderFn) {
 export function prep(mapperFn, decoder) {
   return define(function (originalInput, _, err) {
     var blob
-
     try {
       blob = mapperFn(originalInput)
     } catch (e) {
       return err(annotate(originalInput, e.message))
     }
-
     var r = decoder.decode(blob)
     return r.ok ? r : err(annotate(originalInput, r.error.text))
   })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "decoders",
-    "version": "2.0.3",
+    "version": "2.0.5",
     "description": "Elegant and battle-tested validation library for type-safe input data (for TypeScript and Flow)",
     "license": "MIT",
     "repository": {