decoders 2.0.3 → 2.0.4

package/CHANGELOG.md

@@ -1,4 +1,9 @@
-## v2.0.3 (not released yet)
+## v2.0.4
+
+-   Fix a bug in the `url` decoder, which could incorrectly reject URLs with a `/` in the
+    query path. Thanks, @gcampax!
+
+## v2.0.3
 
 -   Fix bundling issue where TypeScript types would not get picked up correctly in old
     TypeScript versions. Thanks, @robinchow!

package/Decoder.js

@@ -2,11 +2,8 @@
 
 exports.__esModule = true
 exports.define = define
-
 var _annotate = require('./annotate')
-
 var _format = require('./format')
-
 var _result = require('./result')
 
 function noThrow(fn) {
@@ -19,13 +16,10 @@ function noThrow(fn) {
     }
   }
 }
-
 function format(err, formatter) {
   var formatted = formatter(err)
-
   if (typeof formatted === 'string') {
     var _err = new Error('\n' + formatted)
-
     _err.name = 'Decoding error'
     return _err
   } else {
@@ -44,9 +38,7 @@ function define(fn) {
     if (formatter === void 0) {
       formatter = _format.formatInline
     }
-
     var result = decode(blob)
-
     if (result.ok) {
       return result.value
     } else {
@@ -85,7 +77,6 @@ function define(fn) {
   function describe(message) {
     return define(function (blob, _, err) {
       var result = decode(blob)
-
       if (result.ok) {
         return result
       } else {
@@ -100,7 +91,6 @@ function define(fn) {
       return result.ok ? next([blob, result.value], ok, err) : result
     })
   }
-
   return Object.freeze({
     verify: verify,
     value: value,

package/Decoder.mjs

@@ -12,13 +12,10 @@ function noThrow(fn) {
     }
   }
 }
-
 function format(err, formatter) {
   var formatted = formatter(err)
-
   if (typeof formatted === 'string') {
     var _err = new Error('\n' + formatted)
-
     _err.name = 'Decoding error'
     return _err
   } else {
@@ -37,9 +34,7 @@ export function define(fn) {
     if (formatter === void 0) {
       formatter = formatInline
     }
-
     var result = decode(blob)
-
     if (result.ok) {
       return result.value
     } else {
@@ -78,7 +73,6 @@ export function define(fn) {
   function describe(message) {
     return define(function (blob, _, err) {
       var result = decode(blob)
-
       if (result.ok) {
         return result
       } else {
@@ -93,7 +87,6 @@ export function define(fn) {
       return result.ok ? next([blob, result.value], ok, err) : result
     })
   }
-
   return Object.freeze({
     verify: verify,
     value: value,

package/_utils.js

@@ -10,7 +10,6 @@ exports.summarize = summarize
 var INDENT = '  '
 
 exports.INDENT = INDENT
-
 function subtract(xs, ys) {
   var result = new Set()
   xs.forEach(function (x) {
@@ -24,16 +23,13 @@ function subtract(xs, ys) {
 function asDate(value) {
   return !!value && Object.prototype.toString.call(value) === '[object Date]' && !isNaN(value) ? value : null
 }
-
 function isMultiline(s) {
   return s.indexOf('\n') >= 0
 }
-
 function indent(s, prefix) {
   if (prefix === void 0) {
     prefix = INDENT
   }
-
   if (isMultiline(s)) {
     return s
       .split('\n')
@@ -50,9 +46,7 @@ function summarize(ann, keypath) {
   if (keypath === void 0) {
     keypath = []
   }
-
   var result = []
-
   if (ann.type === 'array') {
     var items = ann.items
     var index = 0
@@ -70,15 +64,11 @@ function summarize(ann, keypath) {
       })
     })
   }
-
   var text = ann.text
-
   if (!text) {
     return result
   }
-
   var prefix
-
   if (keypath.length === 0) {
     prefix = ''
   } else if (keypath.length === 1) {
@@ -86,6 +76,5 @@ function summarize(ann, keypath) {
   } else {
     prefix = 'Value at keypath ' + keypath.map(String).join('.') + ': '
   }
-
   return [].concat(result, ['' + prefix + text])
 }

package/_utils.mjs

@@ -20,7 +20,6 @@ export function indent(s, prefix) {
   if (prefix === void 0) {
     prefix = INDENT
   }
-
   if (isMultiline(s)) {
     return s
       .split('\n')
@@ -37,9 +36,7 @@ export function summarize(ann, keypath) {
   if (keypath === void 0) {
     keypath = []
   }
-
   var result = []
-
   if (ann.type === 'array') {
     var items = ann.items
     var index = 0
@@ -57,15 +54,11 @@ export function summarize(ann, keypath) {
       })
     })
   }
-
   var text = ann.text
-
   if (!text) {
     return result
   }
-
   var prefix
-
   if (keypath.length === 0) {
     prefix = ''
   } else if (keypath.length === 1) {
@@ -73,6 +66,5 @@ export function summarize(ann, keypath) {
   } else {
     prefix = 'Value at keypath ' + keypath.map(String).join('.') + ': '
   }
-
   return [].concat(result, ['' + prefix + text])
 }

package/annotate.js

@@ -13,7 +13,6 @@ exports.object = object
 exports.scalar = scalar
 exports.unknown = unknown
 exports.updateText = updateText
-
 function _extends() {
   _extends = Object.assign
     ? Object.assign.bind()
@@ -30,15 +29,11 @@ function _extends() {
       }
   return _extends.apply(this, arguments)
 }
-
 var _register = new WeakSet()
-
 function brand(ann) {
   _register.add(ann)
-
   return ann
 }
-
 function object(fields, text) {
   return brand({
     type: 'object',
@@ -46,7 +41,6 @@ function object(fields, text) {
     text: text,
   })
 }
-
 function array(items, text) {
   return brand({
     type: 'array',
@@ -54,14 +48,12 @@ function array(items, text) {
     text: text,
   })
 }
-
 function func(text) {
   return brand({
     type: 'function',
     text: text,
   })
 }
-
 function unknown(value, text) {
   return brand({
     type: 'unknown',
@@ -69,7 +61,6 @@ function unknown(value, text) {
     text: text,
   })
 }
-
 function scalar(value, text) {
   return brand({
     type: 'scalar',
@@ -77,7 +68,6 @@ function scalar(value, text) {
     text: text,
   })
 }
-
 function circularRef(text) {
   return brand({
     type: 'circular-ref',
@@ -99,14 +89,11 @@ function updateText(annotation, text) {
 
 function merge(objAnnotation, fields) {
   var newFields = _extends({}, objAnnotation.fields, fields)
-
   return object(newFields, objAnnotation.text)
 }
-
 function asAnnotation(thing) {
   return typeof thing === 'object' && thing !== null && _register.has(thing) ? thing : undefined
 }
-
 function annotateArray(value, text, seen) {
   seen.add(value)
   var items = value.map(function (v) {
@@ -114,7 +101,6 @@ function annotateArray(value, text, seen) {
   })
   return array(items, text)
 }
-
 function annotateObject(obj, text, seen) {
   seen.add(obj)
   var fields = {}
@@ -124,18 +110,14 @@ function annotateObject(obj, text, seen) {
   })
   return object(fields, text)
 }
-
 function annotate(value, text, seen) {
   if (value === null || value === undefined || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' || typeof value === 'symbol' || typeof value.getMonth === 'function') {
     return scalar(value, text)
   }
-
   var ann = asAnnotation(value)
-
   if (ann) {
     return updateText(ann, text)
   }
-
   if (Array.isArray(value)) {
     if (seen.has(value)) {
       return circularRef(text)
@@ -143,7 +125,6 @@ function annotate(value, text, seen) {
       return annotateArray(value, text, seen)
     }
   }
-
   if (typeof value === 'object') {
     if (seen.has(value)) {
       return circularRef(text)
@@ -151,18 +132,14 @@ function annotate(value, text, seen) {
       return annotateObject(value, text, seen)
     }
   }
-
   if (typeof value === 'function') {
     return func(text)
   }
-
   return unknown(value, text)
 }
-
 function public_annotate(value, text) {
   return annotate(value, text, new WeakSet())
 }
-
 function public_annotateObject(obj, text) {
   return annotateObject(obj, text, new WeakSet())
 }

package/annotate.mjs

@@ -14,15 +14,11 @@ function _extends() {
       }
   return _extends.apply(this, arguments)
 }
-
 var _register = new WeakSet()
-
 function brand(ann) {
   _register.add(ann)
-
   return ann
 }
-
 export function object(fields, text) {
   return brand({
     type: 'object',
@@ -78,13 +74,11 @@ export function updateText(annotation, text) {
 
 export function merge(objAnnotation, fields) {
   var newFields = _extends({}, objAnnotation.fields, fields)
-
   return object(newFields, objAnnotation.text)
 }
 export function asAnnotation(thing) {
   return typeof thing === 'object' && thing !== null && _register.has(thing) ? thing : undefined
 }
-
 function annotateArray(value, text, seen) {
   seen.add(value)
   var items = value.map(function (v) {
@@ -92,7 +86,6 @@ function annotateArray(value, text, seen) {
   })
   return array(items, text)
 }
-
 function annotateObject(obj, text, seen) {
   seen.add(obj)
   var fields = {}
@@ -102,18 +95,14 @@ function annotateObject(obj, text, seen) {
   })
   return object(fields, text)
 }
-
 function annotate(value, text, seen) {
   if (value === null || value === undefined || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' || typeof value === 'symbol' || typeof value.getMonth === 'function') {
     return scalar(value, text)
   }
-
   var ann = asAnnotation(value)
-
   if (ann) {
     return updateText(ann, text)
   }
-
   if (Array.isArray(value)) {
     if (seen.has(value)) {
       return circularRef(text)
@@ -121,7 +110,6 @@ function annotate(value, text, seen) {
       return annotateArray(value, text, seen)
     }
   }
-
   if (typeof value === 'object') {
     if (seen.has(value)) {
       return circularRef(text)
@@ -129,20 +117,15 @@ function annotate(value, text, seen) {
       return annotateObject(value, text, seen)
     }
   }
-
   if (typeof value === 'function') {
     return func(text)
   }
-
   return unknown(value, text)
 }
-
 function public_annotate(value, text) {
   return annotate(value, text, new WeakSet())
 }
-
 function public_annotateObject(obj, text) {
   return annotateObject(obj, text, new WeakSet())
 }
-
 export { public_annotate as annotate, public_annotateObject as annotateObject, annotate as __private_annotate }

package/format.js

@@ -5,73 +5,57 @@ exports.formatInline = formatInline
 exports.formatShort = formatShort
 exports.serializeAnnotation = serializeAnnotation
 exports.serializeValue = serializeValue
-
 var _utils = require('./_utils')
-
 function serializeString(s, width) {
   if (width === void 0) {
     width = 80
   }
   var ser = JSON.stringify(s)
-
   if (ser.length <= width) {
     return ser
   }
-
   var truncated = s.substring(0, width - 15) + '...'
   ser = JSON.stringify(truncated) + ' [truncated]'
   return ser
 }
-
 function serializeArray(annotation, prefix) {
   var items = annotation.items
-
   if (items.length === 0) {
     return '[]'
   }
-
   var result = []
   items.forEach(function (item) {
     var _serializeAnnotation = serializeAnnotation(item, '' + prefix + _utils.INDENT),
       ser = _serializeAnnotation[0],
       ann = _serializeAnnotation[1]
-
     result.push('' + prefix + _utils.INDENT + ser + ',')
-
     if (ann !== undefined) {
       result.push((0, _utils.indent)(ann, '' + prefix + _utils.INDENT))
     }
   })
   return ['['].concat(result, [prefix + ']']).join('\n')
 }
-
 function serializeObject(annotation, prefix) {
   var fields = annotation.fields
   var fieldNames = Object.keys(fields)
-
   if (fieldNames.length === 0) {
     return '{}'
   }
-
   var result = []
   fieldNames.forEach(function (key) {
     var valueAnnotation = fields[key]
     var kser = serializeValue(key)
     var valPrefix = '' + prefix + _utils.INDENT + ' '.repeat(kser.length + 2)
-
     var _serializeAnnotation2 = serializeAnnotation(valueAnnotation, '' + prefix + _utils.INDENT),
       vser = _serializeAnnotation2[0],
       vann = _serializeAnnotation2[1]
-
     result.push('' + prefix + _utils.INDENT + kser + ': ' + vser + ',')
-
     if (vann !== undefined) {
       result.push((0, _utils.indent)(vann, valPrefix))
     }
   })
   return ['{'].concat(result, [prefix + '}']).join('\n')
 }
-
 function serializeValue(value) {
   if (typeof value === 'string') {
     return serializeString(value)
@@ -83,7 +67,6 @@ function serializeValue(value) {
     return 'undefined'
   } else {
     var valueAsDate = (0, _utils.asDate)(value)
-
     if (valueAsDate !== null) {
       return 'new Date(' + JSON.stringify(valueAsDate.toISOString()) + ')'
     } else if (value instanceof Date) {
@@ -93,13 +76,11 @@ function serializeValue(value) {
     }
   }
 }
-
 function serializeAnnotation(ann, prefix) {
   if (prefix === void 0) {
     prefix = ''
   }
   var serialized
-
   if (ann.type === 'array') {
     serialized = serializeArray(ann, prefix)
   } else if (ann.type === 'object') {
@@ -113,9 +94,7 @@ function serializeAnnotation(ann, prefix) {
   } else {
     serialized = serializeValue(ann.value)
   }
-
   var text = ann.text
-
   if (text !== undefined) {
     var sep = '^'.repeat((0, _utils.isMultiline)(serialized) ? 1 : serialized.length)
     return [serialized, [sep, text].join((0, _utils.isMultiline)(text) ? '\n' : ' ')]
@@ -123,19 +102,16 @@ function serializeAnnotation(ann, prefix) {
     return [serialized, undefined]
   }
 }
-
 function formatInline(ann) {
   var _serializeAnnotation3 = serializeAnnotation(ann),
     serialized = _serializeAnnotation3[0],
     annotation = _serializeAnnotation3[1]
-
   if (annotation !== undefined) {
     return serialized + '\n' + annotation
   } else {
     return serialized
   }
 }
-
 function formatShort(ann) {
   return (0, _utils.summarize)(ann, []).join('\n')
 }

package/format.mjs

@@ -1,69 +1,54 @@
 import { summarize as _summarize, asDate, INDENT, indent, isMultiline } from './_utils.mjs'
-
 function serializeString(s, width) {
   if (width === void 0) {
     width = 80
   }
   var ser = JSON.stringify(s)
-
   if (ser.length <= width) {
     return ser
   }
-
   var truncated = s.substring(0, width - 15) + '...'
   ser = JSON.stringify(truncated) + ' [truncated]'
   return ser
 }
-
 function serializeArray(annotation, prefix) {
   var items = annotation.items
-
   if (items.length === 0) {
     return '[]'
   }
-
   var result = []
   items.forEach(function (item) {
     var _serializeAnnotation = serializeAnnotation(item, '' + prefix + INDENT),
       ser = _serializeAnnotation[0],
       ann = _serializeAnnotation[1]
-
     result.push('' + prefix + INDENT + ser + ',')
-
     if (ann !== undefined) {
       result.push(indent(ann, '' + prefix + INDENT))
     }
   })
   return ['['].concat(result, [prefix + ']']).join('\n')
 }
-
 function serializeObject(annotation, prefix) {
   var fields = annotation.fields
   var fieldNames = Object.keys(fields)
-
   if (fieldNames.length === 0) {
     return '{}'
   }
-
   var result = []
   fieldNames.forEach(function (key) {
     var valueAnnotation = fields[key]
     var kser = serializeValue(key)
     var valPrefix = '' + prefix + INDENT + ' '.repeat(kser.length + 2)
-
     var _serializeAnnotation2 = serializeAnnotation(valueAnnotation, '' + prefix + INDENT),
       vser = _serializeAnnotation2[0],
       vann = _serializeAnnotation2[1]
-
     result.push('' + prefix + INDENT + kser + ': ' + vser + ',')
-
     if (vann !== undefined) {
       result.push(indent(vann, valPrefix))
     }
   })
   return ['{'].concat(result, [prefix + '}']).join('\n')
 }
-
 export function serializeValue(value) {
   if (typeof value === 'string') {
     return serializeString(value)
@@ -75,7 +60,6 @@ export function serializeValue(value) {
     return 'undefined'
   } else {
     var valueAsDate = asDate(value)
-
     if (valueAsDate !== null) {
       return 'new Date(' + JSON.stringify(valueAsDate.toISOString()) + ')'
     } else if (value instanceof Date) {
@@ -90,7 +74,6 @@ export function serializeAnnotation(ann, prefix) {
     prefix = ''
   }
   var serialized
-
   if (ann.type === 'array') {
     serialized = serializeArray(ann, prefix)
   } else if (ann.type === 'object') {
@@ -104,9 +87,7 @@ export function serializeAnnotation(ann, prefix) {
   } else {
     serialized = serializeValue(ann.value)
   }
-
   var text = ann.text
-
   if (text !== undefined) {
     var sep = '^'.repeat(isMultiline(serialized) ? 1 : serialized.length)
     return [serialized, [sep, text].join(isMultiline(text) ? '\n' : ' ')]
@@ -118,7 +99,6 @@ export function formatInline(ann) {
   var _serializeAnnotation3 = serializeAnnotation(ann),
     serialized = _serializeAnnotation3[0],
     annotation = _serializeAnnotation3[1]
-
   if (annotation !== undefined) {
     return serialized + '\n' + annotation
   } else {