@wdprlib/parser 5.3.0 → 6.0.0

package/src/parser/rules/block/module/listpages/extraction/listpages.ts

@@ -32,6 +32,11 @@ export function extractListPagesModule(
     contentSectionIndices: extraction.contentIndices,
     previewLengths: extraction.previewLengths,
     formFields: extraction.formFields,
+    metadataKeys: extraction.metadataKeys,
+    customRateKeys: extraction.customRateKeys,
+    needsReadableText: extraction.variables.some((name) =>
+      ["preview", "preview_n", "summary", "first_paragraph", "excerpt"].includes(name),
+    ),
     tagsLinkPrefix: extraction.tagsLinkPrefix,
     hiddenTagsLinkPrefix: extraction.hiddenTagsLinkPrefix,
     urlAttrPrefix: listPages["url-attr-prefix"],

package/src/parser/rules/block/module/listpages/extraction/query.ts

@@ -21,6 +21,7 @@ export function buildQuery(module: ListPagesModuleData): ListPagesQuery {
     updatedAt: module["updated-at"],
     createdBy: module["created-by"],
     rating: module.rating,
+    ratingAxis: module["rating-axis"],
     votes: module.votes,
     name: module.name,
     fullname: module.fullname,

package/src/parser/rules/block/module/listpages/extraction/template.ts

@@ -19,6 +19,8 @@ export interface TemplateExtraction {
   contentIndices: number[];
   previewLengths: number[];
   formFields: string[];
+  metadataKeys: string[];
+  customRateKeys: string[];
   tagsLinkPrefix?: string;
   hiddenTagsLinkPrefix?: string;
 }
@@ -31,6 +33,8 @@ export function extractVariablesFromTemplate(template: string): TemplateExtracti
   const contentIndices = new Set<number>();
   const previewLengths = new Set<number>();
   const formFields = new Set<string>();
+  const metadataKeys = new Set<string>();
+  const customRateKeys = new Set<string>();
   let tagsLinkPrefix: string | undefined;
   let hiddenTagsLinkPrefix: string | undefined;
 
@@ -39,6 +43,16 @@ export function extractVariablesFromTemplate(template: string): TemplateExtracti
 
     if (match.braceParam !== undefined) {
       switch (varName) {
+        case "metadata":
+          metadataKeys.add(match.braceParam);
+          variables.add("metadata");
+          continue;
+        case "customrate":
+        case "customrate_votes":
+        case "customrate_percent":
+          customRateKeys.add(match.braceParam);
+          variables.add(varName);
+          continue;
         case "content":
           contentIndices.add(Number(match.braceParam));
           variables.add("content_n");
@@ -90,6 +104,8 @@ export function extractVariablesFromTemplate(template: string): TemplateExtracti
     contentIndices: Array.from(contentIndices).sort((a, b) => a - b),
     previewLengths: Array.from(previewLengths).sort((a, b) => a - b),
     formFields: Array.from(formFields).sort(),
+    metadataKeys: [...metadataKeys].sort(),
+    customRateKeys: [...customRateKeys].sort(),
     tagsLinkPrefix,
     hiddenTagsLinkPrefix,
   };

package/src/parser/rules/block/module/listpages/extraction/variables.ts

@@ -29,6 +29,7 @@ const KNOWN_VARIABLES: ReadonlySet<ListPagesVariable> = new Set([
   "parent_title_linked",
   "content",
   "preview",
+  "excerpt",
   "summary",
   "first_paragraph",
   "tags",

package/src/parser/rules/block/module/listpages/index.ts

@@ -33,6 +33,7 @@ export type {
   DataRequirements,
   UserInfo,
   PageData,
+  PageMetadataValue,
   SiteContext,
   ListPagesExternalData,
   ListPagesDataFetcher,

package/src/parser/rules/block/module/listpages/normalization/order-parent.ts

@@ -3,7 +3,7 @@ import type { NormalizedOrder, NormalizedParent, OrderDirection, OrderField } fr
 /**
  * Mapping from Wikidot's order field names to normalized OrderField values.
  */
-const ORDER_FIELD_MAP: Record<string, OrderField> = {
+const ORDER_FIELD_MAP: Record<string, Exclude<OrderField, "metadata">> = {
   datecreated: "created_at",
   dateedited: "updated_at",
   title: "title",
@@ -12,6 +12,7 @@ const ORDER_FIELD_MAP: Record<string, OrderField> = {
   votes: "votes",
   revisions: "revisions",
   comments: "comments",
+  commented_at: "commented_at",
   pagelength: "size",
   size: "size",
   random: "random",
@@ -23,6 +24,13 @@ const ORDER_FIELD_MAP: Record<string, OrderField> = {
  * Parse order string into structured format.
  */
 export function parseOrder(value: string): NormalizedOrder {
+  const metadata = /^metadata\{([^}]*)\}(?:\s+(asc|desc))?$/i.exec(value.trim());
+  if (metadata)
+    return {
+      field: "metadata",
+      key: metadata[1]!,
+      direction: metadata[2]?.toLowerCase() === "asc" ? "asc" : "desc",
+    };
   const defaultOrder: NormalizedOrder = { field: "created_at", direction: "desc" };
   const trimmed = value.trim().toLowerCase();
   if (!trimmed) return defaultOrder;

package/src/parser/rules/block/module/listpages/normalize.ts

@@ -36,6 +36,7 @@ export function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery
   if (query.pagetype) result.pagetype = query.pagetype;
   if (query.linkTo) result.linkTo = query.linkTo;
   if (query.createdBy) result.createdBy = query.createdBy;
+  if (query.ratingAxis !== undefined) result.ratingAxis = query.ratingAxis;
   if (query.name) result.name = query.name;
   if (query.fullname) result.fullname = query.fullname;
   if (query.range) result.range = query.range;

package/src/parser/rules/block/module/listpages/parser.ts

@@ -78,6 +78,7 @@ export const listPagesModuleRule: ModuleRule = {
       "created-at": createdAt,
       "updated-at": updatedAt,
       rating,
+      "rating-axis": args["rating-axis"],
       votes,
       name,
       fullname,

package/src/parser/rules/block/module/listpages/resolve.ts

@@ -23,6 +23,7 @@ import type { ListPagesExternalData, CompiledTemplate } from "./types";
 import type { ParseFunction } from "../types";
 import { renderListPagesItems } from "./resolution/items";
 import { wrapListPagesResult } from "./resolution/wrapper";
+import { suppressModuleRatings } from "../rate/resolve";
 export type { ParseFunction };
 
 /**
@@ -55,6 +56,7 @@ export function resolveListPages(
   compiledTemplate: CompiledTemplate,
   parse: ParseFunction,
 ): Element[] {
-  const items = renderListPagesItems(module, data, compiledTemplate, parse);
-  return wrapListPagesResult(module, items, parse, data);
+  const parseFragment: ParseFunction = (source) => suppressModuleRatings(parse(source));
+  const items = renderListPagesItems(module, data, compiledTemplate, parseFragment);
+  return wrapListPagesResult(module, items, parseFragment, data);
 }

package/src/parser/rules/block/module/listpages/template/excerpt.ts

@@ -0,0 +1,63 @@
+import type { TextExcerptOptions } from "@wdprlib/ast";
+
+/** Find }%% outside quoted excerpt arguments, allowing regex quantifiers and literal %%. */
+export function findExcerptEnd(template: string, contentStart: number): number {
+  let quote: string | undefined;
+  for (let cursor = contentStart + "excerpt{".length; cursor < template.length; cursor++) {
+    const char = template[cursor];
+    if (quote) {
+      if (char === "\\") cursor++;
+      else if (char === quote) quote = undefined;
+    } else if (char === '"' || char === "'") {
+      quote = char;
+    } else if (char === "}") {
+      return template.startsWith("%%", cursor + 1) ? cursor + 1 : -1;
+    }
+  }
+  return -1;
+}
+
+/** Excerpt uses quoted named arguments; regex backslashes stay literal. */
+export function parseExcerptOptions(input: string): TextExcerptOptions | null {
+  if (input.length > 8_192) return null;
+  const attributes = new Map<string, string>();
+  let cursor = 0;
+  while (cursor < input.length) {
+    while (cursor < input.length && /\s/.test(input[cursor]!)) cursor++;
+    if (cursor === input.length) break;
+    const start = cursor;
+    while (cursor < input.length && /[a-z]/.test(input[cursor]!)) cursor++;
+    const name = input.slice(start, cursor);
+    if (!["pattern", "flags", "group", "match", "max"].includes(name) || attributes.has(name))
+      return null;
+    while (cursor < input.length && /\s/.test(input[cursor]!)) cursor++;
+    if (input[cursor++] !== "=") return null;
+    while (cursor < input.length && /\s/.test(input[cursor]!)) cursor++;
+    const quote = input[cursor++];
+    if (quote !== '"' && quote !== "'") return null;
+    let value = "";
+    while (cursor < input.length && input[cursor] !== quote) {
+      if (input[cursor] === "\\" && (input[cursor + 1] === quote || input[cursor + 1] === "\\")) {
+        value += input[cursor + 1] === quote ? quote : "\\\\";
+        cursor += 2;
+      } else value += input[cursor++];
+    }
+    if (input[cursor++] !== quote) return null;
+    if (cursor < input.length && !/\s/.test(input[cursor]!)) return null;
+    attributes.set(name, value);
+  }
+  const pattern = attributes.get("pattern");
+  if (pattern === undefined) return null;
+  const group = attributes.get("group");
+  const match = attributes.get("match");
+  const max = attributes.get("max");
+  if ((match !== undefined && !/^\d+$/.test(match)) || (max !== undefined && !/^\d+$/.test(max)))
+    return null;
+  return {
+    pattern,
+    flags: attributes.get("flags"),
+    group: group === undefined ? undefined : /^\d+$/.test(group) ? Number(group) : group,
+    match: match === undefined ? undefined : Number(match),
+    maxLength: max === undefined ? undefined : Number(max),
+  };
+}

package/src/parser/rules/block/module/listpages/template/format/content.ts

@@ -1,5 +1,3 @@
-import type { PageData } from "../../types";
-
 /**
  * Split content by ==== separators.
  *
@@ -9,33 +7,3 @@ import type { PageData } from "../../types";
 export function splitContentSections(content: string): string[] {
   return content.split(/^={4,}$/m).map((section) => section.trim());
 }
-
-/**
- * Extract a summary from page content.
- */
-export function getSummary(page: PageData): string {
-  if (page.content) {
-    const sections = splitContentSections(page.content);
-    if (sections.length > 1) {
-      return sections[0]?.trim() ?? "";
-    }
-  }
-  return getFirstParagraph(page.content);
-}
-
-/**
- * Extract the first paragraph from wikitext content.
- */
-export function getFirstParagraph(content?: string): string {
-  if (!content) return "";
-
-  const stripped = content
-    .replace(/^(\+{1,6}) (.*)/gm, "")
-    .replace(/^\[\[toc(\s[^\]]+)?\]\]/gim, "")
-    .replace(/^\[\[\/?div(\s[^\]]+)?\]\]/gim, "")
-    .replace(/^\[\[\/?module(\s[^\]]+)?\]\]/gim, "")
-    .trim();
-
-  const paragraphs = stripped.split(/\n{2,}/);
-  return paragraphs[0]?.trim() ?? "";
-}

package/src/parser/rules/block/module/listpages/template/format/index.ts

@@ -1,4 +1,4 @@
 export { formatDate } from "./date";
-export { getFirstParagraph, getSummary, splitContentSections } from "./content";
+export { splitContentSections } from "./content";
 export { formatTagsLinked } from "./tags";
 export { formatUserLinked } from "./user";

package/src/parser/rules/block/module/listpages/template/getters/index.ts

@@ -6,6 +6,10 @@ import {
 } from "./parameterized";
 import { SIMPLE_GETTERS } from "./simple";
 import type { VariableGetter } from "./types";
+import { createRegisteredGetter } from "./registered";
+import { compileTextExcerpt } from "@wdprlib/ast";
+import { literalWikitext } from "../literal";
+import { parseExcerptOptions } from "../excerpt";
 
 /**
  * Create a getter function for a specific template variable.
@@ -20,8 +24,18 @@ export function createVariableGetter(
   parenParam?: string,
   format?: string,
 ): VariableGetter {
+  if (name === "excerpt") {
+    const options = braceParam === undefined ? null : parseExcerptOptions(braceParam);
+    if (!options || parenParam !== undefined || format !== undefined) return () => "";
+    const extract = compileTextExcerpt(options);
+    return (ctx) => literalWikitext(extract(ctx.page.readableText ?? ""));
+  }
+  const registeredGetter =
+    braceParam !== undefined ? createRegisteredGetter(name, braceParam, format) : null;
+  if (registeredGetter) return registeredGetter;
   const braceGetter = braceParam !== undefined ? createBraceParamGetter(name, braceParam) : null;
   if (braceGetter) return braceGetter;
+  if (braceParam !== undefined) return () => "";
 
   const parenGetter = parenParam !== undefined ? createParenParamGetter(name, parenParam) : null;
   if (parenGetter) return parenGetter;

package/src/parser/rules/block/module/listpages/template/getters/parameterized.ts

@@ -1,5 +1,7 @@
 import { formatDate, formatTagsLinked, splitContentSections } from "../format";
 import type { VariableGetter } from "./types";
+import { excerptText } from "@wdprlib/ast";
+import { literalWikitext } from "../literal";
 
 export function createBraceParamGetter(name: string, param: string): VariableGetter | null {
   switch (name) {
@@ -28,7 +30,7 @@ export function createParenParamGetter(name: string, param: string): VariableGet
   if (name !== "preview") return null;
 
   const len = Number(param);
-  return (ctx) => (ctx.page.content ?? "").slice(0, len);
+  return (ctx) => literalWikitext(excerptText(ctx.page.readableText ?? "", { maxLength: len }));
 }
 
 export function createFormattedGetter(name: string, format: string): VariableGetter | null {

package/src/parser/rules/block/module/listpages/template/getters/registered.ts

@@ -0,0 +1,52 @@
+import { formatDate } from "../format";
+import { literalWikitext } from "../literal";
+import type { VariableGetter } from "./types";
+
+/** Unavailable values stay empty; zero is an available aggregate. */
+export function createRegisteredGetter(
+  name: string,
+  key: string,
+  format?: string,
+): VariableGetter | null {
+  if (name === "metadata")
+    return (ctx) => {
+      const metadata = ctx.page.metadata;
+      const entry = metadata && Object.hasOwn(metadata, key) ? metadata[key] : null;
+      if (!entry) return "";
+      let value: string;
+      switch (entry.type) {
+        case "text":
+          value = entry.value;
+          break;
+        case "number":
+          value = String(entry.value);
+          break;
+        case "date":
+          value = formatDate(entry.value, format);
+          break;
+        case "user":
+          value =
+            format === "id"
+              ? String(entry.value.id)
+              : format === "unix"
+                ? entry.value.unixName
+                : entry.value.name;
+          break;
+      }
+      return literalWikitext(value);
+    };
+  if (name === "customrate" || name === "customrate_votes" || name === "customrate_percent")
+    return (ctx) => {
+      const ratings = ctx.page.customRates;
+      const entry = ratings && Object.hasOwn(ratings, key) ? ratings[key] : null;
+      if (!entry) return "";
+      return String(
+        name === "customrate"
+          ? entry.points
+          : name === "customrate_votes"
+            ? entry.votes
+            : entry.percent,
+      );
+    };
+  return null;
+}

package/src/parser/rules/block/module/listpages/template/getters/simple.ts

@@ -1,4 +1,6 @@
-import { formatDate, formatUserLinked, getFirstParagraph, getSummary } from "../format";
+import { formatDate, formatUserLinked } from "../format";
+import { countCharacters, excerptText } from "@wdprlib/ast";
+import { literalWikitext } from "../literal";
 import type { VariableGetter } from "./types";
 
 /** Default character count for `%%preview%%` when no length is specified (Wikidot default). */
@@ -38,16 +40,24 @@ export const SIMPLE_GETTERS: Record<string, VariableGetter> = {
     ctx.page.parentFullname ? `[[[${ctx.page.parentFullname} | ${ctx.page.parentTitle}]]]` : "",
 
   content: (ctx) => ctx.page.content ?? "",
-  preview: (ctx) => (ctx.page.content ?? "").slice(0, DEFAULT_PREVIEW_LENGTH),
-  summary: (ctx) => getSummary(ctx.page),
-  first_paragraph: (ctx) => getFirstParagraph(ctx.page.content),
+  preview: (ctx) =>
+    literalWikitext(
+      excerptText(ctx.page.readableText ?? "", { maxLength: DEFAULT_PREVIEW_LENGTH }),
+    ),
+  summary: (ctx) => literalWikitext(ctx.page.firstParagraph ?? ""),
+  first_paragraph: (ctx) => literalWikitext(ctx.page.firstParagraph ?? ""),
 
   tags: (ctx) => ctx.page.tags.join(" "),
   _tags: (ctx) => ctx.page.hiddenTags.join(" "),
 
   children: (ctx) => String(ctx.page.children),
   comments: (ctx) => String(ctx.page.comments),
-  size: (ctx) => String(ctx.page.size),
+  size: (ctx) =>
+    ctx.page.readableText !== undefined
+      ? String(countCharacters(ctx.page.readableText))
+      : ctx.page.size !== undefined
+        ? String(ctx.page.size)
+        : "",
   rating: (ctx) => String(ctx.page.rating),
   rating_votes: (ctx) => String(ctx.page.ratingVotes),
   rating_percent: (ctx) => String(ctx.page.ratingPercent ?? 0),

package/src/parser/rules/block/module/listpages/template/literal.ts

@@ -0,0 +1,6 @@
+/** Protect text before secondary include expansion and wikitext parsing. */
+export function literalWikitext(value: string): string {
+  if (value === "") return "";
+  // Encode delimiters and newlines too: a value cannot close this raw region.
+  return `@<${Array.from(value, (char) => `&#${char.codePointAt(0)};`).join("")}>@`;
+}

package/src/parser/rules/block/module/listpages/template/syntax.ts

@@ -1,3 +1,5 @@
+import { findExcerptEnd } from "./excerpt";
+
 export interface TemplateVariableMatch {
   raw: string;
   index: number;
@@ -25,7 +27,10 @@ export function scanTemplateVariables(template: string): TemplateVariableMatch[]
     if (start === -1) break;
 
     const contentStart = start + 2;
-    const end = template.indexOf("%%", contentStart);
+    const end =
+      template.slice(contentStart, contentStart + 8).toLowerCase() === "excerpt{"
+        ? findExcerptEnd(template, contentStart)
+        : template.indexOf("%%", contentStart);
     if (end === -1) break;
 
     const parsed = parseTemplateVariableContent(template.slice(contentStart, end));
@@ -53,6 +58,10 @@ function parseTemplateVariableContent(
   if (cursor === 0) return null;
 
   const name = content.slice(0, cursor);
+  if (name.toLowerCase() === "excerpt" && content[cursor] === "{") {
+    if (!content.endsWith("}")) return null;
+    return { name, braceParam: content.slice(cursor + 1, -1) };
+  }
   let braceParam: string | undefined;
   let parenParam: string | undefined;
   let format: string | undefined;

package/src/parser/rules/block/module/listpages/types/data-requirements.ts

@@ -24,6 +24,12 @@ export interface ListPagesDataRequirement {
 
   /** Field names needed for form_data{field} etc. */
   formFields?: string[];
+  /** Exact metadata keys used by display templates. Also validate query.order on the host. */
+  metadataKeys?: string[];
+  /** Exact custom rating keys needed for display, independent of query.ratingAxis. */
+  customRateKeys?: string[];
+  /** Supply PageData.readableText and firstParagraph for previews, excerpts, and summaries. */
+  needsReadableText?: boolean;
 
   /** Prefix for tags_linked|prefix */
   tagsLinkPrefix?: string;

package/src/parser/rules/block/module/listpages/types/external-data.ts

@@ -1,3 +1,12 @@
+import type { RatingAggregate } from "@wdprlib/ast";
+
+/** Values for host-registered metadata keys. Missing entries remain unavailable. */
+export type PageMetadataValue =
+  | { type: "text"; value: string }
+  | { type: "number"; value: number }
+  | { type: "date"; value: Date }
+  | { type: "user"; value: UserInfo };
+
 /**
  * User information.
  */
@@ -11,6 +20,18 @@ export interface UserInfo {
  * Page data provided by an external source.
  */
 export interface PageData {
+  /**
+   * `%%metadata{key}%%`: only registered, readable entries; keys are case-sensitive.
+   * Values are literal text. Date values accept strftime; user format is name, |id or |unix.
+   * Tag change date/editor may be host-defined keys; WDPR reserves no such keys.
+   */
+  metadata?: Readonly<Record<string, PageMetadataValue | null>>;
+  /**
+   * `%%customrate{key}%%`, `%%customrate_votes{key}%%`, `%%customrate_percent{key}%%`.
+   * Supply readable aggregates for requirement.customRateKeys, just as formFields selects
+   * form data. Missing keys expand to empty text; a supplied zero remains zero.
+   */
+  customRates?: Readonly<Record<string, RatingAggregate | null>>;
   // Identity
   name: string;
   category: string;
@@ -37,6 +58,19 @@ export interface PageData {
 
   // Wikitext content split by ==== when resolving %%content{n}%%.
   content?: string;
+  /**
+   * Text extracted from this page's resolved AST for preview and
+   * `%%excerpt{pattern="..." group="1" match="2" max="200"}%%`.
+   * Values stay literal; raw content is never a fallback.
+   * The host owns extraction policy, dependency invalidation and recursion limits.
+   */
+  readableText?: string;
+  /**
+   * First nonempty paragraph from extractFirstParagraph, for summary and first_paragraph.
+   * Uses the same extraction policy as readableText. Empty when no readable paragraph
+   * exists; undefined when unavailable. Headings and appended footnotes are excluded.
+   */
+  firstParagraph?: string;
 
   // Tags
   tags: string[];
@@ -51,7 +85,8 @@ export interface PageData {
   // Metrics
   children: number;
   comments: number;
-  size: number;
+  /** Materialized readable character count, computed with countCharacters. */
+  size?: number;
   rating: number;
   ratingVotes: number;
   ratingPercent?: number;
@@ -73,7 +108,6 @@ export function definePageData(input: PageDataInput): PageData {
     hiddenTags: input.hiddenTags ?? [],
     children: input.children ?? 0,
     comments: input.comments ?? 0,
-    size: input.size ?? 0,
     rating: input.rating ?? 0,
     ratingVotes: input.ratingVotes ?? 0,
     revisions: input.revisions ?? 0,

package/src/parser/rules/block/module/listpages/types/normalized-query.ts

@@ -32,6 +32,8 @@ export interface NormalizedCategory {
 export type OrderField =
   | "created_at"
   | "updated_at"
+  | "commented_at"
+  | "metadata"
   | "title"
   | "fullname"
   | "rating"
@@ -48,11 +50,13 @@ export type OrderDirection = "asc" | "desc";
 
 /**
  * Normalized order specification.
+ * Providers validate metadata registration, readability and sortability without falling back
+ * to another field. Sort before pagination with a stable page ID tie-breaker. For commented_at,
+ * put pages without comments last and use the same visible, non-deleted comments as the count.
  */
-export interface NormalizedOrder {
-  field: OrderField;
-  direction: OrderDirection;
-}
+export type NormalizedOrder =
+  | { field: Exclude<OrderField, "metadata">; direction: OrderDirection }
+  | { field: "metadata"; key: string; direction: OrderDirection };
 
 /**
  * Normalized parent selector.
@@ -107,6 +111,12 @@ export interface NormalizedListPagesQuery {
   updatedAt?: NormalizedDateSelector;
   createdBy?: string;
   rating?: NormalizedNumericSelector;
+  /**
+   * `rating-axis` selects the custom aggregate for rating/votes filters and order; omission
+   * selects main. Verify registration and read access before filtering, counting or sorting.
+   * Unknown keys must not fall back to main. Display variables select their own keys.
+   */
+  ratingAxis?: string;
   votes?: NormalizedNumericSelector;
   name?: string;
   fullname?: string;

package/src/parser/rules/block/module/listpages/types/query.ts

@@ -34,6 +34,8 @@ export interface ListPagesQuery {
 
   /** Rating selector. @untrusted User input. */
   rating?: string;
+  /** Exact registered custom key for rating/votes filters and order; omitted means main. */
+  ratingAxis?: string;
 
   /** Votes selector. @untrusted User input. */
   votes?: string;

package/src/parser/rules/block/module/listpages/types/variables.ts

@@ -2,6 +2,10 @@
  * All supported ListPages template variables.
  */
 export type ListPagesVariable =
+  | "metadata"
+  | "customrate"
+  | "customrate_votes"
+  | "customrate_percent"
   // Lifecycle - created
   | "created_at"
   | "created_by"
@@ -38,6 +42,7 @@ export type ListPagesVariable =
   | "content_n"
   | "preview"
   | "preview_n"
+  | "excerpt"
   | "summary"
   | "first_paragraph"
   // Tags

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

@@ -36,6 +36,7 @@ type StringUrlQueryKey = Extract<
   | "updatedAt"
   | "createdBy"
   | "rating"
+  | "ratingAxis"
   | "votes"
 >;
 
@@ -81,6 +82,7 @@ export const URL_RESOLVABLE_FIELDS: readonly UrlResolvableField[] = [
     aliases: ["createdby", "created_by"],
   },
   { attr: "rating", queryKey: "rating", type: "string" },
+  { attr: "rating-axis", queryKey: "ratingAxis", type: "string" },
   { attr: "votes", queryKey: "votes", type: "string" },
   { attr: "reverse", queryKey: "reverse", type: "boolean" },
 ];

package/src/parser/rules/block/module/listusers/resolve.ts

@@ -16,6 +16,7 @@ import type {
   ListUsersVariableContext,
 } from "./types";
 import { getModuleParseAst, type ParseFunction } from "../types";
+import { suppressModuleRatings } from "../rate/resolve";
 
 /**
  * Narrowed type for the list-users variant of the Module discriminated union.
@@ -53,6 +54,6 @@ export function resolveListUsers(
 ): Element[] {
   const ctx: ListUsersVariableContext = { user: data.user };
   const substituted = compiledTemplate(ctx);
-  const itemAst = getModuleParseAst(parse(substituted));
+  const itemAst = getModuleParseAst(suppressModuleRatings(parse(substituted)));
   return itemAst.elements;
 }

package/src/parser/rules/block/module/mapping.ts

@@ -11,7 +11,7 @@
  */
 
 import type { ModuleRule } from "./types";
-import { rateModuleRule } from "./rate/index";
+import { rateModuleRule, customRateModuleRule } from "./rate/index";
 import { cssModuleRule } from "./css/index";
 import { backlinksModuleRule } from "./backlinks/index";
 import { categoriesModuleRule } from "./categories/index";
@@ -29,6 +29,7 @@ import { tagCloudModuleRule } from "./tagcloud/parser";
  */
 export const MODULE_RULES: ModuleRule[] = [
   rateModuleRule,
+  customRateModuleRule,
   cssModuleRule,
   backlinksModuleRule,
   categoriesModuleRule,