@rolldown/pluginutils 1.0.0-beta.8-commit.985af6d → 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
@@ -120,13 +127,8 @@ function exclude(expr) {
 * ```
 * @param queryFilterObject The query filter object needs to be matched.
 * @returns a `And` FilterExpression
-*
-* There are three kinds of conditions are supported:
-* 1. `boolean`: if the value is `true`, the key must exist and be truthy. if the value is `false`, the key must not exist or be falsy.
-* 2. `string`: the key must exist and be equal to the value.
-* 3. `RegExp`: the key must exist and match the value.
 */
-function queryObjectToFilterExpr(queryFilter) {
+function queries(queryFilter) {
 	let arr = Object.entries(queryFilter).map(([key, value]) => {
 		return new Query(key, value);
 	});
@@ -174,7 +176,7 @@ function exprInterpreter(expr, code$1, id$1, moduleType$1, ctx = {}) {
 		case "query": {
 			if (id$1 === void 0) throw new Error("`id` is required for `Query` expression");
 			if (!ctx.urlSearchParamsCache) {
-				let [_, queryString = ""] = id$1.split("?", 2);
+				let queryString = extractQueryWithoutFragment(id$1);
 				ctx.urlSearchParamsCache = new URLSearchParams(queryString);
 			}
 			let urlParams = ctx.urlSearchParamsCache;
@@ -183,7 +185,7 @@ function exprInterpreter(expr, code$1, id$1, moduleType$1, ctx = {}) {
 			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 kind ${expr} is not expected.`);
+		default: throw new Error(`Expression ${JSON.stringify(expr)} is not expected.`);
 	}
 }
 
@@ -250,5 +252,5 @@ exports.moduleType = moduleType
 exports.not = not
 exports.or = or
 exports.prefixRegex = prefixRegex
-exports.query = query
-exports.queryObjectToFilterExpr = queryObjectToFilterExpr
+exports.queries = queries
+exports.query = query

package/dist/index.d.cts

@@ -73,13 +73,8 @@ declare function exclude(expr: FilterExpression): Exclude;
 * ```
 * @param queryFilterObject The query filter object needs to be matched.
 * @returns a `And` FilterExpression
-*
-* There are three kinds of conditions are supported:
-* 1. `boolean`: if the value is `true`, the key must exist and be truthy. if the value is `false`, the key must not exist or be falsy.
-* 2. `string`: the key must exist and be equal to the value.
-* 3. `RegExp`: the key must exist and match the value.
 */
-declare function queryObjectToFilterExpr(queryFilter: QueryFilterObject): And;
+declare function queries(queryFilter: QueryFilterObject): And;
 declare function interpreter(exprs: TopLevelFilterExpression | TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType): boolean;
 interface InterpreterCtx {
   urlSearchParamsCache?: URLSearchParams;
@@ -118,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 { FilterExpression, FilterExpressionKind, QueryFilterObject, TopLevelFilterExpression, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex, query, queryObjectToFilterExpr };
+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

@@ -73,13 +73,8 @@ declare function exclude(expr: FilterExpression): Exclude;
 * ```
 * @param queryFilterObject The query filter object needs to be matched.
 * @returns a `And` FilterExpression
-*
-* There are three kinds of conditions are supported:
-* 1. `boolean`: if the value is `true`, the key must exist and be truthy. if the value is `false`, the key must not exist or be falsy.
-* 2. `string`: the key must exist and be equal to the value.
-* 3. `RegExp`: the key must exist and match the value.
 */
-declare function queryObjectToFilterExpr(queryFilter: QueryFilterObject): And;
+declare function queries(queryFilter: QueryFilterObject): And;
 declare function interpreter(exprs: TopLevelFilterExpression | TopLevelFilterExpression[], code?: string, id?: string, moduleType?: PluginModuleType): boolean;
 interface InterpreterCtx {
   urlSearchParamsCache?: URLSearchParams;
@@ -118,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 { FilterExpression, FilterExpressionKind, QueryFilterObject, TopLevelFilterExpression, and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex, query, queryObjectToFilterExpr };
+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
@@ -118,13 +125,8 @@ function exclude(expr) {
 * ```
 * @param queryFilterObject The query filter object needs to be matched.
 * @returns a `And` FilterExpression
-*
-* There are three kinds of conditions are supported:
-* 1. `boolean`: if the value is `true`, the key must exist and be truthy. if the value is `false`, the key must not exist or be falsy.
-* 2. `string`: the key must exist and be equal to the value.
-* 3. `RegExp`: the key must exist and match the value.
 */
-function queryObjectToFilterExpr(queryFilter) {
+function queries(queryFilter) {
 	let arr = Object.entries(queryFilter).map(([key, value]) => {
 		return new Query(key, value);
 	});
@@ -172,7 +174,7 @@ function exprInterpreter(expr, code$1, id$1, moduleType$1, ctx = {}) {
 		case "query": {
 			if (id$1 === void 0) throw new Error("`id` is required for `Query` expression");
 			if (!ctx.urlSearchParamsCache) {
-				let [_, queryString = ""] = id$1.split("?", 2);
+				let queryString = extractQueryWithoutFragment(id$1);
 				ctx.urlSearchParamsCache = new URLSearchParams(queryString);
 			}
 			let urlParams = ctx.urlSearchParamsCache;
@@ -181,7 +183,7 @@ function exprInterpreter(expr, code$1, id$1, moduleType$1, ctx = {}) {
 			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 kind ${expr} is not expected.`);
+		default: throw new Error(`Expression ${JSON.stringify(expr)} is not expected.`);
 	}
 }
 
@@ -234,4 +236,4 @@ function makeRegexIdFilterToMatchWithQuery(input) {
 }
 
 //#endregion
-export { and, code, exactRegex, exclude, exprInterpreter, id, include, interpreter, interpreterImpl, makeIdFiltersToMatchWithQuery, moduleType, not, or, prefixRegex, query, queryObjectToFilterExpr };
+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.985af6d",
+  "version": "1.0.0-beta.8-commit.bf53a10",
   "license": "MIT",
   "type": "module",
   "repository": {