Skip to content

Commit b23de39

Browse files
json-qjson-q
authored
chore: enable Rslint rule: @typescript-eslint/no-redundant-type-constituents (#11986)
1 parent 72465af commit b23de39

9 files changed

Lines changed: 57 additions & 48 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"lint:js": "pnpm run lint-ci:js --write",
3434
"lint-ci:js": "biome check --diagnostic-level=warn --no-errors-on-unmatched --max-diagnostics=none --error-on-warnings",
3535
"lint:rs": "cargo clippy --workspace --all-targets",
36-
"lint:type": "rslint --config rslint.json --max-warnings=2283",
36+
"lint:type": "rslint --config rslint.json --max-warnings=2232",
3737
"build:binding:dev": "pnpm --filter @rspack/binding run build:dev",
3838
"build:binding:debug": "pnpm --filter @rspack/binding run build:debug",
3939
"build:binding:ci": "pnpm --filter @rspack/binding run build:ci",

‎packages/rspack/etc/core.api.md‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ interface BlockStatement extends Node_4, HasSpan {
483483
}
484484

485485
// @public (undocumented)
486-
type BonjourServer = any;
486+
type BonjourServer = Record<string, any>;
487487

488488
// @public (undocumented)
489489
interface BooleanLiteral extends Node_4, HasSpan {
@@ -645,7 +645,7 @@ export type ChunkLoading = false | ChunkLoadingType;
645645
export type ChunkLoadingGlobal = string;
646646

647647
// @public
648-
export type ChunkLoadingType = string | "jsonp" | "import-scripts" | "require" | "async-node" | "import";
648+
export type ChunkLoadingType = LiteralUnion<"jsonp" | "import-scripts" | "require" | "async-node" | "import", string>;
649649

650650
// @public (undocumented)
651651
export type ChunkPathData = {
@@ -1636,7 +1636,7 @@ export interface CssExtractRspackPluginOptions {
16361636
// (undocumented)
16371637
insert?: string | ((linkTag: HTMLLinkElement) => void);
16381638
// (undocumented)
1639-
linkType?: string | "text/css" | false;
1639+
linkType?: LiteralUnion<"text/css", string> | false;
16401640
// (undocumented)
16411641
pathinfo?: boolean;
16421642
// (undocumented)
@@ -1780,7 +1780,7 @@ type DevServerOptions<A extends BasicApplication = BasicApplication, S extends B
17801780
compress?: boolean | undefined;
17811781
allowedHosts?: string | string[] | undefined;
17821782
historyApiFallback?: boolean | HistoryApiFallbackOptions | undefined;
1783-
bonjour?: boolean | Record<string, never> | BonjourServer | undefined;
1783+
bonjour?: boolean | BonjourServer | undefined;
17841784
watchFiles?: string | string[] | WatchFiles | (string | WatchFiles)[] | undefined;
17851785
static?: string | boolean | Static | (string | Static)[] | undefined;
17861786
server?: ServerType<A, S> | ServerConfiguration<A, S> | undefined;
@@ -2890,7 +2890,7 @@ interface GlobalPassOption {
28902890
}
28912891

28922892
// @public (undocumented)
2893-
type GotHandler = (result: any | null, callback: (error: Error | null) => void) => void;
2893+
type GotHandler<T = any> = (result: T | null, callback: (error: Error | null) => void) => void;
28942894

28952895
// @public (undocumented)
28962896
type GroupConfig<T, R = T> = {
@@ -4202,7 +4202,7 @@ export type LibraryOptions = {
42024202
};
42034203

42044204
// @public
4205-
export type LibraryType = string | "var" | "module" | "assign" | "assign-properties" | "this" | "window" | "self" | "global" | "commonjs" | "commonjs2" | "commonjs-module" | "commonjs-static" | "amd" | "amd-require" | "umd" | "umd2" | "jsonp" | "system";
4205+
export type LibraryType = LiteralUnion<"var" | "module" | "assign" | "assign-properties" | "this" | "window" | "self" | "global" | "commonjs" | "commonjs2" | "commonjs-module" | "commonjs-static" | "amd" | "amd-require" | "umd" | "umd2" | "jsonp" | "system", string>;
42064206

42074207
// @public (undocumented)
42084208
export type LightningcssFeatureOptions = {
@@ -4296,6 +4296,9 @@ const LimitChunkCountPlugin: {
42964296
// @public (undocumented)
42974297
type Literal = StringLiteral | BooleanLiteral | NullLiteral | NumericLiteral | BigIntLiteral | RegExpLiteral | JSXText;
42984298

4299+
// @public
4300+
export type LiteralUnion<T extends U, U> = T | (U & Record<never, never>);
4301+
42994302
// @public (undocumented)
43004303
export type Loader = Record<string, any>;
43014304

@@ -5654,7 +5657,7 @@ type PluginImportOptions = PluginImportConfig[];
56545657
export type Plugins = Plugin_2[];
56555658

56565659
// @public (undocumented)
5657-
type Port = number | string | "auto";
5660+
type Port = number | LiteralUnion<"auto", string>;
56585661

56595662
// @public (undocumented)
56605663
type PrintedElement = {
@@ -5789,8 +5792,8 @@ type ProxyConfigArray = (ProxyConfigArrayItem | ((req?: Request_2, res?: Respons
57895792

57905793
// @public (undocumented)
57915794
type ProxyConfigArrayItem = {
5792-
path?: HttpProxyMiddlewareOptionsFilter | undefined;
5793-
context?: HttpProxyMiddlewareOptionsFilter | undefined;
5795+
path?: HttpProxyMiddlewareOptionsFilter;
5796+
context?: HttpProxyMiddlewareOptionsFilter;
57945797
} & {
57955798
bypass?: ByPass;
57965799
} & {
@@ -5812,7 +5815,7 @@ interface PseudoClasses {
58125815
}
58135816

58145817
// @public
5815-
export type PublicPath = "auto" | Filename;
5818+
export type PublicPath = LiteralUnion<"auto", string> | Exclude<Filename, string>;
58165819

58175820
// @public (undocumented)
58185821
type Purge = (files?: string | string[] | Set<string>) => void;
@@ -6483,6 +6486,7 @@ declare namespace rspackExports {
64836486
IgnoreWarningsNormalized,
64846487
OptimizationRuntimeChunkNormalized,
64856488
RspackOptionsNormalized,
6489+
LiteralUnion,
64866490
FilenameTemplate,
64876491
Filename,
64886492
Name,
@@ -7112,7 +7116,7 @@ type ServerOptions = ServerOptions_2 & {
71127116
type ServerResponse_2 = ServerResponse;
71137117

71147118
// @public (undocumented)
7115-
type ServerType<A extends BasicApplication = BasicApplication, S extends BasicServer = Server_3<IncomingMessage, ServerResponse>> = "http" | "https" | "spdy" | "http2" | string | ((arg0: ServerOptions, arg1: A) => S);
7119+
type ServerType<A extends BasicApplication = BasicApplication, S extends BasicServer = Server_3<IncomingMessage, ServerResponse>> = LiteralUnion<"http" | "https" | "spdy" | "http2", string> | ((arg0: ServerOptions, arg1: A) => S);
71167120

71177121
// @public (undocumented)
71187122
type ServeStaticOptions = {
@@ -8088,7 +8092,7 @@ interface TerserCompressOptions_2 {
80888092
type TerserEcmaVersion = 5 | 2015 | 2016 | string | number;
80898093

80908094
// @public (undocumented)
8091-
type TerserEcmaVersion_2 = 5 | 2015 | 2016 | string | number;
8095+
type TerserEcmaVersion_2 = LiteralUnion<5 | 2015 | 2016, number> | string;
80928096

80938097
// @public (undocumented)
80948098
interface TerserMangleOptions {
@@ -9018,7 +9022,7 @@ export const wasm: Wasm;
90189022
export type WasmLoading = false | WasmLoadingType;
90199023

90209024
// @public
9021-
export type WasmLoadingType = string | "fetch-streaming" | "fetch" | "async-node";
9025+
export type WasmLoadingType = LiteralUnion<"fetch-streaming" | "fetch" | "async-node", string>;
90229026

90239027
// @public (undocumented)
90249028
type WasmPlugin = [wasmPackage: string, config: Record<string, any>];

‎packages/rspack/src/builtin-plugin/SwcJsMinimizerPlugin.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
type RawSwcJsMinimizerRspackPluginOptions
55
} from "@rspack/binding";
66

7+
import type { LiteralUnion } from "../config";
78
import type { AssetConditions } from "../util/assetCondition";
89
import { create } from "./base";
910

@@ -148,7 +149,7 @@ export interface JsFormatOptions {
148149
wrapFuncArgs?: boolean;
149150
}
150151

151-
export type TerserEcmaVersion = 5 | 2015 | 2016 | string | number;
152+
export type TerserEcmaVersion = LiteralUnion<5 | 2015 | 2016, number> | string;
152153
export interface TerserCompressOptions {
153154
arguments?: boolean;
154155
arrows?: boolean;

‎packages/rspack/src/builtin-plugin/css-extract/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
BuiltinPluginName,
44
type RawCssExtractPluginOption
55
} from "@rspack/binding";
6-
import type { Compiler } from "../..";
6+
import type { Compiler, LiteralUnion } from "../..";
77
import { MODULE_TYPE } from "./loader";
88
import { PLUGIN_NAME } from "./utils";
99

@@ -20,7 +20,7 @@ export interface CssExtractRspackPluginOptions {
2020
ignoreOrder?: boolean;
2121
insert?: string | ((linkTag: HTMLLinkElement) => void);
2222
attributes?: Record<string, string>;
23-
linkType?: string | "text/css" | false;
23+
linkType?: LiteralUnion<"text/css", string> | false;
2424
runtime?: boolean;
2525

2626
// workaround for pathinto, deprecate this when rspack supports pathinfo

‎packages/rspack/src/config/devServer.ts‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
* Copyright (c) JS Foundation and other contributors
88
* https://github.com/webpack/webpack-dev-server/blob/master/LICENSE
99
*/
10-
import type { Compiler, MultiCompiler, MultiStats, Stats, Watching } from "..";
10+
import type {
11+
Compiler,
12+
LiteralUnion,
13+
MultiCompiler,
14+
MultiStats,
15+
Stats,
16+
Watching
17+
} from "..";
1118

1219
type Logger = ReturnType<Compiler["getInfrastructureLogger"]>;
1320
type MultiWatching = MultiCompiler["watch"];
@@ -51,7 +58,7 @@ type OutputFileSystem = import("..").OutputFileSystem & {
5158
readFileSync: typeof import("fs").readFileSync;
5259
};
5360
type RspackConfiguration = import("..").Configuration;
54-
type Port = number | string | "auto";
61+
type Port = number | LiteralUnion<"auto", string>;
5562

5663
type HistoryContext = {
5764
readonly match: RegExpMatchArray;
@@ -108,7 +115,7 @@ type DevMiddlewareOptions<
108115
};
109116

110117
type BasicApplication = any;
111-
type BonjourServer = any;
118+
type BonjourServer = Record<string, any>;
112119
type ChokidarWatchOptions = { [key: string]: any };
113120
type ServeIndexOptions = { [key: string]: any };
114121
type ServeStaticOptions = { [key: string]: any };
@@ -149,11 +156,7 @@ type ServerType<
149156
typeof import("http").ServerResponse
150157
>
151158
> =
152-
| "http"
153-
| "https"
154-
| "spdy"
155-
| "http2"
156-
| string
159+
| LiteralUnion<"http" | "https" | "spdy" | "http2", string>
157160
| ((arg0: ServerOptions, arg1: A) => S);
158161

159162
type ServerConfiguration<
@@ -173,8 +176,8 @@ type WebSocketServerConfiguration = {
173176
};
174177
type NextFunction = (err?: any) => void;
175178
type ProxyConfigArrayItem = {
176-
path?: HttpProxyMiddlewareOptionsFilter | undefined;
177-
context?: HttpProxyMiddlewareOptionsFilter | undefined;
179+
path?: HttpProxyMiddlewareOptionsFilter;
180+
context?: HttpProxyMiddlewareOptionsFilter;
178181
} & {
179182
bypass?: ByPass;
180183
} & {
@@ -282,7 +285,7 @@ export type DevServerOptions<
282285
compress?: boolean | undefined;
283286
allowedHosts?: string | string[] | undefined;
284287
historyApiFallback?: boolean | HistoryApiFallbackOptions | undefined;
285-
bonjour?: boolean | Record<string, never> | BonjourServer | undefined;
288+
bonjour?: boolean | BonjourServer | undefined;
286289
watchFiles?:
287290
| string
288291
| string[]

‎packages/rspack/src/config/types.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import type ModuleGraph from "../ModuleGraph";
1010
import type { ResolveCallback } from "./adapterRuleUse";
1111
import type { DevServerOptions } from "./devServer";
1212

13+
/** https://github.com/microsoft/TypeScript/issues/29729 */
14+
export type LiteralUnion<T extends U, U> = T | (U & Record<never, never>);
15+
1316
export type FilenameTemplate = string;
1417

1518
export type Filename =
@@ -48,19 +51,18 @@ export type Falsy = false | "" | 0 | null | undefined;
4851

4952
//#region Entry
5053
/** The publicPath of the resource referenced by this entry. */
51-
export type PublicPath = "auto" | Filename;
54+
export type PublicPath =
55+
| LiteralUnion<"auto", string>
56+
| Exclude<Filename, string>;
5257

5358
/** The baseURI of the resource referenced by this entry. */
5459
export type BaseUri = string;
5560

5661
/** How this entry load other chunks. */
57-
export type ChunkLoadingType =
58-
| string
59-
| "jsonp"
60-
| "import-scripts"
61-
| "require"
62-
| "async-node"
63-
| "import";
62+
export type ChunkLoadingType = LiteralUnion<
63+
"jsonp" | "import-scripts" | "require" | "async-node" | "import",
64+
string
65+
>;
6466

6567
/** How this entry load other chunks. */
6668
export type ChunkLoading = false | ChunkLoadingType;
@@ -69,11 +71,10 @@ export type ChunkLoading = false | ChunkLoadingType;
6971
export type AsyncChunks = boolean;
7072

7173
/** Option to set the method of loading WebAssembly Modules. */
72-
export type WasmLoadingType =
73-
| string
74-
| "fetch-streaming"
75-
| "fetch"
76-
| "async-node";
74+
export type WasmLoadingType = LiteralUnion<
75+
"fetch-streaming" | "fetch" | "async-node",
76+
string
77+
>;
7778

7879
/** Option to set the method of loading WebAssembly Modules. */
7980
export type WasmLoading = false | WasmLoadingType;
@@ -106,8 +107,7 @@ export type AuxiliaryComment = string | LibraryCustomUmdCommentObject;
106107
export type LibraryExport = string | string[];
107108

108109
/** Configure how the library will be exposed. */
109-
export type LibraryType =
110-
| string
110+
export type LibraryType = LiteralUnion<
111111
| "var"
112112
| "module"
113113
| "assign"
@@ -125,7 +125,9 @@ export type LibraryType =
125125
| "umd"
126126
| "umd2"
127127
| "jsonp"
128-
| "system";
128+
| "system",
129+
string
130+
>;
129131

130132
/** When using output.library.type: "umd", setting output.library.umdNamedDefine to true will name the AMD module of the UMD build. */
131133
export type UmdNamedDefine = boolean;

‎packages/rspack/src/lib/Cache.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export interface Etag {
2323

2424
export type CallbackCache<T> = (err?: WebpackError | null, result?: T) => void;
2525

26-
type GotHandler = (
27-
result: any | null,
26+
type GotHandler<T = any> = (
27+
result: T | null,
2828
callback: (error: Error | null) => void
2929
) => void;
3030

‎packages/rspack/src/loader-runner/service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export enum RequestSyncType {
136136
export type HandleIncomingRequest = (
137137
requestType: RequestType,
138138
...args: any[]
139-
) => Promise<any> | any;
139+
) => any;
140140

141141
// content, sourceMap, additionalData
142142
type WorkerArgs = any[];

‎rslint.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
}
1414
},
1515
"rules": {
16-
"@typescript-eslint/no-redundant-type-constituents": "warn",
1716
"@typescript-eslint/no-explicit-any": "warn",
1817
"@typescript-eslint/no-unsafe-argument": "warn",
1918
"@typescript-eslint/no-unsafe-member-access": "warn",

0 commit comments

Comments
 (0)