type-plus 8.0.0-beta.7 → 8.0.0-beta.8

package/esm/type-guard/is_type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is_type.d.ts","sourceRoot":"","sources":["../../src/type-guard/is_type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAEnD;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;AACnD;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,IAAI,CAAC,CAAA;yBAAvE,MAAM;;;;;;AAetB;;;GAGG;AACH,iBAAS,OAAO,CAAC,EAAE,SAAS,KAAK,KAAK,OAAO,CAAA;AAC7C;;;GAGG;AACH,iBAAS,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,IAAI,KAAK,CAAA"}
+{"version":3,"file":"is_type.d.ts","sourceRoot":"","sources":["../../src/type-guard/is_type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAEnD;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;AACnD;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,IAAI,CAAC,CAAA;yBAAvE,MAAM;YAQV,CAAC,SAAS,IAAI,YAAY,CAAC;YAK3B,CAAC,SAAS,KAAK,YAAY,CAAC;;gBAyBxB,EAAE,SAAS,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;;AAvB9C;;;GAGG;AACH,iBAAS,OAAO,CAAC,EAAE,SAAS,KAAK,KAAK,OAAO,CAAA;AAC7C;;;GAGG;AACH,iBAAS,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,IAAI,KAAK,CAAA"}

package/esm/utils/as.d.ts

@@ -5,6 +5,6 @@ export declare function asAny(subject: unknown): any;
  */
 export declare function amend<S>(subject: S): {
     union<T>(): T & S;
-    intersect<T_1>(): S | T_1;
+    intersect<T>(): T | S;
 };
 //# sourceMappingURL=as.d.ts.map

package/esm/utils/as.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"as.d.ts","sourceRoot":"","sources":["../../src/utils/as.ts"],"names":[],"mappings":"AAAA,wBAAgB,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,CAEzC;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG,CAE3C;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;gBAErB,CAAC,GAAG,CAAC;;EAOlB"}
+{"version":3,"file":"as.d.ts","sourceRoot":"","sources":["../../src/utils/as.ts"],"names":[],"mappings":"AAAA,wBAAgB,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,CAEzC;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG,CAE3C;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;UAE3B,CAAC,KAAK,CAAC,GAAG,CAAC;cAGP,CAAC,KAAK,CAAC,GAAG,CAAC;EAItB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "type-plus",
-  "version": "8.0.0-beta.7",
+  "version": "8.0.0-beta.8",
   "description": "Provides additional types for TypeScript.",
   "keywords": [
     "assert",
@@ -55,46 +55,42 @@
     "unpartial": "^1.0.4"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@repobuddy/jest": "^4.0.0",
     "@repobuddy/typescript": "^2.0.0",
     "@size-limit/esbuild-why": "^11.1.5",
     "@size-limit/preset-small-lib": "^11.1.5",
     "@types/node": "^18.11.11",
+    "@vitest/coverage-v8": "^4.0.15",
     "assertron": "^11.0.2",
     "cross-env": "^7.0.3",
-    "depcheck": "^1.4.3",
-    "jest": "^29.7.0",
-    "jest-watch-suspend": "^1.1.2",
-    "jest-watch-toggle-config-2": "^2.1.0",
-    "jest-watch-typeahead": "^2.2.2",
-    "npm-run-all2": "^7.0.0",
+    "npm-run-all2": "^8.0.0",
     "rimraf": "^6.0.0",
     "size-limit": "^11.1.5",
     "ts-5.4": "npm:typescript@~5.4.0",
     "ts-5.5": "npm:typescript@~5.5.0",
-    "ts-jest": "^29.1.2",
-    "typescript": "^5.6.2"
+    "typescript": "~5.6.0",
+    "vitest": "^4.0.15"
+  },
+  "peerDependencies": {
+    "typescript": ">= 5.6.0"
   },
   "scripts": {
     "build": "run-p build:*",
     "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:doc": "typedoc",
     "clean": "rimraf cjs coverage esm lib libm tslib --glob *.tsbuildinfo",
-    "coverage": "cross-env NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 jest --coverage",
-    "depcheck": "depcheck",
+    "coverage": "vitest run --coverage",
+    "knip": "knip",
     "nuke": "run-p clean nuke:local",
     "nuke:local": "rimraf node_modules",
     "size": "size-limit",
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 jest",
+    "test": "vitest run",
     "test:type": "run-p test:type:*",
-    "test:type:latest": "./node_modules/typescript/bin/tsc --noEmit",
     "test:type:54": "./node_modules/ts-5.4/bin/tsc -p tsconfig.ts54.json --noEmit",
     "test:type:55": "./node_modules/ts-5.5/bin/tsc -p tsconfig.ts55.json --noEmit",
-    "test:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 jest --watch",
-    "verify": "npm-run-all clean -p build depcheck lint coverage -p size",
-    "w": "cross-env NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 jest --watch",
-    "watch": "cross-env NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 jest --watch"
+    "test:type:latest": "./node_modules/typescript/bin/tsc --noEmit",
+    "test:watch": "vitest watch",
+    "verify": "npm-run-all clean -p build knip lint coverage -p size",
+    "w": "vitest watch",
+    "watch": "vitest watch"
   }
 }

