decoders 2.0.0-beta4 → 2.0.0-beta8

package/core/tuple.js.flow

@@ -2,15 +2,17 @@
 
 import { annotate } from '../annotate';
 import { compose, predicate } from './composition';
-import { err, ok, okOrErrValue, unwrap } from '../result';
+import { err, ok, unwrap } from '../result';
 import { poja } from './array';
 import type { Decoder } from '../_types';
+import type { Result } from '../result';
+
+function okOrErr<T, E>(result: Result<T, E>): T | E {
+    return result.type === 'ok' ? result.value : result.error;
+}
 
 const ntuple = (n: number) =>
-    compose(
-        poja,
-        predicate((arr) => arr.length === n, `Must be a ${n}-tuple`),
-    );
+    predicate(poja, (arr) => arr.length === n, `Must be a ${n}-tuple`);
 
 /**
  * Builds a Decoder that returns Ok for 1-tuple of [T], given a Decoder for T.
@@ -26,7 +28,7 @@ export function tuple1<T>(decoder1: Decoder<T>): Decoder<[T]> {
         } catch (e) {
             // If a decoder error has happened while unwrapping all the
             // results, try to construct a good error message
-            return err(annotate([okOrErrValue(result1)]));
+            return err(annotate([okOrErr(result1)]));
         }
     });
 }
@@ -49,7 +51,7 @@ export function tuple2<T1, T2>(
         } catch (e) {
             // If a decoder error has happened while unwrapping all the
             // results, try to construct a good error message
-            return err(annotate([okOrErrValue(result1), okOrErrValue(result2)]));
+            return err(annotate([okOrErr(result1), okOrErr(result2)]));
         }
     });
 }
@@ -74,13 +76,7 @@ export function tuple3<T1, T2, T3>(
         } catch (e) {
             // If a decoder error has happened while unwrapping all the
             // results, try to construct a good error message
-            return err(
-                annotate([
-                    okOrErrValue(result1),
-                    okOrErrValue(result2),
-                    okOrErrValue(result3),
-                ]),
-            );
+            return err(annotate([okOrErr(result1), okOrErr(result2), okOrErr(result3)]));
         }
     });
 }
@@ -114,10 +110,10 @@ export function tuple4<T1, T2, T3, T4>(
             // results, try to construct a good error message
             return err(
                 annotate([
-                    okOrErrValue(result1),
-                    okOrErrValue(result2),
-                    okOrErrValue(result3),
-                    okOrErrValue(result4),
+                    okOrErr(result1),
+                    okOrErr(result2),
+                    okOrErr(result3),
+                    okOrErr(result4),
                 ]),
             );
         }
@@ -156,11 +152,11 @@ export function tuple5<T1, T2, T3, T4, T5>(
             // results, try to construct a good error message
             return err(
                 annotate([
-                    okOrErrValue(result1),
-                    okOrErrValue(result2),
-                    okOrErrValue(result3),
-                    okOrErrValue(result4),
-                    okOrErrValue(result5),
+                    okOrErr(result1),
+                    okOrErr(result2),
+                    okOrErr(result3),
+                    okOrErr(result4),
+                    okOrErr(result5),
                 ]),
             );
         }
@@ -202,12 +198,12 @@ export function tuple6<T1, T2, T3, T4, T5, T6>(
             // results, try to construct a good error message
             return err(
                 annotate([
-                    okOrErrValue(result1),
-                    okOrErrValue(result2),
-                    okOrErrValue(result3),
-                    okOrErrValue(result4),
-                    okOrErrValue(result5),
-                    okOrErrValue(result6),
+                    okOrErr(result1),
+                    okOrErr(result2),
+                    okOrErr(result3),
+                    okOrErr(result4),
+                    okOrErr(result5),
+                    okOrErr(result6),
                 ]),
             );
         }

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

@@ -1,12 +1,16 @@
-import { annotate } from '../annotate';
-import { compose, predicate } from './composition';
-import { err, ok, okOrErrValue, unwrap } from '../result';
-import { poja } from './array';
+import { annotate } from '../annotate.mjs';
+import { compose, predicate } from './composition.mjs';
+import { err, ok, unwrap } from '../result.mjs';
+import { poja } from './array.mjs';
+
+function okOrErr(result) {
+  return result.type === 'ok' ? result.value : result.error;
+}
 
 var ntuple = function ntuple(n) {
-  return compose(poja, predicate(function (arr) {
+  return predicate(poja, function (arr) {
     return arr.length === n;
-  }, "Must be a " + n + "-tuple"));
+  }, "Must be a " + n + "-tuple");
 };
 /**
  * Builds a Decoder that returns Ok for 1-tuple of [T], given a Decoder for T.
@@ -24,7 +28,7 @@ export function tuple1(decoder1) {
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return err(annotate([okOrErrValue(result1)]));
+      return err(annotate([okOrErr(result1)]));
     }
   });
 }
@@ -45,7 +49,7 @@ export function tuple2(decoder1, decoder2) {
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return err(annotate([okOrErrValue(result1), okOrErrValue(result2)]));
+      return err(annotate([okOrErr(result1), okOrErr(result2)]));
     }
   });
 }
@@ -68,7 +72,7 @@ export function tuple3(decoder1, decoder2, decoder3) {
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return err(annotate([okOrErrValue(result1), okOrErrValue(result2), okOrErrValue(result3)]));
+      return err(annotate([okOrErr(result1), okOrErr(result2), okOrErr(result3)]));
     }
   });
 }
@@ -93,7 +97,7 @@ export function tuple4(decoder1, decoder2, decoder3, decoder4) {
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return err(annotate([okOrErrValue(result1), okOrErrValue(result2), okOrErrValue(result3), okOrErrValue(result4)]));
+      return err(annotate([okOrErr(result1), okOrErr(result2), okOrErr(result3), okOrErr(result4)]));
     }
   });
 }
@@ -120,7 +124,7 @@ export function tuple5(decoder1, decoder2, decoder3, decoder4, decoder5) {
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return err(annotate([okOrErrValue(result1), okOrErrValue(result2), okOrErrValue(result3), okOrErrValue(result4), okOrErrValue(result5)]));
+      return err(annotate([okOrErr(result1), okOrErr(result2), okOrErr(result3), okOrErr(result4), okOrErr(result5)]));
     }
   });
 }
@@ -149,7 +153,7 @@ export function tuple6(decoder1, decoder2, decoder3, decoder4, decoder5, decoder
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return err(annotate([okOrErrValue(result1), okOrErrValue(result2), okOrErrValue(result3), okOrErrValue(result4), okOrErrValue(result5), okOrErrValue(result6)]));
+      return err(annotate([okOrErr(result1), okOrErr(result2), okOrErr(result3), okOrErr(result4), okOrErr(result5), okOrErr(result6)]));
     }
   });
 }

package/format.d.ts

@@ -0,0 +1,4 @@
+import { Annotation } from './annotate';
+
+export function formatInline(ann: Annotation): string;
+export function formatShort(ann: Annotation): string;

package/{format/inline.js → format.js}

@@ -2,10 +2,11 @@
 
 exports.__esModule = true;
 exports.formatInline = formatInline;
+exports.formatShort = formatShort;
 exports.serializeAnnotation = serializeAnnotation;
 exports.serializeValue = serializeValue;
 
-var _utils = require("../_utils");
+var _utils = require("./_utils");
 
 function serializeString(s, width) {
   if (width === void 0) {
@@ -143,4 +144,8 @@ function formatInline(ann) {
   } else {
     return serialized;
   }
+}
+
+function formatShort(ann) {
+  return (0, _utils.summarize)(ann, []).join('\n');
 }

package/{_esm/format/inline.js.flow → format.js.flow}

@@ -1,7 +1,7 @@
 // @flow strict
 
-import { asDate, indent, INDENT, isMultiline } from '../_utils';
-import type { Annotation, ArrayAnnotation, ObjectAnnotation } from '../annotate';
+import { summarize as _summarize, asDate, INDENT, indent, isMultiline } from './_utils';
+import type { Annotation, ArrayAnnotation, ObjectAnnotation } from './annotate';
 
 function serializeString(s: string, width: number = 80): string {
     // Full string
@@ -120,3 +120,7 @@ export function formatInline(ann: Annotation): string {
         return serialized;
     }
 }
+
+export function formatShort(ann: Annotation): string {
+    return _summarize(ann, []).join('\n');
+}

package/{_esm/format/inline.js → format.mjs}

@@ -1,4 +1,4 @@
-import { asDate, indent, INDENT, isMultiline } from '../_utils';
+import { summarize as _summarize, asDate, INDENT, indent, isMultiline } from './_utils.mjs';
 
 function serializeString(s, width) {
   if (width === void 0) {
@@ -134,4 +134,7 @@ export function formatInline(ann) {
   } else {
     return serialized;
   }
+}
+export function formatShort(ann) {
+  return _summarize(ann, []).join('\n');
 }

package/index.d.ts

@@ -0,0 +1,43 @@
+export {
+    Decoder,
+    DecodeResult,
+    DecoderType,
+    Guard,
+    GuardType,
+    Predicate,
+    Scalar,
+} from './_types';
+export { Result } from './result';
+export { JSONValue, JSONObject, JSONArray } from './core/json';
+
+export { guard } from './_guard';
+
+export { compose, map, predicate } from './core/composition';
+
+export { array, nonEmptyArray, poja } from './core/array';
+export { boolean, numericBoolean, truthy } from './core/boolean';
+export { constant, hardcoded, mixed, null_, undefined_, unknown } from './core/constants';
+export { date, iso8601 } from './core/date';
+export { describe } from './core/describe';
+export { disjointUnion } from './core/dispatch';
+export {
+    either,
+    either3,
+    either4,
+    either5,
+    either6,
+    either7,
+    either8,
+    either9,
+    oneOf,
+} from './core/either';
+export { fail } from './core/fail';
+export { instanceOf } from './core/instanceOf';
+export { json, jsonObject, jsonArray } from './core/json';
+export { lazy } from './core/lazy';
+export { mapping, dict } from './core/mapping';
+export { integer, number, positiveInteger, positiveNumber } from './core/number';
+export { exact, inexact, object, pojo } from './core/object';
+export { maybe, nullable, optional } from './core/optional';
+export { email, httpsUrl, nonEmptyString, regex, string, url } from './core/string';
+export { tuple1, tuple2, tuple3, tuple4, tuple5, tuple6 } from './core/tuple';

package/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.url = exports.unknown = exports.undefined_ = exports.tuple6 = exports.tuple5 = exports.tuple4 = exports.tuple3 = exports.tuple2 = exports.tuple1 = exports.truthy = exports.string = exports.regex = exports.predicate = 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.mixed = exports.maybe = exports.mapping = exports.map = exports.lazy = exports.jsonObject = exports.jsonArray = exports.json = exports.iso8601 = exports.integer = exports.instanceOf = exports.inexact = exports.hardcoded = exports.guard = exports.fail = exports.exact = exports.email = exports.either9 = exports.either8 = exports.either7 = exports.either6 = exports.either5 = exports.either4 = exports.either3 = exports.either = exports.dispatch = exports.dict = exports.describe = exports.date = exports.constant = exports.compose = exports["boolean"] = exports.array = void 0;
+exports.url = exports.unknown = exports.undefined_ = exports.tuple6 = exports.tuple5 = exports.tuple4 = exports.tuple3 = exports.tuple2 = exports.tuple1 = exports.truthy = exports.string = exports.regex = exports.predicate = 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.mixed = exports.maybe = exports.mapping = exports.map = exports.lazy = exports.jsonObject = exports.jsonArray = exports.json = exports.iso8601 = exports.integer = exports.instanceOf = exports.inexact = exports.httpsUrl = exports.hardcoded = exports.guard = exports.fail = exports.exact = exports.email = exports.either9 = exports.either8 = exports.either7 = exports.either6 = exports.either5 = exports.either4 = exports.either3 = exports.either = exports.disjointUnion = exports.dict = exports.describe = exports.date = exports.constant = exports.compose = exports["boolean"] = exports.array = void 0;
 
 var _guard = require("./_guard");
 
@@ -45,7 +45,7 @@ exports.describe = _describe.describe;
 
 var _dispatch = require("./core/dispatch");
 
-exports.dispatch = _dispatch.dispatch;
+exports.disjointUnion = _dispatch.disjointUnion;
 
 var _either = require("./core/either");
 
@@ -105,6 +105,7 @@ exports.optional = _optional.optional;
 var _string = require("./core/string");
 
 exports.email = _string.email;
+exports.httpsUrl = _string.httpsUrl;
 exports.nonEmptyString = _string.nonEmptyString;
 exports.regex = _string.regex;
 exports.string = _string.string;

package/index.js.flow

@@ -39,7 +39,7 @@ export { boolean, numericBoolean, truthy } from './core/boolean';
 export { constant, hardcoded, mixed, null_, undefined_, unknown } from './core/constants';
 export { date, iso8601 } from './core/date';
 export { describe } from './core/describe';
-export { dispatch } from './core/dispatch';
+export { disjointUnion } from './core/dispatch';
 export {
     either,
     either3,
@@ -59,5 +59,5 @@ export { mapping, dict } from './core/mapping';
 export { integer, number, positiveInteger, positiveNumber } from './core/number';
 export { exact, inexact, object, pojo } from './core/object';
 export { maybe, nullable, optional } from './core/optional';
-export { email, nonEmptyString, regex, string, url } from './core/string';
+export { email, httpsUrl, nonEmptyString, regex, string, url } from './core/string';
 export { tuple1, tuple2, tuple3, tuple4, tuple5, tuple6 } from './core/tuple';

package/{_esm/index.js → index.mjs}

@@ -16,22 +16,22 @@
  * type.  In our case, it's fine to fail with a runtime error.
  *
  */
