@primmel/primmel 1.5.0 → 1.5.2

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

@@ -104,7 +104,9 @@ exports.subjectConstruct = exports.conditionSetConstruct = exports.behaviorConst
 exports.resolveSubject = resolveSubject;
 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 ref_1 = require("./ref");
 const field_parser_2 = require("./field-parser");
 const twin_1 = require("./twin");
 const composition_1 = require("./composition");
@@ -153,6 +155,10 @@ const parseInstrument = function (id, data) {
         measurand: null,
         components: [],
         structure: [],
+        // Initialized so the ref fold (docs/primmel/18 §18.4) mirrors the
+        // first derives-from block here — the fold only mirrors slots the
+        // object already carries.
+        source: null,
     };
     const t = (0, tokenize_2.tokenizePackage)(data);
     let i = 0;
@@ -183,7 +189,12 @@ const parseInstrument = function (id, data) {
             result.note = (0, tokenize_2.stripWrapping)(t[i++]);
         }
         else if (cmd === 'source') {
-            result.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
+            // Repeated provenance blocks accumulate; `source` stays the first.
+            const src = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
+            (result.sourceRefs ??= []).push(src);
+            if (!result.source) {
+                result.source = src;
+            }
         }
         else if (cmd === 'variant') {
             const variantId = (0, tokenize_2.stripWrapping)(t[i++]);
@@ -245,6 +256,18 @@ const parseInstrument = function (id, data) {
                 else if (fc === 'source') {
                     result.familySource = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(ft[j++]));
                 }
+                else if (fc === 'ref') {
+                    // The unified typed reference (docs/primmel/18) — the family
+                    // block's provenance folds onto familySource.
+                    const rr = (0, ref_1.parseRef)(ft, j, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+                    j = rr.next;
+                    if (rr.ref.predicate === 'derives-from') {
+                        const b = (0, ref_1.refTargetToSourceRef)(rr.ref.target);
+                        if (b && !result.familySource) {
+                            result.familySource = b;
+                        }
+                    }
+                }
                 else {
                     (0, tokenize_2.unwrapBlock)(ft[j++]);
                 }
@@ -276,8 +299,16 @@ const parseInstrument = function (id, data) {
         else if (cmd === 'reference') {
             result.referenceIds = readReference(t[i++]);
         }
+        else if (cmd === 'ref') {
+            // The unified typed reference (docs/primmel/18).
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+            if (!(0, ref_1.foldRefIntoLegacy)(result, rr.ref)) {
+                (result.refs ??= []).push(rr.ref);
+            }
+            i = rr.next;
+        }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return ctx => {
@@ -331,7 +362,7 @@ function parseMeasurand(block) {
             m.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return m;
@@ -361,7 +392,7 @@ function parseComponent(id, block) {
             c.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return c;
@@ -416,7 +447,7 @@ function parseStructure(id, block) {
             s.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return s;
@@ -465,7 +496,7 @@ function parseDimension(id, block) {
             dim.values = parseDimensionValues((0, tokenize_2.unwrapBlock)(t[i++]));
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return dim;
@@ -585,11 +616,23 @@ function parseModelGroup(block) {
         else if (cmd === 'source') {
             mg.sources.push((0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++])));
         }
+        else if (cmd === 'ref') {
+            // The unified typed reference (docs/primmel/18) — a model_group
+            // provenance line folds onto the sources list.
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+            i = rr.next;
+            if (rr.ref.predicate === 'derives-from') {
+                const b = (0, ref_1.refTargetToSourceRef)(rr.ref.target);
+                if (b) {
+                    mg.sources.push(b);
+                }
+            }
+        }
         else if (cmd === 'sample_selection') {
             mg.sampleSelection.push((0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++])));
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return mg;
@@ -782,7 +825,11 @@ const dumpInstrument = function (inst) {
         if (inst.familyNote) {
             out += '    note "' + (0, tokenize_2.escapeString)(inst.familyNote) + '"\n';
         }
-        out += dumpSource('source', inst.familySource ?? null, '    ');
+        if (inst.familySource &&
+            (inst.familySource.doc || inst.familySource.clause)) {
+            // The canonical provenance spelling (docs/primmel/18 §18.4).
+            out += (0, ref_1.dumpSourceRefAsRef)(inst.familySource, '    ', tokenize_2.escapeString);
+        }
         out += '  }\n';
     }
     if (inst.familyCriteria.length > 0) {
@@ -814,14 +861,24 @@ const dumpInstrument = function (inst) {
         out += dumpIdList('identical_characteristics', inst.modelGroup.identicalCharacteristics, '    ');
         out += dumpIdList('identical_attributes', inst.modelGroup.identicalAttributes, '    ');
         for (const s of inst.modelGroup.sources ?? []) {
-            out += dumpSource('source', s, '    ');
+            // The canonical provenance spelling (docs/primmel/18 §18.4).
+            out += (0, ref_1.dumpSourceRefAsRef)(s, '    ', tokenize_2.escapeString);
         }
         for (const s of inst.modelGroup.sampleSelection ?? []) {
             out += dumpSource('sample_selection', s, '    ');
         }
         out += '  }\n';
     }
-    out += dumpSource('source', inst.source ?? null, '  ');
+    const instSources = inst.sourceRefs && inst.sourceRefs.length > 0
+        ? inst.sourceRefs
+        : inst.source
+            ? [inst.source]
+            : [];
+    for (const s of instSources) {
+        // The canonical provenance spelling (docs/primmel/18 §18.4).
+        out += (0, ref_1.dumpSourceRefAsRef)(s, '  ', tokenize_2.escapeString);
+    }
+    out += (0, ref_1.dumpRefs)(inst.refs, '  ', tokenize_2.escapeString);
     out += dumpIdList('reference', inst.referenceIds, '  ');
     out += '}\n';
     return out;
@@ -863,7 +920,13 @@ const parseAttributeDefinition = function (id, data) {
             result.definition = (0, tokenize_2.stripWrapping)(t[i++]);
         }
         else if (cmd === 'source' || cmd === 'reference') {
-            result.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
+            // Repeated provenance blocks accumulate; `source` stays the first
+            // entry (the requirement family's idiom, TODO.roadmap/24).
+            const src = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
+            (result.sourceRefs ??= []).push(src);
+            if (!result.source) {
+                result.source = src;
+            }
         }
         else if (cmd === 'quantity_kind') {
             result.quantityKind = (0, tokenize_2.stripWrapping)(t[i++]);
@@ -901,8 +964,16 @@ const parseAttributeDefinition = function (id, data) {
         else if (cmd === 'derived') {
             result.derived = (0, tokenize_2.stripWrapping)(t[i++]);
         }
+        else if (cmd === 'ref') {
+            // The unified typed reference (docs/primmel/18).
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+            if (!(0, ref_1.foldRefIntoLegacy)(result, rr.ref)) {
+                (result.refs ??= []).push(rr.ref);
+            }
+            i = rr.next;
+        }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return ctx => {
@@ -921,7 +992,16 @@ const dumpAttributeDefinition = function (a) {
     if (a.definition) {
         out += '  definition "' + (0, tokenize_2.escapeString)(a.definition) + '"\n';
     }
-    out += dumpSource('source', a.source, '  ');
+    const attrSources = a.sourceRefs && a.sourceRefs.length > 0
+        ? a.sourceRefs
+        : a.source
+            ? [a.source]
+            : [];
+    for (const s of attrSources) {
+        // The canonical provenance spelling (docs/primmel/18 §18.4).
+        out += (0, ref_1.dumpSourceRefAsRef)(s, '  ', tokenize_2.escapeString);
+    }
+    out += (0, ref_1.dumpRefs)(a.refs, '  ', tokenize_2.escapeString);
     if (a.quantityKind) {
         out += '  quantity_kind ' + a.quantityKind + '\n';
     }
@@ -1003,8 +1083,16 @@ const parseCapability = function (id, data) {
         else if (cmd === 'reference') {
             result.referenceIds = readReference(t[i++]);
         }
+        else if (cmd === 'ref') {
+            // The unified typed reference (docs/primmel/18).
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+            if (!(0, ref_1.foldRefIntoLegacy)(result, rr.ref)) {
+                (result.refs ??= []).push(rr.ref);
+            }
+            i = rr.next;
+        }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return ctx => {
@@ -1029,6 +1117,7 @@ const dumpCapability = function (c) {
     out += dumpIdList('satisfies_requirements', c.satisfiesRequirements, '  ');
     out += dumpIdList('verified_by_tests', c.verifiedByTests, '  ');
     out += dumpIdList('reference', c.referenceIds, '  ');
+    out += (0, ref_1.dumpRefs)(c.refs, '  ', tokenize_2.escapeString);
     out += '}\n';
     return out;
 };
@@ -1060,13 +1149,26 @@ const parseBehavior = function (id, data) {
             result.response = (0, tokenize_2.stripWrapping)(t[i++]);
         }
         else if (cmd === 'source' || cmd === 'reference') {
-            result.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
+            // Repeated provenance blocks accumulate; `source` stays the first.
+            const src = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
+            (result.sourceRefs ??= []).push(src);
+            if (!result.source) {
+                result.source = src;
+            }
         }
         else if (cmd === 'verified_by' || cmd === 'verified_by_tests') {
             result.verifiedBy = readReference(t[i++]);
         }
+        else if (cmd === 'ref') {
+            // The unified typed reference (docs/primmel/18).
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+            if (!(0, ref_1.foldRefIntoLegacy)(result, rr.ref)) {
+                (result.refs ??= []).push(rr.ref);
+            }
+            i = rr.next;
+        }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return ctx => {
@@ -1085,7 +1187,16 @@ const dumpBehavior = function (b) {
     if (b.response) {
         out += '  response "' + (0, tokenize_2.escapeString)(b.response) + '"\n';
     }
-    out += dumpSource('source', b.source, '  ');
+    const behaviorSources = b.sourceRefs && b.sourceRefs.length > 0
+        ? b.sourceRefs
+        : b.source
+            ? [b.source]
+            : [];
+    for (const s of behaviorSources) {
+        // The canonical provenance spelling (docs/primmel/18 §18.4).
+        out += (0, ref_1.dumpSourceRefAsRef)(s, '  ', tokenize_2.escapeString);
+    }
+    out += (0, ref_1.dumpRefs)(b.refs, '  ', tokenize_2.escapeString);
     out += dumpIdList('verified_by', b.verifiedBy, '  ');
     out += '}\n';
     return out;
@@ -1127,11 +1238,36 @@ const parseConditionSet = function (id, data) {
                 result.source = src;
             }
         }
+        else if (cmd === 'ref') {
+            // The unified typed reference (docs/primmel/18): derives-from folds
+            // onto the source/sources provenance channel, cites onto
+            // referenceIds, the rest stay as refs.
+            const rr = (0, ref_1.parseRef)(t, i, tokenize_2.stripWrapping, tokenize_2.unwrapBlock);
+            i = rr.next;
+            if (rr.ref.predicate === 'derives-from') {
+                const b = (0, ref_1.refTargetToSourceRef)(rr.ref.target);
+                if (b) {
+                    result.sources.push(b);
+                    if (!result.source) {
+                        result.source = b;
+                    }
+                }
+                else {
+                    (result.refs ??= []).push(rr.ref);
+                }
+            }
+            else if (rr.ref.predicate === 'cites') {
+                result.referenceIds.push(rr.ref.target);
+            }
+            else {
+                (result.refs ??= []).push(rr.ref);
+            }
+        }
         else if (cmd === 'reference') {
             result.referenceIds = readReference(t[i++]);
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return ctx => {
@@ -1220,9 +1356,12 @@ const dumpConditionSet = function (cs) {
             ? [cs.source]
             : [];
     for (const s of sources) {
-        out += dumpSource('source', s, '  ');
+        // The canonical provenance spelling (docs/primmel/18 §18.4): a
+        // URN-anchored block dumps as a derives-from ref line.
+        out += (0, ref_1.dumpSourceRefAsRef)(s, '  ', tokenize_2.escapeString);
     }
     out += dumpIdList('reference', cs.referenceIds, '  ');
+    out += (0, ref_1.dumpRefs)(cs.refs, '  ', tokenize_2.escapeString);
     out += '}\n';
     return out;
 };
@@ -1397,7 +1536,7 @@ function readCharacteristicBlock(block) {
             c.source = (0, field_parser_1.readSource)((0, tokenize_2.unwrapBlock)(t[i++]));
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return c;
@@ -1741,7 +1880,7 @@ const parseSubject = function (id, data) {
             result.referenceIds = readReference(t[i++]);
         }
         else {
-            (0, tokenize_2.unwrapBlock)(t[i++]);
+            i = (0, parse_block_1.skipUnknownValue)(t, i, cmd);
         }
     }
     return ctx => {