@primmel/primmel 1.21.12 → 1.21.13

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

@@ -0,0 +1,211 @@
+"use strict";
+// ─────────────────────────────────────────────────────────────────────
+// Uncertainty-budget construct (register W5 — the language side of the
+// GUM plane): one measured quantity's uncertainty components and the
+// coverage factor of the expansion. The budget is a DECLARATION — the
+// propagation law is the GUM's, computed by the evaluation plane
+// (plurimath#488); the model names the components, their kinds, and
+// their provenance, never the arithmetic:
+//   uncertainty_budget u_ref {
+//     target mpe_error
+//     coverage k 2
+//     component u_cal {
+//       type B
+//       distribution rectangular
+//       half_width 0.5
+//       unit "kg"
+//       source { doc "urn:..." clause "..." }
+//     }
+//     component u_rep {
+//       type A
+//       series reference_pair_error
+//     }
+//   }
+// ─────────────────────────────────────────────────────────────────────
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dumpUncertaintyBudget = exports.parseUncertaintyBudget = void 0;
+const tokenize_1 = require("../tokenize");
+const field_parser_1 = require("./field-parser");
+const ref_1 = require("./ref");
+const correspondence_1 = require("./correspondence");
+const parse_block_1 = require("../parse-block");
+const DISTRIBUTIONS = new Set([
+    'rectangular',
+    'triangular',
+    'normal',
+    'ushape',
+]);
+function readComponent(block) {
+    const c = {
+        id: '',
+        type: 'B',
+        series: '',
+        distribution: '',
+        halfWidth: '',
+        unit: '',
+        source: null,
+        description: '',
+    };
+    const t = (0, tokenize_1.tokenizePackage)(block);
+    let i = 0;
+    while (i < t.length) {
+        const kw = t[i++];
+        if (i >= t.length) {
+            throw new Error(`Parsing error: uncertainty_budget component. ID ${c.id}: Expecting value for ${kw}`);
+        }
+        if (kw === 'type') {
+            const v = (0, tokenize_1.stripWrapping)(t[i++]);
+            if (v !== 'A' && v !== 'B') {
+                throw new Error(`Parsing error: uncertainty_budget component. ID ${c.id}: unknown type "${v}" (A evaluates the statistics of a series; B states a distribution)`);
+            }
+            c.type = v;
+        }
+        else if (kw === 'series') {
+            c.series = (0, tokenize_1.stripWrapping)(t[i++]);
+        }
+        else if (kw === 'distribution') {
+            const v = (0, tokenize_1.stripWrapping)(t[i++]);
+            if (!DISTRIBUTIONS.has(v)) {
+                throw new Error(`Parsing error: uncertainty_budget component. ID ${c.id}: unknown distribution "${v}" (rectangular | triangular | normal | ushape)`);
+            }
+            c.distribution = v;
+        }
+        else if (kw === 'half_width') {
+            c.halfWidth = (0, tokenize_1.stripWrapping)(t[i++]);
+        }
+        else if (kw === 'unit') {
+            c.unit = (0, tokenize_1.stripWrapping)(t[i++]);
+        }
+        else if (kw === 'description') {
+            c.description = (0, tokenize_1.stripWrapping)(t[i++]);
+        }
+        else if (kw === 'source') {
+            c.source = (0, field_parser_1.readSource)((0, tokenize_1.unwrapBlock)(t[i++]));
+        }
+        else {
+            i = (0, parse_block_1.skipUnknownValue)(t, i, kw);
+        }
+    }
+    return c;
+}
+const parseUncertaintyBudget = function (id, data) {
+    const result = {
+        id,
+        target: '',
+        coverageK: '',
+        components: [],
+        source: null,
+    };
+    const t = (0, tokenize_1.tokenizePackage)(data);
+    let i = 0;
+    while (i < t.length) {
+        const kw = t[i++];
+        if (i >= t.length) {
+            throw new Error(`Parsing error: uncertainty_budget. ID ${id}: Expecting value for ${kw}`);
+        }
+        if (kw === 'target') {
+            result.target = (0, tokenize_1.stripWrapping)(t[i++]);
+        }
+        else if (kw === 'coverage') {
+            const head = (0, tokenize_1.stripWrapping)(t[i++]);
+            if (head !== 'k') {
+                throw new Error(`Parsing error: uncertainty_budget. ID ${id}: coverage states its factor — coverage k <number>`);
+            }
+            result.coverageK = (0, tokenize_1.stripWrapping)(t[i++]);
+        }
+        else if (kw === 'component') {
+            // the entry shape: `component <id> { … }` — the id is the bare
+            // token between the keyword and the block
+            if (t[i].startsWith('{')) {
+                throw new Error(`Parsing error: uncertainty_budget. ID ${id}: a component carries an id — component <id> { … }`);
+            }
+            const cid = (0, tokenize_1.stripWrapping)(t[i++]);
+            const c = readComponent((0, tokenize_1.unwrapBlock)(t[i++]));
+            c.id = cid;
+            result.components.push(c);
+        }
+        else if (kw === 'source') {
+            result.source = (0, field_parser_1.readSource)((0, tokenize_1.unwrapBlock)(t[i++]));
+        }
+        else if (kw === 'ref') {
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_1.stripWrapping, tokenize_1.unwrapBlock);
+            if (!(0, ref_1.foldRefIntoLegacy)(result, rr.ref)) {
+                (result.refs ??= []).push(rr.ref);
+            }
+            i = rr.next;
+        }
+        else if (kw === 'corresponds') {
+            const cc = (0, correspondence_1.parseCorresponds)(t, i, tokenize_1.stripWrapping);
+            (result.correspondences ??= []).push(cc.corr);
+            i = cc.next;
+        }
+        else {
+            i = (0, parse_block_1.skipUnknownValue)(t, i, kw);
+        }
+    }
+    return ctx => {
+        ctx.uncertaintyBudgets[id] = result;
+        return ctx;
+    };
+};
+exports.parseUncertaintyBudget = parseUncertaintyBudget;
+const dumpUncertaintyBudget = function (b) {
+    let out = 'uncertainty_budget ' + b.id + ' {\n';
+    if (b.target) {
+        out += '  target ' + b.target + '\n';
+    }
+    if (b.coverageK) {
+        out += '  coverage k ' + b.coverageK + '\n';
+    }
+    for (const c of b.components) {
+        out += '  component ' + c.id + ' {\n';
+        out += '    type ' + c.type + '\n';
+        if (c.type === 'A' && c.series) {
+            out += '    series ' + c.series + '\n';
+        }
+        if (c.type === 'B') {
+            if (c.distribution) {
+                out += '    distribution ' + c.distribution + '\n';
+            }
+            if (c.halfWidth) {
+                out += '    half_width ' + c.halfWidth + '\n';
+            }
+            if (c.unit) {
+                out += '    unit "' + (0, tokenize_1.escapeString)(c.unit) + '"\n';
+            }
+        }
+        if (c.description) {
+            out += '    description "' + (0, tokenize_1.escapeString)(c.description) + '"\n';
+        }
+        if (c.source && (c.source.doc || c.source.clause)) {
+            out +=
+                '    source { doc "' +
+                    (0, tokenize_1.escapeString)(c.source.doc) +
+                    '" clause "' +
+                    (0, tokenize_1.escapeString)(c.source.clause) +
+                    '"' +
+                    (c.source.fragment
+                        ? ' fragment "' + (0, tokenize_1.escapeString)(c.source.fragment) + '"'
+                        : '') +
+                    ' }\n';
+        }
+        out += '  }\n';
+    }
+    if (b.source && (b.source.doc || b.source.clause)) {
+        out +=
+            '  source { doc "' +
+                (0, tokenize_1.escapeString)(b.source.doc) +
+                '" clause "' +
+                (0, tokenize_1.escapeString)(b.source.clause) +
+                '"' +
+                (b.source.fragment
+                    ? ' fragment "' + (0, tokenize_1.escapeString)(b.source.fragment) + '"'
+                    : '') +
+                ' }\n';
+    }
+    out += (0, correspondence_1.dumpCorrespondences)(b.correspondences, '  ', tokenize_1.escapeString, field_parser_1.dumpBareSafe);
+    out += '}\n';
+    return out;
+};
+exports.dumpUncertaintyBudget = dumpUncertaintyBudget;
+//# sourceMappingURL=uncertaintyBudget.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/verdict.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAkB/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAiB/C,eAAO,MAAM,YAAY,EAAE,MAiF1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,OAAO,CA8CvC,CAAC"}
+{"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../../../src/ser-des/config/verdict.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAsB/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAiB/C,eAAO,MAAM,YAAY,EAAE,MAqF1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,OAAO,CAkDvC,CAAC"}

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

