@othree.io/optional 1.9.0 → 2.1.0
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/lib/optional.d.ts +1 -1
- package/lib/optional.d.ts.map +1 -1
- package/lib/optional.js +9 -5
- package/lib/optional.js.map +1 -1
- package/package.json +1 -1
package/lib/optional.d.ts
CHANGED
|
@@ -20,5 +20,5 @@ export declare class EmptyOptionalError extends Error {
|
|
|
20
20
|
static ERROR: string;
|
|
21
21
|
constructor();
|
|
22
22
|
}
|
|
23
|
-
export declare function Optional<T>(value: Optional<T> | T, error?: Error): Optional<T>;
|
|
23
|
+
export declare function Optional<T>(value: Optional<T> | T | undefined | null, error?: Error): Optional<T>;
|
|
24
24
|
//# sourceMappingURL=optional.d.ts.map
|
package/lib/optional.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optional.d.ts","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"optional.d.ts","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":"AAiBA,wBAAgB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAUhE;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAWtG;AAED,MAAM,WAAW,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK;IACrC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;IAChC,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;IACjC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAA;IACzE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IACzG,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACjF,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1H,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACzF,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAClI,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAC9B;AAED,oBAAY,QAAQ,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;AAEzC,wBAAgB,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAEnD;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,MAAM,CAAC,KAAK,SAAuB;;CAOtC;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAuFjG"}
|
package/lib/optional.js
CHANGED
|
@@ -17,6 +17,10 @@ function isOptional(optional) {
|
|
|
17
17
|
typeof optional.orThrow === 'function' &&
|
|
18
18
|
typeof optional.map === 'function' &&
|
|
19
19
|
typeof optional.mapAsync === 'function' &&
|
|
20
|
+
typeof optional.orMap === 'function' &&
|
|
21
|
+
typeof optional.orMapAsync === 'function' &&
|
|
22
|
+
typeof optional.catch === 'function' &&
|
|
23
|
+
typeof optional.catchAsync === 'function' &&
|
|
20
24
|
typeof optional.getError === 'function' &&
|
|
21
25
|
typeof optional.isEmpty === 'boolean' &&
|
|
22
26
|
typeof optional.isPresent === 'boolean');
|
|
@@ -85,11 +89,11 @@ function Optional(value, error) {
|
|
|
85
89
|
}
|
|
86
90
|
return theValue;
|
|
87
91
|
},
|
|
88
|
-
orElse: (elseValue)
|
|
89
|
-
if (isEmpty) {
|
|
92
|
+
orElse: function (elseValue) {
|
|
93
|
+
if (isEmpty && !theError) {
|
|
90
94
|
return elseValue;
|
|
91
95
|
}
|
|
92
|
-
return
|
|
96
|
+
return this.get();
|
|
93
97
|
},
|
|
94
98
|
orThrow: (error) => {
|
|
95
99
|
if (isEmpty) {
|
|
@@ -110,13 +114,13 @@ function Optional(value, error) {
|
|
|
110
114
|
return Promise.resolve(Optional(undefined, theError));
|
|
111
115
|
},
|
|
112
116
|
orMap: (callback) => {
|
|
113
|
-
if (isEmpty) {
|
|
117
|
+
if (isEmpty && !theError) {
|
|
114
118
|
return Try(() => callback());
|
|
115
119
|
}
|
|
116
120
|
return Optional(theValue, theError);
|
|
117
121
|
},
|
|
118
122
|
orMapAsync: (callback) => {
|
|
119
|
-
if (isEmpty) {
|
|
123
|
+
if (isEmpty && !theError) {
|
|
120
124
|
return TryAsync(() => callback());
|
|
121
125
|
}
|
|
122
126
|
return Promise.resolve(Optional(theValue, theError));
|
package/lib/optional.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optional.js","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,SAAS,UAAU,CAAC,QAAa;IAC7B,OAAO,OAAO,CAAC,QAAQ;QACnB,OAAO,QAAQ,CAAC,GAAG,KAAK,UAAU;QAClC,OAAO,QAAQ,CAAC,MAAM,KAAK,UAAU;QACrC,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU;QACtC,OAAO,QAAQ,CAAC,GAAG,KAAK,UAAU;QAClC,OAAO,QAAQ,CAAC,QAAQ,KAAK,UAAU;QACvC,OAAO,QAAQ,CAAC,QAAQ,KAAK,UAAU;QACvC,OAAO,QAAQ,CAAC,OAAO,KAAK,SAAS;QACrC,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS,CAAC,CAAA;AAChD,CAAC;AAED,SAAgB,GAAG,CAAI,KAA4B;IAC/C,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,EAAE,CAAA;QACrB,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;YACnB,OAAO,KAAoB,CAAA;SAC9B;QACD,OAAO,QAAQ,CAAC,KAAU,CAAC,CAAA;KAC9B;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,QAAQ,CAAC,SAAU,EAAE,KAAK,CAAC,CAAA;KACrC;AACL,CAAC;AAVD,kBAUC;AAED,SAAsB,QAAQ,CAAI,KAA8C;;QAC5E,IAAI;YACA,MAAM,KAAK,GAAG,MAAM,KAAK,EAAE,CAAA;YAC3B,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;gBACnB,OAAO,KAAoB,CAAA;aAC9B;YACD,OAAO,QAAQ,CAAC,KAAU,CAAC,CAAA;SAC9B;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;YAC3C,OAAO,QAAQ,CAAC,SAAU,EAAE,KAAK,CAAC,CAAA;SACrC;IACL,CAAC;CAAA;AAXD,4BAWC;AAmBD,SAAgB,KAAK,CAAI,KAAa;IAClC,OAAO,QAAQ,CAAC,SAAU,EAAE,KAAK,CAAC,CAAA;AACtC,CAAC;AAFD,sBAEC;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAGzC;QACI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAE1B,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAA;IACxC,CAAC;;AAPL,gDAQC;AAPU,wBAAK,GAAG,oBAAoB,CAAA;AASvC,SAAgB,QAAQ,CAAI,
|
|
1
|
+
{"version":3,"file":"optional.js","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":"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"}
|