ts-fortress 4.2.0 → 4.2.1

package/dist/entry-point.mjs

@@ -58,6 +58,6 @@ export { createCastFn } from './utils/create-cast-fn.mjs';
 export { createIsFn } from './utils/create-is-fn.mjs';
 export { createPrimitiveType } from './utils/create-primitive-type.mjs';
 export { createType } from './utils/create-type.mjs';
-export { toIntersectionString, toUnionString } from './utils/to-union-string.mjs';
+export { toIntersectionString, toUnionKeyString, toUnionString } from './utils/to-union-string.mjs';
 export { createPrimitiveValidationError, prependIndexToValidationErrors, prependPathToValidationErrors, validationErrorToMessage, validationErrorsToMessages } from './utils/validation-error.mjs';
 //# sourceMappingURL=entry-point.mjs.map

package/dist/index.mjs

@@ -58,6 +58,6 @@ export { createCastFn } from './utils/create-cast-fn.mjs';
 export { createIsFn } from './utils/create-is-fn.mjs';
 export { createPrimitiveType } from './utils/create-primitive-type.mjs';
 export { createType } from './utils/create-type.mjs';
-export { toIntersectionString, toUnionString } from './utils/to-union-string.mjs';
+export { toIntersectionString, toUnionKeyString, toUnionString } from './utils/to-union-string.mjs';
 export { createPrimitiveValidationError, prependIndexToValidationErrors, prependPathToValidationErrors, validationErrorToMessage, validationErrorsToMessages } from './utils/validation-error.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/record/omit.mjs

@@ -1,11 +1,11 @@
 import { Obj } from 'ts-data-forge';
-import { toUnionString } from '../utils/to-union-string.mjs';
+import { toUnionKeyString } from '../utils/to-union-string.mjs';
 import { record } from './record.mjs';
 
 /** Creates a record type with keys omitted. */
 const omit = (recordType, keysToOmit, options) => record(Obj.omit(recordType.shape, keysToOmit), {
     typeName: options?.typeName ??
-        `Omit<${recordType.typeName}, ${toUnionString(keysToOmit)}>`,
+        `Omit<${recordType.typeName}, ${toUnionKeyString(keysToOmit)}>`,
     allowExcessProperties: options?.allowExcessProperties ?? recordType.allowExcessProperties,
 });
 