-export { guard } from './_guard';
-export { compose, map, predicate } from './core/composition';
-export { array, nonEmptyArray, poja } from './core/array';
-export { boolean, numericBoolean, truthy } from './core/boolean';
-export { constant, hardcoded, mixed, null_, undefined_, unknown } from './core/constants';
-export { date, iso8601 } from './core/date';
-export { describe } from './core/describe';
-export { dispatch } from './core/dispatch';
-export { either, either3, either4, either5, either6, either7, either8, either9, oneOf } from './core/either';
-export { fail } from './core/fail';
-export { instanceOf } from './core/instanceOf';
-export { json, jsonObject, jsonArray } from './core/json';
-export { lazy } from './core/lazy';
-export { mapping, dict } from './core/mapping';
-export { integer, number, positiveInteger, positiveNumber } from './core/number';
-export { exact, inexact, object, pojo } from './core/object';
-export { maybe, nullable, optional } from './core/optional';
-export { email, nonEmptyString, regex, string, url } from './core/string';
-export { tuple1, tuple2, tuple3, tuple4, tuple5, tuple6 } from './core/tuple';
+export { guard } from './_guard.mjs';
+export { compose, map, predicate } from './core/composition.mjs';
+export { array, nonEmptyArray, poja } from './core/array.mjs';
+export { boolean, numericBoolean, truthy } from './core/boolean.mjs';
+export { constant, hardcoded, mixed, null_, undefined_, unknown } from './core/constants.mjs';
+export { date, iso8601 } from './core/date.mjs';
+export { describe } from './core/describe.mjs';
+export { disjointUnion } from './core/dispatch.mjs';
+export { either, either3, either4, either5, either6, either7, either8, either9, oneOf } from './core/either.mjs';
+export { fail } from './core/fail.mjs';
+export { instanceOf } from './core/instanceOf.mjs';
+export { json, jsonObject, jsonArray } from './core/json.mjs';
+export { lazy } from './core/lazy.mjs';
+export { mapping, dict } from './core/mapping.mjs';
+export { integer, number, positiveInteger, positiveNumber } from './core/number.mjs';
+export { exact, inexact, object, pojo } from './core/object.mjs';
+export { maybe, nullable, optional } from './core/optional.mjs';
+export { email, httpsUrl, nonEmptyString, regex, string, url } from './core/string.mjs';
+export { tuple1, tuple2, tuple3, tuple4, tuple5, tuple6 } from './core/tuple.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "decoders",
-    "version": "2.0.0-beta4",
+    "version": "2.0.0-beta8",
     "description": "Elegant and battle-tested validation library for type-safe input data (for TypeScript and Flow)",
     "license": "MIT",
     "repository": {
@@ -13,7 +13,7 @@
         "url": "https://github.com/nvie/decoders/issues"
     },
     "main": "./index.js",
