@memoarchitect/tools 0.13.2 → 0.15.1

package/packages/tools/lib/server/dev-validate.js.map

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

package/packages/tools/lib/server/element-writer.d.ts

@@ -1,4 +1,5 @@
 import type { MemoElement, MemoModelDTO } from '../model/semantic.js';
+import type { OutlineSource } from '../authoring/outline-source.js';
 export interface ElementRemoveResult {
     success: boolean;
     elementId: string;
@@ -7,5 +8,7 @@ export interface ElementRemoveResult {
     error?: string;
 }
 /** Remove one project-owned usage plus every connection that references it. */
-export declare function removeElement(element: MemoElement, model: MemoModelDTO, projectRoot: string): Promise<ElementRemoveResult>;
+export declare function removeElement(element: MemoElement, model: MemoModelDTO, projectRoot: string, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<ElementRemoveResult>;
 //# sourceMappingURL=element-writer.d.ts.map

package/packages/tools/lib/server/element-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"element-writer.d.ts","sourceRoot":"","sources":["../../src/server/element-writer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAItE,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AA6CD,+EAA+E;AAC/E,wBAAsB,aAAa,CAC/B,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC,CAwE9B"}
+{"version":3,"file":"element-writer.d.ts","sourceRoot":"","sources":["../../src/server/element-writer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAkDD,+EAA+E;AAC/E,wBAAsB,aAAa,CAC/B,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM;AACnB,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,mBAAmB,CAAC,CAyF9B"}

package/packages/tools/lib/server/element-writer.js

@@ -1,8 +1,12 @@
 import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { assertWritable } from './write-guard.js';
 import { dirname, relative, resolve, sep } from 'node:path';
-import { parseText } from '../model/parser-utils.js';
-import { isConnectionUsage } from '../language/generated/ast.js';
+import { outlineNodes } from '../authoring/source-outline.js';
+import { shortNameOf } from '../model/element-index.js';
 const identifierPattern = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+function relativeFile(projectRoot, file) {
+    return (relative(projectRoot, resolve(projectRoot, file))).replaceAll('\\', '/');
+}
 function projectFile(projectRoot, file) {
     const absolute = resolve(projectRoot, file);
     const rel = relative(projectRoot, absolute);
@@ -10,18 +14,15 @@ function projectFile(projectRoot, file) {
         return undefined;
     return absolute;
 }
-function nodes(root) {
-    const found = [];
-    const stack = [...(root.members ?? [])];
-    while (stack.length) {
-        const node = stack.pop();
-        if (!node || typeof node !== 'object')
-            continue;
-        found.push(node);
-        if (Array.isArray(node.members))
-            stack.push(...node.members);
-    }
-    return found;
+/** Relationship statements a deletion may cut: they reference the element, they do not own it. */
+const RELATIONSHIP_STATEMENTS = new Set([
+    'ConnectionUsage', 'InterfaceUsage', 'AllocationUsage', 'FlowUsage', 'SuccessionFlowUsage',
+    'SuccessionAsUsage', 'BindingConnectorAsUsage', 'Dependency',
+]);
+/** Whether a relationship statement names `name` at one of its ends. */
+function namesEnd(text, name) {
+    const escaped = identifierPattern(name);
+    return new RegExp(`(?:::>|\\b(?:connect|to|from|first|then|allocate|bind))\\s+${escaped}(?![A-Za-z0-9_])`).test(text);
 }
 function wholeLine(source, start, end) {
     const lineStart = source.lastIndexOf('\n', start - 1) + 1;
@@ -39,11 +40,14 @@ function applyCuts(source, cuts) {
 }
 function atomicWrite(path, text) {
     const temporary = resolve(dirname(path), `.${path.split(sep).pop()}.delete-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+    assertWritable(path);
     writeFileSync(temporary, text, 'utf8');
     renameSync(temporary, path);
 }
 /** Remove one project-owned usage plus every connection that references it. */
-export async function removeElement(element, model, projectRoot) {
+export async function removeElement(element, model, projectRoot, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines) {
     if (!element.file)
         return { success: false, elementId: element.id, error: 'The element has no writable source file.' };
     const connected = model.relationships.filter(relationship => relationship.sourceId === element.id || relationship.targetId === element.id);
@@ -57,46 +61,63 @@ export async function removeElement(element, model, projectRoot) {
     }
     const files = new Set([element.file, ...connected.map(relationship => relationship.file).filter((file) => !!file)]);
     const prepared = new Map();
-    const endpoint = new RegExp(`::>\\s*${identifierPattern(element.id)}(?![A-Za-z0-9_-])`);
+    // A connection names an end by the element's declared name or by its
+    // qualified id; either is a reference the deletion would leave dangling.
+    const declaredName = shortNameOf(element.id);
+    const endpoint = new RegExp(`::>\\s*(?:${identifierPattern(element.id)}|${identifierPattern(declaredName)})(?![A-Za-z0-9_-])`);
+    const namedRelationships = new Set(connected.map(relationship => relationship.id));
     for (const file of files) {
         const absolute = projectFile(projectRoot, file);
         if (!absolute || !existsSync(absolute)) {
             return { success: false, elementId: element.id, error: `${file} is not a writable project file.` };
         }
         const source = readFileSync(absolute, 'utf8');
-        const parsed = await parseText(source);
-        if (parsed.errors.length) {
-            return { success: false, elementId: element.id, error: `${file} does not parse (${parsed.errors[0].message}).` };
+        let nodes;
+        try {
+            nodes = [...outlineNodes(await outlines.outline(relativeFile(projectRoot, file), source))];
+        }
+        catch (e) {
+            return { success: false, elementId: element.id, error: `${file} cannot be edited: ${e instanceof Error ? e.message : String(e)}` };
         }
-        const all = nodes(parsed.document.parseResult.value);
         const cuts = [];
-        for (const node of all) {
-            const cst = node.$cstNode;
-            if (!cst)
-                continue;
-            if (file === element.file && !isConnectionUsage(node) && node.name === element.id) {
-                cuts.push(wholeLine(source, cst.offset, cst.offset + cst.length));
+        let found = false;
+        for (const node of nodes) {
+            const isRelationship = RELATIONSHIP_STATEMENTS.has(node.metaclass);
+            // The element is the declaration its id names. A bare id, with no
+            // namespace, is matched by its declared name.
+            if (file === element.file && !isRelationship
+                && (node.key === element.id || (!element.id.includes('::') && node.name === element.id))) {
+                cuts.push(wholeLine(source, node.start, node.end));
+                found = true;
                 continue;
             }
-            if (isConnectionUsage(node)) {
-                const declaration = source.slice(cst.offset, cst.offset + cst.length);
-                if (endpoint.test(declaration))
-                    cuts.push(wholeLine(source, cst.offset, cst.offset + cst.length));
+            if (!isRelationship)
+                continue;
+            const text = source.slice(node.start, node.end);
+            if (namedRelationships.has(node.key) || namesEnd(text, element.id) || namesEnd(text, declaredName)) {
+                cuts.push(wholeLine(source, node.start, node.end));
             }
         }
-        if (file === element.file && !cuts.some(cut => source.slice(cut.start, cut.end).includes(element.id))) {
+        if (file === element.file && !found) {
             return { success: false, elementId: element.id, error: `Element "${element.id}" was not found in ${file}.` };
         }
         const updated = applyCuts(source, cuts);
         if (endpoint.test(updated)) {
             return { success: false, elementId: element.id, error: `${file} would still reference "${element.id}" after deletion.` };
         }
-        const reparsed = await parseText(updated);
-        if (reparsed.errors.length) {
-            return { success: false, elementId: element.id, error: `Deleting the element would leave ${file} invalid (${reparsed.errors[0].message}).` };
-        }
         prepared.set(file, { absolute, original: source, text: updated });
     }
+    // The deletion is valid as a whole or not at all: one file's edit alone can
+    // leave a reference to what another's removed.
+    const edits = new Map([...prepared].map(([file, entry]) => [relativeFile(projectRoot, file), entry.text]));
+    for (const file of prepared.keys()) {
+        try {
+            await outlines.verify(relativeFile(projectRoot, file), prepared.get(file).text, edits);
+        }
+        catch (e) {
+            return { success: false, elementId: element.id, error: `Deleting the element would leave ${file} invalid (${e instanceof Error ? e.message : String(e)}).` };
+        }
+    }
     const written = [];
     try {
         for (const preparedFile of prepared.values()) {

package/packages/tools/lib/server/element-writer.js.map

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

package/packages/tools/lib/server/mutation-domain.d.ts

@@ -19,4 +19,14 @@ export declare class MixedMutationDomainError extends Error {
  * apart from a modelled one.
  */
 export declare function assertSingleDomainMutation(messageType: string, payload: unknown): void;
+/**
+ * The messages a read-only server answers. An allowlist, not a second denylist: the mutation set
+ * (`MODEL_MUTATION_MESSAGES`) does not cover every write (dashboards, user preferences, the
+ * DHF stores, the toolchain settings), and a pinned view must change nothing it was not asked to.
+ * A message type that is not here is refused, so a handler added later is refused until someone
+ * decides it reads only.
+ */
+export declare const READ_ONLY_MESSAGES: ReadonlySet<string>;
+/** Whether a read-only server may answer this message. */
+export declare function isReadOnlyMessage(messageType: string): boolean;
 //# sourceMappingURL=mutation-domain.d.ts.map

package/packages/tools/lib/server/mutation-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutation-domain.d.ts","sourceRoot":"","sources":["../../src/server/mutation-domain.ts"],"names":[],"mappings":"AAsBA,iDAAiD;AACjD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE/D,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAE/C,CAAC;AA0BF,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,cAAc,CAElE;AAED,yEAAyE;AACzE,qBAAa,wBAAyB,SAAQ,KAAK;IACnC,QAAQ,CAAC,WAAW,EAAE,MAAM;IAAE,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE;gBAAhE,WAAW,EAAE,MAAM,EAAW,eAAe,EAAE,SAAS,MAAM,EAAE;CAQxF;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAStF"}
+{"version":3,"file":"mutation-domain.d.ts","sourceRoot":"","sources":["../../src/server/mutation-domain.ts"],"names":[],"mappings":"AAyBA,iDAAiD;AACjD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE/D,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAE/C,CAAC;AAuCF,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,cAAc,CAElE;AAED,yEAAyE;AACzE,qBAAa,wBAAyB,SAAQ,KAAK;IACnC,QAAQ,CAAC,WAAW,EAAE,MAAM;IAAE,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE;gBAAhE,WAAW,EAAE,MAAM,EAAW,eAAe,EAAE,SAAS,MAAM,EAAE;CAQxF;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAStF;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC,MAAM,CASjD,CAAC;AAEH,0DAA0D;AAC1D,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAE9D"}

package/packages/tools/lib/server/mutation-domain.js

@@ -5,15 +5,18 @@
 //
 //   semantic — what the model says. Lives in `.sysml`, reviewed, diffed,
 //              versioned, and read by every tool that reads SysML.
-//   layout   — where a symbol sits on a canvas. Lives in a `.viewlayout`
-//              sidecar, and says nothing about the model.
+//   layout   — where a symbol sits on a canvas. Lives in the `@MemoLayout…`
+//              statements of the `view` that owns it (`model/view-layout-block.ts`),
+//              and says nothing about the model.
 //
 // The rule this module enforces is that **no single action writes both**.
-// Moving a symbol must produce no `.sysml` diff, and editing a declaration must
-// leave the sidecar alone. The reason is reviewability: once a drag can change
-// source, a semantic diff can no longer be read as a semantic change, and once
-// a semantic edit can move symbols, a layout diff stops being noise you can
-// safely ignore.
+// Moving a symbol writes only those statements, and editing a declaration
+// leaves them alone. The reason is reviewability: once a drag can change a
+// declaration, a semantic diff can no longer be read as a semantic change, and
+// once a semantic edit can move symbols, a layout diff stops being noise you can
+// safely ignore. Both live in one file, so the line between them is the
+// statement: `layoutBlindRevision` hashes a file without them, and a change that
+// leaves that hash alone is a layout change.
 //
 // Keeping it as a check rather than a convention means a new handler cannot
 // quietly reintroduce the mixture: an unclassified mutation is a failure, not a
@@ -39,11 +42,24 @@ const MUTATION_DOMAINS = {
     'diagram:source:save': 'semantic',
     'methodology:source:save': 'semantic',
     'csv:import': 'semantic',
+    // A preview writes nothing; the apply and the review each write the source files they name.
+    'import:preview': 'neither',
+    // Writes the generated documents of one device under dhf-output/, which is output and not model source.
+    'dhf:device:generate': 'neither',
+    'guide:evaluate': 'neither',
+    // Reads the working tree against the commit it branched from and writes nothing. Not a read a pinned view can answer.
+    'impact:compute': 'neither',
+    'import:apply': 'semantic',
+    'suspect:review': 'semantic',
+    // A release record and every statement that links it, written together.
+    'release:create': 'semantic',
     'diagram:layout:update': 'layout',
     // User diagrams are a sidecar too — a saved view is presentation state, and
     // creating one has never written SysML.
     'diagram:create': 'layout',
     'diagram:update': 'layout',
+    // How a view shows itself is part of what the view says: its declaration, not its layout.
+    'diagram:display:update': 'semantic',
     'diagram:delete': 'layout',
 };
 export function mutationDomain(messageType) {
@@ -55,7 +71,7 @@ export class MixedMutationDomainError extends Error {
     offendingFields;
     constructor(messageType, offendingFields) {
         super(`"${messageType}" is a ${mutationDomain(messageType)} mutation but carries layout data `
-            + `(${offendingFields.join(', ')}). Layout changes go to the view sidecar and semantic `
+            + `(${offendingFields.join(', ')}). Layout changes go to the view's layout statements and semantic `
             + 'changes go to SysML source; one action never writes both.');
         this.messageType = messageType;
         this.offendingFields = offendingFields;
@@ -84,4 +100,25 @@ export function assertSingleDomainMutation(messageType, payload) {
     if (offending.length > 0)
         throw new MixedMutationDomainError(messageType, offending);
 }
+/**
+ * The messages a read-only server answers. An allowlist, not a second denylist: the mutation set
+ * (`MODEL_MUTATION_MESSAGES`) does not cover every write (dashboards, user preferences, the
+ * DHF stores, the toolchain settings), and a pinned view must change nothing it was not asked to.
+ * A message type that is not here is refused, so a handler added later is refused until someone
+ * decides it reads only.
+ */
+export const READ_ONLY_MESSAGES = new Set([
+    'request:refresh',
+    'dhf:docs:load', 'dhf:templates:list', 'dhf:template:read',
+    'diagram:source:request', 'methodology:source:request', 'diagram:parse',
+    'import:preview', 'rule:preview', 'open-file',
+    // Choosing another version, and comparing two, write nothing.
+    'versions:list', 'version:open', 'release:diff',
+    // Evaluating the method against the model reads it and writes nothing.
+    'guide:evaluate',
+]);
+/** Whether a read-only server may answer this message. */
+export function isReadOnlyMessage(messageType) {
+    return READ_ONLY_MESSAGES.has(messageType);
+}
 //# sourceMappingURL=mutation-domain.js.map

package/packages/tools/lib/server/mutation-domain.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutation-domain.js","sourceRoot":"","sources":["../../src/server/mutation-domain.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,EAAE;AACF,6EAA6E;AAC7E,QAAQ;AACR,EAAE;AACF,yEAAyE;AACzE,mEAAmE;AACnE,yEAAyE;AACzE,0DAA0D;AAC1D,EAAE;AACF,0EAA0E;AAC1E,gFAAgF;AAChF,+EAA+E;AAC/E,+EAA+E;AAC/E,4EAA4E;AAC5E,iBAAiB;AACjB,EAAE;AACF,4EAA4E;AAC5E,gFAAgF;AAChF,WAAW;AACX,gFAAgF;AAKhF,yDAAyD;AACzD,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACjD,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa;CAClE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,gBAAgB,GAAmC;IACrD,gBAAgB,EAAE,UAAU;IAC5B,gBAAgB,EAAE,UAAU;IAC5B,gBAAgB,EAAE,UAAU;IAC5B,qBAAqB,EAAE,UAAU;IACjC,qBAAqB,EAAE,UAAU;IACjC,qBAAqB,EAAE,UAAU;IACjC,qBAAqB,EAAE,UAAU;IACjC,yBAAyB,EAAE,UAAU;IACrC,YAAY,EAAE,UAAU;IACxB,uBAAuB,EAAE,QAAQ;IACjC,4EAA4E;IAC5E,wCAAwC;IACxC,gBAAgB,EAAE,QAAQ;IAC1B,gBAAgB,EAAE,QAAQ;IAC1B,gBAAgB,EAAE,QAAQ;CAC7B,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,WAAmB;IAC9C,OAAO,gBAAgB,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC;AACtD,CAAC;AAED,yEAAyE;AACzE,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IAC1B;IAA8B;IAAnD,YAAqB,WAAmB,EAAW,eAAkC;QACjF,KAAK,CACD,IAAI,WAAW,UAAU,cAAc,CAAC,WAAW,CAAC,oCAAoC;cACtF,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,wDAAwD;cACtF,2DAA2D,CAChE,CAAC;QALe,gBAAW,GAAX,WAAW,CAAQ;QAAW,oBAAe,GAAf,eAAe,CAAmB;QAMjF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IAC3C,CAAC;CACJ;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,0BAA0B,CAAC,WAAmB,EAAE,OAAgB;IAC5E,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,UAAU;QAAE,OAAO;IACvD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO;IACpD,MAAM,MAAM,GAAG,OAAkC,CAAC;IAClD,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;IAClF,2EAA2E;IAC3E,wEAAwE;IACxE,mCAAmC;IACnC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AACzF,CAAC"}
+{"version":3,"file":"mutation-domain.js","sourceRoot":"","sources":["../../src/server/mutation-domain.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,EAAE;AACF,6EAA6E;AAC7E,QAAQ;AACR,EAAE;AACF,yEAAyE;AACzE,mEAAmE;AACnE,4EAA4E;AAC5E,qFAAqF;AACrF,iDAAiD;AACjD,EAAE;AACF,0EAA0E;AAC1E,0EAA0E;AAC1E,2EAA2E;AAC3E,+EAA+E;AAC/E,iFAAiF;AACjF,wEAAwE;AACxE,iFAAiF;AACjF,6CAA6C;AAC7C,EAAE;AACF,4EAA4E;AAC5E,gFAAgF;AAChF,WAAW;AACX,gFAAgF;AAKhF,yDAAyD;AACzD,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACjD,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa;CAClE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,gBAAgB,GAAmC;IACrD,gBAAgB,EAAE,UAAU;IAC5B,gBAAgB,EAAE,UAAU;IAC5B,gBAAgB,EAAE,UAAU;IAC5B,qBAAqB,EAAE,UAAU;IACjC,qBAAqB,EAAE,UAAU;IACjC,qBAAqB,EAAE,UAAU;IACjC,qBAAqB,EAAE,UAAU;IACjC,yBAAyB,EAAE,UAAU;IACrC,YAAY,EAAE,UAAU;IACxB,4FAA4F;IAC5F,gBAAgB,EAAE,SAAS;IAC3B,wGAAwG;IACxG,qBAAqB,EAAE,SAAS;IAChC,gBAAgB,EAAE,SAAS;IAC3B,sHAAsH;IACtH,gBAAgB,EAAE,SAAS;IAC3B,cAAc,EAAE,UAAU;IAC1B,gBAAgB,EAAE,UAAU;IAC5B,wEAAwE;IACxE,gBAAgB,EAAE,UAAU;IAC5B,uBAAuB,EAAE,QAAQ;IACjC,4EAA4E;IAC5E,wCAAwC;IACxC,gBAAgB,EAAE,QAAQ;IAC1B,gBAAgB,EAAE,QAAQ;IAC1B,0FAA0F;IAC1F,wBAAwB,EAAE,UAAU;IACpC,gBAAgB,EAAE,QAAQ;CAC7B,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,WAAmB;IAC9C,OAAO,gBAAgB,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC;AACtD,CAAC;AAED,yEAAyE;AACzE,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IAC1B;IAA8B;IAAnD,YAAqB,WAAmB,EAAW,eAAkC;QACjF,KAAK,CACD,IAAI,WAAW,UAAU,cAAc,CAAC,WAAW,CAAC,oCAAoC;cACtF,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,oEAAoE;cAClG,2DAA2D,CAChE,CAAC;QALe,gBAAW,GAAX,WAAW,CAAQ;QAAW,oBAAe,GAAf,eAAe,CAAmB;QAMjF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IAC3C,CAAC;CACJ;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,0BAA0B,CAAC,WAAmB,EAAE,OAAgB;IAC5E,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,UAAU;QAAE,OAAO;IACvD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO;IACpD,MAAM,MAAM,GAAG,OAAkC,CAAC;IAClD,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;IAClF,2EAA2E;IAC3E,wEAAwE;IACxE,mCAAmC;IACnC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AACzF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAwB,IAAI,GAAG,CAAC;IAC3D,iBAAiB;IACjB,eAAe,EAAE,oBAAoB,EAAE,mBAAmB;IAC1D,wBAAwB,EAAE,4BAA4B,EAAE,eAAe;IACvE,gBAAgB,EAAE,cAAc,EAAE,WAAW;IAC7C,8DAA8D;IAC9D,eAAe,EAAE,cAAc,EAAE,cAAc;IAC/C,uEAAuE;IACvE,gBAAgB;CACnB,CAAC,CAAC;AAEH,0DAA0D;AAC1D,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACjD,OAAO,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC/C,CAAC"}

package/packages/tools/lib/server/package-source.d.ts

@@ -1,3 +1,4 @@
+import { type SourceOutline } from '../authoring/source-outline.js';
 /** One level of body indentation, matching the layout the generator emits. */
 export declare const INDENT = "    ";
 /** A declaration with a body, located in one file's source text. */
@@ -21,8 +22,8 @@ export interface LocatedPackage {
     /** Offset of the body's closing brace. */
     bodyEnd: number;
 }
-/** Every package declared in one file's source, with its qualified name. */
-export declare function locatePackages(source: string): Promise<LocatedPackage[]>;
+/** Every package declared in one file, with its qualified name. */
+export declare function locatePackages(outline: SourceOutline): LocatedPackage[];
 /**
  * Every declaration in one file that can hold a package: the packages, and the
  * usages whose bodies may group with one.
@@ -32,14 +33,23 @@ export declare function locatePackages(source: string): Promise<LocatedPackage[]
  * qualified name of such a package therefore runs through the usage that holds
  * it — `catalogPackage::scrHome::grpHeader` — which is what the SysML namespace
  * says it is, and what makes it addressable by name like any other package.
+ *
+ * Read from the file's source outline, never by matching a name in the text: a
+ * comment mentioning the name is not a declaration, and two packages can
+ * differ only in their nesting.
  */
-export declare function locateContainers(source: string): Promise<LocatedPackage[]>;
+export declare function locateContainers(outline: SourceOutline): LocatedPackage[];
 /** Insert text as the last member of a package body, indented one level in. */
 export declare function insertIntoBody(source: string, target: LocatedPackage, text: string): string;
 /** Replace a range, re-indenting the replacement to the line it starts on. */
 export declare function spliceIndented(source: string, start: number, end: number, replacement: string): string;
 /** Remove a range together with the blank line it would otherwise leave behind. */
 export declare function removeLine(source: string, start: number, end: number): string;
+/** The range `removeLine` removes: the declaration, its indentation, and its line break. */
+export declare function removedLine(source: string, start: number, end: number): {
+    from: number;
+    to: number;
+};
 /** Strip the common leading whitespace from every line of a block. */
 export declare function dedent(text: string): string;
 //# sourceMappingURL=package-source.d.ts.map

package/packages/tools/lib/server/package-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-source.d.ts","sourceRoot":"","sources":["../../src/server/package-source.ts"],"names":[],"mappings":"AAWA,8EAA8E;AAC9E,eAAO,MAAM,MAAM,SAAS,CAAC;AAE7B,oEAAoE;AACpE,MAAM,WAAW,cAAc;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,wDAAwD;IACxD,GAAG,EAAE,MAAM,CAAC;IACZ,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,4EAA4E;AAC5E,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAE9E;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CA+BhF;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAU3F;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAMtG;AAED,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAQ7E;AAED,sEAAsE;AACtE,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM3C"}
+{"version":3,"file":"package-source.d.ts","sourceRoot":"","sources":["../../src/server/package-source.ts"],"names":[],"mappings":"AAQA,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAElF,8EAA8E;AAC9E,eAAO,MAAM,MAAM,SAAS,CAAC;AAE7B,oEAAoE;AACpE,MAAM,WAAW,cAAc;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,wDAAwD;IACxD,GAAG,EAAE,MAAM,CAAC;IACZ,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,cAAc,EAAE,CAEvE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,cAAc,EAAE,CAgBzE;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAU3F;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAMtG;AAED,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7E;AAED,4FAA4F;AAC5F,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAQpG;AAED,sEAAsE;AACtE,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM3C"}

package/packages/tools/lib/server/package-source.js

@@ -2,16 +2,15 @@
 //
 // Shared by the element persistor and the package writer, because "put this
 // declaration in that package" is one question with one answer whichever of
-// them is asking. A package is found by parsing, never by matching its name in
-// the file text: a comment mentioning the name is not a declaration, and two
-// packages can differ only in their nesting.
+// them is asking. A package is found in the file's source outline, never by
+// matching its name in the text.
 // ─────────────────────────────────────────────────────────────────────────────
-import { parseText } from '../model/parser-utils.js';
+import { outlineNodes } from '../authoring/source-outline.js';
 /** One level of body indentation, matching the layout the generator emits. */
 export const INDENT = '    ';
-/** Every package declared in one file's source, with its qualified name. */
-export async function locatePackages(source) {
-    return (await locateContainers(source)).filter(container => container.isPackage);
+/** Every package declared in one file, with its qualified name. */
+export function locatePackages(outline) {
+    return locateContainers(outline).filter(container => container.isPackage);
 }
 /**
  * Every declaration in one file that can hold a package: the packages, and the
@@ -22,39 +21,27 @@ export async function locatePackages(source) {
  * qualified name of such a package therefore runs through the usage that holds
  * it — `catalogPackage::scrHome::grpHeader` — which is what the SysML namespace
  * says it is, and what makes it addressable by name like any other package.
+ *
+ * Read from the file's source outline, never by matching a name in the text: a
+ * comment mentioning the name is not a declaration, and two packages can
+ * differ only in their nesting.
  */
-export async function locateContainers(source) {
-    if (!source.trim())
-        return [];
-    const { document, errors } = await parseText(source);
-    if (errors.length > 0)
-        return [];
+export function locateContainers(outline) {
     const found = [];
-    const visit = (node, parent) => {
-        for (const member of [...(node.members ?? []), ...(node.body ?? [])]) {
-            const isPackage = member.$type === 'PackageDeclaration';
-            // A usage without a name or a body holds nothing and addresses
-            // nothing; `{` below would otherwise find the next sibling's brace.
-            if (!member.name || (!isPackage && !member.body))
-                continue;
-            const qualifiedName = parent ? `${parent}::${member.name}` : member.name;
-            const cst = member.$cstNode;
-            if (cst) {
-                const start = cst.offset;
-                const end = cst.offset + cst.length;
-                const bodyStart = source.indexOf('{', start);
-                const bodyEnd = source.lastIndexOf('}', end - 1);
-                if (bodyStart !== -1 && bodyEnd > bodyStart && bodyEnd < end) {
-                    found.push({
-                        qualifiedName, name: member.name, isPackage,
-                        start, end, bodyStart: bodyStart + 1, bodyEnd,
-                    });
-                }
-            }
-            visit(member, qualifiedName);
-        }
-    };
-    visit(document.parseResult.value, '');
+    for (const node of outlineNodes(outline)) {
+        // A declaration without a name or a body holds nothing and addresses nothing.
+        if (!node.name || !node.body)
+            continue;
+        found.push({
+            qualifiedName: node.key,
+            name: node.name,
+            isPackage: node.role === 'package',
+            start: node.start,
+            end: node.end,
+            bodyStart: node.body.open,
+            bodyEnd: node.body.close,
+        });
+    }
     return found;
 }
 /** Insert text as the last member of a package body, indented one level in. */
@@ -79,6 +66,11 @@ export function spliceIndented(source, start, end, replacement) {
 }
 /** Remove a range together with the blank line it would otherwise leave behind. */
 export function removeLine(source, start, end) {
+    const { from, to } = removedLine(source, start, end);
+    return source.slice(0, from) + source.slice(to);
+}
+/** The range `removeLine` removes: the declaration, its indentation, and its line break. */
+export function removedLine(source, start, end) {
     const lineStart = source.lastIndexOf('\n', start - 1) + 1;
     const leadingIsBlank = /^[ \t]*$/.test(source.slice(lineStart, start));
     const from = leadingIsBlank ? lineStart : start;
@@ -87,7 +79,7 @@ export function removeLine(source, start, end) {
         to += 1;
     if (source[to] === '\n')
         to += 1;
-    return source.slice(0, from) + source.slice(to);
+    return { from, to };
 }
 /** Strip the common leading whitespace from every line of a block. */
 export function dedent(text) {

package/packages/tools/lib/server/package-source.js.map

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

package/packages/tools/lib/server/package-writer.d.ts

@@ -1,4 +1,5 @@
 import { type IrIdentityIndex } from '../model/ir-identity.js';
+import type { OutlineSource } from '../authoring/outline-source.js';
 /**
  * Why a package rename or delete is only a text edit.
  *
@@ -35,7 +36,9 @@ export declare function createPackage(cwd: string, request: {
     file: string;
     parent?: string;
     name: string;
-}): Promise<PackageWriteResult>;
+}, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<PackageWriteResult>;
 /**
  * Rename a package in place.
  *
@@ -46,7 +49,9 @@ export declare function renamePackage(cwd: string, request: {
     file: string;
     qualifiedName: string;
     name: string;
-}): Promise<PackageWriteResult>;
+}, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<PackageWriteResult>;
 /**
  * Re-parent a package: move its whole declaration under another package.
  *
@@ -61,7 +66,9 @@ export declare function movePackage(cwd: string, request: {
     /** Absent means the file's top level. */
     targetParent?: string;
     targetFile: string;
-}): Promise<PackageWriteResult>;
+}, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<PackageWriteResult>;
 /**
  * Remove a package declaration, keeping everything it declares.
  *
@@ -73,7 +80,9 @@ export declare function movePackage(cwd: string, request: {
 export declare function deletePackage(cwd: string, request: {
     file: string;
     qualifiedName: string;
-}): Promise<PackageWriteResult>;
+}, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<PackageWriteResult>;
 /**
  * Move a nested declaration into a grouping package beside it.
  *
@@ -91,7 +100,9 @@ export declare function moveIntoGroupingPackage(cwd: string, request: {
     file: string;
     qualifiedName: string;
     targetPackage: string;
-}): Promise<PackageWriteResult>;
+}, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<PackageWriteResult>;
 /**
  * Move one element's declaration into another package.
  *
@@ -108,5 +119,7 @@ export declare function moveElementToPackage(cwd: string, request: {
     targetFile: string;
     /** Absent means the file's top level. */
     targetPackage?: string;
-}, index: IrIdentityIndex): Promise<PackageWriteResult>;
+}, index: IrIdentityIndex, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<PackageWriteResult>;
 //# sourceMappingURL=package-writer.d.ts.map

package/packages/tools/lib/server/package-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-writer.d.ts","sourceRoot":"","sources":["../../src/server/package-writer.ts"],"names":[],"mappings":"AA0BA,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,yBAAyB,CAAC;AAMjC;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,QAGA,CAAC;AAEvC,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,mDAAmD;IACnD,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,2BAA2B,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAKD;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzD,OAAO,CAAC,kBAAkB,CAAC,CAgC7B;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/D,OAAO,CAAC,kBAAkB,CAAC,CAqC7B;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC7B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IACL,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACtB,GACF,OAAO,CAAC,kBAAkB,CAAC,CA2D7B;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACjD,OAAO,CAAC,kBAAkB,CAAC,CA8B7B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACxE,OAAO,CAAC,kBAAkB,CAAC,CAsC7B;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACtC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,EACD,KAAK,EAAE,eAAe,GACvB,OAAO,CAAC,kBAAkB,CAAC,CAyD7B"}
+{"version":3,"file":"package-writer.d.ts","sourceRoot":"","sources":["../../src/server/package-writer.ts"],"names":[],"mappings":"AAyBA,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,QAGA,CAAC;AAEvC,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,mDAAmD;IACnD,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,2BAA2B,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAKD;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AACxD,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,kBAAkB,CAAC,CAkC7B;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AAC9D,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,kBAAkB,CAAC,CAuC7B;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC7B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IACL,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACtB;AACD,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,kBAAkB,CAAC,CAmE7B;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;AAChD,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,kBAAkB,CAAC,CAgC7B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;AACvE,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,kBAAkB,CAAC,CAyC7B;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACtC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IACL,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,EACD,KAAK,EAAE,eAAe;AACtB,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,kBAAkB,CAAC,CA8D7B"}