@rolldown/pluginutils 1.0.0-beta.8-commit.d95f99e → 1.0.0-beta.8-commit.bf53a10

package/dist/index.cjs

@@ -5,6 +5,13 @@ const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
 	return url.replace(postfixRE, "");
 }
+function extractQueryWithoutFragment(url) {
+	const questionMarkIndex = url.indexOf("?");
+	if (questionMarkIndex === -1) return "";
+	const fragmentIndex = url.indexOf("#", questionMarkIndex);
+	if (fragmentIndex === -1) return url.substring(questionMarkIndex);
+	else return url.substring(questionMarkIndex, fragmentIndex);
+}
 
 //#endregion
 //#region src/composable-filters.ts
@@ -60,6 +67,16 @@ var Code = class {
 		this.kind = "code";
 	}
 };
+var Query = class {
+	kind;
+	key;
+	pattern;
+	constructor(key, pattern) {
+		this.pattern = pattern;
+		this.key = key;
+		this.kind = "query";
+	}
+};
 var Include = class {
 	kind;
 	expr;
@@ -94,24 +111,41 @@ function moduleType(pattern) {
 function code(pattern) {
 	return new Code(pattern);
 }
+function query(key, pattern) {
+	return new Query(key, pattern);
+}
 function include(expr) {
 	return new Include(expr);
 }
 function exclude(expr) {
 	return new Exclude(expr);
 }
+/**
+* convert a queryObject to FilterExpression like
+* ```js
+*   and(query(k1, v1), query(k2, v2))
+* ```
+* @param queryFilterObject The query filter object needs to be matched.
+* @returns a `And` FilterExpression
+*/
+function queries(queryFilter) {
+	let arr = Object.entries(queryFilter).map(([key, value]) => {
+		return new Query(key, value);
+	});
+	return and(...arr);
+}
 function interpreter(exprs, code$1, id$1, moduleType$1) {
 	let arr = [];
 	if (Array.isArray(exprs)) arr = exprs;
 	else arr = [exprs];
 	return interpreterImpl(arr, code$1, id$1, moduleType$1);
 }
-function interpreterImpl(expr, code$1, id$1, moduleType$1) {
+function interpreterImpl(expr, code$1, id$1, moduleType$1, ctx = {}) {
 	let hasInclude = false;
 	for (const e of expr) switch (e.kind) {
 		case "include": {
 			hasInclude = true;
-			if (exprInterpreter(e.expr, code$1, id$1, moduleType$1)) return true;
+			if (exprInterpreter(e.expr, code$1, id$1, moduleType$1, ctx)) return true;
 			break;
 		}
 		case "exclude": {
@@ -121,11 +155,11 @@ function interpreterImpl(expr, code$1, id$1, moduleType$1) {
 	}
 	return !hasInclude;
 }
-function exprInterpreter(expr, code$1, id$1, moduleType$1) {
+function exprInterpreter(expr, code$1, id$1, moduleType$1, ctx = {}) {
 	switch (expr.kind) {
-		case "and": return expr.args.every((e) => exprInterpreter(e, code$1, id$1, moduleType$1));
-		case "or": return expr.args.some((e) => exprInterpreter(e, code$1, id$1, moduleType$1));
-		case "not": return !exprInterpreter(expr.expr, code$1, id$1, moduleType$1);
+		case "and": return expr.args.every((e) => exprInterpreter(e, code$1, id$1, moduleType$1, ctx));
+		case "or": return expr.args.some((e) => exprInterpreter(e, code$1, id$1, moduleType$1, ctx));
+		case "not": return !exprInterpreter(expr.expr, code$1, id$1, moduleType$1, ctx);
 		case "id": {
 			if (id$1 === void 0) throw new Error("`id` is required for `id` expression");
 			if (expr.params.cleanUrl) id$1 = cleanUrl(id$1);
@@ -139,7 +173,19 @@ function exprInterpreter(expr, code$1, id$1, moduleType$1) {
 			if (code$1 === void 0) throw new Error("`code` is required for `code` expression");
 			return typeof expr.pattern === "string" ? code$1.includes(expr.pattern) : expr.pattern.test(code$1);
 		}
-		default: throw new Error(`Expression kind ${expr.kind} is not expected.`);
+		case "query": {
+			if (id$1 === void 0) throw new Error("`id` is required for `Query` expression");
+			if (!ctx.urlSearchParamsCache) {
+				let queryString = extractQueryWithoutFragment(id$1);
+				ctx.urlSearchParamsCache = new URLSearchParams(queryString);
+			}
+			let urlParams = ctx.urlSearchParamsCache;
+			if (typeof expr.pattern === "boolean") if (expr.pattern) return urlParams.has(expr.key);
+			else return !urlParams.has(expr.key);
+			else if (typeof expr.pattern === "string") return urlParams.get(expr.key) === expr.pattern;
+			else return expr.pattern.test(urlParams.get(expr.key) ?? "");
+		}
+		default: throw new Error(`Expression ${JSON.stringify(expr)} is not expected.`);
 	}
 }
 
@@ -192,7 +238,6 @@ function makeRegexIdFilterToMatchWithQuery(input) {
 }
 
 //#endregion
-exports.And = And
 exports.and = and
 exports.code = code
 exports.exactRegex = exactRegex
@@ -206,4 +251,6 @@ exports.makeIdFiltersToMatchWithQuery = makeIdFiltersToMatchWithQuery
 exports.moduleType = moduleType
 exports.not = not
 exports.or = or
-exports.prefixRegex = prefixRegex
+exports.prefixRegex = prefixRegex
+exports.queries = queries
+exports.query = query

package/dist/index.d.cts

@@ -2,7 +2,7 @@
 type StringOrRegExp = string | RegExp;
 type PluginModuleType = "js" | "jsx" | "ts" | "tsx" | "json" | "text" | "base64" | "dataurl" | "binary" | "empty" | (string & {});
 type FilterExpressionKind = FilterExpression["kind"];
-type FilterExpression = And | Or | Not | Id | ModuleType | Code | Include | Exclude;
+type FilterExpression = And | Or | Not | Id | ModuleType | Code | Query;
 type TopLevelFilterExpression = Include | Exclude;
 declare class And {
   kind: "and";
@@ -19,6 +19,9 @@ declare class Not {
   expr: FilterExpression;
   constructor(expr: FilterExpression);
 }
+interface QueryFilterObject {
+  [key: string]: StringOrRegExp | boolean;
+}
 interface IdParams {
   cleanUrl?: boolean;
 }
@@ -38,6 +41,12 @@ declare class Code {
   pattern: StringOrRegExp;
   constructor(expr: StringOrRegExp);
 }
+declare class Query {
+  kind: "query";
+  key: string;
+  pattern: StringOrRegExp | boolean;
+  constructor(key: string, pattern: StringOrRegExp | boolean);
+}
 declare class Include {
   kind: "include";
   expr: FilterExpression;
@@ -54,11 +63,24 @@ declare function not(expr: FilterExpression): Not;
 declare function id(pattern: StringOrRegExp, params?: IdParams): Id;
 declare function moduleType(pattern: PluginModuleType): ModuleType;
 declare function code(pattern: StringOrRegExp): Code;
+declare function query(key: string, pattern: StringOrRegExp | boolean): Query;
 declare function include(expr: FilterExpression): Include;
 declare function exclude(expr: FilterExpression): Exclude;
+/**
+* convert a queryObject to FilterExpression like
+* ```js
+*   and(query(k1, v1), query(k2, v2))
+* ```
+* @param queryFilterObject The query filter object needs to be matched.
+* @returns a `And` FilterExpression
+*/
+declare function queries(queryFilter: QueryFilterObject): And;
 declare function interpreter(exprs: TopLevelFilterExpression | TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType): boolean;
-declare function interpreterImpl(expr: TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType): boolean;
-declare function exprInterpreter(expr: FilterExpression, code?: string, id?: string, moduleType?: PluginModuleType): boolean;
+interface InterpreterCtx {
+  urlSearchParamsCache?: URLSearchParams;
+}
+declare function interpreterImpl(expr: TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType, ctx?: InterpreterCtx): boolean;
+declare function exprInterpreter(expr: FilterExpression, code?: string, id?: string, moduleType?: PluginModuleType, ctx?: InterpreterCtx): boolean;
 
 //#endregion
 //#region src/simple-filters.d.ts
@@ -91,4 +113,4 @@ declare function makeIdFiltersToMatchWithQuery<T extends string | RegExp>(input:
 declare function makeIdFiltersToMatchWithQuery(input: string | RegExp | readonly (string | RegExp)[]): string | RegExp | (string | RegExp)[];
 
 //#endregion
-export { And, FilterExpression, FilterExpressionKind, TopLevelFilterExpression, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex };
+export { FilterExpression, FilterExpressionKind, QueryFilterObject, TopLevelFilterExpression, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex, queries, query };

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 type StringOrRegExp = string | RegExp;
 type PluginModuleType = "js" | "jsx" | "ts" | "tsx" | "json" | "text" | "base64" | "dataurl" | "binary" | "empty" | (string & {});
 type FilterExpressionKind = FilterExpression["kind"];
-type FilterExpression = And | Or | Not | Id | ModuleType | Code | Include | Exclude;
+type FilterExpression = And | Or | Not | Id | ModuleType | Code | Query;
 type TopLevelFilterExpression = Include | Exclude;
 declare class And {
   kind: "and";
@@ -19,6 +19,9 @@ declare class Not {
   expr: FilterExpression;
   constructor(expr: FilterExpression);
 }
+interface QueryFilterObject {
+  [key: string]: StringOrRegExp | boolean;
+}
 interface IdParams {
   cleanUrl?: boolean;
 }
@@ -38,6 +41,12 @@ declare class Code {
   pattern: StringOrRegExp;
   constructor(expr: StringOrRegExp);
 }
+declare class Query {
+  kind: "query";
+  key: string;
+  pattern: StringOrRegExp | boolean;
+  constructor(key: string, pattern: StringOrRegExp | boolean);
+}
 declare class Include {
   kind: "include";
   expr: FilterExpression;
@@ -54,11 +63,24 @@ declare function not(expr: FilterExpression): Not;
 declare function id(pattern: StringOrRegExp, params?: IdParams): Id;
 declare function moduleType(pattern: PluginModuleType): ModuleType;
 declare function code(pattern: StringOrRegExp): Code;
+declare function query(key: string, pattern: StringOrRegExp | boolean): Query;
 declare function include(expr: FilterExpression): Include;
 declare function exclude(expr: FilterExpression): Exclude;
+/**
+* convert a queryObject to FilterExpression like
+* ```js
+*   and(query(k1, v1), query(k2, v2))
+* ```
+* @param queryFilterObject The query filter object needs to be matched.
+* @returns a `And` FilterExpression
+*/
+declare function queries(queryFilter: QueryFilterObject): And;
 declare function interpreter(exprs: TopLevelFilterExpression | TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType): boolean;
-declare function interpreterImpl(expr: TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType): boolean;
-declare function exprInterpreter(expr: FilterExpression, code?: string, id?: string, moduleType?: PluginModuleType): boolean;
+interface InterpreterCtx {
+  urlSearchParamsCache?: URLSearchParams;
+}
+declare function interpreterImpl(expr: TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType, ctx?: InterpreterCtx): boolean;
+declare function exprInterpreter(expr: FilterExpression, code?: string, id?: string, moduleType?: PluginModuleType, ctx?: InterpreterCtx): boolean;
 
 //#endregion
 //#region src/simple-filters.d.ts
@@ -91,4 +113,4 @@ declare function makeIdFiltersToMatchWithQuery<T extends string | RegExp>(input:
 declare function makeIdFiltersToMatchWithQuery(input: string | RegExp | readonly (string | RegExp)[]): string | RegExp | (string | RegExp)[];
 
 //#endregion
-export { And, FilterExpression, FilterExpressionKind, TopLevelFilterExpression, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex };
+export { FilterExpression, FilterExpressionKind, QueryFilterObject, TopLevelFilterExpression, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex, queries, query };

package/dist/index.js

@@ -3,6 +3,13 @@ const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
 	return url.replace(postfixRE, "");
 }
+function extractQueryWithoutFragment(url) {
+	const questionMarkIndex = url.indexOf("?");
+	if (questionMarkIndex === -1) return "";
+	const fragmentIndex = url.indexOf("#", questionMarkIndex);
+	if (fragmentIndex === -1) return url.substring(questionMarkIndex);
+	else return url.substring(questionMarkIndex, fragmentIndex);
+}
 
 //#endregion
 //#region src/composable-filters.ts
@@ -58,6 +65,16 @@ var Code = class {
 		this.kind = "code";
 	}
 };
+var Query = class {
+	kind;
+	key;
+	pattern;
+	constructor(key, pattern) {
+		this.pattern = pattern;
+		this.key = key;
+		this.kind = "query";
+	}
+};
 var Include = class {
 	kind;
 	expr;
@@ -92,24 +109,41 @@ function moduleType(pattern) {
 function code(pattern) {
 	return new Code(pattern);
 }
+function query(key, pattern) {
+	return new Query(key, pattern);
+}
 function include(expr) {
 	return new Include(expr);
 }
 function exclude(expr) {
 	return new Exclude(expr);
 }
+/**
+* convert a queryObject to FilterExpression like
+* ```js
+*   and(query(k1, v1), query(k2, v2))
+* ```
+* @param queryFilterObject The query filter object needs to be matched.
+* @returns a `And` FilterExpression
+*/
+function queries(queryFilter) {
+	let arr = Object.entries(queryFilter).map(([key, value]) => {
+		return new Query(key, value);
+	});
+	return and(...arr);
+}
 function interpreter(exprs, code$1, id$1, moduleType$1) {
 	let arr = [];
 	if (Array.isArray(exprs)) arr = exprs;
 	else arr = [exprs];
 	return interpreterImpl(arr, code$1, id$1, moduleType$1);
 }
-function interpreterImpl(expr, code$1, id$1, moduleType$1) {
+function interpreterImpl(expr, code$1, id$1, moduleType$1, ctx = {}) {
 	let hasInclude = false;
 	for (const e of expr) switch (e.kind) {
 		case "include": {
 			hasInclude = true;
-			if (exprInterpreter(e.expr, code$1, id$1, moduleType$1)) return true;
+			if (exprInterpreter(e.expr, code$1, id$1, moduleType$1, ctx)) return true;
 			break;
 		}
 		case "exclude": {
@@ -119,11 +153,11 @@ function interpreterImpl(expr, code$1, id$1, moduleType$1) {
 	}
 	return !hasInclude;
 }
-function exprInterpreter(expr, code$1, id$1, moduleType$1) {
+function exprInterpreter(expr, code$1, id$1, moduleType$1, ctx = {}) {
 	switch (expr.kind) {
-		case "and": return expr.args.every((e) => exprInterpreter(e, code$1, id$1, moduleType$1));
-		case "or": return expr.args.some((e) => exprInterpreter(e, code$1, id$1, moduleType$1));
-		case "not": return !exprInterpreter(expr.expr, code$1, id$1, moduleType$1);
+		case "and": return expr.args.every((e) => exprInterpreter(e, code$1, id$1, moduleType$1, ctx));
+		case "or": return expr.args.some((e) => exprInterpreter(e, code$1, id$1, moduleType$1, ctx));
+		case "not": return !exprInterpreter(expr.expr, code$1, id$1, moduleType$1, ctx);
 		case "id": {
 			if (id$1 === void 0) throw new Error("`id` is required for `id` expression");
 			if (expr.params.cleanUrl) id$1 = cleanUrl(id$1);
@@ -137,7 +171,19 @@ function exprInterpreter(expr, code$1, id$1, moduleType$1) {
 			if (code$1 === void 0) throw new Error("`code` is required for `code` expression");
 			return typeof expr.pattern === "string" ? code$1.includes(expr.pattern) : expr.pattern.test(code$1);
 		}
-		default: throw new Error(`Expression kind ${expr.kind} is not expected.`);
+		case "query": {
+			if (id$1 === void 0) throw new Error("`id` is required for `Query` expression");
+			if (!ctx.urlSearchParamsCache) {
+				let queryString = extractQueryWithoutFragment(id$1);
+				ctx.urlSearchParamsCache = new URLSearchParams(queryString);
+			}
+			let urlParams = ctx.urlSearchParamsCache;
+			if (typeof expr.pattern === "boolean") if (expr.pattern) return urlParams.has(expr.key);
+			else return !urlParams.has(expr.key);
+			else if (typeof expr.pattern === "string") return urlParams.get(expr.key) === expr.pattern;
+			else return expr.pattern.test(urlParams.get(expr.key) ?? "");
+		}
+		default: throw new Error(`Expression ${JSON.stringify(expr)} is not expected.`);
 	}
 }
 
@@ -190,4 +236,4 @@ function makeRegexIdFilterToMatchWithQuery(input) {
 }
 
 //#endregion
-export { And, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex };
+export { and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex, queries, query };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rolldown/pluginutils",
-  "version": "1.0.0-beta.8-commit.d95f99e",
+  "version": "1.0.0-beta.8-commit.bf53a10",
   "license": "MIT",
   "type": "module",
   "repository": {