decoders 2.0.0-beta5 → 2.0.0-beta9

package/core/composition.js

@@ -2,27 +2,26 @@
 
 exports.__esModule = true;
 exports.compose = compose;
-exports.map = map;
 exports.predicate = predicate;
+exports.prep = prep;
+exports.transform = transform;
 
-var Result = _interopRequireWildcard(require("../result"));
+var _result = require("../result");
 
 var _annotate = require("../annotate");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /**
- * Given a decoder T and a mapping function from T's to V's, returns a decoder
- * for V's.  This is useful to change the original input data.
+ * Accepts any value the given decoder accepts, and on success, will call the
+ * mapper value **on the decoded result**. If the mapper function throws an
+ * error, the whole decoder will fail using the error message as the failure
+ * reason.
  */
-function map(decoder, mapper) {
+function transform(decoder, transformFn) {
   return compose(decoder, function (x) {
     try {
-      return Result.ok(mapper(x));
+      return (0, _result.ok)(transformFn(x));
     } catch (e) {
-      return Result.err((0, _annotate.annotate)(x, e instanceof Error ? e.message : String(e)));
+      return (0, _result.err)((0, _annotate.annotate)(x, e instanceof Error ? e.message : String(e)));
     }
   });
 }
@@ -40,7 +39,7 @@ function map(decoder, mapper) {
 
 function compose(decoder, next) {
   return function (blob) {
-    return Result.andThen(decoder(blob), next);
+    return (0, _result.andThen)(decoder(blob), next);
   };
 }
 /**
@@ -49,8 +48,35 @@ function compose(decoder, next) {
  */
 
 
-function predicate(predicate, msg) {
-  return function (value) {
-    return predicate(value) ? Result.ok(value) : Result.err((0, _annotate.annotate)(value, msg));
+function predicate(decoder, predicateFn, msg) {
+  return function (blob) {
+    return (0, _result.andThen)(decoder(blob), function (value) {
+      return predicateFn(value) ? (0, _result.ok)(value) : (0, _result.err)((0, _annotate.annotate)(value, msg));
+    });
+  };
+}
+/**
+ * Pre-process the data input before passing it into the decoder. This gives
+ * you the ability to arbitrarily customize the input on the fly before passing
+ * it to the decoder. Of course, the input value at that point is still of
+ * `unknown` type, so you will have to deal with that accordingly.
+ */
+
+
+function prep(mapperFn, decoder) {
+  return function (blob) {
+    var blob2;
+
+    try {
+      blob2 = mapperFn(blob);
+    } catch (e) {
+      return (0, _result.err)((0, _annotate.annotate)(blob, e.message));
+    }
+
+    return (0, _result.orElse)(decoder(blob2), function (ann) {
+      return (0, _result.err)((0, _annotate.annotate)(blob, ann.text));
+    } //                    ^^^^ Annotates the _original_ input value
+    //                         (instead of echoing back blob2 in the output)
+    );
   };
 }

package/core/composition.js.flow

@@ -1,19 +1,21 @@
 // @flow strict
 
-import * as Result from '../result';
+import { andThen, err, ok, orElse } from '../result';
 import { annotate } from '../annotate';
 import type { Decoder } from '../_types';
 
 /**
- * Given a decoder T and a mapping function from T's to V's, returns a decoder
- * for V's.  This is useful to change the original input data.
+ * Accepts any value the given decoder accepts, and on success, will call the
+ * mapper value **on the decoded result**. If the mapper function throws an
+ * error, the whole decoder will fail using the error message as the failure
+ * reason.
  */
-export function map<T, V>(decoder: Decoder<T>, mapper: (T) => V): Decoder<V> {
+export function transform<T, V>(decoder: Decoder<T>, transformFn: (T) => V): Decoder<V> {
     return compose(decoder, (x) => {
         try {
-            return Result.ok(mapper(x));
+            return ok(transformFn(x));
         } catch (e) {
-            return Result.err(annotate(x, e instanceof Error ? e.message : String(e)));
+            return err(annotate(x, e instanceof Error ? e.message : String(e)));
         }
     });
 }
@@ -29,15 +31,44 @@ export function map<T, V>(decoder: Decoder<T>, mapper: (T) => V): Decoder<V> {
  * argument.
  */
 export function compose<T, V>(decoder: Decoder<T>, next: Decoder<V, T>): Decoder<V> {
-    return (blob: mixed) => Result.andThen(decoder(blob), next);
+    return (blob: mixed) => andThen(decoder(blob), next);
 }
 
 /**
  * Factory function returning a Decoder<T>, given a predicate function that
  * accepts/rejects the input of type T.
  */
-export function predicate<T>(predicate: (T) => boolean, msg: string): Decoder<T, T> {
-    return (value: T) => {
-        return predicate(value) ? Result.ok(value) : Result.err(annotate(value, msg));
+export function predicate<T>(
+    decoder: Decoder<T>,
+    predicateFn: (T) => boolean,
+    msg: string,
+): Decoder<T> {
+    return (blob: mixed) =>
+        andThen(decoder(blob), (value) =>
+            predicateFn(value) ? ok(value) : err(annotate(value, msg)),
+        );
+}
+
+/**
+ * Pre-process the data input before passing it into the decoder. This gives
+ * you the ability to arbitrarily customize the input on the fly before passing
+ * it to the decoder. Of course, the input value at that point is still of
+ * `unknown` type, so you will have to deal with that accordingly.
+ */
+export function prep<I, T>(mapperFn: (mixed) => I, decoder: Decoder<T, I>): Decoder<T> {
+    return (blob: mixed) => {
+        let blob2;
+        try {
+            blob2 = mapperFn(blob);
+        } catch (e) {
+            return err(annotate(blob, e.message));
+        }
+
+        return orElse(
+            decoder(blob2),
+            (ann) => err(annotate(blob, ann.text)),
+            //                    ^^^^ Annotates the _original_ input value
+            //                         (instead of echoing back blob2 in the output)
+        );
     };
 }

package/core/composition.mjs

@@ -0,0 +1,70 @@
+import { andThen, err, ok, orElse } from '../result.mjs';
+import { annotate } from '../annotate.mjs';
+
+/**
+ * Accepts any value the given decoder accepts, and on success, will call the
+ * mapper value **on the decoded result**. If the mapper function throws an
+ * error, the whole decoder will fail using the error message as the failure
+ * reason.
+ */
+export function transform(decoder, transformFn) {
+  return compose(decoder, function (x) {
+    try {
+      return ok(transformFn(x));
+    } catch (e) {
+      return err(annotate(x, e instanceof Error ? e.message : String(e)));
+    }
+  });
+}
+/**
+ * Compose two decoders by passing the result of the first into the second.
+ * The second decoder may assume as its input type the output type of the first
+ * decoder (so it's not necessary to accept the typical "mixed").  This is
+ * useful for "narrowing down" the checks.  For example, if you want to write
+ * a decoder for positive numbers, you can compose it from an existing decoder
+ * for any number, and a decoder that, assuming a number, checks if it's
+ * positive.  Very often combined with the predicate() helper as the second
+ * argument.
+ */
+
+export function compose(decoder, next) {
+  return function (blob) {
+    return andThen(decoder(blob), next);
+  };
+}
+/**
+ * Factory function returning a Decoder<T>, given a predicate function that
+ * accepts/rejects the input of type T.
+ */
+
+export function predicate(decoder, predicateFn, msg) {
+  return function (blob) {
+    return andThen(decoder(blob), function (value) {
+      return predicateFn(value) ? ok(value) : err(annotate(value, msg));
+    });
+  };
+}
+/**
+ * Pre-process the data input before passing it into the decoder. This gives
+ * you the ability to arbitrarily customize the input on the fly before passing
+ * it to the decoder. Of course, the input value at that point is still of
+ * `unknown` type, so you will have to deal with that accordingly.
+ */
+
+export function prep(mapperFn, decoder) {
+  return function (blob) {
+    var blob2;
+
+    try {
+      blob2 = mapperFn(blob);
+    } catch (e) {
+      return err(annotate(blob, e.message));
+    }
+
+    return orElse(decoder(blob2), function (ann) {
+      return err(annotate(blob, ann.text));
+    } //                    ^^^^ Annotates the _original_ input value
+    //                         (instead of echoing back blob2 in the output)
+    );
+  };
+}

package/core/constants.d.ts

@@ -0,0 +1,11 @@
+import { Decoder, Scalar } from '../_types';
+
+// Constants
+
+export const null_: Decoder<null>;
+export const undefined_: Decoder<undefined>;
+export function constant<T extends Scalar>(value: T): Decoder<T>;
+export function hardcoded<T extends Scalar>(value: T): Decoder<T>;
+export function hardcoded<T>(value: T): Decoder<T>;
+export const mixed: Decoder<unknown>;
+export const unknown: Decoder<unknown>;

package/core/constants.js

@@ -5,19 +5,15 @@ exports.constant = constant;
 exports.hardcoded = hardcoded;
 exports.unknown = exports.undefined_ = exports.null_ = exports.mixed = void 0;
 
-var Result = _interopRequireWildcard(require("../result"));
-
 var _annotate = require("../annotate");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _result = require("../result");
 
 /**
  * Decoder that only returns Ok for `null` inputs.  Err otherwise.
  */
 var null_ = function null_(blob) {
-  return blob === null ? Result.ok(blob) : Result.err((0, _annotate.annotate)(blob, 'Must be null'));
+  return blob === null ? (0, _result.ok)(blob) : (0, _result.err)((0, _annotate.annotate)(blob, 'Must be null'));
 };
 /**
  * Decoder that only returns Ok for `undefined` inputs.  Err otherwise.
@@ -27,7 +23,7 @@ var null_ = function null_(blob) {
 exports.null_ = null_;
 
 var undefined_ = function undefined_(blob) {
-  return blob === undefined ? Result.ok(blob) : Result.err((0, _annotate.annotate)(blob, 'Must be undefined'));
+  return blob === undefined ? (0, _result.ok)(blob) : (0, _result.err)((0, _annotate.annotate)(blob, 'Must be undefined'));
 };
 /**
  * Decoder that only returns Ok for the given value constant.  Err otherwise.
@@ -38,7 +34,7 @@ exports.undefined_ = undefined_;
 
 function constant(value) {
   return function (blob) {
-    return blob === value ? Result.ok(value) : Result.err((0, _annotate.annotate)(blob, "Must be constant " + String(value)));
+    return blob === value ? (0, _result.ok)(value) : (0, _result.err)((0, _annotate.annotate)(blob, "Must be constant " + String(value)));
   };
 }
 /**
@@ -48,7 +44,7 @@ function constant(value) {
 
 function hardcoded(value) {
   return function () {
-    return Result.ok(value);
+    return (0, _result.ok)(value);
   };
 }
 /**
@@ -57,7 +53,7 @@ function hardcoded(value) {
 
 
 var unknown = function unknown(blob) {
-  return Result.ok(blob);
+  return (0, _result.ok)(blob);
 };
 /**
  * Alias of unknown.

package/core/constants.js.flow

@@ -1,22 +1,20 @@
 // @flow strict
 
-import * as Result from '../result';
 import { annotate } from '../annotate';
+import { err, ok } from '../result';
 import type { Decoder, Scalar } from '../_types';
 
 /**
  * Decoder that only returns Ok for `null` inputs.  Err otherwise.
  */
 export const null_: Decoder<null> = (blob: mixed) =>
-    blob === null ? Result.ok(blob) : Result.err(annotate(blob, 'Must be null'));
+    blob === null ? ok(blob) : err(annotate(blob, 'Must be null'));
 
 /**
  * Decoder that only returns Ok for `undefined` inputs.  Err otherwise.
  */
 export const undefined_: Decoder<void> = (blob: mixed) =>
-    blob === undefined
-        ? Result.ok(blob)
-        : Result.err(annotate(blob, 'Must be undefined'));
+    blob === undefined ? ok(blob) : err(annotate(blob, 'Must be undefined'));
 
 /**
  * Decoder that only returns Ok for the given value constant.  Err otherwise.
@@ -24,21 +22,21 @@ export const undefined_: Decoder<void> = (blob: mixed) =>
 export function constant<T: Scalar>(value: T): Decoder<T> {
     return (blob: mixed) =>
         blob === value
-            ? Result.ok(value)
-            : Result.err(annotate(blob, `Must be constant ${String(value)}`));
+            ? ok(value)
+            : err(annotate(blob, `Must be constant ${String(value)}`));
 }
 
 /**
  * Decoder that always returns Ok for the given hardcoded value, no matter what the input.
  */
 export function hardcoded<T>(value: T): Decoder<T> {
-    return () => Result.ok(value);
+    return () => ok(value);
 }
 
 /**
  * Decoder that always returns Ok for the given hardcoded value, no matter what the input.
  */
-export const unknown: Decoder<mixed> = (blob: mixed) => Result.ok(blob);
+export const unknown: Decoder<mixed> = (blob: mixed) => ok(blob);
 
 /**
  * Alias of unknown.

package/{_esm/core/constants.js → core/constants.mjs}

@@ -1,18 +1,18 @@
-import * as Result from '../result';
-import { annotate } from '../annotate';
+import { annotate } from '../annotate.mjs';
+import { err, ok } from '../result.mjs';
 
 /**
  * Decoder that only returns Ok for `null` inputs.  Err otherwise.
  */
 export var null_ = function null_(blob) {
-  return blob === null ? Result.ok(blob) : Result.err(annotate(blob, 'Must be null'));
+  return blob === null ? ok(blob) : err(annotate(blob, 'Must be null'));
 };
 /**
  * Decoder that only returns Ok for `undefined` inputs.  Err otherwise.
  */
 
 export var undefined_ = function undefined_(blob) {
-  return blob === undefined ? Result.ok(blob) : Result.err(annotate(blob, 'Must be undefined'));
+  return blob === undefined ? ok(blob) : err(annotate(blob, 'Must be undefined'));
 };
 /**
  * Decoder that only returns Ok for the given value constant.  Err otherwise.
@@ -20,7 +20,7 @@ export var undefined_ = function undefined_(blob) {
 
 export function constant(value) {
   return function (blob) {
-    return blob === value ? Result.ok(value) : Result.err(annotate(blob, "Must be constant " + String(value)));
+    return blob === value ? ok(value) : err(annotate(blob, "Must be constant " + String(value)));
   };
 }
 /**
@@ -29,7 +29,7 @@ export function constant(value) {
 
 export function hardcoded(value) {
   return function () {
-    return Result.ok(value);
+    return ok(value);
   };
 }
 /**
@@ -37,7 +37,7 @@ export function hardcoded(value) {
  */
 
 export var unknown = function unknown(blob) {
-  return Result.ok(blob);
+  return ok(blob);
 };
 /**
  * Alias of unknown.

package/core/date.d.ts

@@ -0,0 +1,4 @@
+import { Decoder } from '../_types';
+
+export const date: Decoder<Date>;
+export const iso8601: Decoder<Date>;

package/core/date.js

@@ -3,19 +3,15 @@
 exports.__esModule = true;
 exports.iso8601 = exports.date = void 0;
 
-var Result = _interopRequireWildcard(require("../result"));
-
 var _annotate = require("../annotate");
 
-var _utils = require("../_utils");
+var _result = require("../result");
 
-var _composition = require("./composition");
+var _utils = require("../_utils");
 
 var _string = require("./string");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _composition = require("./composition");
 
 // Only matches the shape.  This "over-matches" some values that still aren't
 // valid dates (like 9999-99-99), but those will be caught by JS Date's
@@ -23,7 +19,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var iso8601_re = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
 
 var date = function date(value) {
-  return (0, _utils.isDate)(value) ? Result.ok(value) : Result.err((0, _annotate.annotate)(value, 'Must be a Date'));
+  return (0, _utils.isDate)(value) ? (0, _result.ok)(value) : (0, _result.err)((0, _annotate.annotate)(value, 'Must be a Date'));
 };
 /**
  * Decoder that only returns Ok for strings that are valid ISO8601 date
@@ -32,7 +28,7 @@ var date = function date(value) {
 
 
 exports.date = date;
-var iso8601 = (0, _composition.map)( // Input itself needs to match the ISO8601 regex...
+var iso8601 = (0, _composition.transform)( // Input itself needs to match the ISO8601 regex...
 (0, _string.regex)(iso8601_re, 'Must be ISO8601 format'), // Make sure it is a _valid_ date
 function (value) {
   var date = new Date(value);

package/core/date.js.flow

@@ -1,10 +1,10 @@
 // @flow strict
 
-import * as Result from '../result';
 import { annotate } from '../annotate';
+import { err, ok } from '../result';
 import { isDate } from '../_utils';
-import { map } from './composition';
 import { regex } from './string';
+import { transform } from './composition';
 import type { Decoder } from '../_types';
 
 // $FlowFixMe[unclear-type] (not really an issue) - deliberate casting
@@ -17,15 +17,13 @@ const iso8601_re =
     /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
 
 export const date: Decoder<Date> = (value: mixed) =>
-    isDate(value)
-        ? Result.ok(((value: cast): Date))
-        : Result.err(annotate(value, 'Must be a Date'));
+    isDate(value) ? ok(((value: cast): Date)) : err(annotate(value, 'Must be a Date'));
 
 /**
  * Decoder that only returns Ok for strings that are valid ISO8601 date
  * strings.  Err otherwise.
  */
-export const iso8601: Decoder<Date> = map(
+export const iso8601: Decoder<Date> = transform(
     // Input itself needs to match the ISO8601 regex...
     regex(iso8601_re, 'Must be ISO8601 format'),
 

package/{_esm/core/date.js → core/date.mjs}

@@ -1,21 +1,21 @@
-import * as Result from '../result';
-import { annotate } from '../annotate';
-import { isDate } from '../_utils';
-import { map } from './composition';
-import { regex } from './string';
+import { annotate } from '../annotate.mjs';
+import { err, ok } from '../result.mjs';
+import { isDate } from '../_utils.mjs';
+import { regex } from './string.mjs';
+import { transform } from './composition.mjs';
 // Only matches the shape.  This "over-matches" some values that still aren't
 // valid dates (like 9999-99-99), but those will be caught by JS Date's
 // internal validations
 var iso8601_re = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
 export var date = function date(value) {
-  return isDate(value) ? Result.ok(value) : Result.err(annotate(value, 'Must be a Date'));
+  return isDate(value) ? ok(value) : err(annotate(value, 'Must be a Date'));
 };
 /**
  * Decoder that only returns Ok for strings that are valid ISO8601 date
  * strings.  Err otherwise.
  */
 
-export var iso8601 = map( // Input itself needs to match the ISO8601 regex...
+export var iso8601 = transform( // Input itself needs to match the ISO8601 regex...
 regex(iso8601_re, 'Must be ISO8601 format'), // Make sure it is a _valid_ date
 function (value) {
   var date = new Date(value);

package/core/describe.d.ts

@@ -0,0 +1,3 @@
+import { Decoder } from '../_types';
+
+export function describe<T>(decoder: Decoder<T>, msg: string): Decoder<T>;

package/core/describe.js

@@ -3,13 +3,9 @@
 exports.__esModule = true;
 exports.describe = describe;
 
-var Result = _interopRequireWildcard(require("../result"));
-
 var _annotate = require("../annotate");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _result = require("../result");
 
 /**
  * Wrap another decoder, and override the error message in case it fails. This
@@ -19,7 +15,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 function describe(decoder, message) {
   return function (blob) {
-    return Result.mapError(decoder(blob), function (err) {
+    return (0, _result.mapError)(decoder(blob), function (err) {
       return (0, _annotate.annotate)(err, message);
     });
   };

package/core/describe.js.flow

@@ -1,7 +1,7 @@
 // @flow strict
 
-import * as Result from '../result';
 import { annotate } from '../annotate';
+import { mapError } from '../result';
 import type { Decoder } from '../_types';
 
 /**
@@ -12,6 +12,6 @@ import type { Decoder } from '../_types';
  */
 export function describe<T>(decoder: Decoder<T>, message: string): Decoder<T> {
     return (blob: mixed) => {
-        return Result.mapError(decoder(blob), (err) => annotate(err, message));
+        return mapError(decoder(blob), (err) => annotate(err, message));
     };
 }

package/{_esm/core/describe.js → core/describe.mjs}

@@ -1,5 +1,5 @@
-import * as Result from '../result';
-import { annotate } from '../annotate';
+import { annotate } from '../annotate.mjs';
+import { mapError } from '../result.mjs';
 
 /**
  * Wrap another decoder, and override the error message in case it fails. This
@@ -9,7 +9,7 @@ import { annotate } from '../annotate';
  */
 export function describe(decoder, message) {
   return function (blob) {
-    return Result.mapError(decoder(blob), function (err) {
+    return mapError(decoder(blob), function (err) {
       return annotate(err, message);
     });
   };

package/core/dispatch.d.ts

@@ -0,0 +1,8 @@
+import { Decoder, DecoderType } from '../_types';
+
+export type Values<T extends object> = T[keyof T];
+
+export function taggedUnion<O extends { [key: string]: Decoder<any> }>(
+    field: string,
+    mapping: O,
+): Decoder<Values<{ [key in keyof O]: DecoderType<O[key]> }>>;

package/core/dispatch.js

@@ -1,17 +1,15 @@
 "use strict";
 
 exports.__esModule = true;
-exports.dispatch = dispatch;
+exports.taggedUnion = taggedUnion;
 
-var Result = _interopRequireWildcard(require("../result"));
+var _result = require("../result");
 
 var _object2 = require("./object");
 
 var _either = require("./either");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _composition = require("./composition");
 
 /**
  * Dispatches to one of several given decoders, based on the value found at
@@ -35,25 +33,25 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * Then these two decoders are equivalent:
  *
  *     const shape = either(rectangle, circle)
- *     const shape = dispatch('type', { rectangle, circle })
+ *     const shape = taggedUnion('type', { rectangle, circle })
  *
  * Will be of type Decoder<Rectangle | Circle>.
  *
- * But the dispatch version will typically be more runtime-efficient.  The
- * reason is that it will first do minimal work to "look ahead" into the `type`
- * field here, and based on that value, pick the decoder to invoke.
+ * But `taggedUnion` will typically be more runtime-efficient.  The reason is
+ * that it will first do minimal work to "look ahead" into the `type` field
+ * here, and based on that value, pick the decoder to invoke.
  *
  * The `either` version will simply try to invoke each decoder, until it finds
  * one that matches.
  *
- * Also, the error messages will be less ambiguous using `dispatch()`.
+ * Also, the error messages will be less ambiguous using `taggedUnion()`.
  */
-function dispatch(field, mapping) {
+function taggedUnion(field, mapping) {
   var _object;
 
-  var base = (0, _object2.object)((_object = {}, _object[field] = (0, _either.oneOf)(Object.keys(mapping)), _object));
+  var base = (0, _object2.object)((_object = {}, _object[field] = (0, _composition.prep)(String, (0, _either.oneOf)(Object.keys(mapping))), _object));
   return function (blob) {
-    return Result.andThen(base(blob), function (baseObj) {
+    return (0, _result.andThen)(base(blob), function (baseObj) {
       var decoderName = baseObj[field];
       var decoder = mapping[decoderName];
       return decoder(blob);