-    "module": "./_esm/index.js",
+    "module": "./index.mjs",
     "keywords": [
         "decoder",
         "decoders",
@@ -41,5 +41,17 @@
         "predicate"
     ],
     "githubUrl": "https://github.com/nvie/decoders",
-    "sideEffects": false
+    "sideEffects": false,
+    "typesVersions": {
+        ">=4.1.0": {
+            "*": [
+                "*"
+            ]
+        },
+        "*": {
+            "*": [
+                "NotSupportedTSVersion.d.ts"
+            ]
+        }
+    }
 }

package/result.d.ts

@@ -0,0 +1,39 @@
+export interface Ok<T> {
+    type: 'ok';
+    value: T;
+    error: undefined;
+}
+
+export interface Err<E> {
+    type: 'err';
+    value: undefined;
+    error: E;
+}
+
+export type Result<T, E> = Ok<T> | Err<E>;
+
+export function ok<T>(value: T): Ok<T>;
+export function err<E>(error: E): Err<E>;
+export function unwrap<T>(result: Result<T, unknown>): T;
+export function expect<T>(result: Result<T, unknown>, message: string | Error): T;
+export function dispatch<T, E, O>(
+    result: Result<T, E>,
+    okCallback: (value: T) => O,
+    errCallback: (error: E) => O,
+): O;
+export function andThen<T, E, T2>(
+    result1: Result<T, E>,
+    lazyResult2: (value: T) => Result<T2, E>,
+): Result<T2, E>;
+export function orElse<T, E, E2>(
+    result1: Result<T, E>,
+    lazyResult2: (errValue: E) => Result<T, E2>,
+): Result<T, E2>;
+export function mapOk<T, E, T2>(
+    result: Result<T, E>,
+    mapper: (value: T) => T2,
+): Result<T2, E>;
+export function mapError<T, E, E2>(
+    result: Result<T, E>,
+    mapper: (error: E) => E2,
+): Result<T, E2>;

