@wdprlib/parser 5.1.4 → 5.1.6

package/THIRD-PARTY-LICENSES.md

@@ -0,0 +1,23 @@
+# Third-Party Licenses
+
+Portions of this package's code, data structures, and algorithms were adapted from or based on the projects listed below and modified for wdpr's TypeScript implementation. Test fixtures derived from ftml are distributed in the wdpr source repository.
+
+## ftml
+
+- Source: <https://github.com/scpwiki/ftml>
+- Author: Emmie Smith
+- Copyright notice: Copyright (C) 2019-2026 Wikijump Team
+- License: GNU Affero General Public License, version 3 or later
+
+The GNU Affero General Public License version 3 is reproduced in [LICENSE](LICENSE). The upstream project permits use under version 3 or any later version.
+
+## Wikidot Text_Wiki
+
+- Source: <https://github.com/gabrys/wikidot/tree/master/lib/Text_Wiki/Text>
+- Authors and contributors named in the source: Paul M. Jones, Michal Frackowiak, Manuel Holtgrewe, and Bertrand Gugger
+- Copyright notice in some files: 2005 bertrand Gugger
+- License: GNU Lesser General Public License, version 2.1
+
+The GNU Lesser General Public License version 2.1 is reproduced in [licenses/LGPL-2.1.txt](licenses/LGPL-2.1.txt).
+
+The surrounding Wikidot project is Copyright (c) 2008 by Wikidot Inc. and is distributed under the GNU Affero General Public License, version 3 or later. See the upstream [LICENSE.txt](https://github.com/gabrys/wikidot/blob/master/LICENSE.txt).

package/dist/index.cjs

@@ -1,4 +1,3 @@
-var import_node_module = require("node:module");
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1298,17 +1297,22 @@ function parseInlineUntil(ctx, endType) {
 }
 // packages/parser/src/parser/rules/block/parsing/attributes/names.ts
 function consumeAttributeName(ctx, startPos, startConsumed, startName, options) {
+  if (startName === "_" && isAttributeWordToken(ctx.tokens[startPos])) {
+    startName += ctx.tokens[startPos]?.value ?? "";
+    startPos++;
+    startConsumed++;
+  }
   return options.strikeHyphens ? consumeRawNameSuffix(ctx, startPos, startConsumed, startName, options.hyphenatedNames) : consumeSafeNameSuffix(ctx, startPos, startConsumed, startName);
 }
 function isAttributeNameToken(token5) {
-  return token5?.type === "TEXT" || token5?.type === "IDENTIFIER";
+  return isAttributeWordToken(token5) || token5?.type === "UNDERSCORE";
 }
 function consumeSafeNameSuffix(ctx, startPos, startConsumed, startName) {
   let name = startName;
   let pos = startPos;
   let consumed = startConsumed;
-  while (ctx.tokens[pos]?.type === "TEXT" && ctx.tokens[pos]?.value === "-" && isAttributeNameToken(ctx.tokens[pos + 1])) {
-    name += "-";
+  while (isAttributeNameSeparator(ctx.tokens[pos]) && isAttributeWordToken(ctx.tokens[pos + 1])) {
+    name += ctx.tokens[pos]?.value ?? "";
     pos++;
     consumed++;
     name += ctx.tokens[pos]?.value ?? "";
@@ -1321,18 +1325,18 @@ function consumeRawNameSuffix(ctx, startPos, startConsumed, startName, hyphenate
   let name = startName;
   let pos = startPos;
   let consumed = startConsumed;
-  while (isHyphenToken(ctx.tokens[pos])) {
-    while (isHyphenToken(ctx.tokens[pos])) {
-      if (hyphenatedNames) {
+  while (isAttributeNameSeparator(ctx.tokens[pos])) {
+    while (isAttributeNameSeparator(ctx.tokens[pos])) {
+      if (hyphenatedNames || ctx.tokens[pos]?.type === "UNDERSCORE") {
         name += ctx.tokens[pos]?.value ?? "-";
       }
       pos++;
       consumed++;
     }
-    if (!isAttributeNameToken(ctx.tokens[pos])) {
+    if (!isAttributeWordToken(ctx.tokens[pos])) {
       break;
     }
-    if (hyphenatedNames) {
+    if (hyphenatedNames || name.endsWith("_")) {
       name += ctx.tokens[pos]?.value ?? "";
     }
     pos++;
@@ -1340,8 +1344,11 @@ function consumeRawNameSuffix(ctx, startPos, startConsumed, startName, hyphenate
   }
   return { name, pos, consumed };
 }
-function isHyphenToken(token5) {
-  return token5?.type === "TEXT" && token5.value === "-" || token5?.type === "STRIKE_MARKER";
+function isAttributeWordToken(token5) {
+  return token5?.type === "TEXT" || token5?.type === "IDENTIFIER";
+}
+function isAttributeNameSeparator(token5) {
+  return token5?.type === "TEXT" && token5.value === "-" || token5?.type === "STRIKE_MARKER" || token5?.type === "UNDERSCORE";
 }
 
 // packages/parser/src/parser/rules/block/parsing/attributes/values.ts
@@ -4456,18 +4463,18 @@ var listPagesModuleRule = {
       wrapper,
       rss
     } = args;
-    const linkTo = args["link-to"] ?? args.linkto;
-    const createdBy = args["created-by"] ?? args.createdby;
-    const createdAt = args["created-at"] ?? args.createdat;
-    const updatedAt = args["updated-at"] ?? args.updatedat;
-    const perPage = args["per-page"] ?? args.perpage;
-    const prependLine = args["prepend-line"] ?? args.prependline;
-    const appendLine = args["append-line"] ?? args.appendline;
-    const rssDescription = args["rss-description"] ?? args.rssdescription;
-    const rssHome = args["rss-home"] ?? args.rsshome;
-    const rssLimit = args["rss-limit"] ?? args.rsslimit;
-    const rssOnly = args["rss-only"] ?? args.rssonly;
-    const urlAttrPrefix = args["url-attr-prefix"] ?? args.urlattrprefix;
+    const linkTo = args["link-to"] ?? args.linkto ?? args.link_to;
+    const createdBy = args["created-by"] ?? args.createdby ?? args.created_by;
+    const createdAt = args["created-at"] ?? args.createdat ?? args.created_at;
+    const updatedAt = args["updated-at"] ?? args.updatedat ?? args.updated_at;
+    const perPage = args["per-page"] ?? args.perpage ?? args.per_page;
+    const prependLine = args["prepend-line"] ?? args.prependline ?? args.prepend_line;
+    const appendLine = args["append-line"] ?? args.appendline ?? args.append_line;
+    const rssDescription = args["rss-description"] ?? args.rssdescription ?? args.rss_description;
+    const rssHome = args["rss-home"] ?? args.rsshome ?? args.rss_home;
+    const rssLimit = args["rss-limit"] ?? args.rsslimit ?? args.rss_limit;
+    const rssOnly = args["rss-only"] ?? args.rssonly ?? args.rss_only;
+    const urlAttrPrefix = args["url-attr-prefix"] ?? args.urlattrprefix ?? args.url_attr_prefix;
     const rawArgs = { ...args };
     return {
       module: "list-pages",
@@ -5979,7 +5986,12 @@ function setsEqual(left, right) {
 var URL_RESOLVABLE_FIELDS = [
   { attr: "offset", queryKey: "offset", type: "number" },
   { attr: "limit", queryKey: "limit", type: "number" },
-  { attr: "per-page", queryKey: "perPage", type: "number" },
+  {
+    attr: "per-page",
+    queryKey: "perPage",
+    type: "number",
+    aliases: ["perpage", "per_page"]
+  },
   { attr: "order", queryKey: "order", type: "string" },
   { attr: "tags", queryKey: "tags", type: "string", urlAttrs: ["tag"] },
   { attr: "category", queryKey: "category", type: "string" },
@@ -5987,9 +5999,24 @@ var URL_RESOLVABLE_FIELDS = [
   { 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: "created-at",
+    queryKey: "createdAt",
+    type: "string",
+    aliases: ["createdat", "created_at"]
+  },
+  {
+    attr: "updated-at",
+    queryKey: "updatedAt",
+    type: "string",
+    aliases: ["updatedat", "updated_at"]
+  },
+  {
+    attr: "created-by",
+    queryKey: "createdBy",
+    type: "string",
+    aliases: ["createdby", "created_by"]
+  },
   { attr: "rating", queryKey: "rating", type: "string" },
   { attr: "votes", queryKey: "votes", type: "string" },
   { attr: "reverse", queryKey: "reverse", type: "boolean" }
@@ -6312,7 +6339,7 @@ function resolveQuery(requirement, urlParams) {
   const { query, rawAttributes, urlAttrPrefix } = requirement;
   const resolved = { ...query };
   for (const field of URL_RESOLVABLE_FIELDS) {
-    const rawValue = rawAttributes[field.attr];
+    const rawValue = [field.attr, ...field.aliases ?? []].map((attr) => rawAttributes[attr]).find((value) => value !== undefined);
     if (!rawValue)
       continue;
     const resolvedValue = resolveUrlValue(rawValue, getUrlParamNames(field), urlParams, urlAttrPrefix);

package/dist/index.js

@@ -1233,17 +1233,22 @@ function parseInlineUntil(ctx, endType) {
 }
 // packages/parser/src/parser/rules/block/parsing/attributes/names.ts
 function consumeAttributeName(ctx, startPos, startConsumed, startName, options) {
+  if (startName === "_" && isAttributeWordToken(ctx.tokens[startPos])) {
+    startName += ctx.tokens[startPos]?.value ?? "";
+    startPos++;
+    startConsumed++;
+  }
   return options.strikeHyphens ? consumeRawNameSuffix(ctx, startPos, startConsumed, startName, options.hyphenatedNames) : consumeSafeNameSuffix(ctx, startPos, startConsumed, startName);
 }
 function isAttributeNameToken(token5) {
-  return token5?.type === "TEXT" || token5?.type === "IDENTIFIER";
+  return isAttributeWordToken(token5) || token5?.type === "UNDERSCORE";
 }
 function consumeSafeNameSuffix(ctx, startPos, startConsumed, startName) {
   let name = startName;
   let pos = startPos;
   let consumed = startConsumed;
-  while (ctx.tokens[pos]?.type === "TEXT" && ctx.tokens[pos]?.value === "-" && isAttributeNameToken(ctx.tokens[pos + 1])) {
-    name += "-";
+  while (isAttributeNameSeparator(ctx.tokens[pos]) && isAttributeWordToken(ctx.tokens[pos + 1])) {
+    name += ctx.tokens[pos]?.value ?? "";
     pos++;
     consumed++;
     name += ctx.tokens[pos]?.value ?? "";
@@ -1256,18 +1261,18 @@ function consumeRawNameSuffix(ctx, startPos, startConsumed, startName, hyphenate
   let name = startName;
   let pos = startPos;
   let consumed = startConsumed;
-  while (isHyphenToken(ctx.tokens[pos])) {
-    while (isHyphenToken(ctx.tokens[pos])) {
-      if (hyphenatedNames) {
+  while (isAttributeNameSeparator(ctx.tokens[pos])) {
+    while (isAttributeNameSeparator(ctx.tokens[pos])) {
+      if (hyphenatedNames || ctx.tokens[pos]?.type === "UNDERSCORE") {
         name += ctx.tokens[pos]?.value ?? "-";
       }
       pos++;
       consumed++;
     }
-    if (!isAttributeNameToken(ctx.tokens[pos])) {
+    if (!isAttributeWordToken(ctx.tokens[pos])) {
       break;
     }
-    if (hyphenatedNames) {
+    if (hyphenatedNames || name.endsWith("_")) {
       name += ctx.tokens[pos]?.value ?? "";
     }
     pos++;
@@ -1275,8 +1280,11 @@ function consumeRawNameSuffix(ctx, startPos, startConsumed, startName, hyphenate
   }
   return { name, pos, consumed };
 }
-function isHyphenToken(token5) {
-  return token5?.type === "TEXT" && token5.value === "-" || token5?.type === "STRIKE_MARKER";
+function isAttributeWordToken(token5) {
+  return token5?.type === "TEXT" || token5?.type === "IDENTIFIER";
+}
+function isAttributeNameSeparator(token5) {
+  return token5?.type === "TEXT" && token5.value === "-" || token5?.type === "STRIKE_MARKER" || token5?.type === "UNDERSCORE";
 }
 
 // packages/parser/src/parser/rules/block/parsing/attributes/values.ts
@@ -4391,18 +4399,18 @@ var listPagesModuleRule = {
       wrapper,
       rss
     } = args;
-    const linkTo = args["link-to"] ?? args.linkto;
-    const createdBy = args["created-by"] ?? args.createdby;
-    const createdAt = args["created-at"] ?? args.createdat;
-    const updatedAt = args["updated-at"] ?? args.updatedat;
-    const perPage = args["per-page"] ?? args.perpage;
-    const prependLine = args["prepend-line"] ?? args.prependline;
-    const appendLine = args["append-line"] ?? args.appendline;
-    const rssDescription = args["rss-description"] ?? args.rssdescription;
-    const rssHome = args["rss-home"] ?? args.rsshome;
-    const rssLimit = args["rss-limit"] ?? args.rsslimit;
-    const rssOnly = args["rss-only"] ?? args.rssonly;
-    const urlAttrPrefix = args["url-attr-prefix"] ?? args.urlattrprefix;
+    const linkTo = args["link-to"] ?? args.linkto ?? args.link_to;
+    const createdBy = args["created-by"] ?? args.createdby ?? args.created_by;
+    const createdAt = args["created-at"] ?? args.createdat ?? args.created_at;
+    const updatedAt = args["updated-at"] ?? args.updatedat ?? args.updated_at;
+    const perPage = args["per-page"] ?? args.perpage ?? args.per_page;
+    const prependLine = args["prepend-line"] ?? args.prependline ?? args.prepend_line;
+    const appendLine = args["append-line"] ?? args.appendline ?? args.append_line;
+    const rssDescription = args["rss-description"] ?? args.rssdescription ?? args.rss_description;
+    const rssHome = args["rss-home"] ?? args.rsshome ?? args.rss_home;
+    const rssLimit = args["rss-limit"] ?? args.rsslimit ?? args.rss_limit;
+    const rssOnly = args["rss-only"] ?? args.rssonly ?? args.rss_only;
+    const urlAttrPrefix = args["url-attr-prefix"] ?? args.urlattrprefix ?? args.url_attr_prefix;
     const rawArgs = { ...args };
     return {
       module: "list-pages",
@@ -5914,7 +5922,12 @@ function setsEqual(left, right) {
 var URL_RESOLVABLE_FIELDS = [
   { attr: "offset", queryKey: "offset", type: "number" },
   { attr: "limit", queryKey: "limit", type: "number" },
-  { attr: "per-page", queryKey: "perPage", type: "number" },
+  {
+    attr: "per-page",
+    queryKey: "perPage",
+    type: "number",
+    aliases: ["perpage", "per_page"]
+  },
   { attr: "order", queryKey: "order", type: "string" },
   { attr: "tags", queryKey: "tags", type: "string", urlAttrs: ["tag"] },
   { attr: "category", queryKey: "category", type: "string" },
@@ -5922,9 +5935,24 @@ var URL_RESOLVABLE_FIELDS = [
   { 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: "created-at",
+    queryKey: "createdAt",
+    type: "string",
+    aliases: ["createdat", "created_at"]
+  },
+  {
+    attr: "updated-at",
+    queryKey: "updatedAt",
+    type: "string",
+    aliases: ["updatedat", "updated_at"]
+  },
+  {
+    attr: "created-by",
+    queryKey: "createdBy",
+    type: "string",
+    aliases: ["createdby", "created_by"]
+  },
   { attr: "rating", queryKey: "rating", type: "string" },
   { attr: "votes", queryKey: "votes", type: "string" },
   { attr: "reverse", queryKey: "reverse", type: "boolean" }
@@ -6247,7 +6275,7 @@ function resolveQuery(requirement, urlParams) {
   const { query, rawAttributes, urlAttrPrefix } = requirement;
   const resolved = { ...query };
   for (const field of URL_RESOLVABLE_FIELDS) {
-    const rawValue = rawAttributes[field.attr];
+    const rawValue = [field.attr, ...field.aliases ?? []].map((attr) => rawAttributes[attr]).find((value) => value !== undefined);
     if (!rawValue)
       continue;
     const resolvedValue = resolveUrlValue(rawValue, getUrlParamNames(field), urlParams, urlAttrPrefix);