@wdprlib/parser 5.1.4 → 5.1.5

package/dist/index.cjs

@@ -1298,17 +1298,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 +1326,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 +1345,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 +4464,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 +5987,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 +6000,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 +6340,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);

package/package.json

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

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

@@ -3,9 +3,9 @@
  * Parser rule for the Wikidot `[[module ListPages ...]]` block.
  *
  * Parses the module's attributes into a structured `list-pages` Module AST node.
- * Handles both hyphenated (`link-to`) and concatenated (`linkto`) attribute name
- * formats, as Wikidot normalizes both to lowercase. The raw attribute values are
- * preserved in the `attributes` field for `@URL` resolution by external applications.
+ * Handles hyphenated (`link-to`), concatenated (`linkto`), and snake_case (`link_to`)
+ * attribute name formats. The raw attribute values are preserved in the `attributes`
+ * field for `@URL` resolution by external applications.
  *
  * @module
  */
@@ -51,19 +51,19 @@ export const listPagesModuleRule: ModuleRule = {
       wrapper,
       rss,
     } = args;
-    // Hyphenated attributes (stored with hyphens in lowercase)
-    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;
+    // Compound attributes accept Wikidot's supported spelling variants.
+    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;
 
     // Store all raw arguments for @URL resolution by external apps
     const rawArgs: Record<string, string> = { ...args };

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

@@ -1,9 +1,27 @@
 import type { ListPagesQuery } from "../types";
 
 export type UrlResolvableField =
-  | { 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[] };
+  | {
+      attr: string;
+      queryKey: StringUrlQueryKey;
+      type: "string";
+      aliases?: readonly string[];
+      urlAttrs?: readonly string[];
+    }
+  | {
+      attr: string;
+      queryKey: NumberUrlQueryKey;
+      type: "number";
+      aliases?: readonly string[];
+      urlAttrs?: readonly string[];
+    }
+  | {
+      attr: string;
+      queryKey: BooleanUrlQueryKey;
+      type: "boolean";
+      aliases?: readonly string[];
+      urlAttrs?: readonly string[];
+    };
 
 type StringUrlQueryKey = Extract<
   keyof ListPagesQuery,
@@ -31,7 +49,12 @@ type BooleanUrlQueryKey = Extract<keyof ListPagesQuery, "reverse">;
 export const URL_RESOLVABLE_FIELDS: readonly UrlResolvableField[] = [
   { 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" },
@@ -39,9 +62,24 @@ export const URL_RESOLVABLE_FIELDS: readonly UrlResolvableField[] = [
   { 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" },

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

@@ -22,7 +22,9 @@ export function resolveQuery(
   const resolved: ListPagesQuery = { ...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(

package/src/parser/rules/block/parsing/attributes/names.ts

@@ -19,13 +19,19 @@ export function consumeAttributeName(
   startName: string,
   options: AttributeNameOptions,
 ): AttributeNameResult {
+  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);
 }
 
 export function isAttributeNameToken(token: Token | undefined): token is Token {
-  return token?.type === "TEXT" || token?.type === "IDENTIFIER";
+  return isAttributeWordToken(token) || token?.type === "UNDERSCORE";
 }
 
 function consumeSafeNameSuffix(
@@ -38,12 +44,8 @@ function consumeSafeNameSuffix(
   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 ?? "";
@@ -65,20 +67,20 @@ function consumeRawNameSuffix(
   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++;
@@ -88,6 +90,14 @@ function consumeRawNameSuffix(
   return { name, pos, consumed };
 }
 
-function isHyphenToken(token: Token | undefined): boolean {
-  return (token?.type === "TEXT" && token.value === "-") || token?.type === "STRIKE_MARKER";
+function isAttributeWordToken(token: Token | undefined): boolean {
+  return token?.type === "TEXT" || token?.type === "IDENTIFIER";
+}
+
+function isAttributeNameSeparator(token: Token | undefined): boolean {
+  return (
+    (token?.type === "TEXT" && token.value === "-") ||
+    token?.type === "STRIKE_MARKER" ||
+    token?.type === "UNDERSCORE"
+  );
 }