ts-fortress 4.2.0 → 4.3.0

package/dist/entry-point.mjs

@@ -52,12 +52,13 @@ export { isOptionalProperty, optional } from './record/optional.mjs';
 export { partial } from './record/partial.mjs';
 export { pick } from './record/pick.mjs';
 export { record, strictRecord } from './record/record.mjs';
+export { required } from './record/required.mjs';
 export { valueof } from './record/valueof.mjs';
 export { createAssertFn } from './utils/create-assert-fn.mjs';
 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/entry-point.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"entry-point.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"entry-point.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/index.mjs

@@ -51,6 +51,7 @@ export { isOptionalProperty, optional } from './record/optional.mjs';
 export { partial } from './record/partial.mjs';
 export { pick } from './record/pick.mjs';
 export { record, strictRecord } from './record/record.mjs';
+export { required } from './record/required.mjs';
 export { valueof } from './record/valueof.mjs';
 import 'ts-data-forge';
 export { createAssertFn } from './utils/create-assert-fn.mjs';
@@ -58,6 +59,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/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/record/index.d.mts

@@ -5,5 +5,6 @@ export * from './optional.mjs';
 export * from './partial.mjs';
 export * from './pick.mjs';
 export * from './record.mjs';
+export * from './required.mjs';
 export * from './valueof.mjs';
 //# sourceMappingURL=index.d.mts.map

package/dist/record/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/record/index.mts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/record/index.mts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC"}

package/dist/record/index.mjs

@@ -5,5 +5,6 @@ export { isOptionalProperty, optional } from './optional.mjs';
 export { partial } from './partial.mjs';
 export { pick } from './pick.mjs';
 export { record, strictRecord } from './record.mjs';
+export { required } from './required.mjs';
 export { valueof } from './valueof.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/record/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;"}

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/optional.d.mts

@@ -1,5 +1,6 @@
 import { type Type } from '../type.mjs';
 export type OptionalPropertyType<T extends Type<unknown>> = T & PartiallyRequired<T, 'optional'>;
+export type RequiredPropertyType<T extends Type<unknown>> = PartiallyOptional<T, 'optional'>;
 export declare const optional: <T extends Type<unknown>>(t: T) => OptionalPropertyType<T>;
 export declare const isOptionalProperty: <T extends Type<unknown>>(t: T) => t is OptionalPropertyType<T>;
 //# sourceMappingURL=optional.d.mts.map

package/dist/record/optional.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"optional.d.mts","sourceRoot":"","sources":["../../src/record/optional.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAC3D,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;AAEnC,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,EAC9C,GAAG,CAAC,KACH,oBAAoB,CAAC,CAAC,CAGvB,CAAC;AAEH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,EACxD,GAAG,CAAC,KACH,CAAC,IAAI,oBAAoB,CAAC,CAAC,CACuB,CAAC"}
+{"version":3,"file":"optional.d.mts","sourceRoot":"","sources":["../../src/record/optional.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAC3D,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;AAEnC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,IAAI,iBAAiB,CAC3E,CAAC,EACD,UAAU,CACX,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,EAC9C,GAAG,CAAC,KACH,oBAAoB,CAAC,CAAC,CAGvB,CAAC;AAEH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,EACxD,GAAG,CAAC,KACH,CAAC,IAAI,oBAAoB,CAAC,CAAC,CACuB,CAAC"}

package/dist/record/optional.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"optional.mjs","sources":["../../src/record/optional.mts"],"sourcesContent":[null],"names":[],"mappings":"MAKa,QAAQ,GAAG,CACtB,CAAI,MACyB;AAC7B,IAAA,GAAG,CAAC;AACJ,IAAA,QAAQ,EAAE,IAAI;AACf,CAAA;MAEY,kBAAkB,GAAG,CAChC,CAAI,KAEJ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK;;;;"}
+{"version":3,"file":"optional.mjs","sources":["../../src/record/optional.mts"],"sourcesContent":[null],"names":[],"mappings":"MAUa,QAAQ,GAAG,CACtB,CAAI,MACyB;AAC7B,IAAA,GAAG,CAAC;AACJ,IAAA,QAAQ,EAAE,IAAI;AACf,CAAA;MAEY,kBAAkB,GAAG,CAChC,CAAI,KAEJ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK;;;;"}

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/record/required.d.mts

@@ -0,0 +1,22 @@
+import { type RecordType, type Type } from '../type.mjs';
+import { type RequiredPropertyType } from './optional.mjs';
+/**
+ * Creates a Required type. If keysToBeRequired is set, only those keys are
+ * made required, otherwise, all properties are made required.
+ */
+export declare const required: <const R extends ReadonlyRecord<string, Type<unknown>>, const KeysToBeRequired extends NonEmptyArray<keyof R & string>>(recordType: RecordType<R>, options?: PartialReadonly<{
+    keysToBeRequired: KeysToBeRequired;
+    typeName: string;
+    /** @default true */
+    allowExcessProperties: boolean;
+}>) => RequiredType<R, KeysToBeRequired>;
+type RequiredTypeShape<R extends ReadonlyRecord<string, Type<unknown>>, KeysToBeRequired extends NonEmptyArray<keyof R & string> | undefined> = TypeEq<KeysToBeRequired, undefined> extends true ? FullyRequiredType<R> : PartiallyRequiredType<R, ArrayElement<KeysToBeRequired>>;
+type FullyRequiredType<R extends ReadonlyRecord<string, Type<unknown>>> = {
+    readonly [P in keyof R]: RequiredPropertyType<R[P]>;
+};
+type PartiallyRequiredType<R extends ReadonlyRecord<string, Type<unknown>>, K extends keyof R> = {
+    readonly [P in keyof R]: P extends K ? RequiredPropertyType<R[P]> : R[P];
+};
+export type RequiredType<R extends ReadonlyRecord<string, Type<unknown>>, KeysToBeRequired extends NonEmptyArray<keyof R & string> | undefined> = RecordType<RequiredTypeShape<R, KeysToBeRequired>>;
+export {};
+//# sourceMappingURL=required.d.mts.map

