ts-fortress 8.4.0 → 8.5.1

package/dist/brand/brand.d.mts

@@ -2,10 +2,10 @@ import { type Brand, type Primitive, type StrictExtract } from 'ts-type-forge';
 import { type Type } from '../type.mjs';
 export type { Brand } from 'ts-type-forge';
 type ArrayToUnion<A extends readonly unknown[]> = A extends readonly [] ? never : A[number];
-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<{
+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<{
     baseType: Type<A>;
-    is: (a: A) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
-    defaultValue: A;
+    is?: (a: A) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
+    defaultValue?: A;
     typeName?: string;
     brandKeys: BrandTrueKeys;
     brandFalseKeys?: BrandFalseKeys;

package/dist/brand/brand.d.mts.map

@@ -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,CACF,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,CAiDpE,CAAC"}
+{"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

@@ -1,7 +1,9 @@
 import { pipe, Result } from 'ts-data-forge';
 import { createType } from '../utils/create-type.mjs';
 
-const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue, is, typeName, }) => {
+const brand = ({ baseType, brandFalseKeys, brandKeys, defaultValue: defaultValue_, is: is_, typeName, }) => {
+    const is = is_ ?? ((_a) => true);
+    const defaultValue = defaultValue_ ?? baseType.defaultValue;
     if (!is(defaultValue)) {
         throw new Error(`defaultValue ${defaultValue} doesn't pass \`is\` function`);
     }

package/dist/brand/brand.mjs.map

@@ -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,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;;;;"}
+{"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/dist/predefined/brand/string/uri.mjs

@@ -15,7 +15,9 @@ const uri = (options) => brand({
     typeName: 'Uri',
 });
 const defaultUri = 'https://example.com';
-const isUri = (s) => URL.canParse(s);
+// `URL.canParse` trims leading/trailing ASCII whitespace per the WHATWG URL parser, so
+// surrounding whitespace must be rejected explicitly to avoid accepting e.g. " https://example.com ".
+const isUri = (s) => s === s.trim() && URL.canParse(s);
 
 export { uri };
 //# sourceMappingURL=uri.mjs.map

package/dist/predefined/brand/string/uri.mjs.map

@@ -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;;;;"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "ts-fortress",
-  "version": "8.4.0",
+  "version": "8.5.1",
   "private": false,
   "keywords": [
     "typescript"

package/src/brand/brand.mts

@@ -17,15 +17,15 @@ export const brand = <
   baseType,
   brandFalseKeys,
   brandKeys,
-  defaultValue,
-  is,
+  defaultValue: defaultValue_,
+  is: is_,
   typeName,
 }: Readonly<{
   baseType: Type<A>;
-  is: (
+  is?: (
     a: A,
   ) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
-  defaultValue: A;
+  defaultValue?: A;
   typeName?: string;
   brandKeys: BrandTrueKeys;
   brandFalseKeys?: BrandFalseKeys;
@@ -34,6 +34,10 @@ export const brand = <
 > => {
   type T = Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;
 
+  const is: (a: A) => a is T = is_ ?? ((_a): _a is T => true);
+
+  const defaultValue: A = defaultValue_ ?? baseType.defaultValue;
+
   if (!is(defaultValue)) {
     throw new Error(
       `defaultValue ${defaultValue} doesn't pass \`is\` function`,

package/src/predefined/brand/string/uri.mts

@@ -3,7 +3,7 @@ import { brand } from '../../../brand/index.mjs';
 import { string } from '../../../primitives/index.mjs';
 import { type Type } from '../../../type.mjs';
 
-// A valid URI always has a non-empty scheme, so it also satisfies `NonEmptyString`.
+// An absolute URI/URL always has a non-empty scheme, so it also satisfies `NonEmptyString`.
 export type Uri = Brand<string, 'Uri' | 'NonEmptyString'>;
 
 /**
@@ -26,7 +26,9 @@ export const uri = (
 
 const defaultUri = 'https://example.com';
 
-const isUri = (s: string): s is Uri => URL.canParse(s);
+// `URL.canParse` trims leading/trailing ASCII whitespace per the WHATWG URL parser, so
+// surrounding whitespace must be rejected explicitly to avoid accepting e.g. " https://example.com ".
+const isUri = (s: string): s is Uri => s === s.trim() && URL.canParse(s);
 
 if (import.meta.vitest !== undefined) {
   test('defaultUri', () => {

package/src/predefined/brand/string/uri.test.mts

@@ -22,6 +22,9 @@ const invalidSamples = [
   'relative/path',
   '/absolute/path',
   '1http://example.com',
+  ' https://example.com',
+  'https://example.com ',
+  ' https://example.com ',
 ] as const satisfies readonly string[];
 
 describe(uri, () => {