@primmel/primmel 1.2.0 → 1.3.0

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

@@ -1,44 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpMapProfile = exports.parseMapProfile = void 0;
-const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const parseMapProfile = function (namespace, data) {
     const result = {
         namespace,
         description: '',
         mappings: {},
     };
-    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 === 'mapping') {
-                    // mapping block: source → target pairs
-                    const block = (0, tokenize_1.removePackage)(t[i++]);
-                    for (const line of block
-                        .split(/\n+/)
-                        .map(s => s.trim())
-                        .filter(s => s)) {
-                        const m = line.match(/^(\S+)\s*->\s*(\S+)$/);
-                        if (m) {
-                            result.mappings[m[1]] = m[2];
-                        }
-                    }
-                }
-                else {
-                    i++; // forward-compatible: skip unknown keyword value
+    (0, parse_block_1.forEachEntry)(data, (command, value) => {
+        if (command === 'description') {
+            result.description = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'mapping') {
+            // mapping block: source → target pairs
+            const block = (0, parse_block_1.unwrapped)(value);
+            for (const line of block
+                .split(/\n+/)
+                .map(s => s.trim())
+                .filter(s => s)) {
+                const m = line.match(/^(\S+)\s*->\s*(\S+)$/);
+                if (m) {
+                    result.mappings[m[1]] = m[2];
                 }
             }
-            else {
-                throw new Error(`Parsing error: map_profile. NS ${namespace}: Expecting value for ${command}`);
-            }
         }
-    }
+        else {
+            return false;
+        }
+        return true;
+    }, { construct: 'map_profile', id: namespace });
     return ctx => {
         ctx.mapProfiles[namespace] = result;
         return ctx;

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

@@ -1 +1 @@
-{"version":3,"file":"mapProfile.js","sourceRoot":"","sources":["../../../../src/ser-des/config/mapProfile.ts"],"names":[],"mappings":";;;AACA,0CAA6D;AAGtD,MAAM,eAAe,GAAW,UAAU,SAAS,EAAE,IAAI;IAC9D,MAAM,MAAM,GAAe;QACzB,SAAS;QACT,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,EAAE;KACb,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,SAAS,EAAE,CAAC;oBACjC,uCAAuC;oBACvC,MAAM,KAAK,GAAG,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACpC,KAAK,MAAM,IAAI,IAAI,KAAK;yBACrB,KAAK,CAAC,KAAK,CAAC;yBACZ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;yBAClB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAClB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;wBAC7C,IAAI,CAAC,EAAE,CAAC;4BACN,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC/B,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,CAAC,EAAE,CAAC,CAAC,iDAAiD;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,kCAAkC,SAAS,yBAAyB,OAAO,EAAE,CAC9E,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QACpC,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AA1CW,QAAA,eAAe,mBA0C1B;AAEK,MAAM,cAAc,GAAuB,UAAU,EAAE;IAC5D,IAAI,GAAG,GAAG,cAAc,GAAG,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC;IACjD,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACnB,GAAG,IAAI,iBAAiB,GAAG,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,GAAG,IAAI,eAAe,CAAC;QACvB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,GAAG,IAAI,MAAM,GAAG,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACrD,CAAC;QACD,GAAG,IAAI,OAAO,CAAC;IACjB,CAAC;IACD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,cAAc,kBAezB"}
+{"version":3,"file":"mapProfile.js","sourceRoot":"","sources":["../../../../src/ser-des/config/mapProfile.ts"],"names":[],"mappings":";;;AACA,gDAAyD;AAGlD,MAAM,eAAe,GAAW,UAAU,SAAS,EAAE,IAAI;IAC9D,MAAM,MAAM,GAAe;QACzB,SAAS;QACT,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,EAAE;KACb,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,SAAS,EAAE,CAAC;YACjC,uCAAuC;YACvC,MAAM,KAAK,GAAG,IAAA,uBAAS,EAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,MAAM,IAAI,IAAI,KAAK;iBACrB,KAAK,CAAC,KAAK,CAAC;iBACZ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBAClB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAC7C,IAAI,CAAC,EAAE,CAAC;oBACN,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EACD,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,EAAE,SAAS,EAAE,CAC5C,CAAC;IAEF,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QACpC,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,eAAe,mBAoC1B;AAEK,MAAM,cAAc,GAAuB,UAAU,EAAE;IAC5D,IAAI,GAAG,GAAG,cAAc,GAAG,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC;IACjD,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACnB,GAAG,IAAI,iBAAiB,GAAG,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,GAAG,IAAI,eAAe,CAAC;QACvB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,GAAG,IAAI,MAAM,GAAG,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACrD,CAAC;QACD,GAAG,IAAI,OAAO,CAAC;IACjB,CAAC;IACD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,cAAc,kBAezB"}

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

@@ -18,22 +18,22 @@ const parseMetadata = function (token) {
             const keyword = t[i++];
             if (i < t.length) {
                 if (keyword === 'title') {
-                    metadata.title = (0, tokenize_1.removePackage)(t[i++]);
+                    metadata.title = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (keyword === 'schema') {
-                    metadata.schema = (0, tokenize_1.removePackage)(t[i++]);
+                    metadata.schema = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (keyword === 'edition') {
-                    metadata.edition = (0, tokenize_1.removePackage)(t[i++]);
+                    metadata.edition = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (keyword === 'author') {
-                    metadata.author = (0, tokenize_1.removePackage)(t[i++]);
+                    metadata.author = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (keyword === 'namespace') {
-                    metadata.namespace = (0, tokenize_1.removePackage)(t[i++]);
+                    metadata.namespace = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (keyword === 'shortname') {
-                    metadata.shortname = (0, tokenize_1.removePackage)(t[i++]);
+                    metadata.shortname = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else {
                     throw new Error('Parsing error: metadata. Unknown keyword ' + keyword);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/note.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzD,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMvD,eAAO,MAAM,SAAS,EAAE,MA8CvB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAYtD,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,IAAI,CAajC,CAAC"}
+{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/note.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGzD,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMvD,eAAO,MAAM,SAAS,EAAE,MAwCvB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAYtD,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,IAAI,CAajC,CAAC"}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpNote = exports.resolveNote = exports.parseNote = void 0;
 const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const resolve_1 = require("../resolve");
 const VALID_NOTE_TYPES = ['NOTE', 'CAUTION', 'WARNING'];
 const parseNote = function (id, data) {
@@ -14,34 +15,25 @@ const parseNote = 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 === 'type') {
-                    const v = t[i++];
-                    if (!VALID_NOTE_TYPES.includes(v)) {
-                        throw new Error(`Parsing error: note. ID ${id}: Unknown type ${v} (valid: ${VALID_NOTE_TYPES.join(', ')})`);
-                    }
-                    result.type = v;
-                }
-                else if (command === 'message') {
-                    result.message = (0, tokenize_1.removePackage)(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: note. ID ${id}: Expecting value for ${command}`);
+    (0, parse_block_1.forEachEntry)(data, (command, value) => {
+        if (command === 'type') {
+            const v = value();
+            if (!VALID_NOTE_TYPES.includes(v)) {
+                throw new Error(`Parsing error: note. ID ${id}: Unknown type ${v} (valid: ${VALID_NOTE_TYPES.join(', ')})`);
             }
+            result.type = v;
         }
-    }
+        else if (command === 'message') {
+            result.message = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'reference') {
+            result._relations.ref = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else {
+            return false;
+        }
+        return true;
+    }, { construct: 'note', id });
     return ctx => {
         ctx.notes[id] = result;
         return ctx;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/process.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAMpD,eAAO,MAAM,YAAY,EAAE,MAwD1B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAuC/D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,OAAO,CA0CvC,CAAC"}
+{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/process.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAMpD,eAAO,MAAM,YAAY,EAAE,MAsD1B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAuC/D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,OAAO,CA6CvC,CAAC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpProcess = exports.resolveProcess = exports.parseProcess = void 0;
 const resolve_1 = require("../resolve");
 const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const parseProcess = function (id, data) {
     const result = {
         id: id,
@@ -14,6 +15,7 @@ const parseProcess = function (id, data) {
         provision: [],
         page: null,
         measure: [],
+        parent: '',
         _relations: {
             actor: '',
             output: [],
@@ -22,45 +24,39 @@ const parseProcess = function (id, data) {
             page: '',
         },
     };
-    if (data !== '') {
-        const t = (0, tokenize_1.tokenizePackage)(data);
-        let i = 0;
-        while (i < t.length) {
-            const keyword = t[i++];
-            if (i < t.length) {
-                if (keyword === 'modality') {
-                    result.modality = t[i++];
-                }
-                else if (keyword === 'name') {
-                    result.name = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (keyword === 'actor') {
-                    result._relations.actor = t[i++];
-                }
-                else if (keyword === 'subprocess') {
-                    result._relations.page = t[i++];
-                }
-                else if (keyword === 'validate_provision') {
-                    result._relations.provision = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else if (keyword === 'validate_measurement') {
-                    result.measure = (0, tokenize_1.tokenizePackage)(t[i++]).map(x => (0, tokenize_1.removePackage)(x));
-                }
-                else if (keyword === 'output') {
-                    result._relations.output = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else if (keyword === 'reference_data_registry') {
-                    result._relations.input = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else {
-                    i++; // forward-compatible: skip unknown keyword value
-                }
-            }
-            else {
-                throw new Error(`Parsing error: process. ID ${id}: Expecting value for ${keyword}`);
-            }
+    (0, parse_block_1.forEachEntry)(data, (keyword, value) => {
+        if (keyword === 'modality') {
+            result.modality = value();
         }
-    }
+        else if (keyword === 'name') {
+            result.name = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (keyword === 'actor') {
+            result._relations.actor = value();
+        }
+        else if (keyword === 'parent') {
+            result.parent = value();
+        }
+        else if (keyword === 'canvas' || keyword === 'subprocess') {
+            result._relations.page = value();
+        }
+        else if (keyword === 'validate_provision') {
+            result._relations.provision = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else if (keyword === 'validate_measurement') {
+            result.measure = (0, tokenize_1.tokenizePackage)(value()).map(x => (0, tokenize_1.unwrapBlock)(x));
+        }
+        else if (keyword === 'output') {
+            result._relations.output = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else if (keyword === 'reference_data_registry') {
+            result._relations.input = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else {
+            return false;
+        }
+        return true;
+    }, { construct: 'process', id });
     return ctx => {
         ctx.processes[id] = result;
         return ctx;
@@ -78,13 +74,13 @@ const resolveProcess = function (ctx, unresolved) {
         page: null,
     };
     for (const id of _relations.output) {
-        const r = (0, resolve_1.resolveFromContext)(ctx, 'registers', id);
+        const r = (0, resolve_1.resolveFromContext)(ctx, 'regs', id);
         if (r !== undefined) {
             p.output.push(r);
         }
     }
     for (const id of _relations.input) {
-        const r = (0, resolve_1.resolveFromContext)(ctx, 'registers', id);
+        const r = (0, resolve_1.resolveFromContext)(ctx, 'regs', id);
         if (r !== undefined) {
             p.input.push(r);
         }
@@ -143,7 +139,10 @@ const dumpProcess = function (process) {
         out += '  }\n';
     }
     if (process.page !== null) {
-        out += '  subprocess ' + process.page.id + '\n';
+        out += '  canvas ' + process.page.id + '\n';
+    }
+    if (process.parent) {
+        out += '  parent ' + process.parent + '\n';
     }
     out += '}\n';
     return out;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/provision.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAI5D,eAAO,MAAM,cAAc,EAAE,MA0C5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,SAAS,EAAE,mBAAmB,CAUnE,CAAC;AAEJ,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,SAAS,CAkB3C,CAAC"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/provision.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAI5D,eAAO,MAAM,cAAc,EAAE,MAoC5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,SAAS,EAAE,mBAAmB,CAUnE,CAAC;AAEJ,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,SAAS,CAkB3C,CAAC"}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpProvision = exports.resolveProvision = exports.parseProvision = void 0;
 const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const resolve_1 = require("../resolve");
 const parseProvision = function (id, data) {
     const result = {
@@ -14,33 +15,24 @@ const parseProvision = 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 === 'modality') {
-                    result.modality = t[i++];
-                }
-                else if (command === 'condition') {
-                    result.condition = (0, tokenize_1.removePackage)(t[i++]);
-                }
-                else if (command === 'reference') {
-                    result._relations.ref = (0, tokenize_1.tokenizePackage)(t[i++]);
-                }
-                else {
-                    result.subject.set(command, t[i++]);
-                }
-            }
-            else {
-                throw new Error('Parsing error: provision. ID ' +
-                    id +
-                    ': Expecting value for ' +
-                    command);
-            }
+    (0, parse_block_1.forEachEntry)(data, (command, value) => {
+        if (command === 'modality') {
+            result.modality = value();
         }
-    }
+        else if (command === 'condition') {
+            result.condition = (0, parse_block_1.unwrapped)(value);
+        }
+        else if (command === 'reference') {
+            result._relations.ref = (0, tokenize_1.tokenizePackage)(value());
+        }
+        else {
+            // Unknown command becomes a subject key → its raw value.
+            // (Provisions are intentionally extensible: free-form key/value
+            // pairs are part of the spec.)
+            result.subject.set(command, value());
+        }
+        return true;
+    }, { construct: 'provision', id });
     return ctx => {
         ctx.provisions[id] = result;
         return ctx;

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

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

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

@@ -15,10 +15,10 @@ const parseReference = (id, data) => {
             const keyword = t[i++];
             if (i < t.length) {
                 if (keyword === 'document') {
-                    ref.document = (0, tokenize_1.removePackage)(t[i++]);
+                    ref.document = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else if (keyword === 'clause') {
-                    ref.clause = (0, tokenize_1.removePackage)(t[i++]);
+                    ref.clause = (0, tokenize_1.unwrapBlock)(t[i++]);
                 }
                 else {
                     i++; // forward-compatible: skip unknown keyword value

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

@@ -1 +1 @@
-{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../../../src/ser-des/config/reference.ts"],"names":[],"mappings":";;;AACA,0CAA2E;AAGpE,MAAM,cAAc,GAAW,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE;IACjE,MAAM,GAAG,GAAc;QACrB,EAAE,EAAE,EAAE;QACN,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;KACX,CAAC;IACF,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,MAAM,CAAC,GAAa,IAAA,0BAAe,EAAC,IAAI,CAAC,CAAC;QAC1C,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,UAAU,EAAE,CAAC;oBAC3B,GAAG,CAAC,QAAQ,GAAG,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvC,CAAC;qBAAM,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAChC,GAAG,CAAC,MAAM,GAAG,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACN,CAAC,EAAE,CAAC,CAAC,iDAAiD;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,gCAAgC,EAAE,yBAAyB,OAAO,EAAE,CACrE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;QACzB,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,cAAc,kBA+BzB;AAEK,MAAM,aAAa,GAAsB,UAAU,GAAG;IAC3D,IAAI,GAAG,GAAW,YAAY,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;IACjD,GAAG,IAAI,cAAc,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;IAC3D,GAAG,IAAI,YAAY,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACvD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}
+{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../../../src/ser-des/config/reference.ts"],"names":[],"mappings":";;;AACA,0CAAyE;AAGlE,MAAM,cAAc,GAAW,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE;IACjE,MAAM,GAAG,GAAc;QACrB,EAAE,EAAE,EAAE;QACN,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;KACX,CAAC;IACF,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,MAAM,CAAC,GAAa,IAAA,0BAAe,EAAC,IAAI,CAAC,CAAC;QAC1C,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,UAAU,EAAE,CAAC;oBAC3B,GAAG,CAAC,QAAQ,GAAG,IAAA,sBAAW,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrC,CAAC;qBAAM,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAChC,GAAG,CAAC,MAAM,GAAG,IAAA,sBAAW,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACnC,CAAC;qBAAM,CAAC;oBACN,CAAC,EAAE,CAAC,CAAC,iDAAiD;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,gCAAgC,EAAE,yBAAyB,OAAO,EAAE,CACrE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;QACzB,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,cAAc,kBA+BzB;AAEK,MAAM,aAAa,GAAsB,UAAU,GAAG;IAC3D,IAAI,GAAG,GAAW,YAAY,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;IACjD,GAAG,IAAI,cAAc,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;IAC3D,GAAG,IAAI,YAAY,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACvD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}

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

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/role.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAEpC,eAAO,MAAM,SAAS,EAAE,MAyBvB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,IAAI,CAKjC,CAAC"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/role.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAEpC,eAAO,MAAM,SAAS,EAAE,MAuBvB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,IAAI,CAKjC,CAAC"}

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

@@ -2,27 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpRole = exports.parseRole = void 0;
 const tokenize_1 = require("../tokenize");
+const parse_block_1 = require("../parse-block");
 const parseRole = (id, data) => {
     const role = {
         id: id,
         name: '',
     };
-    const t = (0, tokenize_1.tokenizePackage)(data);
-    let i = 0;
-    while (i < t.length) {
-        const keyword = t[i++];
-        if (i < t.length) {
-            if (keyword === 'name') {
-                role.name = (0, tokenize_1.removePackage)(t[i++]);
-            }
-            else {
-                i++; // forward-compatible: skip unknown keyword value
-            }
+    (0, parse_block_1.forEachEntry)(data, (keyword, value) => {
+        if (keyword === 'name') {
+            role.name = (0, parse_block_1.unwrapped)(value);
         }
         else {
-            throw new Error(`Parsing error: role. ID ${id}: Expecting value for ${keyword}`);
+            return false;
         }
-    }
+        return true;
+    }, { construct: 'role', id });
     return ctx => {
         ctx.roles[id] = role;
         return ctx;

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

@@ -1 +1 @@
-{"version":3,"file":"role.js","sourceRoot":"","sources":["../../../../src/ser-des/config/role.ts"],"names":[],"mappings":";;;AACA,0CAA2E;AAGpE,MAAM,SAAS,GAAW,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE;IAC5D,MAAM,IAAI,GAAS;QACjB,EAAE,EAAE,EAAE;QACN,IAAI,EAAE,EAAE;KACT,CAAC;IACF,MAAM,CAAC,GAAkB,IAAA,0BAAe,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,OAAO,GAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC,IAAI,GAAG,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,CAAC,EAAE,CAAC,CAAC,iDAAiD;YACxD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,2BAA2B,EAAE,yBAAyB,OAAO,EAAE,CAChE,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,EAAE;QACX,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QACrB,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,SAAS,aAyBpB;AAEK,MAAM,QAAQ,GAAiB,UAAU,IAAI;IAClD,IAAI,GAAG,GAAW,OAAO,GAAG,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC;IAC7C,GAAG,IAAI,UAAU,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACpD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AALW,QAAA,QAAQ,YAKnB"}
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../../../src/ser-des/config/role.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAC3C,gDAAyD;AAGlD,MAAM,SAAS,GAAW,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE;IAC5D,MAAM,IAAI,GAAS;QACjB,EAAE,EAAE,EAAE;QACN,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,IAAA,0BAAY,EACV,IAAI,EACJ,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACjB,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,GAAG,IAAA,uBAAS,EAAC,KAAK,CAAC,CAAC;QAC/B,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,IAAI,CAAC;QACrB,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,SAAS,aAuBpB;AAEK,MAAM,QAAQ,GAAiB,UAAU,IAAI;IAClD,IAAI,GAAG,GAAW,OAAO,GAAG,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC;IAC7C,GAAG,IAAI,UAAU,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACpD,GAAG,IAAI,KAAK,CAAC;IACb,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AALW,QAAA,QAAQ,YAKnB"}

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

@@ -20,7 +20,7 @@ const parseStateMachine = function (entityName, data) {
                     result.initialState = t[i++];
                 }
                 else if (command === 'states') {
-                    const stateBlock = (0, tokenize_1.removePackage)(t[i++]);
+                    const stateBlock = (0, tokenize_1.unwrapBlock)(t[i++]);
                     for (const s of stateBlock.split(/\s+/).filter(s => s.length > 0)) {
                         result.states.push({ name: s });
                     }
@@ -45,19 +45,19 @@ const parseStateMachine = function (entityName, data) {
                     const cascades = [];
                     const referenceIds = [];
                     if (i < t.length && t[i].startsWith('{')) {
-                        const body = (0, tokenize_1.removePackage)(t[i++]);
+                        const body = (0, tokenize_1.unwrapBlock)(t[i++]);
                         const bt = (0, tokenize_1.tokenizePackage)(body);
                         let j = 0;
                         while (j < bt.length) {
                             const cmd = bt[j++];
                             if (j < bt.length) {
                                 if (cmd === 'guard') {
-                                    guard = (0, tokenize_1.removePackage)(bt[j++]);
+                                    guard = (0, tokenize_1.unwrapBlock)(bt[j++]);
                                 }
                                 else if (cmd === 'cascade') {
                                     const target = bt[j++];
                                     if (j < bt.length) {
-                                        const cascadeBlock = (0, tokenize_1.removePackage)(bt[j++]);
+                                        const cascadeBlock = (0, tokenize_1.unwrapBlock)(bt[j++]);
                                         cascades.push(parseCascade(target, cascadeBlock));
                                     }
                                 }
@@ -65,7 +65,7 @@ const parseStateMachine = function (entityName, data) {
                                     referenceIds.push(...(0, tokenize_1.tokenizePackage)(bt[j++]));
                                 }
                                 else {
-                                    (0, tokenize_1.removePackage)(bt[j++]);
+                                    (0, tokenize_1.unwrapBlock)(bt[j++]);
                                 }
                             }
                         }
@@ -106,10 +106,10 @@ function parseCascade(target, block) {
         const cmd = t[i++];
         if (i < t.length) {
             if (cmd === 'where') {
-                cascade.where = (0, tokenize_1.removePackage)(t[i++]);
+                cascade.where = (0, tokenize_1.unwrapBlock)(t[i++]);
             }
             else if (cmd === 'set') {
-                const setBlock = (0, tokenize_1.removePackage)(t[i++]);
+                const setBlock = (0, tokenize_1.unwrapBlock)(t[i++]);
                 const st = (0, tokenize_1.tokenizePackage)(setBlock);
                 let j = 0;
                 while (j < st.length) {
@@ -119,7 +119,7 @@ function parseCascade(target, block) {
                             j++;
                         }
                         if (j < st.length) {
-                            const value = (0, tokenize_1.removePackage)(st[j++]);
+                            const value = (0, tokenize_1.unwrapBlock)(st[j++]);
                             const setEntry = { field, value };
                             cascade.set.push(setEntry);
                         }
@@ -127,7 +127,7 @@ function parseCascade(target, block) {
                 }
             }
             else {
-                (0, tokenize_1.removePackage)(t[i++]);
+                (0, tokenize_1.unwrapBlock)(t[i++]);
             }
         }
     }
@@ -150,17 +150,17 @@ const dumpStateMachine = function (sm) {
         }
         out += ' {\n';
         if (t.guard) {
-            out += '    guard "' + t.guard + '"\n';
+            out += '    guard "' + (0, tokenize_1.escapeString)(t.guard) + '"\n';
         }
         for (const c of t.cascades) {
             out += '    cascade ' + c.targetEntity + ' {\n';
             if (c.where) {
-                out += '      where "' + c.where + '"\n';
+                out += '      where "' + (0, tokenize_1.escapeString)(c.where) + '"\n';
             }
             if (c.set.length > 0) {
                 out += '      set {\n';
                 for (const s of c.set) {
-                    out += '        ' + s.field + ': "' + s.value + '"\n';
+                    out += '        ' + s.field + ': "' + (0, tokenize_1.escapeString)(s.value) + '"\n';
                 }
                 out += '      }\n';
             }