@primmel/primmel 1.1.0 → 1.2.1

package/dist/src/ser-des/config/subform.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpSubformType = exports.parseSubform = void 0;
 const tokenize_1 = require("../tokenize");
+const field_parser_1 = require("./field-parser");
 const parseSubform = function (id, data) {
     const result = {
         id,
@@ -17,7 +18,7 @@ const parseSubform = function (id, data) {
             const command = t[i++];
             if (i < t.length) {
                 if (command === 'description') {
-                    result.description = (0, tokenize_1.removePackage)(t[i++]);
+                    result.description = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (command === 'type') {
                     const v = t[i++];
@@ -29,15 +30,15 @@ const parseSubform = function (id, data) {
                     }
                 }
                 else if (command === 'parameters') {
-                    result.parameters = parseParameters((0, tokenize_1.removePackage)(t[i++]));
+                    result.parameters = parseParameters((0, tokenize_1.unwrapBlock)(t[i++]));
                 }
                 else if (command === 'field') {
                     // field is followed by `name [: type] { ... }`
                     const fieldName = t[i++];
                     if (i < t.length) {
-                        const fieldBlock = (0, tokenize_1.removePackage)(t[i++]);
+                        const fieldBlock = (0, tokenize_1.unwrapBlock)(t[i++]);
                         // Determine if there's a type spec between name and {
-                        const field = parseField(fieldName, fieldBlock);
+                        const field = (0, field_parser_1.parseFormField)(fieldName, fieldBlock);
                         result.fields.push(field);
                     }
                 }
@@ -74,21 +75,21 @@ function parseParameters(block) {
         let defaultValue = '';
         let mapping = null;
         if (i < t.length && t[i].startsWith('{')) {
-            const propBlock = (0, tokenize_1.removePackage)(t[i++]);
+            const propBlock = (0, tokenize_1.unwrapBlock)(t[i++]);
             const pt = (0, tokenize_1.tokenizePackage)(propBlock);
             let j = 0;
             while (j < pt.length) {
                 const cmd = pt[j++];
                 if (j < pt.length) {
                     if (cmd === 'description') {
-                        description = (0, tokenize_1.removePackage)(pt[j++]);
+                        description = (0, tokenize_1.unwrapBlock)(pt[j++]);
                     }
                     else if (cmd === 'default') {
-                        defaultValue = (0, tokenize_1.removePackage)(pt[j++]);
+                        defaultValue = (0, tokenize_1.unwrapBlock)(pt[j++]);
                         hasDefault = true;
                     }
                     else if (cmd === 'mapping') {
-                        const mapBlock = (0, tokenize_1.removePackage)(pt[j++]);
+                        const mapBlock = (0, tokenize_1.unwrapBlock)(pt[j++]);
                         mapping = {};
                         // Map block format: { A: 5, B: 5, C: 3 }
                         const mt = (0, tokenize_1.tokenizePackage)(mapBlock);
@@ -100,7 +101,7 @@ function parseParameters(block) {
                                     k++;
                                 }
                                 if (k < mt.length) {
-                                    mapping[key] = (0, tokenize_1.removePackage)(mt[k++]);
+                                    mapping[key] = (0, tokenize_1.unwrapBlock)(mt[k++]);
                                 }
                             }
                         }
@@ -115,103 +116,18 @@ function parseParameters(block) {
     }
     return params;
 }
-function parseField(name, block) {
-    // Simplified: capture properties without full type-spec parsing
-    const field = {
-        name,
-        type: 'string',
-        label: '',
-        definition: '',
-        unit: '',
-        required: false,
-        measurementMethod: '',
-        calculationId: null,
-        calculationBindings: [],
-        derivation: '',
-        evaluation: null,
-        values: [],
-        defaultValue: '',
-        hasDefault: false,
-        referenceIds: [],
-        fields: [],
-        itemsType: '',
-        subformRef: null,
-    };
-    if (block && block.trim()) {
-        const t = (0, tokenize_1.tokenizePackage)(block);
-        let i = 0;
-        // Skip leading type spec (handled by caller or ': type' before {)
-        while (i < t.length) {
-            const cmd = t[i++];
-            if (i < t.length) {
-                if (cmd === 'label') {
-                    field.label = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'definition') {
-                    field.definition = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'unit') {
-                    field.unit = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'required') {
-                    field.required = (0, tokenize_1.removePackage)(t[i++]) === 'true';
-                }
-                else if (cmd === 'measurement_method') {
-                    field.measurementMethod = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'calculation') {
-                    field.calculationId = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'calculation_bindings') {
-                    // Skip the binding block (raw)
-                    (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'derivation') {
-                    field.derivation = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'evaluation') {
-                    // Skip evaluation block
-                    (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'values') {
-                    field.values = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else if (cmd === 'default') {
-                    field.defaultValue = (0, tokenize_1.removePackage)(t[i++]);
-                    field.hasDefault = true;
-                }
-                else if (cmd === 'min_items' || cmd === 'max_items') {
-                    // Placeholders or integers — store raw
-                    (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'items' || cmd === 'fields') {
-                    // Nested block — skip for now
-                    (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (cmd === 'reference') {
-                    field.referenceIds = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else {
-                    // Unknown property, skip its value
-                    (0, tokenize_1.removePackage)(t[i++]);
-                }
-            }
-        }
-    }
-    return field;
-}
 const dumpSubformType = function (sf) {
     let out = 'subform ' + sf.id + ' {\n';
     out += '  type ' + sf.shapeType + '\n';
     if (sf.description) {
-        out += '  description "' + sf.description + '"\n';
+        out += '  description "' + (0, tokenize_1.escapeString)(sf.description) + '"\n';
     }
     if (sf.parameters.length > 0) {
         out += '  parameters {\n';
         for (const p of sf.parameters) {
             let line = '    ' + p.name + ' : ' + p.type + ' { ';
             if (p.description) {
-                line += 'description "' + p.description + '" ';
+                line += 'description "' + (0, tokenize_1.escapeString)(p.description) + '" ';
             }
             if (p.hasDefault) {
                 line += 'default ' + p.defaultValue + ' ';
@@ -231,10 +147,10 @@ const dumpSubformType = function (sf) {
     for (const f of sf.fields) {
         out += '  field ' + f.name + ' { ';
         if (f.label) {
-            out += 'label "' + f.label + '" ';
+            out += 'label "' + (0, tokenize_1.escapeString)(f.label) + '" ';
         }
         if (f.unit) {
-            out += 'unit "' + f.unit + '" ';
+            out += 'unit "' + (0, tokenize_1.escapeString)(f.unit) + '" ';
         }
         if (f.required) {
             out += 'required true ';

package/dist/src/ser-des/config/subform.js.map

@@ -1 +1 @@
-{"version":3,"file":"subform.js","sourceRoot":"","sources":["../../../../src/ser-des/config/subform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subform.js","sourceRoot":"","sources":["../../../../src/ser-des/config/subform.ts"],"names":[],"mappings":"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"}

package/dist/src/ser-des/config/symbol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"symbol.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/symbol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,EAAc,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAYvE,eAAO,MAAM,WAAW,EAAE,MA0DzB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAY5D,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CAyBrC,CAAC"}
+{"version":3,"file":"symbol.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/symbol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGzD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,EAAc,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAYvE,eAAO,MAAM,WAAW,EAAE,MAoDzB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAY5D,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CAyBrC,CAAC"}

package/dist/src/ser-des/config/symbol.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpSymbol = exports.resolveSymbol = exports.parseSymbol = void 0;
 const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const resolve_1 = require("../resolve");
 const VALID_SYMBOL_TYPES = [
     'number',
@@ -24,46 +25,37 @@ const parseSymbol = function (id, data) {
             ref: [],
         },
     };
-    if (data !== '') {
-        const t = (0, tokenize_1.tokenizePackage)(data);
-        let i = 0;
-        while (i < t.length) {
-            const command = t[i++];
-            if (i < t.length) {
-                if (command === 'name') {
-                    result.name = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (command === 'definition') {
-                    result.definition = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (command === 'type') {
-                    const v = t[i++];
-                    if (!VALID_SYMBOL_TYPES.includes(v)) {
-                        throw new Error(`Parsing error: symbol. ID ${id}: Unknown type ${v} (valid: ${VALID_SYMBOL_TYPES.join(', ')})`);
-                    }
-                    result.type = v;
-                }
-                else if (command === 'unit') {
-                    result.unit = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (command === 'latex') {
-                    result.latex = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (command === 'values') {
-                    result.values = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else if (command === 'reference') {
-                    result._relations.ref = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else {
-                    i++; // forward-compatible: skip unknown keyword value
-                }
-            }
-            else {
-                throw new Error(`Parsing error: symbol. ID ${id}: Expecting value for ${command}`);
+    (0, parse_block_1.forEachEntry)(data, (command, value) => {
+        if (command === 'name') {
+            result.name = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'definition') {
+            result.definition = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'type') {
+            const v = value();
+            if (!VALID_SYMBOL_TYPES.includes(v)) {
+                throw new Error(`Parsing error: symbol. ID ${id}: Unknown type ${v} (valid: ${VALID_SYMBOL_TYPES.join(', ')})`);
             }
+            result.type = v;
         }
-    }
+        else if (command === 'unit') {
+            result.unit = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'latex') {
+            result.latex = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'values') {
+            result.values = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else if (command === 'reference') {
+            result._relations.ref = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else {
+            return false;
+        }
+        return true;
+    }, { construct: 'symbol', id });
     return ctx => {
         ctx.symbols[id] = result;
         return ctx;
@@ -83,16 +75,16 @@ const resolveSymbol = function (ctx, unresolved) {
 exports.resolveSymbol = resolveSymbol;
 const dumpSymbol = function (s) {
     let out = 'symbol ' + s.id + ' {\n';
-    out += '  name "' + s.name + '"\n';
+    out += '  name "' + (0, tokenize_1.escapeString)(s.name) + '"\n';
     if (s.definition) {
-        out += '  definition "' + s.definition + '"\n';
+        out += '  definition "' + (0, tokenize_1.escapeString)(s.definition) + '"\n';
     }
     out += '  type ' + s.type + '\n';
     if (s.unit && s.unit !== '1') {
-        out += '  unit "' + s.unit + '"\n';
+        out += '  unit "' + (0, tokenize_1.escapeString)(s.unit) + '"\n';
     }
     if (s.latex) {
-        out += '  latex "' + s.latex + '"\n';
+        out += '  latex "' + (0, tokenize_1.escapeString)(s.latex) + '"\n';
     }
     if (s.values.length > 0) {
         out += '  values ' + s.values.join(' ') + '\n';

package/dist/src/ser-des/config/symbol.js.map

@@ -1 +1 @@
-{"version":3,"file":"symbol.js","sourceRoot":"","sources":["../../../../src/ser-des/config/symbol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"symbol.js","sourceRoot":"","sources":["../../../../src/ser-des/config/symbol.ts"],"names":[],"mappings":"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"}

package/dist/src/ser-des/config/table.js

@@ -18,21 +18,21 @@ const parseTable = function (id, data) {
             const command = t[i++];
             if (i < t.length) {
                 if (command === 'title') {
-                    result.title = (0, tokenize_1.removePackage)(t[i++]);
+                    result.title = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (command === 'columns') {
-                    result.columns = (0, tokenize_1.removePackage)(t[i++]);
+                    result.columns = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (command === 'display') {
-                    result.display = (0, tokenize_1.removePackage)(t[i++]);
+                    result.display = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (command === 'domain') {
                     // Domain block is captured as raw package string
-                    result.domain = (0, tokenize_1.removePackage)(t[i++]);
+                    result.domain = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (command === 'data') {
                     // Data block contains CSV-like rows
-                    const dataBlock = (0, tokenize_1.removePackage)(t[i++]);
+                    const dataBlock = (0, tokenize_1.unwrapBlock)(t[i++]);
                     result.data = parseTableData(dataBlock);
                 }
                 else {

package/dist/src/ser-des/config/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../src/ser-des/config/table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../src/ser-des/config/table.ts"],"names":[],"mappings":"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"}

package/dist/src/ser-des/config/term.d.ts

@@ -0,0 +1,5 @@
+import type { Dumper, Parser } from '../types';
+import type Term from '../../types/Term';
+export declare const parseTerm: Parser;
+export declare const dumpTerm: Dumper<Term>;
+//# sourceMappingURL=term.d.ts.map

package/dist/src/ser-des/config/term.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"term.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/term.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AAEzC,eAAO,MAAM,SAAS,EAAE,MAmCvB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,IAAI,CAoBjC,CAAC"}

package/dist/src/ser-des/config/term.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dumpTerm = exports.parseTerm = void 0;
+const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
+const parseTerm = function (id, data) {
+    const result = {
+        id,
+        label: '',
+        definition: '',
+        symbolId: '',
+        referenceIds: [],
+        ref: [],
+    };
+    (0, parse_block_1.forEachEntry)(data, (command, value) => {
+        if (command === 'label') {
+            result.label = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'definition') {
+            result.definition = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'symbol') {
+            // symbol reference may be a bare ID (e.g. `symbol Emax`) or a
+            // quoted string (`symbol "Emax"`). stripWrapping handles both.
+            result.symbolId = (0, tokenize_1.stripWrapping)(value());
+        }
+        else if (command === 'reference') {
+            result.referenceIds = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else {
+            return false;
+        }
+        return true;
+    }, { construct: 'term', id });
+    return ctx => {
+        ctx.terms[id] = result;
+        return ctx;
+    };
+};
+exports.parseTerm = parseTerm;
+const dumpTerm = function (term) {
+    let out = 'term ' + term.id + ' {\n';
+    if (term.label) {
+        out += '  label "' + (0, tokenize_1.escapeString)(term.label) + '"\n';
+    }
+    if (term.definition) {
+        out += '  definition "' + (0, tokenize_1.escapeString)(term.definition) + '"\n';
+    }
+    if (term.symbolId) {
+        out += '  symbol ' + term.symbolId + '\n';
+    }
+    if (term.referenceIds.length > 0) {
+        out += '  reference {\n';
+        for (const r of term.referenceIds) {
+            out += '    ' + r + '\n';
+        }
+        out += '  }\n';
+    }
+    out += '}\n';
+    return out;
+};
+exports.dumpTerm = dumpTerm;
+//# sourceMappingURL=term.js.map

package/dist/src/ser-des/config/term.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"term.js","sourceRoot":"","sources":["../../../../src/ser-des/config/term.ts"],"names":[],"mappings":";;;AACA,0CAA2E;AAC3E,gDAAyD;AAGlD,MAAM,SAAS,GAAW,UAAU,EAAE,EAAE,IAAI;IACjD,MAAM,MAAM,GAAS;QACnB,EAAE;QACF,KAAK,EAAE,EAAE;QACT,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,GAAG,EAAE,EAAE;KACR,CAAC;IAEF,IAAA,0BAAY,EACV,IAAI,EACJ,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACjB,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,GAAG,IAAA,uBAAS,EAAC,KAAK,CAAC,CAAC;QAClC,CAAC;aAAM,IAAI,OAAO,KAAK,YAAY,EAAE,CAAC;YACpC,MAAM,CAAC,UAAU,GAAG,IAAA,uBAAS,EAAC,KAAK,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,8DAA8D;YAC9D,+DAA+D;YAC/D,MAAM,CAAC,QAAQ,GAAG,IAAA,wBAAa,EAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,CAAC,YAAY,GAAG,IAAA,0BAAe,EAAC,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EACD,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAC1B,CAAC;IAEF,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QACvB,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,SAAS,aAmCpB;AAEK,MAAM,QAAQ,GAAiB,UAAU,IAAI;IAClD,IAAI,GAAG,GAAW,OAAO,GAAG,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC;IAC7C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,GAAG,IAAI,WAAW,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;IACxD,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,GAAG,IAAI,gBAAgB,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAClE,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,GAAG,IAAI,WAAW,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC5C,CAAC;IACD,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,GAAG,IAAI,iBAAiB,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAClC,GAAG,IAAI,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,GAAG,IAAI,OAAO,CAAC;IACjB,CAAC;IACD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AApBW,QAAA,QAAQ,YAoBnB"}

package/dist/src/ser-des/config/viewProfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viewProfile.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/viewProfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,eAAO,MAAM,gBAAgB,EAAE,MAmC9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"viewProfile.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/viewProfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAEvD,eAAO,MAAM,gBAAgB,EAAE,MA6B9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,WAAW,CAa/C,CAAC"}

package/dist/src/ser-des/config/viewProfile.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpViewProfile = exports.parseViewProfile = void 0;
 const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const parseViewProfile = function (id, data) {
     const result = {
         id,
@@ -9,30 +10,21 @@ const parseViewProfile = function (id, data) {
         roles: [],
         visibleElements: [],
     };
-    if (data !== '') {
-        const t = (0, tokenize_1.tokenizePackage)(data);
-        let i = 0;
-        while (i < t.length) {
-            const command = t[i++];
-            if (i < t.length) {
-                if (command === 'description') {
-                    result.description = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (command === 'roles') {
-                    result.roles = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else if (command === 'visible') {
-                    result.visibleElements = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else {
-                    i++; // forward-compatible: skip unknown keyword value
-                }
-            }
-            else {
-                throw new Error(`Parsing error: view_profile. ID ${id}: Expecting value for ${command}`);
-            }
+    (0, parse_block_1.forEachEntry)(data, (command, value) => {
+        if (command === 'description') {
+            result.description = (0, parse_block_1.unwrapped)(value);
         }
-    }
+        else if (command === 'roles') {
+            result.roles = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else if (command === 'visible') {
+            result.visibleElements = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else {
+            return false;
+        }
+        return true;
+    }, { construct: 'view_profile', id });
     return ctx => {
         ctx.viewProfiles[id] = result;
         return ctx;

package/dist/src/ser-des/config/viewProfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewProfile.js","sourceRoot":"","sources":["../../../../src/ser-des/config/viewProfile.ts"],"names":[],"mappings":";;;AACA,0CAA6D;AAGtD,MAAM,gBAAgB,GAAW,UAAU,EAAE,EAAE,IAAI;IACxD,MAAM,MAAM,GAAgB;QAC1B,EAAE;QACF,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,EAAE;QACT,eAAe,EAAE,EAAE;KACpB,CAAC;IAEF,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,MAAM,CAAC,GAAkB,IAAA,0BAAe,EAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,OAAO,GAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;oBAC9B,MAAM,CAAC,WAAW,GAAG,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7C,CAAC;qBAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;oBAC/B,MAAM,CAAC,KAAK,GAAG,IAAA,0BAAe,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzC,CAAC;qBAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBACjC,MAAM,CAAC,eAAe,GAAG,IAAA,0BAAe,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACnD,CAAC;qBAAM,CAAC;oBACN,CAAC,EAAE,CAAC,CAAC,iDAAiD;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,mCAAmC,EAAE,yBAAyB,OAAO,EAAE,CACxE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,gBAAgB,oBAmC3B;AAEK,MAAM,eAAe,GAAwB,UAAU,EAAE;IAC9D,IAAI,GAAG,GAAG,eAAe,GAAG,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAC3C,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACnB,GAAG,IAAI,iBAAiB,GAAG,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;IACpD,CAAC;IACD,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,GAAG,IAAI,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAChD,CAAC;IACD,IAAI,EAAE,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,GAAG,IAAI,YAAY,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAC5D,CAAC;IACD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B"}
+{"version":3,"file":"viewProfile.js","sourceRoot":"","sources":["../../../../src/ser-des/config/viewProfile.ts"],"names":[],"mappings":";;;AACA,0CAA8C;AAC9C,gDAAyD;AAGlD,MAAM,gBAAgB,GAAW,UAAU,EAAE,EAAE,IAAI;IACxD,MAAM,MAAM,GAAgB;QAC1B,EAAE;QACF,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,EAAE;QACT,eAAe,EAAE,EAAE;KACpB,CAAC;IAEF,IAAA,0BAAY,EACV,IAAI,EACJ,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACjB,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;YAC9B,MAAM,CAAC,WAAW,GAAG,IAAA,uBAAS,EAAC,KAAK,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,GAAG,IAAA,0BAAe,EAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,CAAC;aAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,CAAC,eAAe,GAAG,IAAA,0BAAe,EAAC,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EACD,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,EAAE,CAClC,CAAC;IAEF,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,gBAAgB,oBA6B3B;AAEK,MAAM,eAAe,GAAwB,UAAU,EAAE;IAC9D,IAAI,GAAG,GAAG,eAAe,GAAG,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAC3C,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACnB,GAAG,IAAI,iBAAiB,GAAG,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;IACpD,CAAC;IACD,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,GAAG,IAAI,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAChD,CAAC;IACD,IAAI,EAAE,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,GAAG,IAAI,YAAY,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAC5D,CAAC;IACD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B"}

package/dist/src/ser-des/includes.d.ts

@@ -7,6 +7,10 @@
  * Include paths are resolved relative to the directory of the
  * including file. Absolute paths are also supported.
  *
+ * Comment-aware: lines starting (after optional whitespace) with `#`
+ * or `//` are skipped, so a comment like `// include "ignored.mmel"`
+ * is NOT expanded. This matches the tokenizer's comment handling.
+ *
  * Cycles are detected and rejected.
  */
 export declare function preprocessIncludes(filePath: string, _seen?: Set<string>): string;

package/dist/src/ser-des/includes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"includes.d.ts","sourceRoot":"","sources":["../../../src/ser-des/includes.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7B,MAAM,CA+BR"}
+{"version":3,"file":"includes.d.ts","sourceRoot":"","sources":["../../../src/ser-des/includes.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7B,MAAM,CA0CR"}

package/dist/src/ser-des/includes.js

@@ -7,12 +7,17 @@
 //
 // Design: recursive, relative-path, cycle-detecting. Follows the
 // same convention as C preprocessor #include and AsciiDoc include::.
+//
+// Comment-aware: `#` and `//` comments containing `include "foo"` are
+// NOT expanded. The tokenizer's own comment-stripping logic is mirrored
+// here so the two stages agree on what counts as content.
 // ─────────────────────────────────────────────────────────────────────
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preprocessIncludes = preprocessIncludes;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const INCLUDE_RE = /^include\s+"([^"]+)"/gm;
+const COMMENT_LINE_RE = /^[ \t]*(#|\/\/)/;
 /**
  * Preprocess include directives in a .mmel file.
  *
@@ -22,6 +27,10 @@ const INCLUDE_RE = /^include\s+"([^"]+)"/gm;
  * Include paths are resolved relative to the directory of the
  * including file. Absolute paths are also supported.
  *
+ * Comment-aware: lines starting (after optional whitespace) with `#`
+ * or `//` are skipped, so a comment like `// include "ignored.mmel"`
+ * is NOT expanded. This matches the tokenizer's comment handling.
+ *
  * Cycles are detected and rejected.
  */
 function preprocessIncludes(filePath, _seen = new Set()) {
@@ -38,8 +47,18 @@ function preprocessIncludes(filePath, _seen = new Set()) {
     const content = (0, fs_1.readFileSync)(absPath, 'utf8');
     const dir = (0, path_1.dirname)(absPath);
     // Replace each include directive with the preprocessed content of
-    // the referenced file
-    return content.replace(INCLUDE_RE, (_match, includePath) => {
+    // the referenced file. Skip comment lines so a `// include "..."` in
+    // a comment doesn't get falsely expanded.
+    return content.replace(INCLUDE_RE, (match, includePath) => {
+        // Look backward from the match start to the start of the line —
+        // if everything before the match on this line is whitespace
+        // followed by `#` or `//`, the match is inside a comment.
+        const matchEnd = INCLUDE_RE.lastIndex;
+        const lineStart = content.lastIndexOf('\n', matchEnd - match.length) + 1;
+        const prefix = content.slice(lineStart, matchEnd - match.length);
+        if (COMMENT_LINE_RE.test(prefix)) {
+            return match; // in a comment — leave untouched
+        }
         const resolved = (0, path_1.isAbsolute)(includePath)
             ? includePath
             : (0, path_1.resolve)(dir, includePath);

package/dist/src/ser-des/includes.js.map

@@ -1 +1 @@
-{"version":3,"file":"includes.js","sourceRoot":"","sources":["../../../src/ser-des/includes.ts"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,wBAAwB;AACxB,EAAE;AACF,uEAAuE;AACvE,gEAAgE;AAChE,EAAE;AACF,iEAAiE;AACjE,qEAAqE;AACrE,wEAAwE;;AAkBxE,gDAkCC;AAlDD,2BAA8C;AAC9C,+BAAoD;AAEpD,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,QAAqB,IAAI,GAAG,EAAE;IAE9B,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,YAAY,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;aAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAClB,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAE7B,kEAAkE;IAClE,sBAAsB;IACtB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,MAAc,EAAE,WAAmB,EAAE,EAAE;QACzE,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,WAAW,CAAC;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE9B,qCAAqC;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,OAAO,CAAC;QAE3E,OAAO,kBAAkB,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"includes.js","sourceRoot":"","sources":["../../../src/ser-des/includes.ts"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,wBAAwB;AACxB,EAAE;AACF,uEAAuE;AACvE,gEAAgE;AAChE,EAAE;AACF,iEAAiE;AACjE,qEAAqE;AACrE,EAAE;AACF,sEAAsE;AACtE,wEAAwE;AACxE,0DAA0D;AAC1D,wEAAwE;;AAuBxE,gDA6CC;AAlED,2BAA8C;AAC9C,+BAAoD;AAEpD,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAE1C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,QAAqB,IAAI,GAAG,EAAE;IAE9B,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,YAAY,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;aAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAClB,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAE7B,kEAAkE;IAClE,qEAAqE;IACrE,0CAA0C;IAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,WAAmB,EAAE,EAAE;QAChE,gEAAgE;QAChE,4DAA4D;QAC5D,0DAA0D;QAC1D,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC,CAAC,iCAAiC;QACjD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,WAAW,CAAC;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE9B,qCAAqC;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,OAAO,CAAC;QAE3E,OAAO,kBAAkB,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC"}