Merge branch 'main' into is-literal

benzaria · web-flow · commit 7492b7a0f8f5 · 2025-05-25T13:51:41.000+01:00
diff --git a/package.json b/package.json
@@ -84,12 +84,35 @@
 		},
 		"overrides": [
 			{
-				"files": "**/*.d.ts",
+				"files": "source/**/*.d.ts",
 				"rules": {
 					"no-restricted-imports": [
 						"error",
-						"tsd",
-						"expect-type"
+						{
+							"paths": ["tsd", "expect-type"],
+							"patterns": [
+								{
+									"group": ["*.js", "*.ts", "!*.d.ts"],
+									"message": "Use `.d.ts` extension."
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"files": "test-d/**/*.ts",
+				"rules": {
+					"no-restricted-imports": [
+						"error",
+						{
+							"patterns": [
+								{
+									"group": ["*.js", "*.ts", "!*.d.ts"],
+									"message": "Use `.d.ts` extension."
+								}
+							]
+						}
 					]
 				}
 			}
diff --git a/source/array-tail.d.ts b/source/array-tail.d.ts
@@ -1,4 +1,4 @@
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {ApplyDefaultOptions, IsArrayReadonly} from './internal/index.d.ts';
 import type {UnknownArray} from './unknown-array.d.ts';
 
diff --git a/source/conditional-keys.d.ts b/source/conditional-keys.d.ts
@@ -1,5 +1,5 @@
-import type {If} from './if.js';
-import type {IsNever} from './is-never.js';
+import type {If} from './if.d.ts';
+import type {IsNever} from './is-never.d.ts';
 
 /**
 Extract the keys from a type where the value type of the key extends the given `Condition`.
diff --git a/source/if.d.ts b/source/if.d.ts
@@ -1,4 +1,4 @@
-import type {IsNever} from './is-never.js';
+import type {IsNever} from './is-never.d.ts';
 
 /**
 An if-else-like type that resolves depending on whether the given `boolean` type is `true` or `false`.
diff --git a/source/internal/array.d.ts b/source/internal/array.d.ts
@@ -1,5 +1,5 @@
-import type {If} from '../if.js';
-import type {IsNever} from '../is-never.js';
+import type {If} from '../if.d.ts';
+import type {IsNever} from '../is-never.d.ts';
 import type {UnknownArray} from '../unknown-array.d.ts';
 
 /**
diff --git a/source/internal/object.d.ts b/source/internal/object.d.ts
@@ -5,9 +5,9 @@ import type {KeysOfUnion} from '../keys-of-union.d.ts';
 import type {RequiredKeysOf} from '../required-keys-of.d.ts';
 import type {Merge} from '../merge.d.ts';
 import type {OptionalKeysOf} from '../optional-keys-of.d.ts';
-import type {IsAny} from '../is-any.js';
-import type {If} from '../if.js';
-import type {IsNever} from '../is-never.js';
+import type {IsAny} from '../is-any.d.ts';
+import type {If} from '../if.d.ts';
+import type {IsNever} from '../is-never.d.ts';
 import type {FilterDefinedKeys, FilterOptionalKeys} from './keys.d.ts';
 import type {NonRecursiveType} from './type.d.ts';
 import type {ToString} from './string.d.ts';
diff --git a/source/internal/type.d.ts b/source/internal/type.d.ts
@@ -1,8 +1,8 @@
 import type {Primitive} from '../primitive.d.ts';
 import type {IsNever} from '../is-never.d.ts';
 import type {IsAny} from '../is-any.d.ts';
-import type {And} from '../and.js';
-import type {If} from '../if.js';
+import type {And} from '../and.d.ts';
+import type {If} from '../if.d.ts';
 
 /**
 Matches any primitive, `void`, `Date`, or `RegExp` value.
@@ -25,8 +25,8 @@ export type Extends<Left, Right> = IsNever<Left> extends true ? IsNever<Right> :
 Returns a boolean for whether the two given types extends the base type.
 */
 export type IsBothExtends<BaseType, FirstType, SecondType> = And<
-	Extends<FirstType, BaseType>,
-	Extends<SecondType, BaseType>
+  Extends<FirstType, BaseType>,
+  Extends<SecondType, BaseType>
 >;
 
 /**
diff --git a/source/is-literal.d.ts b/source/is-literal.d.ts
@@ -1,22 +1,22 @@
 import type {ApplyDefaultOptions, CollapseLiterals} from './internal/object.d.ts';
 import type {Extends, IsNotFalse, IsTrue, Not} from './internal/type.d.ts';
-import type {TagContainer, UnwrapTagged} from './tagged.js';
+import type {TagContainer, UnwrapTagged} from './tagged.d.ds';
 import type {Primitive} from './primitive.d.ts';
 import type {IsNever} from './is-never.d.ts';
 import type {Numeric} from './numeric.d.ts';
-import type {IsAny} from './is-any.js';
-import type {And} from './and.js';
+import type {IsAny} from './is-any.d.ts';
+import type {And} from './and.d.ts';
 
 /**
 @see {@link IsLiteral}
 */
 type IsLiteralOptions = {
-	strict?: boolean
-}
+  strict?: boolean
+};
 
 type DefaultIsLiteralOptions = {
-	strict: true
-}
+  strict: true
+};
 
 /**
 Returns a boolean for whether the given type `T` is the specified `LiteralType`.
@@ -66,9 +66,9 @@ type LiteralChecks<T, LiteralUnionType> = (
 	// If `T` is none of the literal types in the union `LiteralUnionType`, then `LiteralCheck<T, LiteralType>` will evaluate to `false` for the whole union.
 	// If `T` is one of the literal types in the union, it will evaluate to `boolean` (i.e. `true | false`)
 	IsNotFalse<
-		LiteralUnionType extends Primitive
-			? LiteralCheck<T, LiteralUnionType>
-			: never
+  LiteralUnionType extends Primitive
+    ? LiteralCheck<T, LiteralUnionType>
+    : never
 	>
 );
 
@@ -129,7 +129,7 @@ type L2 = Length<`${number}`>;
 @category Type Guard
 @category Utilities
 */
-export type IsStringLiteral<T, Options extends IsLiteralOptions = {}> = 
+export type IsStringLiteral<T, Options extends IsLiteralOptions = {}> = (
 	ApplyDefaultOptions<IsLiteralOptions, DefaultIsLiteralOptions, Options> extends infer ResolvedOptions extends Required<IsLiteralOptions>
 		? IsNever<T> extends false
 			? CollapseLiterals<T extends TagContainer<any> ? UnwrapTagged<T> : T> extends infer Type
@@ -139,6 +139,7 @@ export type IsStringLiteral<T, Options extends IsLiteralOptions = {}> =
 				: never
 			: false
 		: never
+);
 
 type _IsStringLiteral<S> = (
 	// If `T` is an infinite string type (e.g., `on${string}`), `Record<T, never>` produces an index signature,
diff --git a/source/is-lowercase.d.ts b/source/is-lowercase.d.ts
@@ -1,4 +1,4 @@
-import type {Every} from './internal/array.js';
+import type {Every} from './internal/array.d.ts';
 
 /**
 Returns a boolean for whether the given string literal is lowercase.
diff --git a/source/is-tuple.d.ts b/source/is-tuple.d.ts
@@ -1,7 +1,7 @@
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {ApplyDefaultOptions} from './internal/index.d.ts';
-import type {IsAny} from './is-any.js';
-import type {IsNever} from './is-never.js';
+import type {IsAny} from './is-any.d.ts';
+import type {IsNever} from './is-never.d.ts';
 import type {UnknownArray} from './unknown-array.d.ts';
 
 /**
diff --git a/source/is-uppercase.d.ts b/source/is-uppercase.d.ts
@@ -1,4 +1,4 @@
-import type {Every} from './internal/array.js';
+import type {Every} from './internal/array.d.ts';
 
 /**
 Returns a boolean for whether the given string literal is uppercase.
diff --git a/source/partial-on-undefined-deep.d.ts b/source/partial-on-undefined-deep.d.ts
@@ -1,6 +1,6 @@
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {ApplyDefaultOptions, BuiltIns, LiteralKeyOf} from './internal/index.d.ts';
-import type {IsUnknown} from './is-unknown.js';
+import type {IsUnknown} from './is-unknown.d.ts';
 import type {Merge} from './merge.d.ts';
 
 /**
diff --git a/source/require-all-or-none.d.ts b/source/require-all-or-none.d.ts
@@ -1,7 +1,7 @@
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {IfNotAnyOrNever, RequireNone} from './internal/index.d.ts';
-import type {IsAny} from './is-any.js';
-import type {IsNever} from './is-never.js';
+import type {IsAny} from './is-any.d.ts';
+import type {IsNever} from './is-never.d.ts';
 
 /**
 Requires all of the keys in the given object.
diff --git a/source/require-at-least-one.d.ts b/source/require-at-least-one.d.ts
@@ -1,8 +1,8 @@
 import type {Except} from './except.d.ts';
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {IfNotAnyOrNever} from './internal/index.d.ts';
-import type {IsAny} from './is-any.js';
-import type {IsNever} from './is-never.js';
+import type {IsAny} from './is-any.d.ts';
+import type {IsNever} from './is-never.d.ts';
 
 /**
 Create a type that requires at least one of the given keys. The remaining keys are kept as is.
diff --git a/source/require-exactly-one.d.ts b/source/require-exactly-one.d.ts
@@ -1,7 +1,7 @@
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {IfNotAnyOrNever} from './internal/index.d.ts';
-import type {IsAny} from './is-any.js';
-import type {IsNever} from './is-never.js';
+import type {IsAny} from './is-any.d.ts';
+import type {IsNever} from './is-never.d.ts';
 
 /**
 Create a type that requires exactly one of the given keys and disallows more. The remaining keys are kept as is.
diff --git a/source/require-one-or-none.d.ts b/source/require-one-or-none.d.ts
@@ -1,8 +1,8 @@
 import type {RequireExactlyOne} from './require-exactly-one.d.ts';
 import type {IfNotAnyOrNever, RequireNone} from './internal/index.d.ts';
-import type {If} from './if.js';
-import type {IsAny} from './is-any.js';
-import type {IsNever} from './is-never.js';
+import type {If} from './if.d.ts';
+import type {IsAny} from './is-any.d.ts';
+import type {IsNever} from './is-never.d.ts';
 
 /**
 Create a type that requires exactly one of the given keys and disallows more, or none of the given keys. The remaining keys are kept as is.
diff --git a/source/schema.d.ts b/source/schema.d.ts
@@ -1,8 +1,8 @@
-import type {ApplyDefaultOptions} from './internal/object.js';
-import type {IfNotAnyOrNever, NonRecursiveType} from './internal/type.js';
-import type {OptionalKeysOf} from './optional-keys-of.js';
-import type {Simplify} from './simplify.js';
-import type {UnknownArray} from './unknown-array.js';
+import type {ApplyDefaultOptions} from './internal/object.d.ts';
+import type {IfNotAnyOrNever, NonRecursiveType} from './internal/type.d.ts';
+import type {OptionalKeysOf} from './optional-keys-of.d.ts';
+import type {Simplify} from './simplify.d.ts';
+import type {UnknownArray} from './unknown-array.d.ts';
 
 /**
 @see {@link Schema}
diff --git a/source/set-required.d.ts b/source/set-required.d.ts
@@ -1,5 +1,5 @@
 import type {Except} from './except.d.ts';
-import type {If} from './if.js';
+import type {If} from './if.d.ts';
 import type {HomomorphicPick, IsArrayReadonly} from './internal/index.d.ts';
 import type {OptionalKeysOf} from './optional-keys-of.d.ts';
 import type {Simplify} from './simplify.d.ts';
diff --git a/source/single-key-object.d.ts b/source/single-key-object.d.ts
@@ -1,5 +1,5 @@
-import type {IsEmptyObject} from './empty-object.js';
-import type {If} from './if.js';
+import type {IsEmptyObject} from './empty-object.d.ts';
+import type {If} from './if.d.ts';
 import type {IsUnion} from './is-union.d.ts';
 
 /**
diff --git a/source/tuple-to-object.d.ts b/source/tuple-to-object.d.ts
@@ -1,7 +1,7 @@
 import type {IsTuple} from './is-tuple.d.ts';
 import type {UnknownArray} from './unknown-array.d.ts';
-import type {IsAny} from './is-any.js';
-import type {If} from './if.js';
+import type {IsAny} from './is-any.d.ts';
+import type {If} from './if.d.ts';
 
 /**
 Transforms a tuple into an object, mapping each tuple index to its corresponding type as a key-value pair.
diff --git a/test-d/exclude-strict.ts b/test-d/exclude-strict.ts
@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import type {ExcludeStrict} from '../source/exclude-strict.js';
+import type {ExcludeStrict} from '../source/exclude-strict.d.ts';
 
 // Primitive union tests
 
diff --git a/test-d/if.ts b/test-d/if.ts
@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import type {If} from '../source/if.js';
+import type {If} from '../source/if.d.ts';
 
 expectType<string>({} as If<true, string, number>);
 expectType<number>({} as If<false, string, number>);
diff --git a/test-d/internal/collapse-literals-in-union.ts b/test-d/internal/collapse-literals-in-union.ts
@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import type {CollapseLiterals} from '../../source/internal/object.js';
+import type {CollapseLiterals} from '../../source/internal/object.d.ts';
 
 declare const sym1: unique symbol;
 declare const sym2: unique symbol;
diff --git a/test-d/internal/every.ts b/test-d/internal/every.ts
@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import type {Every} from '../../source/internal/array.js';
+import type {Every} from '../../source/internal/array.d.ts';
 
 expectType<Every<[], number>>(true);
 expectType<Every<[1, 2, 3], number>>(true);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type {If} from './if.js';`
	`1`	`+import type {If} from './if.d.ts';`
`2`	`2`	`import type {ApplyDefaultOptions, IsArrayReadonly} from './internal/index.d.ts';`
`3`	`3`	`import type {UnknownArray} from './unknown-array.d.ts';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type {IsNever} from './is-never.js';`
	`1`	`+import type {IsNever} from './is-never.d.ts';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	An if-else-like type that resolves depending on whether the given `boolean` type is `true` or `false`.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type {Every} from './internal/array.js';`
	`1`	`+import type {Every} from './internal/array.d.ts';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`Returns a boolean for whether the given string literal is lowercase.`