ts-fortress 8.4.0 → 8.5.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/dist/brand/brand.d.mts +1 -1
- package/dist/brand/brand.d.mts.map +1 -1
- package/dist/brand/brand.mjs +3 -2
- package/dist/brand/brand.mjs.map +1 -1
- package/dist/predefined/brand/string/uri.mjs +3 -1
- package/dist/predefined/brand/string/uri.mjs.map +1 -1
- package/package.json +1 -1
- package/src/brand/brand.mts +5 -3
- package/src/predefined/brand/string/uri.mts +4 -2
- package/src/predefined/brand/string/uri.test.mts +3 -0
package/dist/brand/brand.d.mts
CHANGED
|
@@ -4,7 +4,7 @@ export type { Brand } from 'ts-type-forge';
|
|
|
4
4
|
type ArrayToUnion<A extends readonly unknown[]> = A extends readonly [] ? never : A[number];
|
|
5
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<{
|
|
6
6
|
baseType: Type<A>;
|
|
7
|
-
is
|
|
7
|
+
is?: (a: A) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
|
|
8
8
|
defaultValue: A;
|
|
9
9
|
typeName?: string;
|
|
10
10
|
brandKeys: BrandTrueKeys;
|
|
@@ -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,sEAOC,QAAQ,CAAC;IACV,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,EAAE,EAAE,
|
|
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,sEAOC,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,EAAE,CAAC,CAAC;IAChB,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,CAmDpE,CAAC"}
|
package/dist/brand/brand.mjs
CHANGED
|
@@ -2,7 +2,8 @@ import { pipe, Result } from 'ts-data-forge';
|
|
|
2
2
|
import { createType } from '../utils/create-type.mjs';
|
|
3
3
|
|
|
4
4
|
const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue, is, typeName, }) => {
|
|
5
|
-
|
|
5
|
+
const isFilled = is ?? ((_a) => true);
|
|
6
|
+
if (!isFilled(defaultValue)) {
|
|
6
7
|
throw new Error(`defaultValue ${defaultValue} doesn't pass \`is\` function`);
|
|
7
8
|
}
|
|
8
9
|
const brandKeysStr = [
|
|
@@ -14,7 +15,7 @@ const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue, is, typeName
|
|
|
14
15
|
.map(baseType.validate)
|
|
15
16
|
.map((res) => Result.isErr(res)
|
|
16
17
|
? res
|
|
17
|
-
:
|
|
18
|
+
: isFilled(res.value)
|
|
18
19
|
? Result.ok(res.value)
|
|
19
20
|
: Result.err([
|
|
20
21
|
{
|
package/dist/brand/brand.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brand.mjs","sources":["../../src/brand/brand.mts"],"sourcesContent":[null],"names":[],"mappings":";;;AAWO,MAAM,KAAK,GAAG,CAInB,EACA,QAAQ,EACR,cAAc,EACd,SAAS,EACT,YAAY,EACZ,EAAE,EACF,QAAQ,GAUR,KAEE;AAGF,IAAA,
|
|
1
|
+
{"version":3,"file":"brand.mjs","sources":["../../src/brand/brand.mts"],"sourcesContent":[null],"names":[],"mappings":";;;AAWO,MAAM,KAAK,GAAG,CAInB,EACA,QAAQ,EACR,cAAc,EACd,SAAS,EACT,YAAY,EACZ,EAAE,EACF,QAAQ,GAUR,KAEE;AAGF,IAAA,MAAM,QAAQ,GAAqB,EAAE,KAAK,CAAC,EAAE,KAAc,IAAI,CAAC;AAEhE,IAAA,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;AAC3B,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,QAAQ,CAAC,GAAG,CAAC,KAAK;cAChB,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;;;;"}
|
|
@@ -15,7 +15,9 @@ const uri = (options) => brand({
|
|
|
15
15
|
typeName: 'Uri',
|
|
16
16
|
});
|
|
17
17
|
const defaultUri = 'https://example.com';
|
|
18
|
-
|
|
18
|
+
// `URL.canParse` trims leading/trailing ASCII whitespace per the WHATWG URL parser, so
|
|
19
|
+
// surrounding whitespace must be rejected explicitly to avoid accepting e.g. " https://example.com ".
|
|
20
|
+
const isUri = (s) => s === s.trim() && URL.canParse(s);
|
|
19
21
|
|
|
20
22
|
export { uri };
|
|
21
23
|
//# sourceMappingURL=uri.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uri.mjs","sources":["../../../../src/predefined/brand/string/uri.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAQA;;AAEG;AACI,MAAM,GAAG,GAAG,CACjB,OAIC,KAED,KAAK,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,IAAI,UAAU,CAAC;AACrD,IAAA,EAAE,EAAE,KAAK;AACT,IAAA,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,UAAU;AACjD,IAAA,SAAS,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC;AACpC,IAAA,QAAQ,EAAE,KAAK;AAChB,CAAA;AAEH,MAAM,UAAU,GAAG,qBAAqB;AAExC,MAAM,KAAK,GAAG,CAAC,CAAS,KAAe,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;;;;"}
|
|
1
|
+
{"version":3,"file":"uri.mjs","sources":["../../../../src/predefined/brand/string/uri.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAQA;;AAEG;AACI,MAAM,GAAG,GAAG,CACjB,OAIC,KAED,KAAK,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,IAAI,UAAU,CAAC;AACrD,IAAA,EAAE,EAAE,KAAK;AACT,IAAA,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,UAAU;AACjD,IAAA,SAAS,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC;AACpC,IAAA,QAAQ,EAAE,KAAK;AAChB,CAAA;AAEH,MAAM,UAAU,GAAG,qBAAqB;AAExC;AACA;AACA,MAAM,KAAK,GAAG,CAAC,CAAS,KAAe,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;;;;"}
|
package/package.json
CHANGED
package/src/brand/brand.mts
CHANGED
|
@@ -22,7 +22,7 @@ export const brand = <
|
|
|
22
22
|
typeName,
|
|
23
23
|
}: Readonly<{
|
|
24
24
|
baseType: Type<A>;
|
|
25
|
-
is
|
|
25
|
+
is?: (
|
|
26
26
|
a: A,
|
|
27
27
|
) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
|
|
28
28
|
defaultValue: A;
|
|
@@ -34,7 +34,9 @@ export const brand = <
|
|
|
34
34
|
> => {
|
|
35
35
|
type T = Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
const isFilled: (a: A) => a is T = is ?? ((_a): _a is T => true);
|
|
38
|
+
|
|
39
|
+
if (!isFilled(defaultValue)) {
|
|
38
40
|
throw new Error(
|
|
39
41
|
`defaultValue ${defaultValue} doesn't pass \`is\` function`,
|
|
40
42
|
);
|
|
@@ -54,7 +56,7 @@ export const brand = <
|
|
|
54
56
|
(res): Result<T, readonly ValidationError[]> =>
|
|
55
57
|
Result.isErr(res)
|
|
56
58
|
? res
|
|
57
|
-
:
|
|
59
|
+
: isFilled(res.value)
|
|
58
60
|
? Result.ok(res.value satisfies T)
|
|
59
61
|
: Result.err([
|
|
60
62
|
{
|
|
@@ -3,7 +3,7 @@ import { brand } from '../../../brand/index.mjs';
|
|
|
3
3
|
import { string } from '../../../primitives/index.mjs';
|
|
4
4
|
import { type Type } from '../../../type.mjs';
|
|
5
5
|
|
|
6
|
-
//
|
|
6
|
+
// An absolute URI/URL always has a non-empty scheme, so it also satisfies `NonEmptyString`.
|
|
7
7
|
export type Uri = Brand<string, 'Uri' | 'NonEmptyString'>;
|
|
8
8
|
|
|
9
9
|
/**
|
|
@@ -26,7 +26,9 @@ export const uri = (
|
|
|
26
26
|
|
|
27
27
|
const defaultUri = 'https://example.com';
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
// `URL.canParse` trims leading/trailing ASCII whitespace per the WHATWG URL parser, so
|
|
30
|
+
// surrounding whitespace must be rejected explicitly to avoid accepting e.g. " https://example.com ".
|
|
31
|
+
const isUri = (s: string): s is Uri => s === s.trim() && URL.canParse(s);
|
|
30
32
|
|
|
31
33
|
if (import.meta.vitest !== undefined) {
|
|
32
34
|
test('defaultUri', () => {
|