rolldown 1.0.0-beta.8-commit.852c603 → 1.0.0-beta.8-commit.a720367

package/dist/shared/filter-index-hnEzlqRW.mjs

@@ -0,0 +1,174 @@
+import { __esm } from "./chunk-DUYDk_2O.mjs";
+
+//#region src/utils/misc.ts
+function arraify(value) {
+	return Array.isArray(value) ? value : [value];
+}
+function isNullish(value) {
+	return value === null || value === void 0;
+}
+function isPromiseLike(value) {
+	return value && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
+}
+function unimplemented(info) {
+	if (info) throw new Error(`unimplemented: ${info}`);
+	throw new Error("unimplemented");
+}
+function unreachable(info) {
+	if (info) throw new Error(`unreachable: ${info}`);
+	throw new Error("unreachable");
+}
+function unsupported(info) {
+	throw new Error(`UNSUPPORTED: ${info}`);
+}
+function noop(..._args) {}
+var init_misc = __esm({ "src/utils/misc.ts"() {} });
+
+//#endregion
+//#region src/plugin/with-filter.ts
+function withFilterImpl(pluginOption, filterObjectList) {
+	if (isPromiseLike(pluginOption)) return pluginOption.then((p) => withFilter(p, filterObjectList));
+	if (pluginOption == false || pluginOption == null) return pluginOption;
+	if (Array.isArray(pluginOption)) return pluginOption.map((p) => withFilter(p, filterObjectList));
+	let plugin = pluginOption;
+	let filterObjectIndex = findMatchedFilterObject(plugin.name, filterObjectList);
+	if (filterObjectIndex === -1) return plugin;
+	let filterObject = filterObjectList[filterObjectIndex];
+	Object.keys(plugin).forEach((key) => {
+		switch (key) {
+			case "transform":
+			case "resolveId":
+			case "load":
+				if (!plugin[key]) return;
+				if (typeof plugin[key] === "object") plugin[key].filter = filterObject[key] ?? plugin[key].filter;
+				else plugin[key] = {
+					handler: plugin[key],
+					filter: filterObject[key]
+				};
+				break;
+			default: break;
+		}
+	});
+	return plugin;
+}
+function withFilter(pluginOption, filterObject) {
+	return withFilterImpl(pluginOption, arraify(filterObject));
+}
+function findMatchedFilterObject(pluginName, overrideFilterObjectList) {
+	if (overrideFilterObjectList.length === 1 && overrideFilterObjectList[0].pluginNamePattern === void 0) return 0;
+	for (let i = 0; i < overrideFilterObjectList.length; i++) for (let j = 0; j < (overrideFilterObjectList[i].pluginNamePattern ?? []).length; j++) {
+		let pattern = overrideFilterObjectList[i].pluginNamePattern[j];
+		if (typeof pattern === "string" && pattern === pluginName) return i;
+		else if (pattern instanceof RegExp && pattern.test(pluginName)) return i;
+	}
+	return -1;
+}
+var init_with_filter = __esm({ "src/plugin/with-filter.ts"() {
+	init_misc();
+} });
+
+//#endregion
+//#region src/plugin/index.ts
+var init_plugin = __esm({ "src/plugin/index.ts"() {
+	init_with_filter();
+} });
+
+//#endregion
+//#region src/filter-index.ts
+function and(...args) {
+	return new And(...args);
+}
+function or(...args) {
+	return new Or(...args);
+}
+function not(expr) {
+	return new Not(expr);
+}
+function id(pattern) {
+	return new Id(pattern);
+}
+function moduleType(pattern) {
+	return new ModuleType(pattern);
+}
+function code(pattern) {
+	return new Code(pattern);
+}
+function include(expr) {
+	return new Include(expr);
+}
+function exclude(expr) {
+	return new Exclude(expr);
+}
+var And, Or, Not, Id, ModuleType, Code, Include, Exclude;
+var init_filter_index = __esm({ "src/filter-index.ts"() {
+	init_plugin();
+	And = class {
+		kind;
+		args;
+		constructor(...args) {
+			if (args.length === 0) throw new Error("`And` expects at least one operand");
+			this.args = args;
+			this.kind = "and";
+		}
+	};
+	Or = class {
+		kind;
+		args;
+		constructor(...args) {
+			if (args.length === 0) throw new Error("`Or` expects at least one operand");
+			this.args = args;
+			this.kind = "or";
+		}
+	};
+	Not = class {
+		kind;
+		expr;
+		constructor(expr) {
+			this.expr = expr;
+			this.kind = "not";
+		}
+	};
+	Id = class {
+		kind;
+		pattern;
+		constructor(pattern) {
+			this.pattern = pattern;
+			this.kind = "id";
+		}
+	};
+	ModuleType = class {
+		kind;
+		pattern;
+		constructor(pattern) {
+			this.pattern = pattern;
+			this.kind = "moduleType";
+		}
+	};
+	Code = class {
+		kind;
+		pattern;
+		constructor(expr) {
+			this.pattern = expr;
+			this.kind = "code";
+		}
+	};
+	Include = class {
+		kind;
+		expr;
+		constructor(expr) {
+			this.expr = expr;
+			this.kind = "include";
+		}
+	};
+	Exclude = class {
+		kind;
+		expr;
+		constructor(expr) {
+			this.expr = expr;
+			this.kind = "exclude";
+		}
+	};
+} });
+
+//#endregion
+export { And, and, arraify, code, exclude, id, include, init_filter_index, init_misc, isNullish, moduleType, noop, not, or, unimplemented, unreachable, unsupported, withFilter };

