ts-fortress 8.5.0 → 8.5.1
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/dist/brand/brand.d.mts
CHANGED
|
@@ -2,10 +2,10 @@ import { type Brand, type Primitive, type StrictExtract } from 'ts-type-forge';
|
|
|
2
2
|
import { type Type } from '../type.mjs';
|
|
3
3
|
export type { Brand } from 'ts-type-forge';
|
|
4
4
|
type ArrayToUnion<A extends readonly unknown[]> = A extends readonly [] ? never : A[number];
|
|
5
|
-
export declare const brand: <const A extends StrictExtract<Primitive, string | number | bigint | boolean>, const BrandTrueKeys extends readonly string[], const BrandFalseKeys extends readonly string[] = readonly []>({ baseType, brandFalseKeys, brandKeys, defaultValue, is, typeName, }: Readonly<{
|
|
5
|
+
export declare const brand: <const A extends StrictExtract<Primitive, string | number | bigint | boolean>, const BrandTrueKeys extends readonly string[], const BrandFalseKeys extends readonly string[] = readonly []>({ baseType, brandFalseKeys, brandKeys, defaultValue: defaultValue_, is: is_, typeName, }: Readonly<{
|
|
6
6
|
baseType: Type<A>;
|
|
7
7
|
is?: (a: A) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
|
|
8
|
-
defaultValue
|
|
8
|
+
defaultValue?: A;
|
|
9
9
|
typeName?: string;
|
|
10
10
|
brandKeys: BrandTrueKeys;
|
|
11
11
|
brandFalseKeys?: BrandFalseKeys;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brand.d.mts","sourceRoot":"","sources":["../../src/brand/brand.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAGxC,YAAY,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3C,KAAK,YAAY,CAAC,CAAC,SAAS,SAAS,OAAO,EAAE,IAAI,CAAC,SAAS,SAAS,EAAE,GACnE,KAAK,GACL,CAAC,CAAC,MAAM,CAAC,CAAC;AAEd,eAAO,MAAM,KAAK,GAChB,KAAK,CAAC,CAAC,SAAS,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EAC5E,KAAK,CAAC,aAAa,SAAS,SAAS,MAAM,EAAE,EAC7C,KAAK,CAAC,cAAc,SAAS,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,EAC5D,
|
|
1
|
+
{"version":3,"file":"brand.d.mts","sourceRoot":"","sources":["../../src/brand/brand.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAGxC,YAAY,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3C,KAAK,YAAY,CAAC,CAAC,SAAS,SAAS,OAAO,EAAE,IAAI,CAAC,SAAS,SAAS,EAAE,GACnE,KAAK,GACL,CAAC,CAAC,MAAM,CAAC,CAAC;AAEd,eAAO,MAAM,KAAK,GAChB,KAAK,CAAC,CAAC,SAAS,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EAC5E,KAAK,CAAC,aAAa,SAAS,SAAS,MAAM,EAAE,EAC7C,KAAK,CAAC,cAAc,SAAS,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,EAC5D,0FAOC,QAAQ,CAAC;IACV,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,EAAE,CAAC,EAAE,CACH,CAAC,EAAE,CAAC,KACD,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;IAC9E,YAAY,CAAC,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,aAAa,CAAC;IACzB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,CAAC,KAAG,IAAI,CACP,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,CAqDpE,CAAC"}
|
package/dist/brand/brand.mjs
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { pipe, Result } from 'ts-data-forge';
|
|
2
2
|
import { createType } from '../utils/create-type.mjs';
|
|
3
3
|
|
|
4
|
-
const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue, is, typeName, }) => {
|
|
5
|
-
const
|
|
6
|
-
|
|
4
|
+
const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue: defaultValue_, is: is_, typeName, }) => {
|
|
5
|
+
const is = is_ ?? ((_a) => true);
|
|
6
|
+
const defaultValue = defaultValue_ ?? baseType.defaultValue;
|
|
7
|
+
if (!is(defaultValue)) {
|
|
7
8
|
throw new Error(`defaultValue ${defaultValue} doesn't pass \`is\` function`);
|
|
8
9
|
}
|
|
9
10
|
const brandKeysStr = [
|
|
@@ -15,7 +16,7 @@ const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue, is, typeName
|
|
|
15
16
|
.map(baseType.validate)
|
|
16
17
|
.map((res) => Result.isErr(res)
|
|
17
18
|
? res
|
|
18
|
-
:
|
|
19
|
+
: is(res.value)
|
|
19
20
|
? Result.ok(res.value)
|
|
20
21
|
: Result.err([
|
|
21
22
|
{
|
package/dist/brand/brand.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brand.mjs","sources":["../../src/brand/brand.mts"],"sourcesContent":[null],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"brand.mjs","sources":["../../src/brand/brand.mts"],"sourcesContent":[null],"names":[],"mappings":";;;MAWa,KAAK,GAAG,CAInB,EACA,QAAQ,EACR,cAAc,EACd,SAAS,EACT,YAAY,EAAE,aAAa,EAC3B,EAAE,EAAE,GAAG,EACP,QAAQ,GAUR,KAEE;AAGF,IAAA,MAAM,EAAE,GAAqB,GAAG,KAAK,CAAC,EAAE,KAAc,IAAI,CAAC;AAE3D,IAAA,MAAM,YAAY,GAAM,aAAa,IAAI,QAAQ,CAAC,YAAY;AAE9D,IAAA,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE;AACrB,QAAA,MAAM,IAAI,KAAK,CACb,gBAAgB,YAAY,CAAA,6BAAA,CAA+B,CAC5D;IACH;AAEA,IAAA,MAAM,YAAY,GAAG;AACnB,QAAA,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA,CAAG,CAAC;AACjC,QAAA,IAAI,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAA,EAAA,CAAI,CAAC,IAAI,EAAE,CAAC;AACrD,KAAA,CAAC,IAAI,CAAC,KAAK,CAAC;AAEb,IAAA,MAAM,cAAc,GAAG,QAAQ,IAAI,YAAY;IAE/C,MAAM,QAAQ,GAAwB,CAAC,CAAC,KACtC,IAAI,CAAC,CAAC;AACH,SAAA,GAAG,CAAC,QAAQ,CAAC,QAAQ;SACrB,GAAG,CACF,CAAC,GAAG,KACF,MAAM,CAAC,KAAK,CAAC,GAAG;AACd,UAAE;AACF,UAAE,EAAE,CAAC,GAAG,CAAC,KAAK;cACV,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,KAAiB;AACjC,cAAE,MAAM,CAAC,GAAG,CAAC;AACT,gBAAA;AACE,oBAAA,IAAI,EAAE,EAAE;oBACR,WAAW,EAAE,GAAG,CAAC,KAAK;AACtB,oBAAA,YAAY,EAAE,cAAc;AAC5B,oBAAA,QAAQ,EAAE,cAAc;oBACxB,OAAO;;AAEL,oBAAA,QAAQ,KAAK;AACX,0BAAE;AACE,4BAAA,IAAI,EAAE,OAAgB;AACtB,4BAAA,WAAW,EAAE,YAAY;AAC1B;AACH,0BAAE,SAAS;AACU,iBAAA;aAC5B,CAAC,CACX,CAAC,KAAK;AAEX,IAAA,OAAO,UAAU,CAAC;AAChB,QAAA,QAAQ,EAAE,cAAc;QACxB,YAAY;QACZ,QAAQ;AACT,KAAA,CAAC;AACJ;;;;"}
|
package/package.json
CHANGED
package/src/brand/brand.mts
CHANGED
|
@@ -17,15 +17,15 @@ export const brand = <
|
|
|
17
17
|
baseType,
|
|
18
18
|
brandFalseKeys,
|
|
19
19
|
brandKeys,
|
|
20
|
-
defaultValue,
|
|
21
|
-
is,
|
|
20
|
+
defaultValue: defaultValue_,
|
|
21
|
+
is: is_,
|
|
22
22
|
typeName,
|
|
23
23
|
}: Readonly<{
|
|
24
24
|
baseType: Type<A>;
|
|
25
25
|
is?: (
|
|
26
26
|
a: A,
|
|
27
27
|
) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
|
|
28
|
-
defaultValue
|
|
28
|
+
defaultValue?: A;
|
|
29
29
|
typeName?: string;
|
|
30
30
|
brandKeys: BrandTrueKeys;
|
|
31
31
|
brandFalseKeys?: BrandFalseKeys;
|
|
@@ -34,9 +34,11 @@ export const brand = <
|
|
|
34
34
|
> => {
|
|
35
35
|
type T = Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
|
|
36
36
|
|
|
37
|
-
const
|
|
37
|
+
const is: (a: A) => a is T = is_ ?? ((_a): _a is T => true);
|
|
38
38
|
|
|
39
|
-
|
|
39
|
+
const defaultValue: A = defaultValue_ ?? baseType.defaultValue;
|
|
40
|
+
|
|
41
|
+
if (!is(defaultValue)) {
|
|
40
42
|
throw new Error(
|
|
41
43
|
`defaultValue ${defaultValue} doesn't pass \`is\` function`,
|
|
42
44
|
);
|
|
@@ -56,7 +58,7 @@ export const brand = <
|
|
|
56
58
|
(res): Result<T, readonly ValidationError[]> =>
|
|
57
59
|
Result.isErr(res)
|
|
58
60
|
? res
|
|
59
|
-
:
|
|
61
|
+
: is(res.value)
|
|
60
62
|
? Result.ok(res.value satisfies T)
|
|
61
63
|
: Result.err([
|
|
62
64
|
{
|