package/dist/record/omit.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"omit.mjs","sources":["../../src/record/omit.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAKA;AACO,MAAM,IAAI,GAAG,CAIlB,UAAyB,EACzB,UAAsB,EACtB,OAKE,KAEF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;IAC7C,QAAQ,EACN,OAAO,EAAE,QAAQ;QACjB,CAAA,KAAA,EAAQ,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,aAAa,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG;AAC9D,IAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,CAAA;;;;"}
+{"version":3,"file":"omit.mjs","sources":["../../src/record/omit.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAKA;AACO,MAAM,IAAI,GAAG,CAIlB,UAAyB,EACzB,UAAsB,EACtB,OAKE,KAEF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;IAC7C,QAAQ,EACN,OAAO,EAAE,QAAQ;QACjB,CAAA,KAAA,EAAQ,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,gBAAgB,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG;AACjE,IAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,CAAA;;;;"}

package/dist/record/partial.mjs

@@ -1,5 +1,5 @@
 import 'ts-data-forge';
-import { toUnionString } from '../utils/to-union-string.mjs';
+import { toUnionKeyString } from '../utils/to-union-string.mjs';
 import { optional } from './optional.mjs';
 import { record } from './record.mjs';
 
@@ -11,7 +11,7 @@ const partial = (recordType, options) => {
     const typeNameFilled = options?.typeName ??
         (options?.keysToBeOptional === undefined
             ? `Partial<${recordType.typeName}>`
-            : `PartiallyPartial<${recordType.typeName}, ${toUnionString(options.keysToBeOptional)}>`);
+            : `PartiallyPartial<${recordType.typeName}, ${toUnionKeyString(options.keysToBeOptional)}>`);
     const keysToBeOptional = new Set(options?.keysToBeOptional ?? Object.keys(recordType.shape));
     const partialShape = 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion

package/dist/record/partial.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"partial.mjs","sources":["../../src/record/partial.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAMA;;;AAGG;MACU,OAAO,GAAG,CAIrB,UAAyB,EACzB,OAME,KACkC;AACpC,IAAA,MAAM,cAAc,GAClB,OAAO,EAAE,QAAQ;AACjB,SAAC,OAAO,EAAE,gBAAgB,KAAK;AAC7B,cAAE,CAAA,QAAA,EAAW,UAAU,CAAC,QAAQ,CAAA,CAAA;AAChC,cAAE,CAAA,iBAAA,EAAoB,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA,CAAA,CAAG,CAAC;AAE7F,IAAA,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CACnD,OAAO,EAAE,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAC3D;AAED,IAAA,MAAM,YAAY;;IAEhB,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAClC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAU,CACpE,CAIF;IAEH,OAAO,MAAM,CAAC,YAAY,EAAE;AAC1B,QAAA,QAAQ,EAAE,cAAc;AACxB,QAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"partial.mjs","sources":["../../src/record/partial.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAMA;;;AAGG;MACU,OAAO,GAAG,CAIrB,UAAyB,EACzB,OAME,KACkC;AACpC,IAAA,MAAM,cAAc,GAClB,OAAO,EAAE,QAAQ;AACjB,SAAC,OAAO,EAAE,gBAAgB,KAAK;AAC7B,cAAE,CAAA,QAAA,EAAW,UAAU,CAAC,QAAQ,CAAA,CAAA;AAChC,cAAE,CAAA,iBAAA,EAAoB,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA,CAAA,CAAG,CAAC;AAEhG,IAAA,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CACnD,OAAO,EAAE,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAC3D;AAED,IAAA,MAAM,YAAY;;IAEhB,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAClC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAU,CACpE,CAIF;IAEH,OAAO,MAAM,CAAC,YAAY,EAAE;AAC1B,QAAA,QAAQ,EAAE,cAAc;AACxB,QAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,KAAA,CAAC;AACJ;;;;"}

package/dist/record/pick.mjs

@@ -1,11 +1,11 @@
 import { Obj } from 'ts-data-forge';
-import { toUnionString } from '../utils/to-union-string.mjs';
+import { toUnionKeyString } from '../utils/to-union-string.mjs';
 import { record } from './record.mjs';
 
 /** Creates a record type with keys picked. */
 const pick = (recordType, keysToPick, options) => record(Obj.pick(recordType.shape, keysToPick), {
     typeName: options?.typeName ??
-        `Pick<${recordType.typeName}, ${toUnionString(keysToPick)}>`,
+        `Pick<${recordType.typeName}, ${toUnionKeyString(keysToPick)}>`,
     allowExcessProperties: options?.allowExcessProperties ?? recordType.allowExcessProperties,
 });
 

package/dist/record/pick.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"pick.mjs","sources":["../../src/record/pick.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAKA;AACO,MAAM,IAAI,GAAG,CAIlB,UAAyB,EACzB,UAAsB,EACtB,OAKE,KAEF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;IAC7C,QAAQ,EACN,OAAO,EAAE,QAAQ;QACjB,CAAA,KAAA,EAAQ,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,aAAa,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG;AAC9D,IAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,CAAA;;;;"}
+{"version":3,"file":"pick.mjs","sources":["../../src/record/pick.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAKA;AACO,MAAM,IAAI,GAAG,CAIlB,UAAyB,EACzB,UAAsB,EACtB,OAKE,KAEF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;IAC7C,QAAQ,EACN,OAAO,EAAE,QAAQ;QACjB,CAAA,KAAA,EAAQ,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,gBAAgB,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG;AACjE,IAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,CAAA;;;;"}

package/dist/utils/index.mjs

@@ -3,6 +3,6 @@ export { createCastFn } from './create-cast-fn.mjs';
 export { createIsFn } from './create-is-fn.mjs';
 export { createPrimitiveType } from './create-primitive-type.mjs';
 export { createType } from './create-type.mjs';
-export { toIntersectionString, toUnionString } from './to-union-string.mjs';
+export { toIntersectionString, toUnionKeyString, toUnionString } from './to-union-string.mjs';
 export { createPrimitiveValidationError, prependIndexToValidationErrors, prependPathToValidationErrors, validationErrorToMessage, validationErrorsToMessages } from './validation-error.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/utils/to-union-string.d.mts

@@ -1,3 +1,4 @@
+export declare const toUnionKeyString: (members: readonly string[]) => string;
 export declare const toUnionString: (members: readonly string[]) => string;
 export declare const toIntersectionString: (members: readonly string[]) => string;
 //# sourceMappingURL=to-union-string.d.mts.map

package/dist/utils/to-union-string.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"to-union-string.d.mts","sourceRoot":"","sources":["../../src/utils/to-union-string.mts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,GAAI,SAAS,SAAS,MAAM,EAAE,KAAG,MACjB,CAAC;AAE3C,eAAO,MAAM,oBAAoB,GAAI,SAAS,SAAS,MAAM,EAAE,KAAG,MACxB,CAAC"}
+{"version":3,"file":"to-union-string.d.mts","sourceRoot":"","sources":["../../src/utils/to-union-string.mts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,GAAI,SAAS,SAAS,MAAM,EAAE,KAAG,MACpB,CAAC;AAE3C,eAAO,MAAM,aAAa,GAAI,SAAS,SAAS,MAAM,EAAE,KAAG,MACtC,CAAC;AAEtB,eAAO,MAAM,oBAAoB,GAAI,SAAS,SAAS,MAAM,EAAE,KAAG,MAC7C,CAAC"}

package/dist/utils/to-union-string.mjs

@@ -1,5 +1,6 @@
-const toUnionString = (members) => members.map((k) => `"${k}"`).join(' | ');
-const toIntersectionString = (members) => members.map((k) => `"${k}"`).join(' & ');
+const toUnionKeyString = (members) => members.map((k) => `"${k}"`).join(' | ');
+const toUnionString = (members) => members.join(' | ');
+const toIntersectionString = (members) => members.join(' & ');
 
-export { toIntersectionString, toUnionString };
+export { toIntersectionString, toUnionKeyString, toUnionString };
 //# sourceMappingURL=to-union-string.mjs.map

package/dist/utils/to-union-string.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"to-union-string.mjs","sources":["../../src/utils/to-union-string.mts"],"sourcesContent":[null],"names":[],"mappings":"AAAO,MAAM,aAAa,GAAG,CAAC,OAA0B,KACtD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC,IAAI,CAAC,KAAK;AAElC,MAAM,oBAAoB,GAAG,CAAC,OAA0B,KAC7D,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC,IAAI,CAAC,KAAK;;;;"}
+{"version":3,"file":"to-union-string.mjs","sources":["../../src/utils/to-union-string.mts"],"sourcesContent":[null],"names":[],"mappings":"AAAO,MAAM,gBAAgB,GAAG,CAAC,OAA0B,KACzD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC,IAAI,CAAC,KAAK;AAElC,MAAM,aAAa,GAAG,CAAC,OAA0B,KACtD,OAAO,CAAC,IAAI,CAAC,KAAK;AAEb,MAAM,oBAAoB,GAAG,CAAC,OAA0B,KAC7D,OAAO,CAAC,IAAI,CAAC,KAAK;;;;"}

package/package.json

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

package/src/compose/intersection.test.mts

@@ -109,9 +109,8 @@ describe('intersection', () => {
               path: [],
               actualValue: { x: 0, y: 1 },
               expectedType:
-                '("{ x: number, y: number }" & "{ z: number, w: number }")',
-              typeName:
-                '("{ x: number, y: number }" & "{ z: number, w: number }")',
+                '({ x: number, y: number } & { z: number, w: number })',
+              typeName: '({ x: number, y: number } & { z: number, w: number })',
               message:
                 'The type of value is expected to match all types of { { x: number, y: number }, { z: number, w: number } }',
             },
@@ -221,10 +220,10 @@ describe('intersection', () => {
             {
               path: [],
               actualValue: 'aaa',
-              expectedType: '("number" & "number")',
+              expectedType: '(number & number)',
               message:
                 'The type of value is expected to match all types of { number, number }',
-              typeName: '("number" & "number")',
+              typeName: '(number & number)',
             },
             {
               path: [],
@@ -236,10 +235,10 @@ describe('intersection', () => {
             {
               path: [],
               actualValue: 'aaa',
-              expectedType: '("number" & "number")',
+              expectedType: '(number & number)',
               message:
                 'The type of value is expected to match all types of { number, number }',
-              typeName: '("number" & "number")',
+              typeName: '(number & number)',
             },
             {
               path: [],
@@ -356,10 +355,10 @@ describe('intersection', () => {
             {
               path: [],
               actualValue: 7,
-              expectedType: '("uintRange(0, 5)" & "uintRange(1, 7)")',
+              expectedType: '(uintRange(0, 5) & uintRange(1, 7))',
               message:
                 'The type of value is expected to match all types of { uintRange(0, 5), uintRange(1, 7) }',
-              typeName: '("uintRange(0, 5)" & "uintRange(1, 7)")',
+              typeName: '(uintRange(0, 5) & uintRange(1, 7))',
             },
             {
               path: [],
@@ -371,10 +370,10 @@ describe('intersection', () => {
             {
               path: [],
               actualValue: 7,
-              expectedType: '("uintRange(0, 5)" & "uintRange(1, 7)")',
+              expectedType: '(uintRange(0, 5) & uintRange(1, 7))',
               message:
                 'The type of value is expected to match all types of { uintRange(0, 5), uintRange(1, 7) }',
-              typeName: '("uintRange(0, 5)" & "uintRange(1, 7)")',
+              typeName: '(uintRange(0, 5) & uintRange(1, 7))',
             },
             {
               path: [],

package/src/compose/merge-records.test.mts

@@ -101,9 +101,8 @@ describe('mergeRecords', () => {
             path: [],
             actualValue: { x: 0, y: 1 },
             expectedType:
-              '("{ x: number, y: number }" & "{ z: number, w: number }")',
-            typeName:
-              '("{ x: number, y: number }" & "{ z: number, w: number }")',
+              '({ x: number, y: number } & { z: number, w: number })',
+            typeName: '({ x: number, y: number } & { z: number, w: number })',
             message:
               'The type of value is expected to match all types of { { x: number, y: number }, { z: number, w: number } }',
           },

package/src/compose/union.test.mts

@@ -91,9 +91,8 @@ describe('union', () => {
           path: [],
           actualValue: 5,
           expectedType:
-            '("{ x: number, y: number }" | "literal(3)" | "literal("2")")',
-          typeName:
-            '("{ x: number, y: number }" | "literal(3)" | "literal("2")")',
+            '({ x: number, y: number } | literal(3) | literal("2"))',
+          typeName: '({ x: number, y: number } | literal(3) | literal("2"))',
           message:
             'The type of value is expected to be one of the elements contained in { { x: number, y: number }, literal(3), literal("2") }',
         });

package/src/record/omit.mts

@@ -1,6 +1,6 @@
 import { expectType, Obj } from 'ts-data-forge';
 import { type RecordType, type Type } from '../type.mjs';
-import { toUnionString } from '../utils/index.mjs';
+import { toUnionKeyString } from '../utils/index.mjs';
 import { record } from './record.mjs';
 
 /** Creates a record type with keys omitted. */
@@ -20,7 +20,7 @@ export const omit = <
   record(Obj.omit(recordType.shape, keysToOmit), {
     typeName:
       options?.typeName ??
-      `Omit<${recordType.typeName}, ${toUnionString(keysToOmit)}>`,
+      `Omit<${recordType.typeName}, ${toUnionKeyString(keysToOmit)}>`,
     allowExcessProperties:
       options?.allowExcessProperties ?? recordType.allowExcessProperties,
   });

package/src/record/partial.mts

@@ -1,6 +1,6 @@
 import { expectType } from 'ts-data-forge';
 import { type RecordType, type Type } from '../type.mjs';
-import { toUnionString } from '../utils/index.mjs';
+import { toUnionKeyString } from '../utils/index.mjs';
 import { optional, type OptionalPropertyType } from './optional.mjs';
 import { record } from './record.mjs';
 
@@ -25,7 +25,7 @@ export const partial = <
     options?.typeName ??
     (options?.keysToBeOptional === undefined
       ? `Partial<${recordType.typeName}>`
-      : `PartiallyPartial<${recordType.typeName}, ${toUnionString(options.keysToBeOptional)}>`);
+      : `PartiallyPartial<${recordType.typeName}, ${toUnionKeyString(options.keysToBeOptional)}>`);
 
   const keysToBeOptional: ReadonlySet<string> = new Set(
     options?.keysToBeOptional ?? Object.keys(recordType.shape),

package/src/record/pick.mts

@@ -1,6 +1,6 @@
 import { expectType, Obj } from 'ts-data-forge';
 import { type RecordType, type Type } from '../type.mjs';
-import { toUnionString } from '../utils/index.mjs';
+import { toUnionKeyString } from '../utils/index.mjs';
 import { record } from './record.mjs';
 
 /** Creates a record type with keys picked. */
@@ -20,7 +20,7 @@ export const pick = <
   record(Obj.pick(recordType.shape, keysToPick), {
     typeName:
       options?.typeName ??
-      `Pick<${recordType.typeName}, ${toUnionString(keysToPick)}>`,
+      `Pick<${recordType.typeName}, ${toUnionKeyString(keysToPick)}>`,
     allowExcessProperties:
       options?.allowExcessProperties ?? recordType.allowExcessProperties,
   });

package/src/utils/to-union-string.mts

@@ -1,5 +1,8 @@
-export const toUnionString = (members: readonly string[]): string =>
+export const toUnionKeyString = (members: readonly string[]): string =>
   members.map((k) => `"${k}"`).join(' | ');
 
+export const toUnionString = (members: readonly string[]): string =>
+  members.join(' | ');
+
 export const toIntersectionString = (members: readonly string[]): string =>
-  members.map((k) => `"${k}"`).join(' & ');
+  members.join(' & ');