decoders 2.0.0-beta3 → 2.0.0-beta7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/NotSupportedTSVersion.d.ts +1 -0
- package/_guard.d.ts +7 -0
- package/_guard.js +2 -6
- package/_guard.js.flow +3 -3
- package/{_esm/_guard.js → _guard.mjs} +3 -3
- package/_types.d.ts +13 -0
- package/{_esm/_types.js → _types.mjs} +0 -0
- package/_utils.d.ts +10 -0
- package/{_esm/_utils.js → _utils.mjs} +0 -0
- package/annotate.d.ts +62 -0
- package/{_esm/annotate.js → annotate.mjs} +0 -0
- package/core/_helpers.d.ts +79 -0
- package/core/array.d.ts +5 -0
- package/core/array.js +5 -9
- package/core/array.js.flow +5 -5
- package/{_esm/core/array.js → core/array.mjs} +7 -7
- package/core/boolean.d.ts +5 -0
- package/core/boolean.js +4 -8
- package/core/boolean.js.flow +3 -5
- package/{_esm/core/boolean.js → core/boolean.mjs} +6 -6
- package/core/composition.d.ts +12 -0
- package/core/composition.js +6 -10
- package/core/composition.js.flow +6 -6
- package/{_esm/core/composition.js → core/composition.mjs} +7 -7
- package/core/constants.d.ts +11 -0
- package/core/constants.js +6 -10
- package/core/constants.js.flow +7 -9
- package/{_esm/core/constants.js → core/constants.mjs} +7 -7
- package/core/date.d.ts +4 -0
- package/core/date.js +3 -7
- package/core/date.js.flow +2 -4
- package/{_esm/core/date.js → core/date.mjs} +6 -6
- package/core/describe.d.ts +3 -0
- package/core/describe.js +2 -6
- package/core/describe.js.flow +2 -2
- package/{_esm/core/describe.js → core/describe.mjs} +3 -3
- package/core/dispatch.d.ts +8 -0
- package/core/dispatch.js +2 -6
- package/core/dispatch.js.flow +2 -2
- package/{_esm/core/dispatch.js → core/dispatch.mjs} +4 -4
- package/core/either.d.ts +61 -0
- package/core/either.js +7 -11
- package/core/either.js.flow +6 -6
- package/{_esm/core/either.js → core/either.mjs} +8 -8
- package/core/fail.d.ts +3 -0
- package/core/fail.js +2 -6
- package/core/fail.js.flow +2 -2
- package/{_esm/core/fail.js → core/fail.mjs} +3 -3
- package/core/instanceOf.d.ts +3 -0
- package/core/instanceOf.js +2 -6
- package/core/instanceOf.js.flow +3 -3
- package/core/instanceOf.mjs +8 -0
- package/core/json.d.ts +11 -0
- package/core/json.mjs +15 -0
- package/core/lazy.d.ts +3 -0
- package/{_esm/core/lazy.js → core/lazy.mjs} +0 -0
- package/core/mapping.d.ts +6 -0
- package/core/mapping.js +4 -8
- package/core/mapping.js.flow +3 -3
- package/{_esm/core/mapping.js → core/mapping.mjs} +7 -7
- package/core/number.d.ts +6 -0
- package/core/number.js +2 -6
- package/core/number.js.flow +3 -3
- package/{_esm/core/number.js → core/number.mjs} +4 -4
- package/core/object.d.ts +33 -0
- package/core/object.js +7 -11
- package/core/object.js.flow +7 -7
- package/{_esm/core/object.js → core/object.mjs} +9 -9
- package/core/optional.d.ts +5 -0
- package/core/optional.js +4 -8
- package/core/optional.js.flow +3 -3
- package/{_esm/core/optional.js → core/optional.mjs} +6 -6
- package/core/string.d.ts +7 -0
- package/core/string.js +5 -9
- package/core/string.js.flow +5 -7
- package/{_esm/core/string.js → core/string.mjs} +7 -7
- package/core/tuple.d.ts +30 -0
- package/core/tuple.js +10 -6
- package/core/tuple.js.flow +24 -30
- package/{_esm/core/tuple.js → core/tuple.mjs} +14 -10
- package/format.d.ts +4 -0
- package/{format/inline.js → format.js} +6 -1
- package/{_esm/format/inline.js.flow → format.js.flow} +6 -2
- package/{_esm/format/inline.js → format.mjs} +4 -1
- package/{_esm/index.js.flow → index.d.ts} +3 -23
- package/index.js.flow +1 -1
- package/{_esm/index.js → index.mjs} +19 -19
- package/package.json +15 -3
- package/result.d.ts +39 -0
- package/result.js +5 -75
- package/result.js.flow +5 -73
- package/{_esm/result.js → result.mjs} +4 -62
- package/_esm/_guard.js.flow +0 -20
- package/_esm/_types.js.flow +0 -20
- package/_esm/_utils.js.flow +0 -97
- package/_esm/annotate.js.flow +0 -218
- package/_esm/core/array.js.flow +0 -103
- package/_esm/core/boolean.js.flow +0 -29
- package/_esm/core/composition.js.flow +0 -43
- package/_esm/core/constants.js.flow +0 -46
- package/_esm/core/date.js.flow +0 -40
- package/_esm/core/describe.js.flow +0 -17
- package/_esm/core/dispatch.js.flow +0 -58
- package/_esm/core/either.js.flow +0 -151
- package/_esm/core/fail.js.flow +0 -12
- package/_esm/core/instanceOf.js +0 -8
- package/_esm/core/instanceOf.js.flow +0 -20
- package/_esm/core/json.js +0 -15
- package/_esm/core/json.js.flow +0 -28
- package/_esm/core/lazy.js.flow +0 -15
- package/_esm/core/mapping.js.flow +0 -54
- package/_esm/core/number.js.flow +0 -34
- package/_esm/core/object.js.flow +0 -203
- package/_esm/core/optional.js.flow +0 -41
- package/_esm/core/string.js.flow +0 -82
- package/_esm/core/tuple.js.flow +0 -220
- package/_esm/format/index.js +0 -2
- package/_esm/format/index.js.flow +0 -4
- package/_esm/format/short.js +0 -4
- package/_esm/format/short.js.flow +0 -8
- package/_esm/result.js.flow +0 -166
- package/format/index.js +0 -12
- package/format/index.js.flow +0 -4
- package/format/inline.js.flow +0 -122
- package/format/short.js +0 -10
- package/format/short.js.flow +0 -8
package/core/constants.js
CHANGED
|
@@ -5,19 +5,15 @@ exports.constant = constant;
|
|
|
5
5
|
exports.hardcoded = hardcoded;
|
|
6
6
|
exports.unknown = exports.undefined_ = exports.null_ = exports.mixed = void 0;
|
|
7
7
|
|
|
8
|
-
var Result = _interopRequireWildcard(require("../result"));
|
|
9
|
-
|
|
10
8
|
var _annotate = require("../annotate");
|
|
11
9
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
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; }
|
|
10
|
+
var _result = require("../result");
|
|
15
11
|
|
|
16
12
|
/**
|
|
17
13
|
* Decoder that only returns Ok for `null` inputs. Err otherwise.
|
|
18
14
|
*/
|
|
19
15
|
var null_ = function null_(blob) {
|
|
20
|
-
return blob === null ?
|
|
16
|
+
return blob === null ? (0, _result.ok)(blob) : (0, _result.err)((0, _annotate.annotate)(blob, 'Must be null'));
|
|
21
17
|
};
|
|
22
18
|
/**
|
|
23
19
|
* Decoder that only returns Ok for `undefined` inputs. Err otherwise.
|
|
@@ -27,7 +23,7 @@ var null_ = function null_(blob) {
|
|
|
27
23
|
exports.null_ = null_;
|
|
28
24
|
|
|
29
25
|
var undefined_ = function undefined_(blob) {
|
|
30
|
-
return blob === undefined ?
|
|
26
|
+
return blob === undefined ? (0, _result.ok)(blob) : (0, _result.err)((0, _annotate.annotate)(blob, 'Must be undefined'));
|
|
31
27
|
};
|
|
32
28
|
/**
|
|
33
29
|
* Decoder that only returns Ok for the given value constant. Err otherwise.
|
|
@@ -38,7 +34,7 @@ exports.undefined_ = undefined_;
|
|
|
38
34
|
|
|
39
35
|
function constant(value) {
|
|
40
36
|
return function (blob) {
|
|
41
|
-
return blob === value ?
|
|
37
|
+
return blob === value ? (0, _result.ok)(value) : (0, _result.err)((0, _annotate.annotate)(blob, "Must be constant " + String(value)));
|
|
42
38
|
};
|
|
43
39
|
}
|
|
44
40
|
/**
|
|
@@ -48,7 +44,7 @@ function constant(value) {
|
|
|
48
44
|
|
|
49
45
|
function hardcoded(value) {
|
|
50
46
|
return function () {
|
|
51
|
-
return
|
|
47
|
+
return (0, _result.ok)(value);
|
|
52
48
|
};
|
|
53
49
|
}
|
|
54
50
|
/**
|
|
@@ -57,7 +53,7 @@ function hardcoded(value) {
|
|
|
57
53
|
|
|
58
54
|
|
|
59
55
|
var unknown = function unknown(blob) {
|
|
60
|
-
return
|
|
56
|
+
return (0, _result.ok)(blob);
|
|
61
57
|
};
|
|
62
58
|
/**
|
|
63
59
|
* Alias of unknown.
|
package/core/constants.js.flow
CHANGED
|
@@ -1,22 +1,20 @@
|
|
|
1
1
|
// @flow strict
|
|
2
2
|
|
|
3
|
-
import * as Result from '../result';
|
|
4
3
|
import { annotate } from '../annotate';
|
|
4
|
+
import { err, ok } from '../result';
|
|
5
5
|
import type { Decoder, Scalar } from '../_types';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Decoder that only returns Ok for `null` inputs. Err otherwise.
|
|
9
9
|
*/
|
|
10
10
|
export const null_: Decoder<null> = (blob: mixed) =>
|
|
11
|
-
blob === null ?
|
|
11
|
+
blob === null ? ok(blob) : err(annotate(blob, 'Must be null'));
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* Decoder that only returns Ok for `undefined` inputs. Err otherwise.
|
|
15
15
|
*/
|
|
16
16
|
export const undefined_: Decoder<void> = (blob: mixed) =>
|
|
17
|
-
blob === undefined
|
|
18
|
-
? Result.ok(blob)
|
|
19
|
-
: Result.err(annotate(blob, 'Must be undefined'));
|
|
17
|
+
blob === undefined ? ok(blob) : err(annotate(blob, 'Must be undefined'));
|
|
20
18
|
|
|
21
19
|
/**
|
|
22
20
|
* Decoder that only returns Ok for the given value constant. Err otherwise.
|
|
@@ -24,21 +22,21 @@ export const undefined_: Decoder<void> = (blob: mixed) =>
|
|
|
24
22
|
export function constant<T: Scalar>(value: T): Decoder<T> {
|
|
25
23
|
return (blob: mixed) =>
|
|
26
24
|
blob === value
|
|
27
|
-
?
|
|
28
|
-
:
|
|
25
|
+
? ok(value)
|
|
26
|
+
: err(annotate(blob, `Must be constant ${String(value)}`));
|
|
29
27
|
}
|
|
30
28
|
|
|
31
29
|
/**
|
|
32
30
|
* Decoder that always returns Ok for the given hardcoded value, no matter what the input.
|
|
33
31
|
*/
|
|
34
32
|
export function hardcoded<T>(value: T): Decoder<T> {
|
|
35
|
-
return () =>
|
|
33
|
+
return () => ok(value);
|
|
36
34
|
}
|
|
37
35
|
|
|
38
36
|
/**
|
|
39
37
|
* Decoder that always returns Ok for the given hardcoded value, no matter what the input.
|
|
40
38
|
*/
|
|
41
|
-
export const unknown: Decoder<mixed> = (blob: mixed) =>
|
|
39
|
+
export const unknown: Decoder<mixed> = (blob: mixed) => ok(blob);
|
|
42
40
|
|
|
43
41
|
/**
|
|
44
42
|
* Alias of unknown.
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
1
|
+
import { annotate } from '../annotate.mjs';
|
|
2
|
+
import { err, ok } from '../result.mjs';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Decoder that only returns Ok for `null` inputs. Err otherwise.
|
|
6
6
|
*/
|
|
7
7
|
export var null_ = function null_(blob) {
|
|
8
|
-
return blob === null ?
|
|
8
|
+
return blob === null ? ok(blob) : err(annotate(blob, 'Must be null'));
|
|
9
9
|
};
|
|
10
10
|
/**
|
|
11
11
|
* Decoder that only returns Ok for `undefined` inputs. Err otherwise.
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
export var undefined_ = function undefined_(blob) {
|
|
15
|
-
return blob === undefined ?
|
|
15
|
+
return blob === undefined ? ok(blob) : err(annotate(blob, 'Must be undefined'));
|
|
16
16
|
};
|
|
17
17
|
/**
|
|
18
18
|
* Decoder that only returns Ok for the given value constant. Err otherwise.
|
|
@@ -20,7 +20,7 @@ export var undefined_ = function undefined_(blob) {
|
|
|
20
20
|
|
|
21
21
|
export function constant(value) {
|
|
22
22
|
return function (blob) {
|
|
23
|
-
return blob === value ?
|
|
23
|
+
return blob === value ? ok(value) : err(annotate(blob, "Must be constant " + String(value)));
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
@@ -29,7 +29,7 @@ export function constant(value) {
|
|
|
29
29
|
|
|
30
30
|
export function hardcoded(value) {
|
|
31
31
|
return function () {
|
|
32
|
-
return
|
|
32
|
+
return ok(value);
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
@@ -37,7 +37,7 @@ export function hardcoded(value) {
|
|
|
37
37
|
*/
|
|
38
38
|
|
|
39
39
|
export var unknown = function unknown(blob) {
|
|
40
|
-
return
|
|
40
|
+
return ok(blob);
|
|
41
41
|
};
|
|
42
42
|
/**
|
|
43
43
|
* Alias of unknown.
|
package/core/date.d.ts
ADDED
package/core/date.js
CHANGED
|
@@ -3,27 +3,23 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.iso8601 = exports.date = void 0;
|
|
5
5
|
|
|
6
|
-
var Result = _interopRequireWildcard(require("../result"));
|
|
7
|
-
|
|
8
6
|
var _annotate = require("../annotate");
|
|
9
7
|
|
|
8
|
+
var _result = require("../result");
|
|
9
|
+
|
|
10
10
|
var _utils = require("../_utils");
|
|
11
11
|
|
|
12
12
|
var _composition = require("./composition");
|
|
13
13
|
|
|
14
14
|
var _string = require("./string");
|
|
15
15
|
|
|
16
|
-
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); }
|
|
17
|
-
|
|
18
|
-
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; }
|
|
19
|
-
|
|
20
16
|
// Only matches the shape. This "over-matches" some values that still aren't
|
|
21
17
|
// valid dates (like 9999-99-99), but those will be caught by JS Date's
|
|
22
18
|
// internal validations
|
|
23
19
|
var iso8601_re = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
|
|
24
20
|
|
|
25
21
|
var date = function date(value) {
|
|
26
|
-
return (0, _utils.isDate)(value) ?
|
|
22
|
+
return (0, _utils.isDate)(value) ? (0, _result.ok)(value) : (0, _result.err)((0, _annotate.annotate)(value, 'Must be a Date'));
|
|
27
23
|
};
|
|
28
24
|
/**
|
|
29
25
|
* Decoder that only returns Ok for strings that are valid ISO8601 date
|
package/core/date.js.flow
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// @flow strict
|
|
2
2
|
|
|
3
|
-
import * as Result from '../result';
|
|
4
3
|
import { annotate } from '../annotate';
|
|
4
|
+
import { err, ok } from '../result';
|
|
5
5
|
import { isDate } from '../_utils';
|
|
6
6
|
import { map } from './composition';
|
|
7
7
|
import { regex } from './string';
|
|
@@ -17,9 +17,7 @@ const iso8601_re =
|
|
|
17
17
|
/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
|
|
18
18
|
|
|
19
19
|
export const date: Decoder<Date> = (value: mixed) =>
|
|
20
|
-
isDate(value)
|
|
21
|
-
? Result.ok(((value: cast): Date))
|
|
22
|
-
: Result.err(annotate(value, 'Must be a Date'));
|
|
20
|
+
isDate(value) ? ok(((value: cast): Date)) : err(annotate(value, 'Must be a Date'));
|
|
23
21
|
|
|
24
22
|
/**
|
|
25
23
|
* Decoder that only returns Ok for strings that are valid ISO8601 date
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { isDate } from '../_utils';
|
|
4
|
-
import { map } from './composition';
|
|
5
|
-
import { regex } from './string';
|
|
1
|
+
import { annotate } from '../annotate.mjs';
|
|
2
|
+
import { err, ok } from '../result.mjs';
|
|
3
|
+
import { isDate } from '../_utils.mjs';
|
|
4
|
+
import { map } from './composition.mjs';
|
|
5
|
+
import { regex } from './string.mjs';
|
|
6
6
|
// Only matches the shape. This "over-matches" some values that still aren't
|
|
7
7
|
// valid dates (like 9999-99-99), but those will be caught by JS Date's
|
|
8
8
|
// internal validations
|
|
9
9
|
var iso8601_re = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[.]\d+)?(?:Z|[+-]\d{2}:?\d{2})$/;
|
|
10
10
|
export var date = function date(value) {
|
|
11
|
-
return isDate(value) ?
|
|
11
|
+
return isDate(value) ? ok(value) : err(annotate(value, 'Must be a Date'));
|
|
12
12
|
};
|
|
13
13
|
/**
|
|
14
14
|
* Decoder that only returns Ok for strings that are valid ISO8601 date
|
package/core/describe.js
CHANGED
|
@@ -3,13 +3,9 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.describe = describe;
|
|
5
5
|
|
|
6
|
-
var Result = _interopRequireWildcard(require("../result"));
|
|
7
|
-
|
|
8
6
|
var _annotate = require("../annotate");
|
|
9
7
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
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; }
|
|
8
|
+
var _result = require("../result");
|
|
13
9
|
|
|
14
10
|
/**
|
|
15
11
|
* Wrap another decoder, and override the error message in case it fails. This
|
|
@@ -19,7 +15,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
19
15
|
*/
|
|
20
16
|
function describe(decoder, message) {
|
|
21
17
|
return function (blob) {
|
|
22
|
-
return
|
|
18
|
+
return (0, _result.mapError)(decoder(blob), function (err) {
|
|
23
19
|
return (0, _annotate.annotate)(err, message);
|
|
24
20
|
});
|
|
25
21
|
};
|
package/core/describe.js.flow
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// @flow strict
|
|
2
2
|
|
|
3
|
-
import * as Result from '../result';
|
|
4
3
|
import { annotate } from '../annotate';
|
|
4
|
+
import { mapError } from '../result';
|
|
5
5
|
import type { Decoder } from '../_types';
|
|
6
6
|
|
|
7
7
|
/**
|
|
@@ -12,6 +12,6 @@ import type { Decoder } from '../_types';
|
|
|
12
12
|
*/
|
|
13
13
|
export function describe<T>(decoder: Decoder<T>, message: string): Decoder<T> {
|
|
14
14
|
return (blob: mixed) => {
|
|
15
|
-
return
|
|
15
|
+
return mapError(decoder(blob), (err) => annotate(err, message));
|
|
16
16
|
};
|
|
17
17
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
1
|
+
import { annotate } from '../annotate.mjs';
|
|
2
|
+
import { mapError } from '../result.mjs';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Wrap another decoder, and override the error message in case it fails. This
|
|
@@ -9,7 +9,7 @@ import { annotate } from '../annotate';
|
|
|
9
9
|
*/
|
|
10
10
|
export function describe(decoder, message) {
|
|
11
11
|
return function (blob) {
|
|
12
|
-
return
|
|
12
|
+
return mapError(decoder(blob), function (err) {
|
|
13
13
|
return annotate(err, message);
|
|
14
14
|
});
|
|
15
15
|
};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Decoder, DecoderType } from '../_types';
|
|
2
|
+
|
|
3
|
+
export type $Values<T extends object> = T[keyof T];
|
|
4
|
+
|
|
5
|
+
export function dispatch<O extends { [key: string]: Decoder<any> }>(
|
|
6
|
+
field: string,
|
|
7
|
+
mapping: O,
|
|
8
|
+
): Decoder<$Values<{ [key in keyof O]: DecoderType<O[key]> }>>;
|
package/core/dispatch.js
CHANGED
|
@@ -3,16 +3,12 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.dispatch = dispatch;
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _result = require("../result");
|
|
7
7
|
|
|
8
8
|
var _object2 = require("./object");
|
|
9
9
|
|
|
10
10
|
var _either = require("./either");
|
|
11
11
|
|
|
12
|
-
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); }
|
|
13
|
-
|
|
14
|
-
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; }
|
|
15
|
-
|
|
16
12
|
/**
|
|
17
13
|
* Dispatches to one of several given decoders, based on the value found at
|
|
18
14
|
* runtime in the given field. For example, suppose you have these decoders:
|
|
@@ -53,7 +49,7 @@ function dispatch(field, mapping) {
|
|
|
53
49
|
|
|
54
50
|
var base = (0, _object2.object)((_object = {}, _object[field] = (0, _either.oneOf)(Object.keys(mapping)), _object));
|
|
55
51
|
return function (blob) {
|
|
56
|
-
return
|
|
52
|
+
return (0, _result.andThen)(base(blob), function (baseObj) {
|
|
57
53
|
var decoderName = baseObj[field];
|
|
58
54
|
var decoder = mapping[decoderName];
|
|
59
55
|
return decoder(blob);
|
package/core/dispatch.js.flow
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// @flow strict
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import { andThen } from '../result';
|
|
4
4
|
import { object } from './object';
|
|
5
5
|
import { oneOf } from './either';
|
|
6
6
|
import type { Decoder, DecoderType } from '../_types';
|
|
@@ -49,7 +49,7 @@ export function dispatch<O: { +[field: string]: Decoder<anything>, ... }>(
|
|
|
49
49
|
): Decoder<$Values<$ObjMap<O, DecoderType>>> {
|
|
50
50
|
const base = object({ [field]: oneOf(Object.keys(mapping)) });
|
|
51
51
|
return (blob: mixed) => {
|
|
52
|
-
return
|
|
52
|
+
return andThen(base(blob), (baseObj) => {
|
|
53
53
|
const decoderName = baseObj[field];
|
|
54
54
|
const decoder = mapping[decoderName];
|
|
55
55
|
return decoder(blob);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { object } from './object';
|
|
3
|
-
import { oneOf } from './either';
|
|
1
|
+
import { andThen } from '../result.mjs';
|
|
2
|
+
import { object } from './object.mjs';
|
|
3
|
+
import { oneOf } from './either.mjs';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* Dispatches to one of several given decoders, based on the value found at
|
|
@@ -42,7 +42,7 @@ export function dispatch(field, mapping) {
|
|
|
42
42
|
|
|
43
43
|
var base = object((_object = {}, _object[field] = oneOf(Object.keys(mapping)), _object));
|
|
44
44
|
return function (blob) {
|
|
45
|
-
return
|
|
45
|
+
return andThen(base(blob), function (baseObj) {
|
|
46
46
|
var decoderName = baseObj[field];
|
|
47
47
|
var decoder = mapping[decoderName];
|
|
48
48
|
return decoder(blob);
|
package/core/either.d.ts
ADDED
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Decoder, Scalar } from '../_types';
|
|
2
|
+
|
|
3
|
+
export function either<T1, T2>(d1: Decoder<T1>, d2: Decoder<T2>): Decoder<T1 | T2>;
|
|
4
|
+
export function either2<T1, T2>(d1: Decoder<T1>, d2: Decoder<T2>): Decoder<T1 | T2>;
|
|
5
|
+
export function either3<T1, T2, T3>(
|
|
6
|
+
d1: Decoder<T1>,
|
|
7
|
+
d2: Decoder<T2>,
|
|
8
|
+
d3: Decoder<T3>,
|
|
9
|
+
): Decoder<T1 | T2 | T3>;
|
|
10
|
+
export function either4<T1, T2, T3, T4>(
|
|
11
|
+
d1: Decoder<T1>,
|
|
12
|
+
d2: Decoder<T2>,
|
|
13
|
+
d3: Decoder<T3>,
|
|
14
|
+
d4: Decoder<T4>,
|
|
15
|
+
): Decoder<T1 | T2 | T3 | T4>;
|
|
16
|
+
export function either5<T1, T2, T3, T4, T5>(
|
|
17
|
+
d1: Decoder<T1>,
|
|
18
|
+
d2: Decoder<T2>,
|
|
19
|
+
d3: Decoder<T3>,
|
|
20
|
+
d4: Decoder<T4>,
|
|
21
|
+
d5: Decoder<T5>,
|
|
22
|
+
): Decoder<T1 | T2 | T3 | T4 | T5>;
|
|
23
|
+
export function either6<T1, T2, T3, T4, T5, T6>(
|
|
24
|
+
d1: Decoder<T1>,
|
|
25
|
+
d2: Decoder<T2>,
|
|
26
|
+
d3: Decoder<T3>,
|
|
27
|
+
d4: Decoder<T4>,
|
|
28
|
+
d5: Decoder<T5>,
|
|
29
|
+
d6: Decoder<T6>,
|
|
30
|
+
): Decoder<T1 | T2 | T3 | T4 | T5 | T6>;
|
|
31
|
+
export function either7<T1, T2, T3, T4, T5, T6, T7>(
|
|
32
|
+
d1: Decoder<T1>,
|
|
33
|
+
d2: Decoder<T2>,
|
|
34
|
+
d3: Decoder<T3>,
|
|
35
|
+
d4: Decoder<T4>,
|
|
36
|
+
d5: Decoder<T5>,
|
|
37
|
+
d6: Decoder<T6>,
|
|
38
|
+
d7: Decoder<T7>,
|
|
39
|
+
): Decoder<T1 | T2 | T3 | T4 | T5 | T6 | T7>;
|
|
40
|
+
export function either8<T1, T2, T3, T4, T5, T6, T7, T8>(
|
|
41
|
+
d1: Decoder<T1>,
|
|
42
|
+
d2: Decoder<T2>,
|
|
43
|
+
d3: Decoder<T3>,
|
|
44
|
+
d4: Decoder<T4>,
|
|
45
|
+
d5: Decoder<T5>,
|
|
46
|
+
d6: Decoder<T6>,
|
|
47
|
+
d7: Decoder<T7>,
|
|
48
|
+
d8: Decoder<T8>,
|
|
49
|
+
): Decoder<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>;
|
|
50
|
+
export function either9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
|
|
51
|
+
d1: Decoder<T1>,
|
|
52
|
+
d2: Decoder<T2>,
|
|
53
|
+
d3: Decoder<T3>,
|
|
54
|
+
d4: Decoder<T4>,
|
|
55
|
+
d5: Decoder<T5>,
|
|
56
|
+
d6: Decoder<T6>,
|
|
57
|
+
d7: Decoder<T7>,
|
|
58
|
+
d8: Decoder<T8>,
|
|
59
|
+
d9: Decoder<T9>,
|
|
60
|
+
): Decoder<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>;
|
|
61
|
+
export function oneOf<T extends Scalar>(constants: readonly T[]): Decoder<T>;
|
package/core/either.js
CHANGED
|
@@ -11,15 +11,11 @@ exports.either8 = either8;
|
|
|
11
11
|
exports.either9 = either9;
|
|
12
12
|
exports.oneOf = oneOf;
|
|
13
13
|
|
|
14
|
-
var Result = _interopRequireWildcard(require("../result"));
|
|
15
|
-
|
|
16
14
|
var _annotate = require("../annotate");
|
|
17
15
|
|
|
18
|
-
var
|
|
19
|
-
|
|
20
|
-
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); }
|
|
16
|
+
var _result = require("../result");
|
|
21
17
|
|
|
22
|
-
|
|
18
|
+
var _utils = require("../_utils");
|
|
23
19
|
|
|
24
20
|
/**
|
|
25
21
|
* Indents and adds a dash in front of this (potentially multiline) string.
|
|
@@ -61,12 +57,12 @@ function nest(errText) {
|
|
|
61
57
|
|
|
62
58
|
function either(d1, d2) {
|
|
63
59
|
return function (blob) {
|
|
64
|
-
return
|
|
65
|
-
return
|
|
60
|
+
return (0, _result.orElse)(d1(blob), function (err1) {
|
|
61
|
+
return (0, _result.orElse)(d2(blob), function (err2) {
|
|
66
62
|
var serr1 = (0, _utils.summarize)(err1).join('\n');
|
|
67
63
|
var serr2 = (0, _utils.summarize)(err2).join('\n');
|
|
68
64
|
var text = ['Either:', nest(serr1), nest(serr2)].join('\n');
|
|
69
|
-
return
|
|
65
|
+
return (0, _result.err)((0, _annotate.annotate)(blob, text));
|
|
70
66
|
});
|
|
71
67
|
});
|
|
72
68
|
};
|
|
@@ -107,10 +103,10 @@ function oneOf(constants) {
|
|
|
107
103
|
});
|
|
108
104
|
|
|
109
105
|
if (winner !== undefined) {
|
|
110
|
-
return
|
|
106
|
+
return (0, _result.ok)(winner);
|
|
111
107
|
}
|
|
112
108
|
|
|
113
|
-
return
|
|
109
|
+
return (0, _result.err)((0, _annotate.annotate)(blob, "Must be one of " + constants.map(function (value) {
|
|
114
110
|
return JSON.stringify(value);
|
|
115
111
|
}).join(', ')));
|
|
116
112
|
};
|
package/core/either.js.flow
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// @flow strict
|
|
2
2
|
|
|
3
|
-
import * as Result from '../result';
|
|
4
3
|
import { annotate } from '../annotate';
|
|
4
|
+
import { err, ok, orElse } from '../result';
|
|
5
5
|
import { indent, summarize } from '../_utils';
|
|
6
6
|
import type { Decoder, Scalar } from '../_types';
|
|
7
7
|
|
|
@@ -46,12 +46,12 @@ function nest(errText: string): string {
|
|
|
46
46
|
|
|
47
47
|
export function either<T1, T2>(d1: Decoder<T1>, d2: Decoder<T2>): Decoder<T1 | T2> {
|
|
48
48
|
return (blob: mixed) =>
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
orElse(d1(blob), (err1) =>
|
|
50
|
+
orElse(d2(blob), (err2) => {
|
|
51
51
|
const serr1 = summarize(err1).join('\n');
|
|
52
52
|
const serr2 = summarize(err2).join('\n');
|
|
53
53
|
const text = ['Either:', nest(serr1), nest(serr2)].join('\n');
|
|
54
|
-
return
|
|
54
|
+
return err(annotate(blob, text));
|
|
55
55
|
}),
|
|
56
56
|
);
|
|
57
57
|
}
|
|
@@ -137,9 +137,9 @@ export function oneOf<T: Scalar>(constants: $ReadOnlyArray<T>): Decoder<T> {
|
|
|
137
137
|
return (blob: mixed) => {
|
|
138
138
|
const winner = constants.find((c) => c === blob);
|
|
139
139
|
if (winner !== undefined) {
|
|
140
|
-
return
|
|
140
|
+
return ok(winner);
|
|
141
141
|
}
|
|
142
|
-
return
|
|
142
|
+
return err(
|
|
143
143
|
annotate(
|
|
144
144
|
blob,
|
|
145
145
|
`Must be one of ${constants
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { indent, summarize } from '../_utils';
|
|
1
|
+
import { annotate } from '../annotate.mjs';
|
|
2
|
+
import { err, ok, orElse } from '../result.mjs';
|
|
3
|
+
import { indent, summarize } from '../_utils.mjs';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* Indents and adds a dash in front of this (potentially multiline) string.
|
|
@@ -42,12 +42,12 @@ function nest(errText) {
|
|
|
42
42
|
|
|
43
43
|
export function either(d1, d2) {
|
|
44
44
|
return function (blob) {
|
|
45
|
-
return
|
|
46
|
-
return
|
|
45
|
+
return orElse(d1(blob), function (err1) {
|
|
46
|
+
return orElse(d2(blob), function (err2) {
|
|
47
47
|
var serr1 = summarize(err1).join('\n');
|
|
48
48
|
var serr2 = summarize(err2).join('\n');
|
|
49
49
|
var text = ['Either:', nest(serr1), nest(serr2)].join('\n');
|
|
50
|
-
return
|
|
50
|
+
return err(annotate(blob, text));
|
|
51
51
|
});
|
|
52
52
|
});
|
|
53
53
|
};
|
|
@@ -80,10 +80,10 @@ export function oneOf(constants) {
|
|
|
80
80
|
});
|
|
81
81
|
|
|
82
82
|
if (winner !== undefined) {
|
|
83
|
-
return
|
|
83
|
+
return ok(winner);
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
return
|
|
86
|
+
return err(annotate(blob, "Must be one of " + constants.map(function (value) {
|
|
87
87
|
return JSON.stringify(value);
|
|
88
88
|
}).join(', ')));
|
|
89
89
|
};
|
package/core/fail.d.ts
ADDED
package/core/fail.js
CHANGED
|
@@ -3,19 +3,15 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.fail = fail;
|
|
5
5
|
|
|
6
|
-
var Result = _interopRequireWildcard(require("../result"));
|
|
7
|
-
|
|
8
6
|
var _annotate = require("../annotate");
|
|
9
7
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
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; }
|
|
8
|
+
var _result = require("../result");
|
|
13
9
|
|
|
14
10
|
/**
|
|
15
11
|
* Decoder that always fails with the given error message, no matter what the input.
|
|
16
12
|
*/
|
|
17
13
|
function fail(msg) {
|
|
18
14
|
return function (blob) {
|
|
19
|
-
return
|
|
15
|
+
return (0, _result.err)((0, _annotate.annotate)(blob, msg));
|
|
20
16
|
};
|
|
21
17
|
}
|
package/core/fail.js.flow
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// @flow strict
|
|
2
2
|
|
|
3
|
-
import * as Result from '../result';
|
|
4
3
|
import { annotate } from '../annotate';
|
|
4
|
+
import { err } from '../result';
|
|
5
5
|
import type { Decoder } from '../_types';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Decoder that always fails with the given error message, no matter what the input.
|
|
9
9
|
*/
|
|
10
10
|
export function fail(msg: string): Decoder<empty> {
|
|
11
|
-
return (blob: mixed) =>
|
|
11
|
+
return (blob: mixed) => err(annotate(blob, msg));
|
|
12
12
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
1
|
+
import { annotate } from '../annotate.mjs';
|
|
2
|
+
import { err } from '../result.mjs';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Decoder that always fails with the given error message, no matter what the input.
|
|
6
6
|
*/
|
|
7
7
|
export function fail(msg) {
|
|
8
8
|
return function (blob) {
|
|
9
|
-
return
|
|
9
|
+
return err(annotate(blob, msg));
|
|
10
10
|
};
|
|
11
11
|
}
|