package/dist/shared/{input-options.d-CN-JV5dt.d.mts → input-options.d-B9XQg_yc.d.mts}

@@ -1,4 +1,4 @@
-import { BindingBuildImportAnalysisPluginConfig, BindingBuiltinPluginName, BindingDynamicImportVarsPluginConfig, BindingGlobImportPluginConfig, BindingHmrOutput, BindingHookResolveIdExtraArgs, BindingIsolatedDeclarationPluginConfig, BindingJsonPluginConfig, BindingManifestPluginConfig, BindingMfManifest, BindingMinifyOptions, BindingModuleFederationPluginOption, BindingModulePreloadPolyfillPluginConfig, BindingRemote, BindingRenderedChunk, BindingReportPluginConfig, BindingTransformHookExtraArgs, BindingViteResolvePluginConfig, BindingWatcherEvent, ParserOptions, PreRenderedChunk, TransformOptions } from "./binding.d-BaNmLM9c.mjs";
+import { BindingBuildImportAnalysisPluginConfig, BindingBuiltinPluginName, BindingDynamicImportVarsPluginConfig, BindingGlobImportPluginConfig, BindingHmrOutput, BindingHookResolveIdExtraArgs, BindingIsolatedDeclarationPluginConfig, BindingJsonPluginConfig, BindingManifestPluginConfig, BindingMfManifest, BindingMinifyOptions, BindingModuleFederationPluginOption, BindingModulePreloadPolyfillPluginConfig, BindingRemote, BindingRenderedChunk, BindingReportPluginConfig, BindingTransformHookExtraArgs, BindingViteResolvePluginConfig, BindingWatcherEvent, ParserOptions, PreRenderedChunk, TransformOptions } from "./binding.d-DE0X2d5U.mjs";
 import { Program } from "@oxc-project/types";
 
 //#region src/log/logging.d.ts