@@ -32,6 +32,7 @@ const tokenize_1 = require("../tokenize");
 const tokenize_2 = require("../tokenize");
 const parse_block_1 = require("../parse-block");
 const field_parser_1 = require("./field-parser");
+const expression_carrier_1 = require("../expression-carrier");
 const acceptance_1 = require("./acceptance");
 const ref_1 = require("./ref");
 const correspondence_1 = require("./correspondence");
@@ -87,7 +88,11 @@ const parseVerdict = function (id, data) {
             result.behavior = value();
         }
         else if (keyword === 'derive' || keyword === 'expression') {
-            result.derive = (0, parse_block_1.unwrapped)(value);
+            // Two carriers: the legacy quoted ocl{…} string and the v3.3
+            // inline block — the value's shape decides.
+            const c = (0, expression_carrier_1.readExpressionCarrier)(value(), 'verdict derive');
+            result.derive = c.source;
+            result.deriveBound = c.inline || undefined;
         }
         else if (keyword === 'inputs' || keyword === 'uses') {
             result.inputs = readIdList(value());
@@ -148,7 +153,12 @@ const dumpVerdict = function (v) {
         out += ' }\n';
     }
     if (v.derive) {
-        out += '  derive "' + (0, tokenize_2.escapeString)(v.derive) + '"\n';
+        if (v.deriveBound) {
+            out += (0, expression_carrier_1.dumpExpressionBlock)('derive', v.derive, '  ');
+        }
+        else {
+            out += '  derive "' + (0, tokenize_2.escapeString)(v.derive) + '"\n';
+        }
     }
     if (v.inputs.length > 0) {
         out += '  inputs { ' + v.inputs.join(' ') + ' }\n';

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../../src/ser-des/dump.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAGzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAiCR"}
+{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../../src/ser-des/dump.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAGzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAsFR"}

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

@@ -28,6 +28,38 @@ function dump(model, dumpers) {
         }
     }
     const processMap = new Map(model.processes.map(p => [p.id, p]));
+    // Containment: the requirements a class declares as members dump
+    // nested inside it, never standalone.
+    const memberIds = new Set();
+    for (const rc of model.requirementClasses ?? []) {
+        for (const m of rc.members ?? []) {
+            memberIds.add(m);
+        }
+    }
+    const requirementMap = new Map((model.requirements ?? []).map(r => [r.id, r]));
+    const classMap = new Map((model.requirementClasses ?? []).map(rc => [rc.id, rc]));
+    const dumpersRef = dumpers;
+    const dumpClassTree = (rcId) => {
+        const rc = classMap.get(rcId);
+        if (!rc) {
+            return '';
+        }
+        const base = dumpersRef.requirementClasses(rc);
+        if (!rc.members || rc.members.length === 0) {
+            return base;
+        }
+        const inner = rc.members
+            .map(m => {
+            const body = dumpersRef.requirements(requirementMap.get(m));
+            return body
+                .split('\n')
+                .filter(l => l !== '')
+                .map(l => '  ' + l)
+                .join('\n');
+        })
+            .join('\n');
+        return base.slice(0, base.lastIndexOf('}')) + inner + '\n}\n';
+    };
     Object.keys(dumpers).forEach(field => {
         if (field === 'processes') {
             for (const p of model.processes) {
@@ -37,6 +69,20 @@ function dump(model, dumpers) {
             }
             return;
         }
+        if (field === 'requirements') {
+            for (const r of model.requirements ?? []) {
+                if (!memberIds.has(r.id)) {
+                    out += dumpersRef.requirements(r);
+                }
+            }
+            return;
+        }
+        if (field === 'requirementClasses') {
+            for (const rc of model.requirementClasses ?? []) {
+                out += dumpClassTree(rc.id);
+            }
+            return;
+        }
         const items = model[field];
         const dumper = dumpers[field];
         for (const item of items) {

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

@@ -1 +1 @@
-{"version":3,"file":"dump.js","sourceRoot":"","sources":["../../../src/ser-des/dump.ts"],"names":[],"mappings":";;AAiBA,uBAoCC;AApDD,gDAAiD;AACjD,8CAAmD;AAGnD;;;;;;;;;;;GAWG;AACH,SAAwB,IAAI,CAC1B,KAAe,EACf,OAA4B;IAE5B,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACxB,GAAG,IAAI,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC;IAC1C,CAAC;IAED,GAAG,IAAI,IAAA,uBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAEvC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC3B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAsC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACzE,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;YAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;oBACxB,GAAG,IAAI,IAAA,yBAAe,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAc,CAAC;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAA8B,CAAC;QAC3D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"dump.js","sourceRoot":"","sources":["../../../src/ser-des/dump.ts"],"names":[],"mappings":"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"}

package/dist/src/ser-des/expression-carrier.d.ts

@@ -0,0 +1,17 @@
+export interface ExpressionCarrier {
+    /** The stored expression source (the canonical render when inline). */
+    source: string;
+    /** The v3.3 block carrier — the checker walks the AST, exactly. */
+    inline: boolean;
+}
+export declare function readExpressionCarrier(token: string, what: string): ExpressionCarrier;
+/** The block-carrier dump: the keyword, the indented canonical source. */
+export declare function dumpExpressionBlock(keyword: string, source: string, indent: string): string;
+/** The args block's entry shape: `name <- source` per line — the scope
+ *  any expression carrier's body binds. Shared by the limit and the
+ *  constraint. */
+export declare function readArgsBlock(token: string): {
+    name: string;
+    source: string;
+}[];
+//# sourceMappingURL=expression-carrier.d.ts.map

package/dist/src/ser-des/expression-carrier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression-carrier.d.ts","sourceRoot":"","sources":["../../../src/ser-des/expression-carrier.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,iBAAiB;IAChC,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,GACX,iBAAiB,CAoBnB;AAED,0EAA0E;AAC1E,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,MAAM,CAMR;AAED;;kBAEkB;AAClB,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,EAAE,CAqBF"}

package/dist/src/ser-des/expression-carrier.js

@@ -0,0 +1,72 @@
+"use strict";
+// ─────────────────────────────────────────────────────────────────────
+// The shared carrier of a machine-executable payload (register 18):
+// the legacy quoted string (the ocl{…} convention) and the v3.3 inline
+// block. The value's shape — a string token or a block token — is the
+// entire carrier decision; they never mix in one facet.
+// ─────────────────────────────────────────────────────────────────────
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readExpressionCarrier = readExpressionCarrier;
+exports.dumpExpressionBlock = dumpExpressionBlock;
+exports.readArgsBlock = readArgsBlock;
+const expressions_1 = require("../expressions");
+const tokenize_1 = require("./tokenize");
+const tokenize_2 = require("./tokenize");
+function readExpressionCarrier(token, what) {
+    if (token.startsWith('{')) {
+        try {
+            return {
+                source: (0, expressions_1.canonicalizeExpression)((0, tokenize_2.unwrapBlock)(token)),
+                inline: true,
+            };
+        }
+        catch (e) {
+            throw new Error(`Parsing error: ${what}: ${e.message ?? String(e)}`);
+        }
+    }
+    if (token.length >= 2 && token.charAt(0) === '"') {
+        return {
+            source: (0, tokenize_2.unescapeString)(token.substr(1, token.length - 2)),
+            inline: false,
+        };
+    }
+    return { source: token, inline: false };
+}
+/** The block-carrier dump: the keyword, the indented canonical source. */
+function dumpExpressionBlock(keyword, source, indent) {
+    const body = source
+        .split('\n')
+        .map(l => indent + '  ' + l)
+        .join('\n');
+    return indent + keyword + ' {\n' + body + '\n' + indent + '}\n';
+}
+/** The args block's entry shape: `name <- source` per line — the scope
+ *  any expression carrier's body binds. Shared by the limit and the
+ *  constraint. */
+function readArgsBlock(token) {
+    const at = (0, tokenize_1.default)(token);
+    const args = [];
+    let k = 0;
+    while (k < at.length) {
+        const name = unescapeStringOrBare(at[k++]);
+        if (k >= at.length) {
+            throw new Error(`limit args: "${name}" binds to nothing`);
+        }
+        if (at[k] !== '<-') {
+            throw new Error(`limit args: expected "<-" after "${name}" (name <- source)`);
+        }
+        k += 1;
+        if (k >= at.length) {
+            throw new Error(`limit args: "${name}" binds to nothing`);
+        }
+        args.push({ name, source: unescapeStringOrBare(at[k++]) });
+    }
+    return args;
+}
+function unescapeStringOrBare(t) {
+    if (t.length >= 2 && t.charAt(0) === '"' && t.charAt(t.length - 1) === '"') {
+        return (0, tokenize_2.unescapeString)(t.substr(1, t.length - 2));
+    }
+    return t;
+}
+//# sourceMappingURL=expression-carrier.js.map

package/dist/src/ser-des/expression-carrier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression-carrier.js","sourceRoot":"","sources":["../../../src/ser-des/expression-carrier.ts"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,oEAAoE;AACpE,uEAAuE;AACvE,sEAAsE;AACtE,wDAAwD;AACxD,wEAAwE;;AAaxE,sDAuBC;AAGD,kDAUC;AAKD,sCAwBC;AA5ED,gDAAwD;AACxD,yCAAkC;AAClC,yCAAyD;AASzD,SAAgB,qBAAqB,CACnC,KAAa,EACb,IAAY;IAEZ,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,IAAA,oCAAsB,EAAC,IAAA,sBAAW,EAAC,KAAK,CAAC,CAAC;gBAClD,MAAM,EAAE,IAAI;aACb,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,KAAM,CAAW,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAC/D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QACjD,OAAO;YACL,MAAM,EAAE,IAAA,yBAAc,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzD,MAAM,EAAE,KAAK;SACd,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC1C,CAAC;AAED,0EAA0E;AAC1E,SAAgB,mBAAmB,CACjC,OAAe,EACf,MAAc,EACd,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM;SAChB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC;SAC3B,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,GAAG,KAAK,CAAC;AAClE,CAAC;AAED;;kBAEkB;AAClB,SAAgB,aAAa,CAAC,KAAa;IAIzC,MAAM,EAAE,GAAG,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAuC,EAAE,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,oBAAoB,CAC7D,CAAC;QACJ,CAAC;QACD,CAAC,IAAI,CAAC,CAAC;QACP,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,oBAAoB,CAAC,CAAS;IACrC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QAC3E,OAAO,IAAA,yBAAc,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"package.d.ts","sourceRoot":"","sources":["../../../src/ser-des/package.ts"],"names":[],"mappings":"AA6BA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAOzC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AA4B7D,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;CAC9B;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,CA8BvD;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,kBAAuB,GAC/B,QAAQ,CAEV;AAaD,uDAAuD;AACvD,MAAM,WAAW,kBAAkB;IACjC,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,+CAA+C;AAC/C,MAAM,WAAW,eAAe;IAC9B,+DAA+D;IAC/D,IAAI,EAAE,MAAM,CAAC;IACb;;qDAEiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,IAAI,EAAE;QAAE,KAAK,EAAE,kBAAkB,CAAC;QAAC,GAAG,EAAE,kBAAkB,CAAA;KAAE,CAAC;CAC9D;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,UAAU,EAAE,iBAAiB,CAAC;CAC/B;AAED,yEAAyE;AACzE,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,YAAY;IACtD,yEAAyE;IACzE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACzB;sEACkE;IAClE,UAAU,EAAE,CAAC,EAAE,CAAC;CACjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,YAAY,EACtD,UAAU,EAAE,iBAAiB,EAC7B,IAAI,EAAE,SAAS,CAAC,EAAE,GACjB,gBAAgB,CAAC,CAAC,CAAC,CAiBrB;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,kBAAuB,GAC/B,iBAAiB,CAOnB;AAyED;kBACkB;AAClB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAkBjE;AAwDD;8EAC8E;AAC9E,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,kBAAuB,GAC/B,UAAU,CAEZ;AAqBD,uEAAuE;AACvE,MAAM,MAAM,cAAc,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;AAEhE,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD;;;;OAIG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,6DAA6D;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,kBAAkB,GAClB,YAAY,GACZ,oBAAoB,GACpB,yBAAyB,CAAC;AAE9B;kEACkE;AAClE,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,IAAI,EAAE,eAAe;gBAArB,IAAI,EAAE,eAAe,EACrC,OAAO,EAAE,MAAM;CAKlB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,EAAE,CAWjE;AAeD,wEAAwE;AAKxE,eAAO,MAAM,YAAY,EAAE,CAAC,MAAM,YAAY,CAAC,EA+I9C,CAAC;AAmBF,eAAO,MAAM,yBAAyB,EAAE,WAAW,CAAC,MAAM,CAqBxD,CAAC;AAMH;;;;;;;uEAOuE;AACvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CA0C1E"}
+{"version":3,"file":"package.d.ts","sourceRoot":"","sources":["../../../src/ser-des/package.ts"],"names":[],"mappings":"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"}

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

@@ -241,6 +241,13 @@ function loadPackageInternal(dir, options = {}, withProvenance = false) {
     const parseOptions = withProvenance
         ? { ...options, withProvenance: true }
         : options;
+    // The declared language generation makes the parse STRICT: a package
+    // that declares what it targets gets unknown keywords as errors, not
+    // the lenient skip (the declared-generation contract, the language
+    // critique §1).
+    if (manifest?.language) {
+        parseOptions.strict = true;
+    }
     const ctx = (0, parse_1.default)(joinChunks(chunks), config_1.PARSER_CONFIG, parseOptions);
     if (manifest) {
         ctx.packageManifest = manifest;
@@ -338,6 +345,11 @@ exports.MERGE_FIELDS = [
     'calculations',
     'verdicts',
     'referenceMaterials',
+    'wireMappings',
+    'stringFormats',
+    'namespaces',
+    'datums',
+    'checks',
     'testPointSets',
     'commonTestConditions',
     'competenceKinds',
@@ -347,6 +359,7 @@ exports.MERGE_FIELDS = [
     'schemeActivityKinds',
     'schemeTypes',
     'constraints',
+    'uncertaintyBudgets',
     'discrepancyRecords',
     'stateMachines',
     'conformanceTests',
@@ -615,7 +628,15 @@ function composePackage(rootDir, options, rootManifest, withProvenance = false)
     const ctxs = new Map();
     const pkgChunks = new Map();
     for (const id of order) {
-        const parsed = parsePackageContent(dirs.get(id), parseOptions);
+        // The declared language generation makes THAT package's parse strict
+        // (per-package contracts: the root's declaration does not bind the
+        // dependencies, and vice versa).
+        const pkgOptions = { ...parseOptions };
+        const pkgManifest = manifests.get(id);
+        if (pkgManifest?.language) {
+            pkgOptions.strict = true;
+        }
+        const parsed = parsePackageContent(dirs.get(id), pkgOptions);
         ctxs.set(id, parsed.ctx);
         pkgChunks.set(id, parsed.chunks);
     }
@@ -745,9 +766,38 @@ function composePackage(rootDir, options, rootManifest, withProvenance = false)
     for (const id of order) {
         const m = manifests.get(id);
         for (const req of m.requires ?? []) {
-            const satisfied = order.some(other => other !== id &&
-                (other === req ||
-                    (manifests.get(other).provides ?? []).includes(req)));
+            // The SCOPED form (`<packageId>:<token>`) names THAT package's
+            // provides token — the same convention the waives entries use.
+            // The bare form matches any composed package's id or provides.
+            // A scoped require's package may sit OUTSIDE the uses closure
+            // (requires never content-merges — the capability-closure
+            // doctrine): resolve its MANIFEST through the locator for this
+            // check, without merging content.
+            const at = req.indexOf(':');
+            const scoped = at > 0 ? { pkg: req.slice(0, at), token: req.slice(at + 1) } : null;
+            let scopedProvides = null;
+            if (scoped && !order.includes(scoped.pkg)) {
+                try {
+                    // Locate + read the manifest ONLY (requires never
+                    // content-merges — the capability-closure doctrine).
+                    const dir = locate(scoped.pkg);
+                    if (dir) {
+                        const rm = readPackageManifest(dir);
+                        scopedProvides = rm.provides ?? [];
+                        manifests.set(scoped.pkg, rm);
+                    }
+                }
+                catch {
+                    // unresolvable → the check below fails it as unsatisfied
+                }
+            }
+            const satisfied = scoped
+                ? order.includes(scoped.pkg)
+                    ? (manifests.get(scoped.pkg).provides ?? []).includes(scoped.token)
+                    : (scopedProvides ?? []).includes(scoped.token)
+                : order.some(other => other !== id &&
+                    (other === req ||
+                        (manifests.get(other).provides ?? []).includes(req)));
             if (!satisfied) {
                 throw new CompositionError('requires-satisfied', `package "${id}" requires "${req}", which no package in the composition provides (requires-satisfied)`);
             }