package/src/array/array.reverse.ts

@@ -13,11 +13,8 @@ import type { IsReadonly } from './array_plus.is_readonly.js'
  * @param T The array type to reverse.
  * @returns The reversed array type.
  */
-export type Reverse<A extends readonly unknown[]> = Reverse._<A> extends infer R
-	? IsReadonly<A> extends true
-		? Readonly<R>
-		: R
-	: never
+export type Reverse<A extends readonly unknown[]> =
+	Reverse._<A> extends infer R ? (IsReadonly<A> extends true ? Readonly<R> : R) : never
 
 export namespace Reverse {
 	export type _<A extends readonly unknown[]> = A extends readonly [infer First, ...infer Rest]

package/src/assertion/assert_type.ts

@@ -58,7 +58,6 @@ assertType.isTrue = (subject: true): asserts subject is true => {
 	if (subject !== true) throw TypeError('subject is not true')
 }
 assertType.noTrue = <S>(subject: Exclude<S, true>): void => {
-	// @ts-ignore
 	if (subject === true) throw TypeError('subject is true')
 }
 
@@ -66,7 +65,6 @@ assertType.isFalse = (subject: false): asserts subject is false => {
 	if (subject !== false) throw TypeError('subject is not false')
 }
 assertType.noFalse = <S>(subject: Exclude<S, false>): void => {
-	// @ts-ignore
 	if (subject === false) throw TypeError('subject is false')
 }
 

package/src/index.ts

@@ -114,8 +114,8 @@ export * from './testing/stub.js'
 export * from './testing/test_type.js'
 export type { CommonKeys, CommonPropKeys } from './tuple/common_prop_keys.js'
 export * from './tuple/create_tuple.js'
-export { drop } from './tuple/drop.js'
 export type { DropFirst, DropLast, DropMatch, DropNull, DropNullable, DropUndefined } from './tuple/drop.js'
+export { drop } from './tuple/drop.js'
 export type * from './tuple/is_not_tuple.js'
 export type * from './tuple/is_tuple.js'
 export type { Tail } from './tuple/tail.js'

package/src/json.ts

@@ -12,6 +12,6 @@ function get<T extends JSONTypes>(obj: JSONTypes, ...props: Array<string | numbe
 	if (props.length === 0) return obj as T
 	if (typeof obj !== 'object' || obj === null) return undefined
 	const p = props.shift()!
-	// @ts-ignore
+	// @ts-expect-error
 	return get(obj[p], ...props) as T
 }

package/src/math/numeric_struct.ts

@@ -96,12 +96,12 @@ export namespace NumericStruct {
 	 *
 	 * It includes the normalization of the `NumericStruct`.
 	 */
-	export type ToNumeric<M extends NumericStruct> = DigitsStruct.ToString<M[DIGITS_STRUCT]> extends infer S extends
-		string
-		? M[TYPE] extends 'bigint'
-			? StringToBigint<S, StringToNumber<S, `The value '${S}' cannot be represented as bigint or number`>>
-			: StringToNumber<S, StringToBigint<S, `The value '${S}' cannot be represented as bigint or number`>>
-		: never
+	export type ToNumeric<M extends NumericStruct> =
+		DigitsStruct.ToString<M[DIGITS_STRUCT]> extends infer S extends string
+			? M[TYPE] extends 'bigint'
+				? StringToBigint<S, StringToNumber<S, `The value '${S}' cannot be represented as bigint or number`>>
+				: StringToNumber<S, StringToBigint<S, `The value '${S}' cannot be represented as bigint or number`>>
+			: never
 
 	export type Add<A extends NumericStruct, B extends NumericStruct> = [
 		A[TYPE],

package/src/object/ANotB.ts

@@ -1,7 +1,7 @@
 import type { IsEqual } from '../equal/is_equal.js'
+import type { AnyRecord } from './any_record.js'
 import type { IsDisjoint } from './IsDisjoint.js'
 import type { KeysWithDiffType } from './KeysWithDiffType.js'
-import type { AnyRecord } from './any_record.js'
 
 export type ANotB<A extends AnyRecord, B extends AnyRecord> = IsEqual<A, B> extends true
 	? never

package/src/object/KeysWithDiffType.ts

@@ -1,6 +1,6 @@
+import type { AnyRecord } from './any_record.js'
 import type { IsDisjoint } from './IsDisjoint.js'
 import type { ValueOf } from './ValueOf.js'
-import type { AnyRecord } from './any_record.js'
 
 export type KeysWithDiffType<A extends AnyRecord, B extends AnyRecord> = IsDisjoint<A, B> extends true
 	? never

package/src/object/adjust_exact_optional_props.ts

@@ -1,6 +1,6 @@
-import type { RequiredKeys } from './RequiredKeys.js'
 import type { AnyRecord } from './any_record.js'
 import type { OptionalKeys } from './optional_key.js'
+import type { RequiredKeys } from './RequiredKeys.js'
 
 /**
  * ⚗️ *transform*
@@ -10,5 +10,14 @@ import type { OptionalKeys } from './optional_key.js'
  * It adds `undefined` to optional properties.
  */
 export type AdjustExactOptionalProps<T extends AnyRecord> = T extends object
-	? { [K in OptionalKeys<T>]?: T[K] | undefined } & { [K in RequiredKeys<T>]: T[K] }
+	? [{ [K in OptionalKeys<T>]?: T[K] | undefined }, { [K in RequiredKeys<T>]: T[K] }] extends [
+			infer O extends AnyRecord,
+			infer R extends AnyRecord,
+		]
+		? keyof O extends never
+			? R
+			: keyof R extends never
+				? O
+				: O & R
+		: never
 	: never

package/src/object/index.ts

@@ -1,8 +1,8 @@
-export type * from './adjust_exact_optional_props.js'
 export type { ANotB, BNotA } from './ANotB.js'
+export type * from './adjust_exact_optional_props.js'
 export type { AnyRecord } from './any_record.js'
-export * from './everyKey.js'
 export type { ExcludePropType } from './ExcludePropType.js'
+export * from './everyKey.js'
 export * from './facade.js'
 export * from './filterKey.js'
 export * from './findKey.js'
@@ -25,15 +25,15 @@ export type * from './optional_key.js'
 export type { Partial, PartialExcept, PartialOmit, PartialPick } from './Partial.js'
 export * from './pick.js'
 export type { Properties } from './properties.js'
-export * from './record.js'
-export type { RecursivePartial } from './recursive_partial.js'
 export type { RecursiveIntersect } from './RecursiveIntersect.js'
 export type { RecursiveRequired } from './RecursiveRequired.js'
+export type { RequiredKeys } from './RequiredKeys.js'
+export * from './record.js'
+export type { RecursivePartial } from './recursive_partial.js'
 export * from './reduceKey.js'
 export * from './replaceProperty.js'
-export type { RequiredKeys } from './RequiredKeys.js'
+export type { SpreadRecord } from './SpreadRecord.js'
 export * from './someKey.js'
 export * from './split.js'
-export type { SpreadRecord } from './SpreadRecord.js'
 export * from './typeOverrideIncompatible.js'
 export type { ValueOf } from './ValueOf.js'

package/src/object/left_join.ts

@@ -1,6 +1,6 @@
 import type { IsEqual } from '../equal/is_equal.js'
-import type { IsDisjoint } from './IsDisjoint.js'
 import type { AnyRecord } from './any_record.js'
+import type { IsDisjoint } from './IsDisjoint.js'
 import type { Properties } from './properties.js'
 
 export type LeftJoin<A extends AnyRecord, B extends AnyRecord> = IsEqual<A, B> extends true

package/src/object/mapProperties.ts

@@ -1,6 +1,6 @@
-import type { ValueOf } from './ValueOf.js'
 import type { AnyRecord } from './any_record.js'
 import { reduceByKey } from './reduceKey.js'
+import type { ValueOf } from './ValueOf.js'
 
 /**
  * An Object-specific version of `map`.

package/src/object/merge.ts

@@ -5,9 +5,9 @@ import type { Or } from '../logical/logical.js'
 import type { IsNever } from '../never/is_never.js'
 import type { IsNotNever } from '../never/is_not_never.js'
 import type { IsLiteral } from '../predicates/literal.js'
+import type { AnyRecord } from './any_record.js'
 import type { IsDisjoint } from './IsDisjoint.js'
 import type { KeyTypes } from './KeyTypes.js'
-import type { AnyRecord } from './any_record.js'
 import type { OptionalKeys } from './optional_key.js'
 
 /**

package/src/object/optional_key.ts

@@ -1,5 +1,5 @@
-import type { KeyTypes } from './KeyTypes.js'
 import type { AnyRecord } from './any_record.js'
+import type { KeyTypes } from './KeyTypes.js'
 
 /**
  * Validate if the key `K` in `T` is optional.

package/src/object/properties.ts

@@ -1,4 +1,37 @@
+import type { IsAny } from '../any/is_any.js'
+import type { IsUnknown } from '../unknown/is_unknown.js'
+
 /**
- * Gets the properties of an object type.
+ * Extracts the property map of a type: an object type with the same keys and
+ * value types as `T`, preserving optional and readonly modifiers.
+ *
+ * - For object types: returns `{ [k in keyof T]: T[k] }`.
+ * - For `any` and `unknown`: returns the input type unchanged.
+ * - For function types (e.g. `() => void`): returns `{}` because call signatures
+ *   are not indexable; for `Function`, returns the interface of methods.
+ * - For intersections: merges properties from all branches.
+ *
+ * @typeParam T - The type whose properties to extract.
+ *
+ * @example
+ * ```ts
+ * type T = { a: number; b?: string }
+ * type R = Properties<T> // { a: number; b?: string }
+ *
+ * type Merged = Properties<{ a: 1 } & { b: 2 }> // { a: 1; b: 2 }
+ * ```
  */
-export type Properties<T> = { [k in keyof T]: T[k] } // & {}
+export type Properties<T> = IsAny<
+	T,
+	{
+		$then: T
+		$else: IsUnknown<
+			T,
+			{
+				$then: T
+				$else: { [k in keyof T]: T[k] } // & {}
+			}
+		>
+	}
+>
+//  [unknown] extends [T] ? unknown : { [k in keyof T]: T[k] } // & {}

package/src/object/record.ts

@@ -1,6 +1,6 @@
 import type { Widen } from '../utils/index.js'
-import type { KeyTypes } from './KeyTypes.js'
 import type { AnyRecord } from './any_record.js'
+import type { KeyTypes } from './KeyTypes.js'
 
 /**
  * Creates a `Record<Key, Value>` or your custom record.

package/src/object/split.ts

@@ -1,7 +1,7 @@
-import type { Partial } from './Partial.js'
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import type { AnyRecord } from './any_record.js'
 import type { Omit } from './omit.js'
+import type { Partial } from './Partial.js'
 import { reduceByKey } from './reduceKey.js'
 
 type Splitter<T extends AnyRecord> = Partial<{ [k in keyof T]: T[k] | undefined }>

package/src/predicates/CanAssign.ts

@@ -1,5 +1,5 @@
-import type { NotExtendable } from './Extends.js'
 import type { Assignable } from './assignable.js'
+import type { NotExtendable } from './Extends.js'
 
 /**
  * Can `A` assign to `B`

package/src/predicates/index.ts

@@ -1,6 +1,6 @@
+export type { And, Not, Or, Xor } from '../logical/logical.js'
 export * from './CanAssign.js'
 export type { Extendable, IsExtend, IsNotExtend, NotExtendable } from './Extends.js'
 export type { If } from './If.js'
 export type { IsEmptyObject } from './IsEmptyObject.js'
 export type { IsLiteral } from './literal.js'
-export type { And, Not, Or, Xor } from '../logical/logical.js'

package/src/promise/index.ts

@@ -1,5 +1,5 @@
 export * from './isPromise.js'
-export * from './mapSeries.js'
 export * from './MaybePromise.js'
+export * from './mapSeries.js'
 export type { AwaitedProp, PromiseValue } from './PromiseValue.js'
 export type { PromiseValueMerge } from './PromiseValueMerge.js'

package/src/promise/isPromise.ts

@@ -1,4 +1,4 @@
 export function isPromise<R = any>(subject: unknown): subject is Promise<R> {
-	// @ts-ignore
+	// @ts-expect-error
 	return !!subject && typeof subject['then'] === 'function'
 }

package/src/string/$extract_manipulated_string.ts

@@ -19,32 +19,36 @@ export type $ExtractManipulatedString<T extends string> = [T, unknown] extends [
 		>
 
 export namespace $ExtractManipulatedString {
-	export type _UpperOrElse<N, Else> = N extends Uppercase<infer Y>
-		? string extends Y
-			? Uppercase<any> extends N
-				? Y
-				: N
-			: $ExtractManipulatedString<Y>
-		: Else
-	export type _LowerOrElse<N, Else> = N extends Lowercase<infer Y>
-		? string extends Y
-			? Lowercase<any> extends N
-				? Y
-				: N
-			: $ExtractManipulatedString<Y>
-		: Else
-	export type _CapOrElse<N, Else> = N extends Capitalize<infer Y>
-		? string extends Y
-			? Capitalize<any> extends N
-				? Y
-				: N
-			: $ExtractManipulatedString<Y>
-		: Else
-	export type _UncapOrElse<N, Else> = N extends Uncapitalize<infer Y>
-		? string extends Y
-			? Uncapitalize<any> extends N
-				? Y
-				: N
-			: $ExtractManipulatedString<Y>
-		: Else
+	export type _UpperOrElse<N, Else> =
+		N extends Uppercase<infer Y>
+			? string extends Y
+				? Uppercase<any> extends N
+					? Y
+					: N
+				: $ExtractManipulatedString<Y>
+			: Else
+	export type _LowerOrElse<N, Else> =
+		N extends Lowercase<infer Y>
+			? string extends Y
+				? Lowercase<any> extends N
+					? Y
+					: N
+				: $ExtractManipulatedString<Y>
+			: Else
+	export type _CapOrElse<N, Else> =
+		N extends Capitalize<infer Y>
+			? string extends Y
+				? Capitalize<any> extends N
+					? Y
+					: N
+				: $ExtractManipulatedString<Y>
+			: Else
+	export type _UncapOrElse<N, Else> =
+		N extends Uncapitalize<infer Y>
+			? string extends Y
+				? Uncapitalize<any> extends N
+					? Y
+					: N
+				: $ExtractManipulatedString<Y>
+			: Else
 }

package/src/string/_string_type.ts

@@ -1,11 +1,12 @@
 import type { $ExtractManipulatedString } from './$extract_manipulated_string.js'
 
-export type _StringType<T extends string> = $ExtractManipulatedString<T> extends infer K
-	? K extends string & infer U
-		? [K, U] extends [U, K]
-			? {} extends { [P in `${K}`]: unknown }
-				? 'templateLiteral'
-				: 'stringLiteral'
-			: 'string'
+export type _StringType<T extends string> =
+	$ExtractManipulatedString<T> extends infer K
+		? K extends string & infer U
+			? [K, U] extends [U, K]
+				? {} extends { [P in `${K}`]: unknown }
+					? 'templateLiteral'
+					: 'stringLiteral'
+				: 'string'
+			: never
 		: never
-	: never