package/dist/record/required.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"required.d.mts","sourceRoot":"","sources":["../../src/record/required.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AAGxB;;;GAGG;AACH,eAAO,MAAM,QAAQ,GACnB,KAAK,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,EACrD,KAAK,CAAC,gBAAgB,SAAS,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,EAE9D,YAAY,UAAU,CAAC,CAAC,CAAC,EACzB,UAAU,eAAe,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IAEjB,oBAAoB;IACpB,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC,KACD,YAAY,CAAC,CAAC,EAAE,gBAAgB,CA2BlC,CAAC;AAaF,KAAK,iBAAiB,CACpB,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,EAC/C,gBAAgB,SAAS,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,SAAS,IAEpE,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,SAAS,IAAI,GAC5C,iBAAiB,CAAC,CAAC,CAAC,GACpB,qBAAqB,CAAC,CAAC,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAE/D,KAAK,iBAAiB,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI;IACxE,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACpD,CAAC;AAEF,KAAK,qBAAqB,CACxB,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,EAC/C,CAAC,SAAS,MAAM,CAAC,IACf;IACF,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACzE,CAAC;AAEF,MAAM,MAAM,YAAY,CACtB,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,EAC/C,gBAAgB,SAAS,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,SAAS,IAClE,UAAU,CAAC,iBAAiB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC"}

package/dist/record/required.mjs

@@ -0,0 +1,33 @@
+import { Obj } from 'ts-data-forge';
+import { toUnionKeyString } from '../utils/to-union-string.mjs';
+import { isOptionalProperty } from './optional.mjs';
+import { record } from './record.mjs';
+
+/**
+ * Creates a Required type. If keysToBeRequired is set, only those keys are
+ * made required, otherwise, all properties are made required.
+ */
+const required = (recordType, options) => {
+    const typeNameFilled = options?.typeName ??
+        (options?.keysToBeRequired === undefined
+            ? `Required<${recordType.typeName}>`
+            : `PartiallyRequired<${recordType.typeName}, ${toUnionKeyString(options.keysToBeRequired)}>`);
+    const keysToBeRequired = new Set(options?.keysToBeRequired ?? Object.keys(recordType.shape));
+    const requiredShape = 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    Object.fromEntries(Object.entries(recordType.shape).map(([k, v]) => [k, keysToBeRequired.has(k) ? makeRequired(v) : v]));
+    return record(requiredShape, {
+        typeName: typeNameFilled,
+        allowExcessProperties: options?.allowExcessProperties ?? recordType.allowExcessProperties,
+    });
+};
+/**
+ * Makes an optional property required by removing the optional flag.
+ */
+const makeRequired = (t) => isOptionalProperty(t)
+    ? // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        Obj.omit(t, ['optional'])
+    : t;
+
+export { required };
+//# sourceMappingURL=required.mjs.map

package/dist/record/required.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"required.mjs","sources":["../../src/record/required.mts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAUA;;;AAGG;MACU,QAAQ,GAAG,CAItB,UAAyB,EACzB,OAME,KACmC;AACrC,IAAA,MAAM,cAAc,GAClB,OAAO,EAAE,QAAQ;AACjB,SAAC,OAAO,EAAE,gBAAgB,KAAK;AAC7B,cAAE,CAAA,SAAA,EAAY,UAAU,CAAC,QAAQ,CAAA,CAAA;AACjC,cAAE,CAAA,kBAAA,EAAqB,UAAU,CAAC,QAAQ,CAAA,EAAA,EAAK,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA,CAAA,CAAG,CAAC;AAEjG,IAAA,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CACnD,OAAO,EAAE,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAC3D;AAED,IAAA,MAAM,aAAa;;IAEjB,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,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAU,CACxE,CAIF;IAEH,OAAO,MAAM,CAAC,aAAa,EAAE;AAC3B,QAAA,QAAQ,EAAE,cAAc;AACxB,QAAA,qBAAqB,EACnB,OAAO,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB;AACrE,KAAA,CAAC;AACJ;AAEA;;AAEG;AACH,MAAM,YAAY,GAAG,CACnB,CAAI,KAEJ,kBAAkB,CAAC,CAAC;AAClB;QACG,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC;MACzB,CAAC;;;;"}

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.3.0",
   "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/index.mts

@@ -5,4 +5,5 @@ export * from './optional.mjs';
 export * from './partial.mjs';
 export * from './pick.mjs';
 export * from './record.mjs';
+export * from './required.mjs';
 export * from './valueof.mjs';

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/optional.mts

@@ -3,6 +3,11 @@ import { type Type } from '../type.mjs';
 export type OptionalPropertyType<T extends Type<unknown>> = T &
   PartiallyRequired<T, 'optional'>;
 
+export type RequiredPropertyType<T extends Type<unknown>> = PartiallyOptional<
+  T,
+  'optional'
+>;
+
 export const optional = <T extends Type<unknown>>(
   t: T,
 ): OptionalPropertyType<T> => ({

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),
@@ -105,7 +105,7 @@ expectType<
       }>;
       allowExcessProperties: boolean;
     }>
->('~=');
+>('=');
 
 expectType<
   RecordType<

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,
   });