@datamoc/mw_games 0.8.1 → 0.9.0-alpha

package/dist/mwl/compiler.d.ts

@@ -35,7 +35,7 @@ export interface MwlEmitOptions {
  * ```ts
  * import { compile } from '@datamoc/mw_games/mwl';
  *
- * const game = compile('[game]\nschema=0.1\n[/game]');
+ * const game = compile("[{ tag: 'game', schema: 0.1 }]");
  * console.log(game.schema); // '0.1'
  * ```
  */
@@ -51,7 +51,7 @@ export interface MwlSourceFile {
  * ```ts
  * import { compileSources } from '@datamoc/mw_games/mwl';
  *
- * const game = compileSources([{ file: 'a.mwl', source: '[game]\nschema=0.1\n[/game]' }]);
+ * const game = compileSources([{ file: 'a.mwl', source: "[{ tag: 'game', schema: 0.1 }]" }]);
  * console.log(game.roots.length); // 1
  * ```
  */
@@ -65,7 +65,7 @@ export declare function compileSources(files: readonly MwlSourceFile[], options?
  * ```ts
  * import { compileNodes, parse } from '@datamoc/mw_games/mwl';
  *
- * const game = compileNodes(parse('[game]\nschema=0.1\n[/game]'));
+ * const game = compileNodes(parse("[{ tag: 'game', schema: 0.1 }]"));
  * console.log(game.schema); // '0.1'
  * ```
  */
@@ -89,7 +89,7 @@ export interface MwlCatalog {
  * ```ts
  * import { compile, extractCatalog } from '@datamoc/mw_games/mwl';
  *
- * const game = compile('[game]\nschema=0.1\n[/game]');
+ * const game = compile("[{ tag: 'game', schema: 0.1 }]");
  * console.log(extractCatalog(game, { locale: 'fr' }).locale); // 'fr'
  * ```
  */
@@ -101,7 +101,7 @@ export declare function extractCatalog(game: MwlCompiledGame, options?: MwlCatal
  * ```ts
  * import { compile, emitModule } from '@datamoc/mw_games/mwl';
  *
- * console.log(emitModule(compile('[game]\nschema=0.1\n[/game]')).startsWith('export const gameData')); // true
+ * console.log(emitModule(compile("[{ tag: 'game', schema: 0.1 }]")).startsWith('export const gameData')); // true
  * ```
  */
 export declare function emitModule(game: MwlCompiledGame, variable?: string): string;
@@ -112,7 +112,7 @@ export declare function emitModule(game: MwlCompiledGame, variable?: string): st
  * ```ts
  * import { compile, emitArtifacts } from '@datamoc/mw_games/mwl';
  *
- * const artifacts = emitArtifacts(compile('[game]\nschema=0.1\n[/game]'));
+ * const artifacts = emitArtifacts(compile("[{ tag: 'game', schema: 0.1 }]"));
  * console.log(artifacts.map((artifact) => artifact.name)); // ['game-data.ts', 'i18n.json', 'assets.json']
  * ```
  */
@@ -124,7 +124,7 @@ export declare function emitArtifacts(game: MwlCompiledGame, options?: MwlEmitOp
  * ```ts
  * import { compileAndEmitSources } from '@datamoc/mw_games/mwl';
  *
- * const artifacts = compileAndEmitSources([{ file: 'a.mwl', source: '[game]\nschema=0.1\n[/game]' }]);
+ * const artifacts = compileAndEmitSources([{ file: 'a.mwl', source: "[{ tag: 'game', schema: 0.1 }]" }]);
  * console.log(artifacts.length); // 3
  * ```
  */

package/dist/mwl/compiler.js

@@ -7,7 +7,7 @@ import { validate } from './schema.js';
  * ```ts
  * import { compile } from '@datamoc/mw_games/mwl';
  *
- * const game = compile('[game]\nschema=0.1\n[/game]');
+ * const game = compile("[{ tag: 'game', schema: 0.1 }]");
  * console.log(game.schema); // '0.1'
  * ```
  */
@@ -22,7 +22,7 @@ export function compile(source, options = {}) {
  * ```ts
  * import { compileSources } from '@datamoc/mw_games/mwl';
  *
- * const game = compileSources([{ file: 'a.mwl', source: '[game]\nschema=0.1\n[/game]' }]);
+ * const game = compileSources([{ file: 'a.mwl', source: "[{ tag: 'game', schema: 0.1 }]" }]);
  * console.log(game.roots.length); // 1
  * ```
  */
@@ -43,7 +43,7 @@ export function compileSources(files, options = {}) {
  * ```ts
  * import { compileNodes, parse } from '@datamoc/mw_games/mwl';
  *
- * const game = compileNodes(parse('[game]\nschema=0.1\n[/game]'));
+ * const game = compileNodes(parse("[{ tag: 'game', schema: 0.1 }]"));
  * console.log(game.schema); // '0.1'
  * ```
  */
@@ -140,7 +140,7 @@ function stripAssetTransform(value) {
  * ```ts
  * import { compile, extractCatalog } from '@datamoc/mw_games/mwl';
  *
- * const game = compile('[game]\nschema=0.1\n[/game]');
+ * const game = compile("[{ tag: 'game', schema: 0.1 }]");
  * console.log(extractCatalog(game, { locale: 'fr' }).locale); // 'fr'
  * ```
  */
@@ -157,7 +157,7 @@ export function extractCatalog(game, options = {}) {
  * ```ts
  * import { compile, emitModule } from '@datamoc/mw_games/mwl';
  *
- * console.log(emitModule(compile('[game]\nschema=0.1\n[/game]')).startsWith('export const gameData')); // true
+ * console.log(emitModule(compile("[{ tag: 'game', schema: 0.1 }]")).startsWith('export const gameData')); // true
  * ```
  */
 export function emitModule(game, variable = 'gameData') {
@@ -170,7 +170,7 @@ export function emitModule(game, variable = 'gameData') {
  * ```ts
  * import { compile, emitArtifacts } from '@datamoc/mw_games/mwl';
  *
- * const artifacts = emitArtifacts(compile('[game]\nschema=0.1\n[/game]'));
+ * const artifacts = emitArtifacts(compile("[{ tag: 'game', schema: 0.1 }]"));
  * console.log(artifacts.map((artifact) => artifact.name)); // ['game-data.ts', 'i18n.json', 'assets.json']
  * ```
  */
@@ -194,7 +194,7 @@ export function emitArtifacts(game, options = {}) {
  * ```ts
  * import { compileAndEmitSources } from '@datamoc/mw_games/mwl';
  *
- * const artifacts = compileAndEmitSources([{ file: 'a.mwl', source: '[game]\nschema=0.1\n[/game]' }]);
+ * const artifacts = compileAndEmitSources([{ file: 'a.mwl', source: "[{ tag: 'game', schema: 0.1 }]" }]);
  * console.log(artifacts.length); // 3
  * ```
  */

package/dist/mwl/content.d.ts

@@ -133,7 +133,7 @@ export interface MwlContentCatalog {
  * ```ts
  * import { compile, contentCatalog } from '@datamoc/mw_games/mwl';
  *
- * console.log(contentCatalog(compile('[game]\nschema=0.1\n[/game]')).campaigns); // []
+ * console.log(contentCatalog(compile("[{ tag: 'game', schema: 0.1 }]")).campaigns); // []
  * ```
  */
 export declare function contentCatalog(game: MwlCompiledGame): MwlContentCatalog;

package/dist/mwl/content.js

@@ -13,7 +13,7 @@ const enumValue = enumAttribute;
  * ```ts
  * import { compile, contentCatalog } from '@datamoc/mw_games/mwl';
  *
- * console.log(contentCatalog(compile('[game]\nschema=0.1\n[/game]')).campaigns); // []
+ * console.log(contentCatalog(compile("[{ tag: 'game', schema: 0.1 }]")).campaigns); // []
  * ```
  */
 export function contentCatalog(game) {

package/dist/mwl/grammar.d.ts

@@ -9,7 +9,7 @@ export interface MwlNode {
     readonly children: readonly MwlNode[];
     readonly location: MwlLocation;
     /**
-     * Names of the attributes that carried the gettext marker `_ "..."`.
+     * Names of the attributes that carried the gettext marker `_("...")`.
      * Present (possibly empty) on nodes parsed from text, so the compiler can
      * extract exactly the author-marked display strings; absent on nodes built
      * programmatically by a converter.
@@ -30,7 +30,7 @@ export interface MwlDiagnostic {
  * import { parse, MwlSyntaxError } from '@datamoc/mw_games/mwl';
  *
  * try {
- *   parse('[game', 'broken.mwl');
+ *   parse('[{ tag: "game" }]', 'broken.mwl');
  * } catch (error) {
  *   if (error instanceof MwlSyntaxError) console.log(error.diagnostic.code);
  * }
@@ -46,36 +46,46 @@ export interface MwlPreprocessOptions {
     readonly includes?: Readonly<Record<string, string>>;
 }
 /**
- * Expands MWL macros, `#ifdef` blocks and `#include`s into flat source text.
+ * Expands MWL macros, `#ifdef` blocks and `#include`s into flat source text,
+ * then rewrites the `_("...")` gettext marker into a form the JSON5 parser
+ * accepts. The marker keeps working because this pass already runs before
+ * structural parsing, the same reason macros survive a change of grammar.
  *
  * @example
  * ```ts
  * import { preprocess } from '@datamoc/mw_games/mwl';
  *
- * console.log(preprocess('[game]\nschema=0.1\n[/game]'));
+ * console.log(preprocess("[{ tag: 'game', schema: 0.1 }]"));
  * ```
  */
 export declare function preprocess(source: string, options?: MwlPreprocessOptions): string;
+/**
+ * Parses MWL source (a top-level array of `{ tag, ...attrs, children }` objects)
+ * into nodes. Numbers and booleans become their string form on the node, so the
+ * schema, compiler, and runtime see exactly the strings they always have; the
+ * JSON5 literal only decides what an author types and what a JSON5-aware tool
+ * can check before validation runs.
+ */
 export declare function parse(source: string, file?: string): MwlNode[];
 /**
- * Unquotes one raw attribute value and strips the `_ "..."` gettext marker.
+ * Unquotes one raw attribute value and strips the `_("...")` gettext marker.
  *
  * @example
  * ```ts
  * import { parseValue } from '@datamoc/mw_games/mwl';
  *
- * console.log(parseValue('_ "Hold the line"', { file: 'a.mwl', line: 1, column: 1 })); // 'Hold the line'
+ * console.log(parseValue('_("Hold the line")', { file: 'a.mwl', line: 1, column: 1 })); // 'Hold the line'
  * ```
  */
 export declare function parseValue(raw: string, location: MwlLocation, lineText?: string): string;
 /**
- * True when a raw attribute value carries the gettext marker `_ "..."`.
+ * True when a raw attribute value carries the gettext marker `_("...")`.
  *
  * @example
  * ```ts
  * import { isGettext } from '@datamoc/mw_games/mwl';
  *
- * console.log(isGettext('_ "Hello"')); // true
+ * console.log(isGettext('_("Hello")')); // true
  * console.log(isGettext('Hello')); // false
  * ```
  */

package/dist/mwl/grammar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grammar.d.ts","sourceRoot":"","sources":["../../src/mwl/grammar.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACxC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IAEnC,YAAY,UAAU,EAAE,aAAa,EAMpC;CACD;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrD;AAUD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,MAAM,CA0ErF;AAkBD,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,SAAU,GAAG,OAAO,EAAE,CA6D/D;AAoCD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,SAAM,GAAG,MAAM,CAarF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE9C"}
+{"version":3,"file":"grammar.d.ts","sourceRoot":"","sources":["../../src/mwl/grammar.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACxC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IAEnC,YAAY,UAAU,EAAE,aAAa,EAMpC;CACD;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrD;AAUD;;;;;;;;;;;;GAYG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,MAAM,CA0ErF;AA6ED;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,SAAU,GAAG,OAAO,EAAE,CA2B/D;AAsID;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,SAAM,GAAG,MAAM,CAgBrF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE9C"}

package/dist/mwl/grammar.js

@@ -1,3 +1,4 @@
+import JSON5 from 'json5';
 /**
  * The error a malformed MWL document throws, carrying the diagnostic that describes it.
  *
@@ -6,7 +7,7 @@
  * import { parse, MwlSyntaxError } from '@datamoc/mw_games/mwl';
  *
  * try {
- *   parse('[game', 'broken.mwl');
+ *   parse('[{ tag: "game" }]', 'broken.mwl');
  * } catch (error) {
  *   if (error instanceof MwlSyntaxError) console.log(error.diagnostic.code);
  * }
@@ -21,13 +22,16 @@ export class MwlSyntaxError extends Error {
 }
 const directiveNames = new Set(['define', 'enddef', 'arg', 'ifdef', 'ifndef', 'else', 'endif', 'include']);
 /**
- * Expands MWL macros, `#ifdef` blocks and `#include`s into flat source text.
+ * Expands MWL macros, `#ifdef` blocks and `#include`s into flat source text,
+ * then rewrites the `_("...")` gettext marker into a form the JSON5 parser
+ * accepts. The marker keeps working because this pass already runs before
+ * structural parsing, the same reason macros survive a change of grammar.
  *
  * @example
  * ```ts
  * import { preprocess } from '@datamoc/mw_games/mwl';
  *
- * console.log(preprocess('[game]\nschema=0.1\n[/game]'));
+ * console.log(preprocess("[{ tag: 'game', schema: 0.1 }]"));
  * ```
  */
 export function preprocess(source, options = {}) {
@@ -104,7 +108,7 @@ export function preprocess(source, options = {}) {
         throw syntax('MWL_ENDDEF', `macro ${macro.name} is missing #enddef`, options.file, lines.length - 1, lines.at(-1) ?? '');
     if (active.length !== 1)
         throw syntax('MWL_ENDIF', 'conditional is missing #endif', options.file, lines.length - 1, lines.at(-1) ?? '');
-    return expandMacros(output.join('\n'), macros, options);
+    return rewriteGettextMarkers(expandMacros(output.join('\n'), macros, options));
 }
 function expandMacros(source, macros, options) {
     return source.replace(/\{([^{}]*)\}/g, (whole, inner) => {
@@ -122,134 +126,265 @@ function expandMacros(source, macros, options) {
         return expandMacros(body, macros, options);
     });
 }
-export function parse(source, file = '<mwl>') {
-    const roots = [];
-    const stack = [];
-    const lines = source.split(/\r?\n/);
-    for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
-        const raw = lines[lineIndex];
-        const line = raw.trim();
-        if (!line || line.startsWith('#'))
-            continue;
-        const location = { file, line: lineIndex + 1, column: Math.max(1, raw.indexOf(line) + 1) };
-        const opening = /^\[([A-Za-z_][\w-]*)\]$/.exec(line);
-        if (opening) {
-            const node = { tag: opening[1], attributes: {}, children: [], location, gettext: [] };
-            if (stack.length)
-                stack.at(-1).children.push(node);
-            else
-                roots.push(node);
-            stack.push(node);
+/**
+ * Rewrites `_("text")` to `{"$gettext": "text"}` before the JSON5 parser runs.
+ * The scan skips string literals and `//`/`block` comments, so prose that merely
+ * mentions the marker (a dialogue line about the syntax itself) survives intact.
+ * An `_("...")` the rewrite does not match, such as one with an unquoted string,
+ * is left for the JSON5 parser to reject with its own line and column.
+ */
+function rewriteGettextMarkers(source) {
+    const marker = /^_\(\s*("(?:[^"\\]|\\[\s\S])*"|'(?:[^'\\]|\\[\s\S])*')\s*\)/;
+    let out = '';
+    let index = 0;
+    while (index < source.length) {
+        const character = source[index];
+        const comment = source[index + 1];
+        if (character === '/' && (comment === '/' || comment === '*')) {
+            const end = comment === '/' ? source.indexOf('\n', index) : source.indexOf('*/', index + 2);
+            const stop = end < 0 ? source.length : comment === '/' ? end : end + 2;
+            out += source.slice(index, stop);
+            index = stop;
             continue;
         }
-        const closing = /^\[\/([A-Za-z_][\w-]*)\]$/.exec(line);
-        if (closing) {
-            const node = stack.pop();
-            if (!node || node.tag !== closing[1])
-                throw new MwlSyntaxError({
-                    code: 'MWL_TAG',
-                    message: `mismatched closing tag ${closing[1]}`,
-                    location,
-                    lineText: raw,
-                });
+        if (character === '"' || character === "'") {
+            const stop = copyJson5String(source, index);
+            out += source.slice(index, stop);
+            index = stop;
             continue;
         }
-        const attribute = /^([A-Za-z_][\w-]*)\s*=\s*(.*)$/.exec(line);
-        if (attribute && stack.length) {
-            const node = stack.at(-1);
-            const block = readBlockValue(attribute[2], location, lines, lineIndex);
-            if (block) {
-                node.attributes[attribute[1]] = block.text;
-                if (block.gettext)
-                    node.gettext.push(attribute[1]);
-                lineIndex += block.extraLines;
+        if (character === '_') {
+            const match = marker.exec(source.slice(index));
+            if (match) {
+                out += `{"$gettext": ${match[1]}}`;
+                index += match[0].length;
                 continue;
             }
-            if (isGettext(attribute[2]))
-                node.gettext.push(attribute[1]);
-            node.attributes[attribute[1]] = parseValue(attribute[2], location, raw);
+        }
+        out += character;
+        index++;
+    }
+    return out;
+}
+/** Copies one JSON5 string literal verbatim, escapes included, so the rewrite never edits inside it. */
+function copyJson5String(source, from) {
+    const quote = source[from];
+    let index = from + 1;
+    while (index < source.length) {
+        const character = source[index];
+        if (character === '\\') {
+            index += 2;
             continue;
         }
+        if (character === quote)
+            return index + 1;
+        // A raw newline ends the literal here; the JSON5 parser reports it.
+        if (character === '\n')
+            return index;
+        index++;
+    }
+    return index;
+}
+/**
+ * Parses MWL source (a top-level array of `{ tag, ...attrs, children }` objects)
+ * into nodes. Numbers and booleans become their string form on the node, so the
+ * schema, compiler, and runtime see exactly the strings they always have; the
+ * JSON5 literal only decides what an author types and what a JSON5-aware tool
+ * can check before validation runs.
+ */
+export function parse(source, file = '<mwl>') {
+    // The marker rewrite is idempotent, so parsing already-preprocessed source
+    // (the `compile` path) is a no-op while a direct `parse` of authored source
+    // keeps working, the way the old tag parser read `_ "..."` inline.
+    const rewritten = rewriteGettextMarkers(source);
+    if (rewritten.trim() === '')
+        return [];
+    let value;
+    try {
+        value = JSON5.parse(rewritten);
+    }
+    catch (error) {
+        throw json5SyntaxError(error, rewritten, file);
+    }
+    if (value === undefined)
+        return [];
+    if (!Array.isArray(value))
+        throw new MwlSyntaxError({
+            code: 'MWL_DOCUMENT',
+            message: 'MWL document must be a top-level array of nodes',
+            location: { file, line: 1, column: 1 },
+            lineText: rewritten.split(/\r?\n/)[0] ?? '',
+        });
+    const context = {
+        file,
+        sites: collectTagSites(rewritten, file),
+        cursor: { index: 0 },
+        parent: undefined,
+    };
+    return value.map((entry) => toNode(entry, context));
+}
+function toNode(entry, context) {
+    if (typeof entry !== 'object' || entry === null || Array.isArray(entry))
         throw new MwlSyntaxError({
-            code: 'MWL_TOKEN',
-            message: 'expected a tag or key=value attribute',
+            code: 'MWL_TAG',
+            message: 'MWL node must be an object with a tag',
+            location: context.parent ?? { file: context.file, line: 1, column: 1 },
+        });
+    const record = entry;
+    if (typeof record.tag !== 'string' || !namePattern.test(record.tag))
+        throw new MwlSyntaxError({
+            code: 'MWL_TAG',
+            message: 'MWL node needs a tag name',
+            location: context.parent ?? { file: context.file, line: 1, column: 1 },
+        });
+    const tag = record.tag;
+    const location = locate(context, tag);
+    const rawChildren = record.children ?? [];
+    if (!Array.isArray(rawChildren))
+        throw new MwlSyntaxError({
+            code: 'MWL_TAG',
+            message: `children of [${tag}] must be an array`,
             location,
-            lineText: raw,
         });
+    const attributes = {};
+    const gettext = [];
+    for (const [name, raw] of Object.entries(record)) {
+        if (name === 'tag' || name === 'children')
+            continue;
+        attributes[name] = toAttribute(tag, name, raw, location, gettext);
     }
-    if (stack.length) {
-        const node = stack.at(-1);
-        throw new MwlSyntaxError({ code: 'MWL_TAG', message: `unclosed tag ${node.tag}`, location: node.location });
+    const childContext = { ...context, parent: location };
+    return {
+        tag,
+        attributes,
+        children: rawChildren.map((child) => toNode(child, childContext)),
+        location,
+        gettext,
+    };
+}
+function toAttribute(tag, name, raw, location, gettext) {
+    if (!namePattern.test(name) || name.startsWith('$') || name.startsWith('_'))
+        throw new MwlSyntaxError({
+            code: 'MWL_ATTRIBUTE',
+            message: `unknown attribute "${name}" on [${tag}]`,
+            location,
+        });
+    if (typeof raw === 'string')
+        return raw;
+    if (typeof raw === 'number' && Number.isFinite(raw))
+        return String(raw);
+    if (typeof raw === 'boolean')
+        return raw ? 'true' : 'false';
+    if (typeof raw === 'object' && raw !== null && !Array.isArray(raw)) {
+        const keys = Object.keys(raw);
+        const text = raw.$gettext;
+        if (keys.length === 1 && keys[0] === '$gettext' && typeof text === 'string') {
+            gettext.push(name);
+            return text;
+        }
     }
-    return roots;
+    throw new MwlSyntaxError({
+        code: 'MWL_ATTRIBUTE',
+        message: `attribute "${name}" on [${tag}] must be a string, number, boolean, or _("...")`,
+        location,
+    });
 }
+const namePattern = /^[A-Za-z_][\w-]*$/;
 /**
- * Reads the `"""..."""` value form, the one that may span lines. Its text is exactly what sits
- * between the delimiters, so wrapped message text survives a round trip; a `"""` block may
- * carry the `_` gettext marker like any other value. Returns null for every other form, which
- * `parseValue` handles on the one line it was given.
+ * Every `tag: 'name'` occurrence in source order. Pre-order node traversal visits
+ * tags in that same order (a parent literal opens before its children), so `locate`
+ * can zip the two sequences and recover a useful line and column per node without
+ * a schema-aware parser. A `tag: '...'` string inside prose can shift a location,
+ * never a value, which is why this stays best-effort rather than load-bearing.
  */
-function readBlockValue(raw, location, lines, from) {
-    const gettext = /^_\s*"""/.test(raw);
-    const source = gettext ? raw.replace(/^_\s*/, '') : raw;
-    if (!source.startsWith('"""'))
-        return null;
-    let text = source.slice(3);
-    let index = from;
-    let end = text.indexOf('"""');
-    while (end < 0) {
-        index++;
-        if (index >= lines.length)
-            throw new MwlSyntaxError({ code: 'MWL_STRING', message: 'unterminated """ value', location });
-        text += `\n${lines[index]}`;
-        end = text.indexOf('"""');
+function collectTagSites(source, file) {
+    const sites = [];
+    const pattern = /\btag\s*:\s*(['"])([A-Za-z_][\w-]*)\1/g;
+    let match;
+    while ((match = pattern.exec(source)) !== null) {
+        sites.push({ tag: match[2], location: offsetToLocation(source, file, match.index) });
     }
-    if (text.slice(end + 3).trim() !== '')
-        throw new MwlSyntaxError({
-            code: 'MWL_STRING',
-            message: 'unexpected text after a """ value',
-            location,
-        });
-    return { text: text.slice(0, end), gettext, extraLines: index - from };
+    return sites;
+}
+function locate(context, tag) {
+    for (let index = context.cursor.index; index < context.sites.length; index++) {
+        if (context.sites[index].tag === tag) {
+            context.cursor.index = index + 1;
+            return context.sites[index].location;
+        }
+    }
+    return context.parent ?? { file: context.file, line: 1, column: 1 };
+}
+function offsetToLocation(source, file, offset) {
+    let line = 1;
+    let column = 1;
+    for (let index = 0; index < offset; index++) {
+        if (source[index] === '\n') {
+            line++;
+            column = 1;
+        }
+        else
+            column++;
+    }
+    return { file, line, column };
+}
+function json5SyntaxError(error, source, file) {
+    const lines = source.split(/\r?\n/);
+    const detail = error;
+    const line = typeof detail?.lineNumber === 'number' ? detail.lineNumber : 1;
+    const column = typeof detail?.columnNumber === 'number' ? detail.columnNumber : 1;
+    let message = error instanceof Error ? error.message : String(error);
+    if (message.includes("'_'"))
+        message += ' (write translatable text as _("..."))';
+    return new MwlSyntaxError({
+        code: 'MWL_SYNTAX',
+        message,
+        location: { file, line: Math.max(1, line), column: Math.max(1, column) },
+        lineText: lines[Math.max(1, line) - 1],
+    });
 }
 /**
- * Unquotes one raw attribute value and strips the `_ "..."` gettext marker.
+ * Unquotes one raw attribute value and strips the `_("...")` gettext marker.
  *
  * @example
  * ```ts
  * import { parseValue } from '@datamoc/mw_games/mwl';
  *
- * console.log(parseValue('_ "Hold the line"', { file: 'a.mwl', line: 1, column: 1 })); // 'Hold the line'
+ * console.log(parseValue('_("Hold the line")', { file: 'a.mwl', line: 1, column: 1 })); // 'Hold the line'
  * ```
  */
 export function parseValue(raw, location, lineText = raw) {
-    // The gettext marker is `_` followed by a quoted string. Requiring the
-    // quote is deliberate: values such as `aliasof=_bas` start with an
-    // underscore and must survive unchanged.
-    let value = raw.trim();
-    const marker = /^_\s*"/.exec(value);
-    if (marker)
-        value = value.slice(marker[0].length - 1);
-    if (value.startsWith('"')) {
-        if (!value.endsWith('"') || value.length < 2)
-            throw new MwlSyntaxError({ code: 'MWL_STRING', message: 'unterminated quoted value', location, lineText });
-        return value.slice(1, -1).replaceAll('""', '"');
+    const value = raw.trim();
+    const marker = /^_\(\s*([\s\S]*?)\s*\)$/.exec(value);
+    const literal = marker ? marker[1] : value;
+    if (literal.startsWith('"') || literal.startsWith("'")) {
+        try {
+            const parsed = JSON5.parse(literal);
+            if (typeof parsed === 'string')
+                return parsed;
+        }
+        catch {
+            // Fall through to the syntax error below.
+        }
+        throw new MwlSyntaxError({ code: 'MWL_STRING', message: 'unterminated string value', location, lineText });
     }
+    if (marker)
+        throw new MwlSyntaxError({ code: 'MWL_STRING', message: '_("...") needs a quoted string', location, lineText });
     return value;
 }
 /**
- * True when a raw attribute value carries the gettext marker `_ "..."`.
+ * True when a raw attribute value carries the gettext marker `_("...")`.
  *
  * @example
  * ```ts
  * import { isGettext } from '@datamoc/mw_games/mwl';
  *
- * console.log(isGettext('_ "Hello"')); // true
+ * console.log(isGettext('_("Hello")')); // true
  * console.log(isGettext('Hello')); // false
  * ```
  */
 export function isGettext(raw) {
-    return /^_\s*"/.test(raw.trim());
+    return /^_\(\s*["']/.test(raw.trim());
 }
 function splitWords(value) {
     const result = [];