@hydranium/core 1.0.0-next.38 → 1.0.0-next.381

package/lib/langium/integrity/integrity-service.js

@@ -7,8 +7,11 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 import { isPromiseLike, Logger } from '@hydranium/protocol';
-import { AstUtils, DocumentState, interruptAndCheck, UriUtils } from '@hydranium/langium';
+import { AstUtils, DocumentState, interruptAndCheck, isOperationCancelled, UriUtils } from '@hydranium/langium';
+import { CancellationToken } from 'vscode-languageserver';
 import { Registry } from '../../util/registry.js';
+import { hasSkippedText } from '../workspace/syntax-errors.js';
+import { isVirtualUri } from '../workspace/virtual-document.js';
 import { IntegrityPhase } from './integrity-rule.js';
 export var IntegrityService;
 (function (IntegrityService) {
@@ -23,6 +26,14 @@ export var IntegrityService;
      * at `DocumentState.Validated` and delivered separately via `publishDiagnostics`
      * or the `onModelUpdated` event.
      *
+     * A document whose parse lacks some of its text reaches this state
+     * unrepaired: no rule runs on it until it parses.
+     *
+     * The AST is what this guarantees, not the text. For a closed document whose
+     * repair was STAGED rather than written (`'editor'` sync mode),
+     * `textDocument` still mirrors disk — read the repair off the AST, or from
+     * the staged content the next open consumes.
+     *
      * Invariant: integrity rules only register at Parsed or Linked, so the build
      * is guaranteed post-integrity once it advances past `onBuildPhase(Linked)`
      * into `IndexedReferences`. {@link IntegrityService.register} enforces this at
@@ -31,6 +42,13 @@ export var IntegrityService;
      */
     IntegrityService.SettledState = DocumentState.IndexedReferences;
 })(IntegrityService || (IntegrityService = {}));
+/**
+ * The shared services of each server that has logged its first silent
+ * write-back. Every language of a server holds the same shared services, so
+ * keying on them makes {@link DefaultIntegrityService.noteSilentWrite} report once
+ * per server rather than once per language.
+ */
+const silentWriteReported = new WeakSet();
 /**
  * Default {@link IntegrityService} implementation. Enforces rules,
  * resyncs document text after mutations, and propagates corrections.
@@ -55,13 +73,14 @@ export class DefaultIntegrityService {
     /** One logger per rule, created at registration and dropped on unregister. */
     ruleLoggers = new Map();
     /**
-     * Rules bucketed by the phase they target, preserving the registry's
-     * priority order within each bucket. Rebuilt lazily on the first
-     * `enforceIntegrity` call after a registry mutation — staleness is detected
-     * via reference identity of the registry's cached array (see
-     * {@link Registry.all}). Filtering the rule list per call would instead
-     * allocate one transient array per document per phase, which a workspace
-     * whose documents all settle at the same phase pays on every build.
+     * Rules bucketed by the phase they target, then by each `$type` from
+     * {@link nodeTypesFor}, preserving the registry's priority order within
+     * each bucket. Rebuilt lazily on the first `enforceIntegrity` call after a
+     * registry mutation — staleness is detected via reference identity of the
+     * registry's cached array (see {@link Registry.all}). Filtering the rule
+     * list per call would instead allocate one transient array per document per
+     * phase, which a workspace whose documents all settle at the same phase pays
+     * on every build.
      */
     phaseBuckets = new Map();
     phaseBucketsFor;