package/result.js

@@ -4,19 +4,12 @@ exports.__esModule = true;
 exports.andThen = andThen;
 exports.dispatch = dispatch;
 exports.err = err;
-exports.errValue = errValue;
 exports.expect = expect;
-exports.isErr = isErr;
-exports.isOk = isOk;
 exports.mapError = mapError;
 exports.mapOk = mapOk;
 exports.ok = ok;
-exports.okOrErrValue = okOrErrValue;
-exports.okValue = okValue;
 exports.orElse = orElse;
-exports.toString = toString;
 exports.unwrap = unwrap;
-exports.withDefault = withDefault;
 
 /**
  * Result <value> <error>
@@ -30,7 +23,8 @@ exports.withDefault = withDefault;
 function ok(value) {
   return {
     type: 'ok',
-    value: value
+    value: value,
+    error: undefined
   };
 }
 /**
@@ -41,37 +35,10 @@ function ok(value) {
 function err(error) {
   return {
     type: 'err',
+    value: undefined,
     error: error
   };
 }
-
-function toString(result) {
-  return result.type === 'ok' ? "Ok(" + String(result.value) + ")" : "Err(" + String(result.error) + ")";
-}
-
-function isOk(result) {
-  return result.type === 'ok';
-}
-
-function isErr(result) {
-  return result.type === 'err';
-}
-
-function withDefault(result, defaultValue) {
-  return result.type === 'ok' ? result.value : defaultValue;
-}
-
-function okValue(result) {
-  return result.type === 'ok' ? result.value : undefined;
-}
-
-function errValue(result) {
-  return result.type === 'err' ? result.error : undefined;
-}
-
-function okOrErrValue(result) {
-  return result.type === 'ok' ? result.value : result.error;
-}
 /**
  * Unwrap the value from this Result instance if this is an "Ok" result.
  * Otherwise, will throw the "Err" error via a runtime exception.
@@ -97,48 +64,6 @@ function expect(result, message) {
 function dispatch(result, okCallback, errCallback) {
   return result.type === 'ok' ? okCallback(result.value) : errCallback(result.error);
 }
-/**
- * If the given result is OK, defers to the other result. Otherwise returns the
- * error result.
- *
- * It's like saying A && B, but on Result.
- *
- * Examples:
- *
- *     Result.ok(42)     && Result.ok('hi')    // => Ok('hi')
- *     Result.err('boo') && Result.ok('hi')    // => Err('boo')
- *     Result.ok(42)     && Result.err('boo')  // => Err('boo')
- *     Result.err('boo') && Result.err('boo')  // => Err('boo')
- *
- */
-// export function and<T, E, T2>(
-//     result1: Result<T, E>,
-//     result2: Result<T2, E>,
-// ): Result<T2, E> {
-//     return result1.type === 'ok' ? result2 : result1;
-// }
-
-/**
- * If the given result is OK, return that result. Otherwise, defers to the
- * other result.
- *
- * It's like saying A || B, but on Result.
- *
- * Examples:
- *
- *     Result.ok(42)      || Result.ok('hi')    // => Ok(42)
- *     Result.err('boo')  || Result.ok('hi')    // => Ok('hi')
- *     Result.ok(42)      || Result.err('boo')  // => Ok(42)
- *     Result.err('bleh') || Result.err('boo')  // => Err('boo')
- *
- */
-// export function or<T, E, E2>(
-//     result1: Result<T, E>,
-//     result2: Result<T, E2>,
-// ): Result<T, E2> {
-//     return result1.type === 'ok' ? result1 : result2;
-// }
-
 /**
  * Like .and(), aka &&, but the second argument gets evaluated lazily only if
  * the first result is an Ok result. If so, it has access to the Ok value from

package/result.js.flow

@@ -6,8 +6,8 @@
  *     | Err <error>
  */
 
