@wdprlib/parser 4.0.0 → 4.1.0

package/dist/index.cjs

@@ -5709,11 +5709,32 @@ function resolveListPages(module2, data, compiledTemplate, parse) {
   const items = renderListPagesItems(module2, data, compiledTemplate, parse);
   return wrapListPagesResult(module2, items, parse);
 }
+// packages/parser/src/parser/rules/block/module/listpages/url-resolution/fields.ts
+var URL_RESOLVABLE_FIELDS = [
+  { attr: "offset", queryKey: "offset", type: "number" },
+  { attr: "limit", queryKey: "limit", type: "number" },
+  { attr: "per-page", queryKey: "perPage", type: "number" },
+  { attr: "order", queryKey: "order", type: "string" },
+  { attr: "tags", queryKey: "tags", type: "string", urlAttrs: ["tag"] },
+  { attr: "category", queryKey: "category", type: "string" },
+  { attr: "parent", queryKey: "parent", type: "string" },
+  { attr: "range", queryKey: "range", type: "string" },
+  { attr: "name", queryKey: "name", type: "string" },
+  { attr: "fullname", queryKey: "fullname", type: "string" },
+  { attr: "created-at", queryKey: "createdAt", type: "string" },
+  { attr: "updated-at", queryKey: "updatedAt", type: "string" },
+  { attr: "created-by", queryKey: "createdBy", type: "string" },
+  { attr: "rating", queryKey: "rating", type: "string" },
+  { attr: "votes", queryKey: "votes", type: "string" },
+  { attr: "reverse", queryKey: "reverse", type: "boolean" }
+];
+
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/params.ts
 function parseUrlParams(url) {
   const params = new Map;
   const parts = url.split("/").filter(Boolean);
-  for (let i = 1;i < parts.length - 1; i += 2) {
+  const pairStart = isUrlParameter(parts[0]) ? 0 : 1;
+  for (let i = pairStart;i < parts.length - 1; i += 2) {
     const key = parts[i];
     const value = parts[i + 1];
     if (key && value) {
@@ -5722,6 +5743,10 @@ function parseUrlParams(url) {
   }
   return params;
 }
+var URL_PARAMETER_NAMES = new Set(URL_RESOLVABLE_FIELDS.flatMap((field) => [field.attr, ...field.urlAttrs ?? []]));
+function isUrlParameter(param) {
+  return param !== undefined && URL_PARAMETER_NAMES.has(param);
+}
 // packages/parser/src/parser/rules/block/module/listpages/normalization/tags-category.ts
 var TOKEN_SEPARATOR = /[,;\s]+/;
 function parseTags(value) {
@@ -5977,26 +6002,6 @@ function normalizeQuery(query) {
   return result;
 }
 
-// packages/parser/src/parser/rules/block/module/listpages/url-resolution/fields.ts
-var URL_RESOLVABLE_FIELDS = [
-  { attr: "offset", queryKey: "offset", type: "number" },
-  { attr: "limit", queryKey: "limit", type: "number" },
-  { attr: "per-page", queryKey: "perPage", type: "number" },
-  { attr: "order", queryKey: "order", type: "string" },
-  { attr: "tags", queryKey: "tags", type: "string" },
-  { attr: "category", queryKey: "category", type: "string" },
-  { attr: "parent", queryKey: "parent", type: "string" },
-  { attr: "range", queryKey: "range", type: "string" },
-  { attr: "name", queryKey: "name", type: "string" },
-  { attr: "fullname", queryKey: "fullname", type: "string" },
-  { attr: "created-at", queryKey: "createdAt", type: "string" },
-  { attr: "updated-at", queryKey: "updatedAt", type: "string" },
-  { attr: "created-by", queryKey: "createdBy", type: "string" },
-  { attr: "rating", queryKey: "rating", type: "string" },
-  { attr: "votes", queryKey: "votes", type: "string" },
-  { attr: "reverse", queryKey: "reverse", type: "boolean" }
-];
-
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/query.ts
 function assignResolvedUrlField(query, field, value) {
   switch (field.type) {
@@ -6017,15 +6022,23 @@ function assignResolvedUrlField(query, field, value) {
 }
 
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/value.ts
-function resolveUrlValue(rawValue, paramName, urlParams, prefix) {
+function resolveUrlValue(rawValue, paramNames, urlParams, prefix) {
   if (!rawValue)
     return;
   if (!rawValue.startsWith("@URL")) {
     return rawValue;
   }
   const defaultValue = rawValue.includes("|") ? rawValue.split("|")[1] : undefined;
-  const actualParamName = prefix ? `${prefix}_${paramName}` : paramName;
-  return urlParams.get(actualParamName) ?? defaultValue;
+  for (const paramName of toParamNames(paramNames)) {
+    const actualParamName = prefix ? `${prefix}_${paramName}` : paramName;
+    const value = urlParams.get(actualParamName);
+    if (value !== undefined)
+      return value;
+  }
+  return defaultValue;
+}
+function toParamNames(paramNames) {
+  return typeof paramNames === "string" ? [paramNames] : paramNames;
 }
 
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/resolve.ts
@@ -6036,13 +6049,16 @@ function resolveQuery(requirement, urlParams) {
     const rawValue = rawAttributes[field.attr];
     if (!rawValue)
       continue;
-    const resolvedValue = resolveUrlValue(rawValue, field.attr, urlParams, urlAttrPrefix);
+    const resolvedValue = resolveUrlValue(rawValue, getUrlParamNames(field), urlParams, urlAttrPrefix);
     if (resolvedValue === undefined)
       continue;
     assignResolvedUrlField(resolved, field, resolvedValue);
   }
   return resolved;
 }
+function getUrlParamNames(field) {
+  return field.urlAttrs ? [field.attr, ...field.urlAttrs] : [field.attr];
+}
 function resolveAndNormalizeQuery(requirement, urlParams) {
   const resolved = resolveQuery(requirement, urlParams);
   return normalizeQuery(resolved);

package/dist/index.js

@@ -5650,11 +5650,32 @@ function resolveListPages(module, data, compiledTemplate, parse) {
   const items = renderListPagesItems(module, data, compiledTemplate, parse);
   return wrapListPagesResult(module, items, parse);
 }
+// packages/parser/src/parser/rules/block/module/listpages/url-resolution/fields.ts
+var URL_RESOLVABLE_FIELDS = [
+  { attr: "offset", queryKey: "offset", type: "number" },
+  { attr: "limit", queryKey: "limit", type: "number" },
+  { attr: "per-page", queryKey: "perPage", type: "number" },
+  { attr: "order", queryKey: "order", type: "string" },
+  { attr: "tags", queryKey: "tags", type: "string", urlAttrs: ["tag"] },
+  { attr: "category", queryKey: "category", type: "string" },
+  { attr: "parent", queryKey: "parent", type: "string" },
+  { attr: "range", queryKey: "range", type: "string" },
+  { attr: "name", queryKey: "name", type: "string" },
+  { attr: "fullname", queryKey: "fullname", type: "string" },
+  { attr: "created-at", queryKey: "createdAt", type: "string" },
+  { attr: "updated-at", queryKey: "updatedAt", type: "string" },
+  { attr: "created-by", queryKey: "createdBy", type: "string" },
+  { attr: "rating", queryKey: "rating", type: "string" },
+  { attr: "votes", queryKey: "votes", type: "string" },
+  { attr: "reverse", queryKey: "reverse", type: "boolean" }
+];
+
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/params.ts
 function parseUrlParams(url) {
   const params = new Map;
   const parts = url.split("/").filter(Boolean);
-  for (let i = 1;i < parts.length - 1; i += 2) {
+  const pairStart = isUrlParameter(parts[0]) ? 0 : 1;
+  for (let i = pairStart;i < parts.length - 1; i += 2) {
     const key = parts[i];
     const value = parts[i + 1];
     if (key && value) {
@@ -5663,6 +5684,10 @@ function parseUrlParams(url) {
   }
   return params;
 }
+var URL_PARAMETER_NAMES = new Set(URL_RESOLVABLE_FIELDS.flatMap((field) => [field.attr, ...field.urlAttrs ?? []]));
+function isUrlParameter(param) {
+  return param !== undefined && URL_PARAMETER_NAMES.has(param);
+}
 // packages/parser/src/parser/rules/block/module/listpages/normalization/tags-category.ts
 var TOKEN_SEPARATOR = /[,;\s]+/;
 function parseTags(value) {
@@ -5918,26 +5943,6 @@ function normalizeQuery(query) {
   return result;
 }
 
-// packages/parser/src/parser/rules/block/module/listpages/url-resolution/fields.ts
-var URL_RESOLVABLE_FIELDS = [
-  { attr: "offset", queryKey: "offset", type: "number" },
-  { attr: "limit", queryKey: "limit", type: "number" },
-  { attr: "per-page", queryKey: "perPage", type: "number" },
-  { attr: "order", queryKey: "order", type: "string" },
-  { attr: "tags", queryKey: "tags", type: "string" },
-  { attr: "category", queryKey: "category", type: "string" },
-  { attr: "parent", queryKey: "parent", type: "string" },
-  { attr: "range", queryKey: "range", type: "string" },
-  { attr: "name", queryKey: "name", type: "string" },
-  { attr: "fullname", queryKey: "fullname", type: "string" },
-  { attr: "created-at", queryKey: "createdAt", type: "string" },
-  { attr: "updated-at", queryKey: "updatedAt", type: "string" },
-  { attr: "created-by", queryKey: "createdBy", type: "string" },
-  { attr: "rating", queryKey: "rating", type: "string" },
-  { attr: "votes", queryKey: "votes", type: "string" },
-  { attr: "reverse", queryKey: "reverse", type: "boolean" }
-];
-
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/query.ts
 function assignResolvedUrlField(query, field, value) {
   switch (field.type) {
@@ -5958,15 +5963,23 @@ function assignResolvedUrlField(query, field, value) {
 }
 
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/value.ts
-function resolveUrlValue(rawValue, paramName, urlParams, prefix) {
+function resolveUrlValue(rawValue, paramNames, urlParams, prefix) {
   if (!rawValue)
     return;
   if (!rawValue.startsWith("@URL")) {
     return rawValue;
   }
   const defaultValue = rawValue.includes("|") ? rawValue.split("|")[1] : undefined;
-  const actualParamName = prefix ? `${prefix}_${paramName}` : paramName;
-  return urlParams.get(actualParamName) ?? defaultValue;
+  for (const paramName of toParamNames(paramNames)) {
+    const actualParamName = prefix ? `${prefix}_${paramName}` : paramName;
+    const value = urlParams.get(actualParamName);
+    if (value !== undefined)
+      return value;
+  }
+  return defaultValue;
+}
+function toParamNames(paramNames) {
+  return typeof paramNames === "string" ? [paramNames] : paramNames;
 }
 
 // packages/parser/src/parser/rules/block/module/listpages/url-resolution/resolve.ts
@@ -5977,13 +5990,16 @@ function resolveQuery(requirement, urlParams) {
     const rawValue = rawAttributes[field.attr];
     if (!rawValue)
       continue;
-    const resolvedValue = resolveUrlValue(rawValue, field.attr, urlParams, urlAttrPrefix);
+    const resolvedValue = resolveUrlValue(rawValue, getUrlParamNames(field), urlParams, urlAttrPrefix);
     if (resolvedValue === undefined)
       continue;
     assignResolvedUrlField(resolved, field, resolvedValue);
   }
   return resolved;
 }
+function getUrlParamNames(field) {
+  return field.urlAttrs ? [field.attr, ...field.urlAttrs] : [field.attr];
+}
 function resolveAndNormalizeQuery(requirement, urlParams) {
   const resolved = resolveQuery(requirement, urlParams);
   return normalizeQuery(resolved);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdprlib/parser",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Parser for Wikidot markup",
   "keywords": [
     "ast",

package/src/parser/rules/block/module/listpages/url-resolution/fields.ts

@@ -1,9 +1,9 @@
 import type { ListPagesQuery } from "../types";
 
 export type UrlResolvableField =
-  | { attr: string; queryKey: StringUrlQueryKey; type: "string" }
-  | { attr: string; queryKey: NumberUrlQueryKey; type: "number" }
-  | { attr: string; queryKey: BooleanUrlQueryKey; type: "boolean" };
+  | { attr: string; queryKey: StringUrlQueryKey; type: "string"; urlAttrs?: readonly string[] }
+  | { attr: string; queryKey: NumberUrlQueryKey; type: "number"; urlAttrs?: readonly string[] }
+  | { attr: string; queryKey: BooleanUrlQueryKey; type: "boolean"; urlAttrs?: readonly string[] };
 
 type StringUrlQueryKey = Extract<
   keyof ListPagesQuery,
@@ -33,7 +33,7 @@ export const URL_RESOLVABLE_FIELDS: readonly UrlResolvableField[] = [
   { attr: "limit", queryKey: "limit", type: "number" },
   { attr: "per-page", queryKey: "perPage", type: "number" },
   { attr: "order", queryKey: "order", type: "string" },
-  { attr: "tags", queryKey: "tags", type: "string" },
+  { attr: "tags", queryKey: "tags", type: "string", urlAttrs: ["tag"] },
   { attr: "category", queryKey: "category", type: "string" },
   { attr: "parent", queryKey: "parent", type: "string" },
   { attr: "range", queryKey: "range", type: "string" },

package/src/parser/rules/block/module/listpages/url-resolution/params.ts

@@ -1,3 +1,5 @@
+import { URL_RESOLVABLE_FIELDS } from "./fields";
+
 /**
  * Parse URL path parameters like /offset/1/page2_limit/1.
  * Returns a map of parameter name -> value.
@@ -5,9 +7,10 @@
 export function parseUrlParams(url: string): Map<string, string> {
   const params = new Map<string, string>();
   const parts = url.split("/").filter(Boolean);
+  const pairStart = isUrlParameter(parts[0]) ? 0 : 1;
 
   // Skip the page name (first part), parse key/value pairs.
-  for (let i = 1; i < parts.length - 1; i += 2) {
+  for (let i = pairStart; i < parts.length - 1; i += 2) {
     const key = parts[i];
     const value = parts[i + 1];
     if (key && value) {
@@ -17,3 +20,11 @@ export function parseUrlParams(url: string): Map<string, string> {
 
   return params;
 }
+
+const URL_PARAMETER_NAMES = new Set(
+  URL_RESOLVABLE_FIELDS.flatMap((field) => [field.attr, ...(field.urlAttrs ?? [])]),
+);
+
+function isUrlParameter(param: string | undefined): boolean {
+  return param !== undefined && URL_PARAMETER_NAMES.has(param);
+}

package/src/parser/rules/block/module/listpages/url-resolution/resolve.ts

@@ -25,7 +25,12 @@ export function resolveQuery(
     const rawValue = rawAttributes[field.attr];
     if (!rawValue) continue;
 
-    const resolvedValue = resolveUrlValue(rawValue, field.attr, urlParams, urlAttrPrefix);
+    const resolvedValue = resolveUrlValue(
+      rawValue,
+      getUrlParamNames(field),
+      urlParams,
+      urlAttrPrefix,
+    );
     if (resolvedValue === undefined) continue;
 
     assignResolvedUrlField(resolved, field, resolvedValue);
@@ -34,6 +39,10 @@ export function resolveQuery(
   return resolved;
 }
 
+function getUrlParamNames(field: (typeof URL_RESOLVABLE_FIELDS)[number]): readonly string[] {
+  return field.urlAttrs ? [field.attr, ...field.urlAttrs] : [field.attr];
+}
+
 /**
  * Resolve all `@URL` parameters and normalize the query.
  *

package/src/parser/rules/block/module/listpages/url-resolution/value.ts

@@ -2,14 +2,14 @@
  * Resolve @URL|default format with actual URL parameters.
  *
  * @param rawValue - The raw attribute value (e.g., "@URL|0")
- * @param paramName - The parameter name (e.g., "offset")
+ * @param paramNames - The parameter name or names (e.g., "offset")
  * @param urlParams - Parsed URL parameters
  * @param prefix - Optional URL attribute prefix (e.g., "page2")
  * @returns Resolved value
  */
 export function resolveUrlValue(
   rawValue: string | undefined,
-  paramName: string,
+  paramNames: string | readonly string[],
   urlParams: Map<string, string>,
   prefix?: string,
 ): string | undefined {
@@ -20,6 +20,15 @@ export function resolveUrlValue(
   }
 
   const defaultValue = rawValue.includes("|") ? rawValue.split("|")[1] : undefined;
-  const actualParamName = prefix ? `${prefix}_${paramName}` : paramName;
-  return urlParams.get(actualParamName) ?? defaultValue;
+  for (const paramName of toParamNames(paramNames)) {
+    const actualParamName = prefix ? `${prefix}_${paramName}` : paramName;
+    const value = urlParams.get(actualParamName);
+    if (value !== undefined) return value;
+  }
+
+  return defaultValue;
+}
+
+function toParamNames(paramNames: string | readonly string[]): readonly string[] {
+  return typeof paramNames === "string" ? [paramNames] : paramNames;
 }