@@ -239,7 +239,7 @@ interface OutputOptions {
 			* - Type: `number`
 			* - Default: `0`
 			*
-			* Minimum size of the desired chunk. If accumulated size of captured modules is smaller than this value, this group will be ignored.s
+			* Minimum size of the desired chunk. If accumulated size of captured modules is smaller than this value, this group will be ignored.
 			*/
 			minSize?: number
 			/**
@@ -316,6 +316,7 @@ declare class RolldownBuild {
 	close(): Promise<void>;
 	[Symbol.asyncDispose](): Promise<void>;
 	generateHmrPatch(changedFiles: string[]): Promise<BindingHmrOutput | undefined>;
+	hmrInvalidate(file: string, firstInvalidatedBy?: string): Promise<BindingHmrOutput | undefined>;
 	get watchFiles(): string[];
 }
 
@@ -325,7 +326,7 @@ declare const rolldown: (input: InputOptions) => Promise<RolldownBuild>;
 
 //#endregion
 //#region src/options/watch-options.d.ts
-interface WatchOptions$1 extends InputOptions {
+interface WatchOptions extends InputOptions {
 	output?: OutputOptions | OutputOptions[];
 }
 
@@ -333,7 +334,7 @@ interface WatchOptions$1 extends InputOptions {
 //#region src/api/watch/watch-emitter.d.ts
 type WatcherEvent = "close" | "event" | "restart" | "change";
 type ChangeEvent$1 = "create" | "update" | "delete";
-type RollupWatcherEvent = {
+type RolldownWatcherEvent = {
 	code: "START"
 } | {
 	code: "BUNDLE_START"
@@ -354,7 +355,7 @@ declare class WatcherEmitter {
 	on(event: "change", listener: (id: string, change: {
 		event: ChangeEvent$1
 	}) => MaybePromise<void>): this;
-	on(event: "event", listener: (data: RollupWatcherEvent) => MaybePromise<void>): this;
+	on(event: "event", listener: (data: RolldownWatcherEvent) => MaybePromise<void>): this;
 	on(event: "restart" | "close", listener: () => MaybePromise<void>): this;
 	onEvent(event: BindingWatcherEvent): Promise<void>;
 	close(): Promise<void>;
@@ -363,7 +364,7 @@ type RolldownWatcher = WatcherEmitter;
 
 //#endregion
 //#region src/api/watch/index.d.ts
-declare const watch: (input: WatchOptions$1 | WatchOptions$1[]) => RolldownWatcher;
+declare const watch: (input: WatchOptions | WatchOptions[]) => RolldownWatcher;
 
 //#endregion
 //#region src/log/log-handler.d.ts
@@ -418,21 +419,19 @@ interface NormalizedOutputOptions {
 }
 
 //#endregion
-//#region src/filter-expression-index.d.ts
+//#region src/filter-index.d.ts
 type FilterExpressionKind = FilterExpression["kind"];
 type FilterExpression = And | Or | Not | Id | ModuleType$1 | Code | Include | Exclude$1;
 type TopLevelFilterExpression = Include | Exclude$1;
 declare class And {
 	kind: "and";
-	left: FilterExpression;
-	right: FilterExpression;
-	constructor(left: FilterExpression, right: FilterExpression);
+	args: FilterExpression[];
+	constructor(...args: FilterExpression[]);
 }
 declare class Or {
 	kind: "or";
-	left: FilterExpression;
-	right: FilterExpression;
-	constructor(left: FilterExpression, right: FilterExpression);
+	args: FilterExpression[];
+	constructor(...args: FilterExpression[]);
 }
 declare class Not {
 	kind: "not";
@@ -464,8 +463,8 @@ declare class Exclude$1 {
 	expr: FilterExpression;
 	constructor(expr: FilterExpression);
 }
-declare function and(left: FilterExpression, right: FilterExpression): And;
-declare function or(left: FilterExpression, right: FilterExpression): Or;
+declare function and(...args: FilterExpression[]): And;
+declare function or(...args: FilterExpression[]): Or;
 declare function not(expr: FilterExpression): Not;
 declare function id(pattern: StringOrRegExp): Id;
 declare function moduleType(pattern: ModuleType): ModuleType$1;
@@ -478,7 +477,6 @@ declare function exclude(expr: FilterExpression): Exclude$1;
 type GeneralHookFilter<Value = StringOrRegExp> = MaybeArray<Value> | {
 	include?: MaybeArray<Value>
 	exclude?: MaybeArray<Value>
-	custom?: TopLevelFilterExpression[]
 };
 interface FormalModuleTypeFilter {
 	include?: ModuleType[];
@@ -520,8 +518,8 @@ interface HookFilter {
 	id?: GeneralHookFilter;
 	moduleType?: ModuleTypeFilter;
 	code?: GeneralHookFilter;
-	custom?: TopLevelFilterExpression[];
 }
+type TUnionWithTopLevelFilterExpressionArray<T> = T | TopLevelFilterExpression[];
 
 //#endregion
 //#region src/plugin/minimal-plugin-context.d.ts
@@ -860,15 +858,15 @@ type AddonHooks = DefinedHookNames["banner" | "footer" | "intro" | "outro"];
 type OutputPluginHooks = DefinedHookNames["augmentChunkHash" | "generateBundle" | "outputOptions" | "renderChunk" | "renderError" | "renderStart" | "writeBundle"];
 type ParallelPluginHooks = Exclude<keyof FunctionPluginHooks | AddonHooks, FirstPluginHooks | SequentialPluginHooks>;
 type HookFilterExtension<K extends keyof FunctionPluginHooks> = K extends "transform" ? {
-	filter?: HookFilter
+	filter?: TUnionWithTopLevelFilterExpressionArray<HookFilter>
 } : K extends "load" ? {
-	filter?: Pick<HookFilter, "id" | "custom">
+	filter?: TUnionWithTopLevelFilterExpressionArray<Pick<HookFilter, "id">>
 } : K extends "resolveId" ? {
-	filter?: {
+	filter?: TUnionWithTopLevelFilterExpressionArray<{
 		id?: GeneralHookFilter<RegExp>
-	} & Pick<HookFilter, "custom">
+	}>
 } : K extends "renderChunk" ? {
-	filter?: Pick<HookFilter, "code">
+	filter?: TUnionWithTopLevelFilterExpressionArray<Pick<HookFilter, "code">>
 } : {};
 type PluginHooks = { [K in keyof FunctionPluginHooks] : ObjectHook<K extends AsyncPluginHooks ? MakeAsync<FunctionPluginHooks[K]> : FunctionPluginHooks[K], HookFilterExtension<K> & (K extends ParallelPluginHooks ? {
 	/**
@@ -966,7 +964,7 @@ interface JsxOptions {
 	refresh?: boolean;
 	development?: boolean;
 }
-interface WatchOptions {
+interface WatcherOptions {
 	skipWrite?: boolean;
 	buildDelay?: number;
 	notify?: {
@@ -1116,7 +1114,7 @@ interface InputOptions {
 	*/
 	jsx?: false | "react" | "react-jsx" | "preserve" | JsxOptions;
 	transform?: OxcTransformOption;
-	watch?: WatchOptions | false;
+	watch?: WatcherOptions | false;
 	dropLabels?: string[];
 	keepNames?: boolean;
 	checks?: ChecksOptions;
@@ -1127,4 +1125,4 @@ interface InputOptions {
 }
 
 //#endregion
-export { AddonFunction, And as And$1, AsyncPluginHooks, BuildOptions, BuiltinPlugin as BuiltinPlugin$1, ChunkFileNamesFunction, ConfigExport, CustomPluginOptions, DefineParallelPluginResult, EmittedAsset, EmittedFile, ExistingRawSourceMap, ExternalOption, FilterExpression, FilterExpressionKind, FunctionPluginHooks, GeneralHookFilter, GetModuleInfo, GlobalsFunction, HookFilter, HookFilterExtension, ImportKind, InputOption, InputOptions, InternalModuleFormat, JsxOptions, LoadResult, LogLevel, LogLevelOption, LogOrStringHandler, LoggingFunction, MaybePromise, MinifyOptions, MinimalPluginContext, ModuleFormat, ModuleInfo, ModuleOptions, ModuleType, ModuleTypeFilter, NormalizedInputOptions, NormalizedOutputOptions, ObjectHook, OutputAsset, OutputBundle, OutputChunk, OutputOptions, ParallelPluginHooks, PartialNull, PartialResolvedId, Plugin, PluginContext, PluginContextMeta, PreRenderedAsset, RenderedChunk, RenderedModule, ResolveIdExtraOptions, ResolveIdResult, ResolvedId, RolldownBuild, RolldownOptions, RolldownOutput, RolldownPlugin, RolldownPluginOption, RolldownWatcher, RollupError, RollupLog, RollupLogWithString, SourceDescription, SourceMap, SourceMapInput, SourcemapIgnoreListOption, TopLevelFilterExpression, TransformPluginContext, TransformResult, TreeshakingOptions, VERSION as VERSION$1, WarningHandlerWithDefault, WatchOptions$1 as WatchOptions, and as and$1, build as build$1, buildImportAnalysisPlugin as buildImportAnalysisPlugin$1, code as code$1, defineConfig as defineConfig$1, defineParallelPlugin, dynamicImportVarsPlugin as dynamicImportVarsPlugin$1, exclude as exclude$1, id as id$1, importGlobPlugin as importGlobPlugin$1, include as include$1, isolatedDeclarationPlugin as isolatedDeclarationPlugin$1, jsonPlugin as jsonPlugin$1, loadFallbackPlugin as loadFallbackPlugin$1, manifestPlugin as manifestPlugin$1, moduleFederationPlugin as moduleFederationPlugin$1, modulePreloadPolyfillPlugin as modulePreloadPolyfillPlugin$1, moduleType as moduleType$1, not as not$1, or as or$1, reportPlugin as reportPlugin$1, rolldown as rolldown$1, viteResolvePlugin as viteResolvePlugin$1, wasmFallbackPlugin as wasmFallbackPlugin$1, wasmHelperPlugin as wasmHelperPlugin$1, watch as watch$1, withFilter as withFilter$1 };
+export { AddonFunction, And as And$1, AsyncPluginHooks, BuildOptions, BuiltinPlugin as BuiltinPlugin$1, ChunkFileNamesFunction, ConfigExport, CustomPluginOptions, DefineParallelPluginResult, EmittedAsset, EmittedFile, ExistingRawSourceMap, ExternalOption, FilterExpression, FilterExpressionKind, FunctionPluginHooks, GeneralHookFilter, GetModuleInfo, GlobalsFunction, HookFilter, HookFilterExtension, ImportKind, InputOption, InputOptions, InternalModuleFormat, JsxOptions, LoadResult, LogLevel, LogLevelOption, LogOrStringHandler, LoggingFunction, MaybePromise, MinifyOptions, MinimalPluginContext, ModuleFormat, ModuleInfo, ModuleOptions, ModuleType, ModuleTypeFilter, NormalizedInputOptions, NormalizedOutputOptions, ObjectHook, OutputAsset, OutputBundle, OutputChunk, OutputOptions, ParallelPluginHooks, PartialNull, PartialResolvedId, Plugin, PluginContext, PluginContextMeta, PreRenderedAsset, RenderedChunk, RenderedModule, ResolveIdExtraOptions, ResolveIdResult, ResolvedId, RolldownBuild, RolldownOptions, RolldownOutput, RolldownPlugin, RolldownPluginOption, RolldownWatcher, RolldownWatcherEvent, RollupError, RollupLog, RollupLogWithString, SourceDescription, SourceMap, SourceMapInput, SourcemapIgnoreListOption, TopLevelFilterExpression, TransformPluginContext, TransformResult, TreeshakingOptions, VERSION as VERSION$1, WarningHandlerWithDefault, WatchOptions, WatcherOptions, and as and$1, build as build$1, buildImportAnalysisPlugin as buildImportAnalysisPlugin$1, code as code$1, defineConfig as defineConfig$1, defineParallelPlugin, dynamicImportVarsPlugin as dynamicImportVarsPlugin$1, exclude as exclude$1, id as id$1, importGlobPlugin as importGlobPlugin$1, include as include$1, isolatedDeclarationPlugin as isolatedDeclarationPlugin$1, jsonPlugin as jsonPlugin$1, loadFallbackPlugin as loadFallbackPlugin$1, manifestPlugin as manifestPlugin$1, moduleFederationPlugin as moduleFederationPlugin$1, modulePreloadPolyfillPlugin as modulePreloadPolyfillPlugin$1, moduleType as moduleType$1, not as not$1, or as or$1, reportPlugin as reportPlugin$1, rolldown as rolldown$1, viteResolvePlugin as viteResolvePlugin$1, wasmFallbackPlugin as wasmFallbackPlugin$1, wasmHelperPlugin as wasmHelperPlugin$1, watch as watch$1, withFilter as withFilter$1 };

package/dist/shared/{input-options.d-BHwth6VM.d.cts → input-options.d-BP-ZTUFR.d.cts}

@@ -1,4 +1,4 @@
-import { BindingBuildImportAnalysisPluginConfig, BindingBuiltinPluginName, BindingDynamicImportVarsPluginConfig, BindingGlobImportPluginConfig, BindingHmrOutput, BindingHookResolveIdExtraArgs, BindingIsolatedDeclarationPluginConfig, BindingJsonPluginConfig, BindingManifestPluginConfig, BindingMfManifest, BindingMinifyOptions, BindingModuleFederationPluginOption, BindingModulePreloadPolyfillPluginConfig, BindingRemote, BindingRenderedChunk, BindingReportPluginConfig, BindingTransformHookExtraArgs, BindingViteResolvePluginConfig, BindingWatcherEvent, ParserOptions, PreRenderedChunk, TransformOptions } from "./binding.d-y7dWnUxd.cjs";
+import { BindingBuildImportAnalysisPluginConfig, BindingBuiltinPluginName, BindingDynamicImportVarsPluginConfig, BindingGlobImportPluginConfig, BindingHmrOutput, BindingHookResolveIdExtraArgs, BindingIsolatedDeclarationPluginConfig, BindingJsonPluginConfig, BindingManifestPluginConfig, BindingMfManifest, BindingMinifyOptions, BindingModuleFederationPluginOption, BindingModulePreloadPolyfillPluginConfig, BindingRemote, BindingRenderedChunk, BindingReportPluginConfig, BindingTransformHookExtraArgs, BindingViteResolvePluginConfig, BindingWatcherEvent, ParserOptions, PreRenderedChunk, TransformOptions } from "./binding.d-BqY7GV3f.cjs";
 import { Program } from "@oxc-project/types";
 
 //#region src/log/logging.d.ts
@@ -239,7 +239,7 @@ interface OutputOptions {
 			* - Type: `number`
 			* - Default: `0`
 			*
-			* Minimum size of the desired chunk. If accumulated size of captured modules is smaller than this value, this group will be ignored.s
+			* Minimum size of the desired chunk. If accumulated size of captured modules is smaller than this value, this group will be ignored.
 			*/
 			minSize?: number
 			/**
@@ -316,6 +316,7 @@ declare class RolldownBuild {
 	close(): Promise<void>;
 	[Symbol.asyncDispose](): Promise<void>;
 	generateHmrPatch(changedFiles: string[]): Promise<BindingHmrOutput | undefined>;
+	hmrInvalidate(file: string, firstInvalidatedBy?: string): Promise<BindingHmrOutput | undefined>;
 	get watchFiles(): string[];
 }
 
@@ -325,7 +326,7 @@ declare const rolldown: (input: InputOptions) => Promise<RolldownBuild>;
 
 //#endregion
 //#region src/options/watch-options.d.ts
-interface WatchOptions$1 extends InputOptions {
+interface WatchOptions extends InputOptions {
 	output?: OutputOptions | OutputOptions[];
 }
 
@@ -333,7 +334,7 @@ interface WatchOptions$1 extends InputOptions {
 //#region src/api/watch/watch-emitter.d.ts
 type WatcherEvent = "close" | "event" | "restart" | "change";
 type ChangeEvent$1 = "create" | "update" | "delete";
-type RollupWatcherEvent = {
+type RolldownWatcherEvent = {
 	code: "START"
 } | {
 	code: "BUNDLE_START"
@@ -354,7 +355,7 @@ declare class WatcherEmitter {
 	on(event: "change", listener: (id: string, change: {
 		event: ChangeEvent$1
 	}) => MaybePromise<void>): this;
-	on(event: "event", listener: (data: RollupWatcherEvent) => MaybePromise<void>): this;
+	on(event: "event", listener: (data: RolldownWatcherEvent) => MaybePromise<void>): this;
 	on(event: "restart" | "close", listener: () => MaybePromise<void>): this;
 	onEvent(event: BindingWatcherEvent): Promise<void>;
 	close(): Promise<void>;
@@ -363,7 +364,7 @@ type RolldownWatcher = WatcherEmitter;
 
 //#endregion
 //#region src/api/watch/index.d.ts
-declare const watch: (input: WatchOptions$1 | WatchOptions$1[]) => RolldownWatcher;
+declare const watch: (input: WatchOptions | WatchOptions[]) => RolldownWatcher;
 
 //#endregion
 //#region src/log/log-handler.d.ts
@@ -418,21 +419,19 @@ interface NormalizedOutputOptions {
 }
 
 //#endregion
-//#region src/filter-expression-index.d.ts
+//#region src/filter-index.d.ts
 type FilterExpressionKind = FilterExpression["kind"];
 type FilterExpression = And | Or | Not | Id | ModuleType$1 | Code | Include | Exclude$1;
 type TopLevelFilterExpression = Include | Exclude$1;
 declare class And {
 	kind: "and";
-	left: FilterExpression;
-	right: FilterExpression;
-	constructor(left: FilterExpression, right: FilterExpression);
+	args: FilterExpression[];
+	constructor(...args: FilterExpression[]);
 }
 declare class Or {
 	kind: "or";
-	left: FilterExpression;
-	right: FilterExpression;
-	constructor(left: FilterExpression, right: FilterExpression);
+	args: FilterExpression[];
+	constructor(...args: FilterExpression[]);
 }
 declare class Not {
 	kind: "not";
@@ -464,8 +463,8 @@ declare class Exclude$1 {
 	expr: FilterExpression;
 	constructor(expr: FilterExpression);
 }
-declare function and(left: FilterExpression, right: FilterExpression): And;
-declare function or(left: FilterExpression, right: FilterExpression): Or;
+declare function and(...args: FilterExpression[]): And;
+declare function or(...args: FilterExpression[]): Or;
 declare function not(expr: FilterExpression): Not;
 declare function id(pattern: StringOrRegExp): Id;
 declare function moduleType(pattern: ModuleType): ModuleType$1;
@@ -478,7 +477,6 @@ declare function exclude(expr: FilterExpression): Exclude$1;
 type GeneralHookFilter<Value = StringOrRegExp> = MaybeArray<Value> | {
 	include?: MaybeArray<Value>
 	exclude?: MaybeArray<Value>
-	custom?: TopLevelFilterExpression[]
 };
 interface FormalModuleTypeFilter {
 	include?: ModuleType[];
@@ -520,8 +518,8 @@ interface HookFilter {
 	id?: GeneralHookFilter;
 	moduleType?: ModuleTypeFilter;
 	code?: GeneralHookFilter;
-	custom?: TopLevelFilterExpression[];
 }
+type TUnionWithTopLevelFilterExpressionArray<T> = T | TopLevelFilterExpression[];
 
 //#endregion
 //#region src/plugin/minimal-plugin-context.d.ts
@@ -860,15 +858,15 @@ type AddonHooks = DefinedHookNames["banner" | "footer" | "intro" | "outro"];
 type OutputPluginHooks = DefinedHookNames["augmentChunkHash" | "generateBundle" | "outputOptions" | "renderChunk" | "renderError" | "renderStart" | "writeBundle"];
 type ParallelPluginHooks = Exclude<keyof FunctionPluginHooks | AddonHooks, FirstPluginHooks | SequentialPluginHooks>;
 type HookFilterExtension<K extends keyof FunctionPluginHooks> = K extends "transform" ? {
-	filter?: HookFilter
+	filter?: TUnionWithTopLevelFilterExpressionArray<HookFilter>
 } : K extends "load" ? {
-	filter?: Pick<HookFilter, "id" | "custom">
+	filter?: TUnionWithTopLevelFilterExpressionArray<Pick<HookFilter, "id">>
 } : K extends "resolveId" ? {
-	filter?: {
+	filter?: TUnionWithTopLevelFilterExpressionArray<{
 		id?: GeneralHookFilter<RegExp>
-	} & Pick<HookFilter, "custom">
+	}>
 } : K extends "renderChunk" ? {
-	filter?: Pick<HookFilter, "code">
+	filter?: TUnionWithTopLevelFilterExpressionArray<Pick<HookFilter, "code">>
 } : {};
 type PluginHooks = { [K in keyof FunctionPluginHooks] : ObjectHook<K extends AsyncPluginHooks ? MakeAsync<FunctionPluginHooks[K]> : FunctionPluginHooks[K], HookFilterExtension<K> & (K extends ParallelPluginHooks ? {
 	/**
@@ -966,7 +964,7 @@ interface JsxOptions {
 	refresh?: boolean;
 	development?: boolean;
 }
-interface WatchOptions {
+interface WatcherOptions {
 	skipWrite?: boolean;
 	buildDelay?: number;
 	notify?: {
@@ -1116,7 +1114,7 @@ interface InputOptions {
 	*/
 	jsx?: false | "react" | "react-jsx" | "preserve" | JsxOptions;
 	transform?: OxcTransformOption;
-	watch?: WatchOptions | false;
+	watch?: WatcherOptions | false;
 	dropLabels?: string[];
 	keepNames?: boolean;
 	checks?: ChecksOptions;
@@ -1127,4 +1125,4 @@ interface InputOptions {
 }
 
 //#endregion
-export { AddonFunction, And, AsyncPluginHooks, BuildOptions, BuiltinPlugin, ChunkFileNamesFunction, ConfigExport, CustomPluginOptions, DefineParallelPluginResult, EmittedAsset, EmittedFile, ExistingRawSourceMap, ExternalOption, FilterExpression, FilterExpressionKind, FunctionPluginHooks, GeneralHookFilter, GetModuleInfo, GlobalsFunction, HookFilter, HookFilterExtension, ImportKind, InputOption, InputOptions, InternalModuleFormat, JsxOptions, LoadResult, LogLevel, LogLevelOption, LogOrStringHandler, LoggingFunction, MaybePromise, MinifyOptions, MinimalPluginContext, ModuleFormat, ModuleInfo, ModuleOptions, ModuleType, ModuleTypeFilter, NormalizedInputOptions, NormalizedOutputOptions, ObjectHook, OutputAsset, OutputBundle, OutputChunk, OutputOptions, ParallelPluginHooks, PartialNull, PartialResolvedId, Plugin, PluginContext, PluginContextMeta, PreRenderedAsset, RenderedChunk, RenderedModule, ResolveIdExtraOptions, ResolveIdResult, ResolvedId, RolldownBuild, RolldownOptions, RolldownOutput, RolldownPlugin, RolldownPluginOption, RolldownWatcher, RollupError, RollupLog, RollupLogWithString, SourceDescription, SourceMap, SourceMapInput, SourcemapIgnoreListOption, TopLevelFilterExpression, TransformPluginContext, TransformResult, TreeshakingOptions, VERSION, WarningHandlerWithDefault, WatchOptions$1 as WatchOptions, and, build, buildImportAnalysisPlugin, code, defineConfig, defineParallelPlugin, dynamicImportVarsPlugin, exclude, id, importGlobPlugin, include, isolatedDeclarationPlugin, jsonPlugin, loadFallbackPlugin, manifestPlugin, moduleFederationPlugin, modulePreloadPolyfillPlugin, moduleType, not, or, reportPlugin, rolldown, viteResolvePlugin, wasmFallbackPlugin, wasmHelperPlugin, watch, withFilter };
+export { AddonFunction, And, AsyncPluginHooks, BuildOptions, BuiltinPlugin, ChunkFileNamesFunction, ConfigExport, CustomPluginOptions, DefineParallelPluginResult, EmittedAsset, EmittedFile, ExistingRawSourceMap, ExternalOption, FilterExpression, FilterExpressionKind, FunctionPluginHooks, GeneralHookFilter, GetModuleInfo, GlobalsFunction, HookFilter, HookFilterExtension, ImportKind, InputOption, InputOptions, InternalModuleFormat, JsxOptions, LoadResult, LogLevel, LogLevelOption, LogOrStringHandler, LoggingFunction, MaybePromise, MinifyOptions, MinimalPluginContext, ModuleFormat, ModuleInfo, ModuleOptions, ModuleType, ModuleTypeFilter, NormalizedInputOptions, NormalizedOutputOptions, ObjectHook, OutputAsset, OutputBundle, OutputChunk, OutputOptions, ParallelPluginHooks, PartialNull, PartialResolvedId, Plugin, PluginContext, PluginContextMeta, PreRenderedAsset, RenderedChunk, RenderedModule, ResolveIdExtraOptions, ResolveIdResult, ResolvedId, RolldownBuild, RolldownOptions, RolldownOutput, RolldownPlugin, RolldownPluginOption, RolldownWatcher, RolldownWatcherEvent, RollupError, RollupLog, RollupLogWithString, SourceDescription, SourceMap, SourceMapInput, SourcemapIgnoreListOption, TopLevelFilterExpression, TransformPluginContext, TransformResult, TreeshakingOptions, VERSION, WarningHandlerWithDefault, WatchOptions, WatcherOptions, and, build, buildImportAnalysisPlugin, code, defineConfig, defineParallelPlugin, dynamicImportVarsPlugin, exclude, id, importGlobPlugin, include, isolatedDeclarationPlugin, jsonPlugin, loadFallbackPlugin, manifestPlugin, moduleFederationPlugin, modulePreloadPolyfillPlugin, moduleType, not, or, reportPlugin, rolldown, viteResolvePlugin, wasmFallbackPlugin, wasmHelperPlugin, watch, withFilter };