-type Ok<+T> = {| +type: 'ok', +value: T |};
-type Err<+E> = {| +type: 'err', +error: E |};
+type Ok<+T> = {| +type: 'ok', +value: T, +error: void |};
+type Err<+E> = {| +type: 'err', +value: void, +error: E |};
 
 export type Result<+T, +E> = Ok<T> | Err<E>;
 
@@ -15,44 +15,14 @@ export type Result<+T, +E> = Ok<T> | Err<E>;
  * Create a new Result instance representing a successful computation.
  */
 export function ok<T>(value: T): Ok<T> {
-    return { type: 'ok', value };
+    return { type: 'ok', value, error: undefined };
 }
 
 /**
  * Create a new Result instance representing a failed computation.
  */
 export function err<E>(error: E): Err<E> {
-    return { type: 'err', error };
-}
-
-export function toString(result: Result<mixed, mixed>): string {
-    return result.type === 'ok'
-        ? `Ok(${String(result.value)})`
-        : `Err(${String(result.error)})`;
-}
-
-export function isOk(result: Result<mixed, mixed>): boolean {
-    return result.type === 'ok';
-}
-
-export function isErr(result: Result<mixed, mixed>): boolean {
-    return result.type === 'err';
-}
-
-export function withDefault<T>(result: Result<T, mixed>, defaultValue: T): T {
-    return result.type === 'ok' ? result.value : defaultValue;
-}
-
-export function okValue<T>(result: Result<T, mixed>): void | T {
-    return result.type === 'ok' ? result.value : undefined;
-}
-
-export function errValue<E>(result: Result<mixed, E>): void | E {
-    return result.type === 'err' ? result.error : undefined;
-}
-
-export function okOrErrValue<T, E>(result: Result<T, E>): T | E {
-    return result.type === 'ok' ? result.value : result.error;
+    return { type: 'err', value: undefined, error };
 }
 
 /**
@@ -83,48 +53,6 @@ export function dispatch<T, E, O>(
     return result.type === 'ok' ? okCallback(result.value) : errCallback(result.error);
 }
 
-/**
- * If the given result is OK, defers to the other result. Otherwise returns the
- * error result.
- *
- * It's like saying A && B, but on Result.
- *
- * Examples:
- *
- *     Result.ok(42)     && Result.ok('hi')    // => Ok('hi')
- *     Result.err('boo') && Result.ok('hi')    // => Err('boo')
- *     Result.ok(42)     && Result.err('boo')  // => Err('boo')
- *     Result.err('boo') && Result.err('boo')  // => Err('boo')
- *
- */
-// export function and<T, E, T2>(
-//     result1: Result<T, E>,
-//     result2: Result<T2, E>,
-// ): Result<T2, E> {
-//     return result1.type === 'ok' ? result2 : result1;
-// }
-
-/**
- * If the given result is OK, return that result. Otherwise, defers to the
- * other result.
- *
- * It's like saying A || B, but on Result.
- *
- * Examples:
- *
- *     Result.ok(42)      || Result.ok('hi')    // => Ok(42)
- *     Result.err('boo')  || Result.ok('hi')    // => Ok('hi')
- *     Result.ok(42)      || Result.err('boo')  // => Ok(42)
- *     Result.err('bleh') || Result.err('boo')  // => Err('boo')
- *
- */
-// export function or<T, E, E2>(
-//     result1: Result<T, E>,
-//     result2: Result<T, E2>,
-// ): Result<T, E2> {
-//     return result1.type === 'ok' ? result1 : result2;
-// }
-
 /**
  * Like .and(), aka &&, but the second argument gets evaluated lazily only if
  * the first result is an Ok result. If so, it has access to the Ok value from