decoders 1.25.2 → 1.26.0-beta2

package/{string.js → cjs/string.js}

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.nonEmptyString = exports.email = void 0;
 exports.regex = regex;
-exports.url = exports.email = exports.nonEmptyString = exports.string = void 0;
+exports.url = exports.string = void 0;
 
 var _debrief = require("debrief");
 
-var _Result = require("lemons/Result");
+var _lemons = require("lemons");
 
 var _utils = require("./utils");
 
@@ -27,7 +28,7 @@ var DEFAULT_SCHEMES = ['https'];
  */
 
 var string = function string(blob) {
-  return typeof blob === 'string' ? (0, _Result.Ok)(blob) : (0, _Result.Err)((0, _debrief.annotate)(blob, 'Must be string'));
+  return typeof blob === 'string' ? (0, _lemons.Ok)(blob) : (0, _lemons.Err)((0, _debrief.annotate)(blob, 'Must be string'));
 };
 /**
  * Decoder that only returns Ok for non-empty string inputs.  Err otherwise.
@@ -76,14 +77,14 @@ var url = function url() {
     var matches = value.match(url_re);
 
     if (!matches) {
-      return (0, _Result.Err)((0, _debrief.annotate)(value, 'Must be URL'));
+      return (0, _lemons.Err)((0, _debrief.annotate)(value, 'Must be URL'));
     } else {
       var scheme = matches[1];
 
       if (schemes.length === 0 || schemes.includes(scheme.toLowerCase())) {
-        return (0, _Result.Ok)(value);
+        return (0, _lemons.Ok)(value);
       } else {
-        return (0, _Result.Err)((0, _debrief.annotate)(value, "URL scheme must be any of: ".concat(schemes.join(', '))));
+        return (0, _lemons.Err)((0, _debrief.annotate)(value, "URL scheme must be any of: ".concat(schemes.join(', '))));
       }
     }
   });

package/{string.js.flow → cjs/string.js.flow}

@@ -1,7 +1,7 @@
 // @flow strict
 
 import { annotate } from 'debrief';
-import { Err, Ok } from 'lemons/Result';
+import { Err, Ok } from 'lemons';
 
 import type { Decoder } from './types';
 import { compose, predicate } from './utils';

package/{tuple.js → cjs/tuple.js}

@@ -12,7 +12,7 @@ exports.tuple6 = tuple6;
 
 var _debrief = require("debrief");
 
-var _Result = require("lemons/Result");
+var _lemons = require("lemons");
 
 var _array = require("./array");
 
@@ -49,11 +49,11 @@ function tuple1(decoder1) {
     var result1 = decoder1(blob1);
 
     try {
-      return (0, _Result.Ok)([result1.unwrap()]);
+      return (0, _lemons.Ok)([result1.unwrap()]);
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return (0, _Result.Err)((0, _debrief.annotate)(result1.errValue()));
+      return (0, _lemons.Err)((0, _debrief.annotate)(result1.errValue()));
     }
   });
 }
@@ -73,11 +73,11 @@ function tuple2(decoder1, decoder2) {
     var result2 = decoder2(blob2);
 
     try {
-      return (0, _Result.Ok)([result1.unwrap(), result2.unwrap()]);
+      return (0, _lemons.Ok)([result1.unwrap(), result2.unwrap()]);
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return (0, _Result.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value()]));
+      return (0, _lemons.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value()]));
     }
   });
 }
@@ -99,11 +99,11 @@ function tuple3(decoder1, decoder2, decoder3) {
     var result3 = decoder3(blob3);
 
     try {
-      return (0, _Result.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap()]);
+      return (0, _lemons.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap()]);
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return (0, _Result.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value()]));
+      return (0, _lemons.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value()]));
     }
   });
 }
@@ -127,11 +127,11 @@ function tuple4(decoder1, decoder2, decoder3, decoder4) {
     var result4 = decoder4(blob4);
 
     try {
-      return (0, _Result.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap(), result4.unwrap()]);
+      return (0, _lemons.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap(), result4.unwrap()]);
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return (0, _Result.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value(), result4.isErr() ? result4.errValue() : result4.value()]));
+      return (0, _lemons.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value(), result4.isErr() ? result4.errValue() : result4.value()]));
     }
   });
 }
@@ -157,11 +157,11 @@ function tuple5(decoder1, decoder2, decoder3, decoder4, decoder5) {
     var result5 = decoder5(blob5);
 
     try {
-      return (0, _Result.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap(), result4.unwrap(), result5.unwrap()]);
+      return (0, _lemons.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap(), result4.unwrap(), result5.unwrap()]);
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return (0, _Result.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value(), result4.isErr() ? result4.errValue() : result4.value(), result5.isErr() ? result5.errValue() : result5.value()]));
+      return (0, _lemons.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value(), result4.isErr() ? result4.errValue() : result4.value(), result5.isErr() ? result5.errValue() : result5.value()]));
     }
   });
 }
@@ -189,11 +189,11 @@ function tuple6(decoder1, decoder2, decoder3, decoder4, decoder5, decoder6) {
     var result6 = decoder6(blob6);
 
     try {
-      return (0, _Result.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap(), result4.unwrap(), result5.unwrap(), result6.unwrap()]);
+      return (0, _lemons.Ok)([result1.unwrap(), result2.unwrap(), result3.unwrap(), result4.unwrap(), result5.unwrap(), result6.unwrap()]);
     } catch (e) {
       // If a decoder error has happened while unwrapping all the
       // results, try to construct a good error message
-      return (0, _Result.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value(), result4.isErr() ? result4.errValue() : result4.value(), result5.isErr() ? result5.errValue() : result5.value(), result6.isErr() ? result6.errValue() : result6.value()]));
+      return (0, _lemons.Err)((0, _debrief.annotate)([result1.isErr() ? result1.errValue() : result1.value(), result2.isErr() ? result2.errValue() : result2.value(), result3.isErr() ? result3.errValue() : result3.value(), result4.isErr() ? result4.errValue() : result4.value(), result5.isErr() ? result5.errValue() : result5.value(), result6.isErr() ? result6.errValue() : result6.value()]));
     }
   });
 }

package/{tuple.js.flow → cjs/tuple.js.flow}

@@ -1,7 +1,7 @@
 // @flow strict
 
 import { annotate } from 'debrief';
-import { Err, Ok } from 'lemons/Result';
+import { Err, Ok } from 'lemons';
 
 import { poja } from './array';
 import type { Decoder } from './types';

package/cjs/types.js

@@ -0,0 +1,3 @@
+"use strict";
+
+var _lemons = require("lemons");

package/{types.js.flow → cjs/types.js.flow}

@@ -1,7 +1,9 @@
 // @flow strict
 
 import type { Annotation } from 'debrief';
-import Result from 'lemons/Result';
+import { Result } from 'lemons';
+
+export type Scalar = string | number | boolean | symbol | void | null;
 
 // NOTE:
 // Normally, we should not be discarding Flow warnings about the use of the

package/{utils.js → cjs/utils.js}

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.map = map;
 exports.compose = compose;
-exports.predicate = predicate;
 exports.isDate = void 0;
+exports.map = map;
+exports.predicate = predicate;
 
 var _debrief = require("debrief");
 
-var _Result = require("lemons/Result");
+var _lemons = require("lemons");
 
 /**
  * `x instanceof Date` checks are unreliable across stack frames (that information
@@ -34,9 +34,9 @@ exports.isDate = isDate;
 function map(decoder, mapper) {
   return compose(decoder, function (x) {
     try {
-      return (0, _Result.Ok)(mapper(x));
+      return (0, _lemons.Ok)(mapper(x));
     } catch (e) {
-      return (0, _Result.Err)((0, _debrief.annotate)(x, e instanceof Error ? e.message : String(e)));
+      return (0, _lemons.Err)((0, _debrief.annotate)(x, e instanceof Error ? e.message : String(e)));
     }
   });
 }
@@ -65,6 +65,6 @@ function compose(decoder, next) {
 
 function predicate(predicate, msg) {
   return function (value) {
-    return predicate(value) ? (0, _Result.Ok)(value) : (0, _Result.Err)((0, _debrief.annotate)(value, msg));
+    return predicate(value) ? (0, _lemons.Ok)(value) : (0, _lemons.Err)((0, _debrief.annotate)(value, msg));
   };
 }

package/{utils.js.flow → cjs/utils.js.flow}

@@ -1,7 +1,7 @@
 // @flow strict
 
 import { annotate } from 'debrief';
-import { Err, Ok } from 'lemons/Result';
+import { Err, Ok } from 'lemons';
 
 import type { Decoder } from './types';