@@ -72,9 +91,7 @@ export class DefaultIntegrityService {
     tracer;
     /**
      * The framework document builder, used to re-parse + re-link a document in place after a
-     * Linked-phase correction (see {@link resyncDocument}). The framework binds
-     * `shared.workspace.DocumentBuilder` to {@link HydraniumDocumentBuilder}; the narrowing
-     * cast surfaces its single-document phase runner.
+     * Linked-phase correction (see {@link resyncDocument}).
      */
     documentBuilder;
     constructor(services, options = {}) {
@@ -109,24 +126,31 @@ export class DefaultIntegrityService {
      * rule set to completion against a doomed build.
      */
     async enforceBatch(documents, phase, cancelToken) {
-        const phaseStart = performance.now();
+        const sincePhaseStart = this.services.shared.Clock.stopwatch();
         let mutatedCount = 0;
         // Per-rule self-time profiling is opt-in: only spin up a session when the
         // debug threshold is active, so the production `info` path allocates
         // nothing and the hot rule loop stays a single const-branch off `session`.
         const session = Logger.isLevelEnabled('debug') ? this.tracer.profile(`integrity ${DocumentState[phase]}`) : undefined;
         for (const document of documents) {
-            const changed = await this.enforceIntegrity(document, phase, cancelToken, session);
-            if (changed) {
+            if (this.isStructurallyBroken(document)) {
+                this.tracer.with(document.uri.toString()).debug('Parse errors: rules skipped until the document parses');
+            }
+            else if (await this.enforceIntegrity(document, phase, cancelToken, session)) {
                 mutatedCount++;
-                await this.resyncDocument(document, cancelToken);
+                // Not cancellable: see `resyncDocument`.
+                await this.resyncDocument(document, CancellationToken.None);
             }
             await interruptAndCheck(cancelToken);
         }
-        const totalMs = Math.round(performance.now() - phaseStart);
-        if (totalMs >= 25 || mutatedCount > 0) {
+        const totalMs = Math.round(sincePhaseStart.elapsedMs);
+        // A repair is the operator's to know of; the timing alone is diagnosis.
+        if (mutatedCount > 0) {
             this.tracer.info(`enforce ${DocumentState[phase]}: docs=${documents.length}, mutated=${mutatedCount} [${totalMs}ms]`);
         }
+        else if (totalMs >= 25) {
+            this.tracer.debug(`enforce ${DocumentState[phase]}: docs=${documents.length}, mutated=${mutatedCount} [${totalMs}ms]`);
+        }
         // One line per rule (count + self-% + self-ms), sorted by cost — only when profiling.
         session?.report('debug');
     }
@@ -141,6 +165,12 @@ export class DefaultIntegrityService {
                 'Allowed phases are Parsed and Linked.');
         }
         const disposable = this.rules.register(rule);
+        // No parsed node carries a type the reflection does not know, so such a
+        // rule never runs. A warning, not a throw: a test reflection may omit the type.
+        if (!this.services.shared.AstReflection.getAllTypes().includes(rule.nodeType)) {
+            this.tracer.warn(`Integrity rule '${this.formatRule(rule)}' is keyed on node type '${rule.nodeType}', ` +
+                'which the AST reflection does not know, so no parsed node matches it.');
+        }
         this.ruleLoggers.set(rule.id, this.tracer.sub(IntegrityPhase.toString(rule.phase)).sub(rule.label ?? rule.id));
         return {
             dispose: () => {
@@ -157,6 +187,14 @@ export class DefaultIntegrityService {
         }
         return removed;
     }
+    /**
+     * Seam: does the parse of `document` lack some of its text? {@link enforceBatch}
+     * runs no rule on such a document, because a repair is written back by
+     * serializing the AST, and a recovered AST lacks what the parser skipped.
+     */
+    isStructurallyBroken(document) {
+        return hasSkippedText(document);
+    }
     /**
      * Run all rules for the given phase against matching AST nodes. Returns
      * `true` if any rule mutated the AST.
@@ -175,37 +213,45 @@ export class DefaultIntegrityService {
      * full rule sweep) — coarser than per (node × rule) to avoid a microtask
      * per inner iteration, finer than per-document so a long-running rule set
      * on a large file can still interrupt mid-stream. Throws
-     * `OperationCancelled` when the token is cancelled; Langium's build
-     * pipeline absorbs the throw at the lock-holder.
+     * `OperationCancelled` when the token is cancelled before any rule mutated
+     * the AST; Langium's build pipeline absorbs the throw at the lock-holder.
+     * After a mutation it stops the sweep and returns `true` instead, so the
+     * caller can resync what was mutated before the cancellation unwinds.
      */
     async enforceIntegrity(document, phase, cancelToken, session) {
         if (cancelToken?.isCancellationRequested) {
             return false;
         }
         let changed = false;
-        const rulesForPhase = this.getPhaseBucket(phase);
-        if (rulesForPhase.length === 0) {
+        const rulesByType = this.getPhaseBucket(phase);
+        if (rulesByType.size === 0) {
             return false;
         }
         const relativeUri = this.services.shared.workspace.WorkspaceManager.wsRelativePath(document.uri);
         for (const node of AstUtils.streamAst(document.parseResult.value)) {
-            for (const rule of rulesForPhase) {
-                if (node.$type === rule.nodeType) {
-                    const ruleLogger = this.ruleLoggers.get(rule.id).with(relativeUri);
-                    // Scope per rule so the session aggregates self-time by rule id across all
-                    // nodes; off the profiling path `session` is undefined and we call directly.
-                    const enforced = session
-                        ? session.scope(rule.id, () => rule.enforce(node, document, ruleLogger))
-                        : rule.enforce(node, document, ruleLogger);
-                    const mutated = isPromiseLike(enforced) ? await enforced : enforced;
-                    if (mutated) {
-                        ruleLogger.trace(`[${relativeUri}] Mutated ${this.formatNode(node)}`);
-                    }
-                    changed = mutated || changed;
+            for (const rule of rulesByType.get(node.$type) ?? NO_RULES) {
+                const ruleLogger = this.ruleLoggers.get(rule.id).with(relativeUri);
+                // Scope per rule so the session aggregates self-time by rule id across all
+                // nodes; off the profiling path `session` is undefined and we call directly.
+                const enforced = session
+                    ? session.scope(rule.id, () => rule.enforce(node, document, ruleLogger))
+                    : rule.enforce(node, document, ruleLogger);
+                const mutated = isPromiseLike(enforced) ? await enforced : enforced;
+                if (mutated) {
+                    ruleLogger.trace(`[${relativeUri}] Mutated ${this.formatNode(node)}`);
                 }
+                changed = mutated || changed;
             }
             if (cancelToken !== undefined) {
-                await interruptAndCheck(cancelToken);
+                try {
+                    await interruptAndCheck(cancelToken);
+                }
+                catch (err) {
+                    if (changed && isOperationCancelled(err)) {
+                        return true;
+                    }
+                    throw err;
+                }
             }
         }
         return changed;
@@ -214,30 +260,111 @@ export class DefaultIntegrityService {
      * Re-serialise the document text after AST mutations, propagate corrections,
      * and re-parse at Parsed phase (safe because linking hasn't occurred yet).
      *
-     * `cancelToken` is checked at entry so a preempted build skips the
-     * serialise / disk-write atomic; the steps inside resync are not further
-     * subdivided because each is a single fast operation that does not yield
-     * a natural interruption point.
+     * Runs to the end whatever `cancelToken` says: the AST is already mutated,
+     * and skipping the resync leaves it against unchanged text that the next
+     * build does not re-parse. `cancelToken` reaches only the re-parse.
      */
     async resyncDocument(document, cancelToken) {
-        if (cancelToken?.isCancellationRequested) {
-            return;
-        }
         const root = document.parseResult.value;
-        const newText = await this.services.serializer.Serializer.serializeAst(root);
+        // Extracted while `document` still holds the text being replaced — the
+        // resync that follows overwrites it with `newText`. Absent on a test
+        // stub that binds no trivia group; `createServerLanguageModule` always
+        // provides it, and an empty registry is already the no-op.
+        const trivia = this.services.trivia?.TriviaService;
+        const extracted = trivia?.extract(document);
+        const serialized = await this.services.serializer.Serializer.serializeAst(root);
+        const newText = extracted === undefined ? serialized : trivia.apply(serialized, extracted, UriUtils.toUri(document.textDocument.uri));
         const oldText = document.textDocument.getText();
         if (oldText === newText) {
             return;
         }
-        // Keep the same version so HydraniumTextDocuments doesn't reject subsequent client edits.
-        // Use manager.update so the `instanceof FullTextDocument` gate in the bare
-        // `TextDocument.update` doesn't trip on adopter-custom text-document types.
-        const textDocument = this.textDocuments.update(document.textDocument, [{ text: newText }], document.textDocument.version);
-        await this.syncCorrections(textDocument);
+        const version = document.textDocument.version;
+        // Commit into the store's own document when the URI is open there, rather
+        // than into whichever text-document object this build is holding. The two
+        // are the same on the LSP path and are NOT when the document was built for
+        // an already-open URI through `fromString`: repairing only the build's copy
+        // leaves the store — the server's authority on what an open document says —
+        // on the unrepaired text, and the reconciling re-parse then redefines
+        // `textDocument` onto the store's object and discards the repair with it.
+        //
+        // Compared against the CST's own text, not against `document.textDocument`.
+        // That object IS the store's on the LSP path, so asking it whether the
+        // store still agrees compares the store with itself and can only ever say
+        // yes — the guard would be vacuous exactly where an editor race can happen.
+        // The CST's `fullText` is the text that actually produced this AST, which
+        // is the only thing a repair derived from it is valid against. A document
+        // with no CST (built from a model rather than parsed) has no better answer
+        // than the text it is carrying.
+        const parsedFrom = document.parseResult.value.$cstNode?.root.fullText ?? oldText;
+        const commit = this.textDocuments.commitRepair(document.textDocument.uri, parsedFrom, newText);
+        if (commit.status === 'stale') {
+            // An edit landed after the parse this repair came from, so the repair
+            // describes text the store has already replaced. Abandon it rather than
+            // hand it to `syncCorrections`: an override that persists from there
+            // would write a correction over the edit that superseded it. That edit
+            // drives a build of its own, which re-runs these rules against what the
+            // document actually says.
+            //
+            // Abandoning the WRITE is only half of it. The build carries on to its
+            // settled phase with whatever AST is registered, and every settled
+            // consumer reads that AST rather than the store — so leaving the rule's
+            // mutation in place would answer questions about this document from a
+            // parse of text nobody has. Reconciling discards it by re-reading the
+            // store, which is what the document now has to agree with.
+            await this.reconcileDocument(document, cancelToken);
+            return;
+        }
+        // A committed repair is a new version; a document no client has open keeps
+        // its number here, and the re-versioning below moves it once the build
+        // has reconciled. Through the store's `update`, so the `instanceof
+        // FullTextDocument` gate in the bare `TextDocument.update` does not trip
+        // on adopter-custom text-document types.
+        const textDocument = commit.status === 'committed' ? commit.document : this.textDocuments.update(document.textDocument, [{ text: newText }], version);
+        await this.syncCorrections(textDocument, parsedFrom);
+        await this.reconcileDocument(document, cancelToken);
+        // Re-version against the REPAIRED text, after either branch. The repair is
+        // a content change the store has not seen: whatever reconciliation ran
+        // during the re-parse saw the text on disk, which in `'editor'` sync mode
+        // is the PRE-repair text. Leave the sequence describing that and the next
+        // open hashes the repair, finds a mismatch and steps the version again, so
+        // every base version taken from this build is stale before it is used.
+        // An open document keeps the store's own version, which is not this
+        // method's to move.
+        //
+        // Deliberately NOT gated on cancellation, unlike the entry to this method:
+        // `syncCorrections` has already written or staged the repair by now, so a
+        // preempted build that skipped this would leave the sequence describing
+        // text that is no longer there.
+        if (!this.textDocuments.isOpen(document.textDocument.uri)) {
+            // The root describes the repair too; left at the re-parse's number, a
+            // syncing read waits for a build nothing requests. The CST is still
+            // the unrepaired text, so the repair is reported as the parsed text.
+            this.services.shared.workspace.VersionSyncService.modelProduced(document, { text: newText });
+        }
+    }
+    /**
+     * Bring `document` back into agreement with the text it is supposed to
+     * describe, after a rule has mutated its AST.
+     *
+     * Used for a correction that was applied and for one that was abandoned,
+     * because the document is left inconsistent either way: applied, the text
+     * moved under the CST; abandoned, the AST carries a mutation the text never
+     * had. Both are the same question — re-read and re-derive — and the phase is
+     * what decides how far that has to go.
+     */
+    async reconcileDocument(document, cancelToken) {
         if (document.state <= DocumentState.Parsed) {
             // Parsed-phase correction: re-parse only. The build pipeline still runs
             // IndexedContent → ComputedScopes → Linked → … on the fresh AST afterwards,
             // so the document reconciles naturally with no extra work here.
+            //
+            // Except for a closed document whose repair did not reach disk — `'editor'`
+            // sync mode stages it instead of writing it — where the re-parse is SKIPPED:
+            // Langium's factory gates the parse on the CST's `fullText`, which still
+            // equals the disk text the same call re-reads and redefines `textDocument`
+            // over. So `document.textDocument` is NOT post-integrity for such a
+            // document — it mirrors disk, and the AST is the only place the repair is
+            // legible, until an open consumes the staging.
             await this.documentBuilder.reparse(document, cancelToken);
         }
         else {
@@ -257,31 +384,138 @@ export class DefaultIntegrityService {
      * already in the synced store (in-place in {@link resyncDocument}); this
      * method routes the out-of-band part by document registration:
      *
-     * - **Open in the language client** → nothing to push here. The AST mutation
-     *   rode the current build, so `ModelService.syncToLanguageClient` (the
-     *   persistent integrity-settled listener) mirrors the corrected text to the
-     *   client by *content* (shadow diff) — no authorship rewrite, no second
-     *   rebuild.
+     * - **Open in the language client** → nothing to push here. The AST
+     *   mutation rode the current build, so
+     *   `DefaultModelService.syncToLanguageClient` (the persistent
+     *   integrity-settled listener) mirrors it to the client by
+     *   *content* (shadow diff), and the editor shows it as an unsaved change.
+     * - **Held only through the data or GLSP head**, or waiting out the release
+     *   grace after its last client's connection was lost → the store is the
+     *   authority, and those heads read the correction from the settled build.
+     *   In silent mode it is also written to disk when the text it was computed
+     *   from is what disk holds, since the repair is then the only difference;
+     *   otherwise it waits for the next save. Editor mode always waits, and the
+     *   repair leaves the document dirty until a save.
      * - **Closed, silent mode** → write to disk directly (disk is authoritative).
-     * - **Closed, editor mode** → stage so the next open picks it up via applyEdit.
+     * - **Closed, editor mode** → stage, so the next open takes the correction
+     *   over the disk text.
+     *
+     * A held URI is not closed. Writing it as one persists the holder's unsaved
+     * edits with the repair, and staging it leaves text no open reads, because
+     * only a first open consumes the stage.
+     *
+     * `parsedFrom` is the text the repaired AST was parsed from. Without it a
+     * held URI's repair is left to the next save.
      */
-    async syncCorrections(document) {
-        // Open files: delivery is the ModelService settled listener's job (by
-        // content, via the shadow) — nothing to do here. Only the open/closed
-        // question is asked, so no reverse address resolution is needed: a file
-        // open under a symlinked path still answers `true`.
+    async syncCorrections(document, parsedFrom) {
+        // Only the open/closed question is asked, so no reverse address
+        // resolution is needed: a file open under a symlinked path still answers
+        // `true`.
         if (this.textDocuments.isOpenInLanguageClient(document.uri)) {
             return;
         }
+        // A virtual document has no disk backing, so neither persisting nor
+        // staging applies: there is no file to write and no editor that could open
+        // one. `URI.fsPath` yields a path for any scheme, so handing this to the
+        // provider would address `<cwd>/<contributor>/<name>` — an unrelated
+        // location a disk-backed provider refuses outright, turning a repair that
+        // was never persistable into a build failure. The correction is already on
+        // the AST and in the text store, which is the whole of where a virtual
+        // document lives, so there is nothing further to propagate.
+        if (isVirtualUri(document.uri)) {
+            this.tracer.with(document.uri).debug('Virtual document: correction kept in memory, nothing to persist');
+            return;
+        }
+        // A document waiting out the release grace still holds its lost client's
+        // unsaved text, so writing it as a closed file would persist that text.
+        if (this.textDocuments.isOpenInAnyClient(document.uri) || this.textDocuments.isReleaseDeferred(document.uri)) {
+            if (this.syncMode === 'silent' && parsedFrom !== undefined) {
+                await this.persistIfDiskMatches(document, parsedFrom);
+            }
+            return;
+        }
         // Closed files, silent mode: write to disk directly.
         if (this.syncMode === 'silent') {
+            const repaired = document.getText();
             // Async write so the integrity pass does not block the event loop on a slow filesystem.
-            await this.fileSystemProvider.writeFile(UriUtils.toUri(document.uri), document.getText());
+            // In the file's task queue, behind any save already queued: written
+            // beside one, the older repair can land last and stay on disk.
+            await this.services.shared.workspace.FileSystemTaskQueue.enqueue(document.uri, () => this.fileSystemProvider.writeFile(UriUtils.toUri(document.uri), repaired));
+            this.noteSilentWrite(document.uri);
             return;
         }
-        // Closed files, editor mode: stage content so the next open picks it up via applyEdit.
+        // Closed files, editor mode: stage content for the next open.
         this.textDocuments.stagePendingContent(document.uri, document.getText());
     }
+    /**
+     * Write the repair in `document` to disk when disk still holds `parsedFrom`,
+     * the text the repair was computed from — so the write carries the repair
+     * and nothing a holder could still discard.
+     *
+     * The read, the compare and the write run as one task in the file's task
+     * queue, so no save of the file lands between them. The store is compared
+     * again once the read returns, and the write is skipped if it no longer
+     * holds the repair: an edit does not wait for the queue, and writing the
+     * older repair then puts text on disk that no participant holds. The
+     * skipped repair loses nothing: the edit drives a build of its own, and a
+     * save writes the store's text. A file that cannot be read is left alone
+     * too: there is no evidence it matches. So is a file an editor opened in the
+     * meantime: the editor receives the repair as an unsaved change, and writing
+     * it would change the file under the editor.
+     */
+    async persistIfDiskMatches(document, parsedFrom) {
+        const uri = UriUtils.toUri(document.uri);
+        const repaired = document.getText();
+        await this.services.shared.workspace.FileSystemTaskQueue.enqueue(document.uri, async () => {
+            let onDisk;
+            try {
+                onDisk = await this.fileSystemProvider.readFile(uri);
+            }
+            catch (error) {
+                this.tracer.with(document.uri).debug(`Held document unreadable on disk, repair left to the next save: ${String(error)}`);
+                return;
+            }
+            // The file itself, not the store's disk baseline: the baseline moves
+            // only when the server hears of a change, so it can still hold the
+            // parsed text after another process rewrote the file and before the
+            // watcher reports it, and this write would then replace that change.
+            if (onDisk !== parsedFrom) {
+                return;
+            }
+            if (this.textDocuments.get(document.uri)?.getText() !== repaired) {
+                this.tracer.with(document.uri).debug('Held document changed while disk was read, repair left to that change');
+                return;
+            }
+            if (this.textDocuments.isOpenInLanguageClient(document.uri)) {
+                this.tracer.with(document.uri).debug('Editor attached while disk was read, repair left to its save');
+                return;
+            }
+            await this.fileSystemProvider.writeFile(uri, repaired);
+            this.textDocuments.setDiskBaseline(document.uri, repaired);
+            this.noteSilentWrite(document.uri);
+        });
+    }
+    /**
+     * Hand the first repair written to disk in `'silent'` sync mode to
+     * {@link reportSilentWrite}. Once per server, whichever language writes,
+     * rather than per file: a workspace-wide repair pass would otherwise log a
+     * line per document.
+     */
+    noteSilentWrite(uri) {
+        if (silentWriteReported.has(this.services.shared)) {
+            return;
+        }
+        silentWriteReported.add(this.services.shared);
+        this.reportSilentWrite(uri);
+    }
+    /**
+     * Log a server's first silent write-back, so an adopter learns that
+     * integrity rules edit their files and which setting controls it.
+     */
+    reportSilentWrite(uri) {
+        this.tracer.info(`Wrote an integrity repair to ${uri}. The integrity service's syncMode option is 'silent', ` +
+            "which writes repairs to disk; 'editor' leaves disk alone. Later repairs are written without this line.");
+    }
     /**
      * Format a rule's name for inclusion in user-facing diagnostic strings
      * (error messages thrown during registration). Defaults to
@@ -305,6 +539,17 @@ export class DefaultIntegrityService {
         const label = fromName ?? fromId;
         return label ? `${node.$type}('${label}')` : node.$type;
     }
+    /**
+     * The `$type`s `rule` runs on. Defaults to its `nodeType` and every subtype,
+     * as Langium's validation registry does: no node carries an abstract or union
+     * type as its `$type`, so an exact match never runs a rule keyed on one.
+     * Read only when the phase buckets rebuild after a registration change, so an
+     * override must not depend on anything else.
+     */
+    nodeTypesFor(rule) {
+        // A type the reflection does not know still matches itself.
+        return [rule.nodeType, ...this.services.shared.AstReflection.getAllSubTypes(rule.nodeType)];
+    }
     getPhaseBucket(phase) {
         const current = this.rules.all();
         if (this.phaseBucketsFor !== current) {
@@ -312,10 +557,18 @@ export class DefaultIntegrityService {
             for (const rule of current) {
                 let bucket = next.get(rule.phase);
                 if (!bucket) {
-                    bucket = [];
+                    bucket = new Map();
                     next.set(rule.phase, bucket);
                 }
-                bucket.push(rule);
+                // Deduplicated, or a rule runs twice on a node of its own type.
+                for (const nodeType of new Set(this.nodeTypesFor(rule))) {
+                    let rules = bucket.get(nodeType);
+                    if (!rules) {
+                        rules = [];
+                        bucket.set(nodeType, rules);
+                    }
+                    rules.push(rule);
+                }
             }
             this.phaseBuckets = next;
             this.phaseBucketsFor = current;
@@ -323,6 +576,7 @@ export class DefaultIntegrityService {
         return this.phaseBuckets.get(phase) ?? EMPTY_PHASE_BUCKET;
     }
 }
-/** Shared empty result so `getPhaseBucket` doesn't allocate per call on the cold path. */
-const EMPTY_PHASE_BUCKET = Object.freeze([]);
+// Shared empty results so neither the cold path nor a node no rule matches allocates.
+const EMPTY_PHASE_BUCKET = new Map();
+const NO_RULES = Object.freeze([]);
 //# sourceMappingURL=integrity-service.js.map

package/lib/langium/integrity/integrity-service.js.map

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

package/lib/langium/keys/containment.d.ts

@@ -12,8 +12,9 @@
  *
  * **These live beside the key provider because the constraint is the key
  * provider's.** `NameBasedKeyProvider` keys a node the `NameProvider` gives no
- * name from its position, as `` `${$containerProperty}@${$containerIndex}` ``,
- * so a node appended with a bare `array.push` carries neither and
+ * name from its position, as `` `${$containerProperty}@${$containerIndex}` ``
+ * (`` `${$containerProperty}@` `` in a single-valued property), so a node
+ * appended with a bare `array.push` carries neither and
  * `getElementKey` answers `undefined` — the element has no key at all, and the
  * GLSP index cannot address it. Deleting from the middle of such a list must
  * renumber the survivors, or an id derived later in the same command names the

package/lib/langium/keys/containment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"containment.d.ts","sourceRoot":"","sources":["../../../src/langium/keys/containment.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,MAAM,SAAS,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAOnI;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,MAAM,SAAS,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAYhH"}
+{"version":3,"file":"containment.d.ts","sourceRoot":"","sources":["../../../src/langium/keys/containment.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,MAAM,SAAS,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAOnI;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,MAAM,SAAS,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAYhH"}

package/lib/langium/keys/containment.js.map

@@ -1 +1 @@
-{"version":3,"file":"containment.js","sourceRoot":"","sources":["../../../src/langium/keys/containment.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAmClF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CAAyB,SAAkB,EAAE,QAAgB,EAAE,QAAkB,EAAE,KAAa;IACxH,MAAM,OAAO,GAAG,KAAwB,CAAC;IACzC,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAC/B,OAAO,CAAC,kBAAkB,GAAG,QAAQ,CAAC;IACtC,OAAO,CAAC,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC1C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,OAAO,KAAK,CAAC;AAChB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAyB,QAAkB,EAAE,QAA6B;IACrG,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACnD,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACpB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/C,KAAyB,CAAC,eAAe,GAAG,KAAK,CAAC;QACnD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,OAAO,CAAC;AAClB,CAAC"}
+{"version":3,"file":"containment.js","sourceRoot":"","sources":["../../../src/langium/keys/containment.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAoClF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CAAyB,SAAkB,EAAE,QAAgB,EAAE,QAAkB,EAAE,KAAa;IACxH,MAAM,OAAO,GAAG,KAAwB,CAAC;IACzC,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAC/B,OAAO,CAAC,kBAAkB,GAAG,QAAQ,CAAC;IACtC,OAAO,CAAC,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC1C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,OAAO,KAAK,CAAC;AAChB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAyB,QAAkB,EAAE,QAA6B;IACrG,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACnD,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACpB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/C,KAAyB,CAAC,eAAe,GAAG,KAAK,CAAC;QACnD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,OAAO,CAAC;AAClB,CAAC"}