@ldclabs/kip-lang 2.1.0 → 2.2.0

package/dist/parser.js

@@ -63,13 +63,8 @@ class Parser {
             case TokenType.Ensure:
             case TokenType.Assert:
             case TokenType.Update:
-            case TokenType.Retract:
-            case TokenType.Supersede:
-            case TokenType.Correct:
             case TokenType.Transition:
             case TokenType.Set:
-            case TokenType.Archive:
-            case TokenType.Tombstone:
             case TokenType.Purge:
             case TokenType.Merge:
                 return this.parseMutationClause();
@@ -90,8 +85,6 @@ class Parser {
                 return this.parseHistoryStatement();
             case TokenType.Changes:
                 return this.parseChangesStatement();
-            case TokenType.Snapshot:
-                return this.parseSnapshotStatement();
             case TokenType.Export:
                 return this.parseExportCapsuleStatement();
             default:
@@ -113,20 +106,10 @@ class Parser {
                 return this.parseAssertStatement();
             case TokenType.Update:
                 return this.parseUpdateStatement();
-            case TokenType.Retract:
-                return this.parseRetractAssertion();
-            case TokenType.Supersede:
-                return this.parseSupersedeAssertion();
-            case TokenType.Correct:
-                return this.parseCorrectEvidence();
             case TokenType.Transition:
-                return this.parseTransitionActivity();
+                return this.parseTransitionStatement();
             case TokenType.Set:
                 return this.parseSetRetention();
-            case TokenType.Archive:
-                return this.parseArchiveStatement();
-            case TokenType.Tombstone:
-                return this.parseTombstoneStatement();
             case TokenType.Purge:
                 return this.parsePurgeStatement();
             case TokenType.Merge:
@@ -225,24 +208,15 @@ class Parser {
         const start = this.currentPos();
         const first = this.expect(TokenType.As);
         this.expectSecondWord(TokenType.Of, first);
-        let basis;
-        if (this.match(TokenType.Seq)) {
-            basis = 'SEQ';
-        }
-        else if (this.match(TokenType.Tx)) {
-            basis = 'TX';
-        }
-        else if (this.match(TokenType.Time)) {
-            basis = 'TIME';
-        }
-        else {
-            this.error(`Expected SEQ, TX or TIME after AS OF but got '${this.current().value}'`, this.current());
-            basis = 'SEQ';
+        // Cognitive time is a sequence coordinate. A transaction id or an instant
+        // is resolved to one first (DESCRIBE TRANSACTION / DESCRIBE SNAPSHOT AT
+        // TIME), so the read names the sequence it actually ran against.
+        if (!this.match(TokenType.Seq)) {
+            this.error(`Expected SEQ after AS OF but got '${this.current().value}'`, this.current());
         }
         const value = this.parseScalarValue();
         return {
             kind: 'AsOfClause',
-            basis,
             value,
             range: { start, end: this.endPos() }
         };
@@ -992,6 +966,7 @@ class Parser {
             handle,
             setFacets: [],
             unsetFacets: [],
+            expectVersions: [],
             range: { start, end: start },
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
@@ -1006,10 +981,6 @@ class Parser {
                     this.rejectRepeat(stmt.match, 'MATCH', tok);
                     stmt.match = this.parseMatchClause();
                     break;
-                case TokenType.Expect:
-                    this.rejectRepeat(stmt.expectVersion, 'EXPECT VERSION', tok);
-                    stmt.expectVersion = this.parseExpectVersionClause();
-                    break;
                 case TokenType.Set: {
                     const clause = this.parseSetClause();
                     if (clause.kind === 'SetFieldsClause') {
@@ -1055,6 +1026,9 @@ class Parser {
                 break;
         }
         this.expect(TokenType.RBrace);
+        // Preconditions trail the body, in the one tail order every mutation
+        // shares: [WHERE] [LIMIT] {EXPECT VERSION} (Spec §52.8).
+        stmt.expectVersions = this.parseExpectVersions();
         stmt.range = { start, end: this.endPos() };
         return stmt;
     }
@@ -1068,14 +1042,12 @@ class Parser {
             : undefined;
         this.dialect = 'raw';
         const tuple = this.parsePropositionTuple();
-        const expectVersion = this.check(TokenType.Expect)
-            ? this.parseExpectVersionClause()
-            : undefined;
+        const expectVersions = this.parseExpectVersions();
         return {
             kind: 'EnsurePropositionStatement',
             handle,
             tuple,
-            expectVersion,
+            expectVersions,
             range: { start, end: this.endPos() },
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
@@ -1314,22 +1286,47 @@ class Parser {
         const expect = this.expect(TokenType.Expect);
         this.expectSecondWord(TokenType.Version, expect);
         const value = this.parseScalarValue();
+        // `OF <plane>` guards one plane's own version instead of the element's
+        // (Spec §35.1): a verdict guarded on ATTRIBUTES is not spoiled by a
+        // metabolism sweep that touched a Facet.
+        let plane;
+        if (this.match(TokenType.Of)) {
+            const tok = this.current();
+            switch (tok.type) {
+                case TokenType.Attributes:
+                    this.advance();
+                    plane = { kind: 'ATTRIBUTES' };
+                    break;
+                case TokenType.Structural:
+                    this.advance();
+                    plane = { kind: 'STRUCTURAL' };
+                    break;
+                case TokenType.Retention:
+                    this.advance();
+                    plane = { kind: 'RETENTION' };
+                    break;
+                case TokenType.Facet:
+                    this.advance();
+                    plane = { kind: 'FACET', facet: this.parseSchemaSymbol() };
+                    break;
+                default:
+                    this.error(`Expected ATTRIBUTES, STRUCTURAL, RETENTION or FACET after OF but got '${tok.value}'`, tok);
+            }
+        }
         return {
             kind: 'ExpectVersionClause',
             value,
+            plane,
             range: { start, end: this.endPos() }
         };
     }
-    parseExpectStateClause() {
-        const start = this.currentPos();
-        const expect = this.expect(TokenType.Expect);
-        this.expectSecondWord(TokenType.State, expect);
-        const value = this.parseScalarValue();
-        return {
-            kind: 'ExpectStateClause',
-            value,
-            range: { start, end: this.endPos() }
-        };
+    /** `{ expect_version_clause }` — the trailing precondition list. */
+    parseExpectVersions() {
+        const clauses = [];
+        while (this.check(TokenType.Expect)) {
+            clauses.push(this.parseExpectVersionClause());
+        }
+        return clauses;
     }
     // ────────────────────────────────────────────────────────────────────
     //  KML — UPDATE
@@ -1339,9 +1336,6 @@ class Parser {
         const start = this.currentPos();
         this.expectKeywordWithSpace(TokenType.Update);
         const target = this.parseTargetRef();
-        const expectVersion = this.check(TokenType.Expect)
-            ? this.parseExpectVersionClause()
-            : undefined;
         const actions = [];
         for (;;) {
             if (this.check(TokenType.Set)) {
@@ -1363,9 +1357,9 @@ class Parser {
             this.error('UPDATE requires at least one SET or UNSET action', this.current());
         }
         // WHERE binds a ?variable target; a direct :id / "id" target already names
-        // the element and may omit it, exactly as ARCHIVE / TOMBSTONE / PURGE /
-        // SET RETENTION / RETRACT ASSERTION do (Spec §58). Whether a bare
-        // ?variable is bound is semantic — inside MUTATE it may be a local handle.
+        // the element and may omit it, exactly as TRANSITION / PURGE /
+        // SET RETENTION do (Spec §58). Whether a bare ?variable is bound is
+        // semantic — inside MUTATE it may be a local handle.
         let where;
         if (this.check(TokenType.Where)) {
             this.expectKeywordWithSpace(TokenType.Where);
@@ -1373,96 +1367,35 @@ class Parser {
             where = this.parseWhereClause();
         }
         const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
+        const expectVersions = this.parseExpectVersions();
         return {
             kind: 'UpdateStatement',
             target,
-            expectVersion,
             actions,
             where,
             limit,
+            expectVersions,
             range: { start, end: this.endPos() },
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
     }
     // ────────────────────────────────────────────────────────────────────
-    //  KML — lifecycle and correction
+    //  KML — TRANSITION (the one lifecycle statement, Spec §52.5)
     // ────────────────────────────────────────────────────────────────────
-    parseRetractAssertion() {
-        const leadingComments = this.collectLeadingComments();
-        const start = this.currentPos();
-        const retract = this.expectKeywordWithSpace(TokenType.Retract);
-        this.expectSecondWord(TokenType.Assertion, retract);
-        const target = this.parseTargetRef();
-        let where;
-        if (this.check(TokenType.Where)) {
-            this.expectKeywordWithSpace(TokenType.Where);
-            this.dialect = 'raw';
-            where = this.parseWhereClause();
-        }
-        const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
-        const expectState = this.check(TokenType.Expect)
-            ? this.parseExpectStateClause()
-            : undefined;
-        return {
-            kind: 'RetractAssertionStatement',
-            target,
-            where,
-            limit,
-            expectState,
-            range: { start, end: this.endPos() },
-            leadingComments: leadingComments.length ? leadingComments : undefined
-        };
-    }
-    parseSupersedeAssertion() {
-        const leadingComments = this.collectLeadingComments();
-        const start = this.currentPos();
-        const supersede = this.expectKeywordWithSpace(TokenType.Supersede);
-        this.expectSecondWord(TokenType.Assertion, supersede);
-        const target = this.parseTargetRef();
-        this.expect(TokenType.By);
-        const by = this.parseTargetRef();
-        const expectState = this.check(TokenType.Expect)
-            ? this.parseExpectStateClause()
-            : undefined;
-        return {
-            kind: 'SupersedeAssertionStatement',
-            target,
-            by,
-            expectState,
-            range: { start, end: this.endPos() },
-            leadingComments: leadingComments.length ? leadingComments : undefined
-        };
-    }
-    parseCorrectEvidence() {
-        const leadingComments = this.collectLeadingComments();
-        const start = this.currentPos();
-        const correct = this.expectKeywordWithSpace(TokenType.Correct);
-        this.expectSecondWord(TokenType.Evidence, correct);
-        const target = this.parseTargetRef();
-        this.expect(TokenType.By);
-        const by = this.parseTargetRef();
-        const expectState = this.check(TokenType.Expect)
-            ? this.parseExpectStateClause()
-            : undefined;
-        return {
-            kind: 'CorrectEvidenceStatement',
-            target,
-            by,
-            expectState,
-            range: { start, end: this.endPos() },
-            leadingComments: leadingComments.length ? leadingComments : undefined
-        };
-    }
-    parseTransitionActivity() {
+    parseTransitionStatement() {
         const leadingComments = this.collectLeadingComments();
         const start = this.currentPos();
-        const transition = this.expectKeywordWithSpace(TokenType.Transition);
-        this.expectSecondWord(TokenType.Activity, transition);
+        this.expectKeywordWithSpace(TokenType.Transition);
         const target = this.parseTargetRef();
         this.expect(TokenType.To);
         const to = this.parseScalarValue();
-        // Terminal outputs and ended_at may be finalized in the same statement
-        // that moves the Activity to its terminal state.
+        // `BY` names the replacing element for "superseded" / "corrected".
+        let by;
+        if (this.match(TokenType.By)) {
+            by = this.parseTargetRef();
+        }
+        // A pending Activity finalizes terminal fields and topology in the same
+        // statement that moves it (Spec §17.5, §52.5).
         const finalize = [];
         while (this.check(TokenType.Set)) {
             const clause = this.parseSetClause();
@@ -1470,19 +1403,27 @@ class Parser {
                 finalize.push(clause);
             }
             else {
-                this.error('TRANSITION ACTIVITY accepts only SET FIELDS and SET STRUCTURAL', this.current());
+                this.error('TRANSITION accepts only SET FIELDS and SET STRUCTURAL', this.current());
                 break;
             }
         }
-        const expectState = this.check(TokenType.Expect)
-            ? this.parseExpectStateClause()
-            : undefined;
+        let where;
+        if (this.check(TokenType.Where)) {
+            this.expectKeywordWithSpace(TokenType.Where);
+            this.dialect = 'raw';
+            where = this.parseWhereClause();
+        }
+        const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
+        const expectVersions = this.parseExpectVersions();
         return {
-            kind: 'TransitionActivityStatement',
+            kind: 'TransitionStatement',
             target,
             to,
+            by,
             finalize,
-            expectState,
+            where,
+            limit,
+            expectVersions,
             range: { start, end: this.endPos() },
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
@@ -1504,69 +1445,18 @@ class Parser {
             where = this.parseWhereClause();
         }
         const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
-        const expectVersion = this.check(TokenType.Expect)
-            ? this.parseExpectVersionClause()
-            : undefined;
+        const expectVersions = this.parseExpectVersions();
         return {
             kind: 'SetRetentionStatement',
             target,
             assignments,
             where,
             limit,
-            expectVersion,
+            expectVersions,
             range: { start, end: this.endPos() },
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
     }
-    parseArchiveStatement() {
-        const { start, target, where, limit, expectState, leadingComments } = this.parseRemovalBody(TokenType.Archive);
-        return {
-            kind: 'ArchiveStatement',
-            target,
-            where,
-            limit,
-            expectState,
-            range: { start, end: this.endPos() },
-            leadingComments
-        };
-    }
-    parseTombstoneStatement() {
-        const { start, target, where, limit, expectState, leadingComments } = this.parseRemovalBody(TokenType.Tombstone);
-        return {
-            kind: 'TombstoneStatement',
-            target,
-            where,
-            limit,
-            expectState,
-            range: { start, end: this.endPos() },
-            leadingComments
-        };
-    }
-    /** ARCHIVE and TOMBSTONE share one shape; PURGE adds its confirmation. */
-    parseRemovalBody(keyword) {
-        const comments = this.collectLeadingComments();
-        const start = this.currentPos();
-        this.expectKeywordWithSpace(keyword);
-        const target = this.parseTargetRef();
-        let where;
-        if (this.check(TokenType.Where)) {
-            this.expectKeywordWithSpace(TokenType.Where);
-            this.dialect = 'raw';
-            where = this.parseWhereClause();
-        }
-        const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
-        const expectState = this.check(TokenType.Expect)
-            ? this.parseExpectStateClause()
-            : undefined;
-        return {
-            start,
-            target,
-            where,
-            limit,
-            expectState,
-            leadingComments: comments.length ? comments : undefined
-        };
-    }
     parsePurgeStatement() {
         const leadingComments = this.collectLeadingComments();
         const start = this.currentPos();
@@ -1582,6 +1472,7 @@ class Parser {
             where = this.parseWhereClause();
         }
         const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
+        const expectVersions = this.parseExpectVersions();
         let referencePolicy;
         if (this.check(TokenType.Reference)) {
             const reference = this.expect(TokenType.Reference);
@@ -1602,6 +1493,7 @@ class Parser {
             target,
             where,
             limit,
+            expectVersions,
             referencePolicy,
             confirm,
             range: { start, end: this.endPos() },
@@ -1623,6 +1515,7 @@ class Parser {
             where = this.parseWhereClause();
         }
         const limit = this.check(TokenType.Limit) ? this.parseLimitClause() : undefined;
+        const expectVersions = this.parseExpectVersions();
         this.expect(TokenType.Confirm);
         const confirmTok = this.current();
         const confirm = this.parseStringLiteral();
@@ -1634,6 +1527,7 @@ class Parser {
             target,
             where,
             limit,
+            expectVersions,
             confirm,
             range: { start, end: this.endPos() },
             leadingComments: leadingComments.length ? leadingComments : undefined
@@ -1653,15 +1547,13 @@ class Parser {
             this.dialect = 'raw';
             where = this.parseWhereClause();
         }
-        const expectVersion = this.check(TokenType.Expect)
-            ? this.parseExpectVersionClause()
-            : undefined;
+        const expectVersions = this.parseExpectVersions();
         return {
             kind: 'MergeConceptStatement',
             source,
             into,
             where,
-            expectVersion,
+            expectVersions,
             range: { start, end: this.endPos() },
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
@@ -1692,11 +1584,6 @@ class Parser {
             case TokenType.Protocol:
                 this.expectSecondWord(TokenType.Protocol, describe);
                 return stmt('PROTOCOL');
-            case TokenType.Execution: {
-                const exec = this.expectSecondWord(TokenType.Execution, describe);
-                this.expectSecondWord(TokenType.Context, exec);
-                return stmt('EXECUTION_CONTEXT');
-            }
             case TokenType.Capabilities:
                 this.expectSecondWord(TokenType.Capabilities, describe);
                 return stmt('CAPABILITIES');
@@ -1753,8 +1640,19 @@ class Parser {
             }
             case TokenType.Snapshot: {
                 this.expectSecondWord(TokenType.Snapshot, describe);
-                const asOf = this.check(TokenType.As) ? this.parseAsOfClause() : undefined;
-                return stmt('SNAPSHOT', { asOf });
+                // A snapshot is addressed by sequence, or resolved from an instant:
+                // the one place wall-clock time enters cognitive-time addressing.
+                let asOf;
+                let atTime;
+                if (this.check(TokenType.As)) {
+                    asOf = this.parseAsOfClause();
+                }
+                else if (this.check(TokenType.At)) {
+                    const at = this.expect(TokenType.At);
+                    this.expectSecondWord(TokenType.Time, at);
+                    atTime = this.parseScalarValue();
+                }
+                return stmt('SNAPSHOT', { asOf, atTime });
             }
             case TokenType.Capsule:
                 this.expectSecondWord(TokenType.Capsule, describe);
@@ -1765,11 +1663,6 @@ class Parser {
                 const value = this.isMetaValueStart() ? this.parseScalarValue() : undefined;
                 return stmt('EPISTEMIC_POLICY', { value });
             }
-            case TokenType.Projection: {
-                const projection = this.expectSecondWord(TokenType.Projection, describe);
-                this.expectSecondWord(TokenType.Capability, projection);
-                return stmt('PROJECTION_CAPABILITY');
-            }
             case TokenType.Trust: {
                 this.expectSecondWord(TokenType.Trust, describe);
                 const value = this.isMetaValueStart() ? this.parseScalarValue() : undefined;
@@ -2077,7 +1970,7 @@ class Parser {
         throw new ParseAbort();
     }
     // ────────────────────────────────────────────────────────────────────
-    //  META — HISTORY / CHANGES / SNAPSHOT
+    //  META — HISTORY / CHANGES
     // ────────────────────────────────────────────────────────────────────
     parseHistoryStatement() {
         const leadingComments = this.collectLeadingComments();
@@ -2156,18 +2049,6 @@ class Parser {
             leadingComments: leadingComments.length ? leadingComments : undefined
         };
     }
-    parseSnapshotStatement() {
-        const leadingComments = this.collectLeadingComments();
-        const start = this.currentPos();
-        this.expect(TokenType.Snapshot);
-        const asOf = this.check(TokenType.As) ? this.parseAsOfClause() : undefined;
-        return {
-            kind: 'SnapshotStatement',
-            asOf,
-            range: { start, end: this.endPos() },
-            leadingComments: leadingComments.length ? leadingComments : undefined
-        };
-    }
     // ────────────────────────────────────────────────────────────────────
     //  META — EXPORT CAPSULE
     // ────────────────────────────────────────────────────────────────────
@@ -2996,13 +2877,8 @@ class Parser {
         TokenType.Ensure,
         TokenType.Assert,
         TokenType.Update,
-        TokenType.Retract,
-        TokenType.Supersede,
-        TokenType.Correct,
         TokenType.Transition,
         TokenType.Set,
-        TokenType.Archive,
-        TokenType.Tombstone,
         TokenType.Purge,
         TokenType.Merge,
         TokenType.Describe,
@@ -3013,7 +2889,6 @@ class Parser {
         TokenType.Preview,
         TokenType.History,
         TokenType.Changes,
-        TokenType.Snapshot,
         TokenType.Export,
         TokenType.EOF
     ]);