@memoarchitect/tools 0.13.2 → 0.15.1

package/packages/tools/lib/server/version-servers.js.map

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

package/packages/tools/lib/server/view-layout-store.d.ts

@@ -1,21 +1,36 @@
 import type { DiagramDTO, DiagramLayout } from '@memoarchitect/tools';
-export declare const VIEW_LAYOUT_EXTENSION = ".viewlayout";
-/** Companion location beside the SysML file that defines the view. */
-export declare function viewLayoutPath(projectRoot: string, diagram: DiagramDTO): string;
-export declare function loadViewLayout(projectRoot: string, diagram: DiagramDTO): DiagramLayout | null;
+import type { OutlineSource } from '../authoring/outline-source.js';
 /**
  * Whether a layout says anything the model does not already say: a moved node,
- * a routed connector, or a canvas setting the user changed. A companion exists
- * to record overrides, so a layout that holds none is not worth a file — the
- * view renders identically without it.
+ * a routed connector, a note, or a canvas setting the user changed. A layout
+ * that holds none is not worth a statement — the view draws identically without.
  */
 export declare function isDefaultViewLayout(layout: DiagramLayout): boolean;
 /**
- * Persist a diagram's overrides beside its SysML source. Returns the companion
- * path, or null when there was nothing to persist — a layout that carries no
- * override drops its entry instead, and the companion is removed once it holds
- * no entries at all, so a purely visual toggle never dirties the project.
+ * Every declared view's saved layout, keyed by diagram id, re-keying node
+ * entries whose id the model no longer uses.
+ *
+ * A layout written before element ids were qualified keys its nodes by the
+ * short name that was then an id — `coffeeMachine`, not
+ * `Kitchen::coffeeMachine`. Without `resolveNodeId` those entries match no node
+ * and every hand-placed box silently returns to automatic placement. Ports are
+ * unaffected: they are nested under their owner and keyed by the name the
+ * source declares. The remap is read-only; the next save writes the new spelling.
  */
-export declare function saveViewLayout(projectRoot: string, diagram: DiagramDTO, layout: DiagramLayout): string | null;
-export declare function loadViewLayouts(projectRoot: string, diagrams: DiagramDTO[]): Record<string, DiagramLayout>;
+export declare function loadViewLayouts(projectRoot: string, diagrams: DiagramDTO[], resolveNodeId?: (savedId: string) => string | undefined): Record<string, DiagramLayout>;
+export interface ViewLayoutSave {
+    success: boolean;
+    /** Why the layout was not written. Never a reason to write it elsewhere. */
+    reason?: string;
+    /** The source file written, when the layout changed. */
+    filePath?: string;
+    /** False when the file already said exactly this. */
+    changed?: boolean;
+}
+/**
+ * Write a diagram's layout into the `view` that declares it. A layout that
+ * holds nothing removes the view's statements. The compiler checks the result
+ * before it reaches disk, like every other write.
+ */
+export declare function saveViewLayout(projectRoot: string, diagram: DiagramDTO, layout: DiagramLayout, outlines: OutlineSource): Promise<ViewLayoutSave>;
 //# sourceMappingURL=view-layout-store.d.ts.map

package/packages/tools/lib/server/view-layout-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-layout-store.d.ts","sourceRoot":"","sources":["../../src/server/view-layout-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEtE,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAUnD,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CAO/E;AAMD,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI,CAgB7F;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAelE;AAeD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAkC7G;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAO1G"}
+{"version":3,"file":"view-layout-store.d.ts","sourceRoot":"","sources":["../../src/server/view-layout-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAmBpE;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAYlE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC3B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EAAE,EACtB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GACxD,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAe/B;AAED,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,4EAA4E;IAC5E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAChC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,GACzF,OAAO,CAAC,cAAc,CAAC,CA6BzB"}

package/packages/tools/lib/server/view-layout-store.js

@@ -1,131 +1,131 @@
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { basename, dirname, resolve } from 'node:path';
-import { parse, stringify } from 'yaml';
-export const VIEW_LAYOUT_EXTENSION = '.viewlayout';
-const safeId = (id) => id.replace(/[^a-zA-Z0-9._-]/g, '_');
-/** Companion location beside the SysML file that defines the view. */
-export function viewLayoutPath(projectRoot, diagram) {
-    if (diagram.sourceFile) {
-        const source = resolve(projectRoot, diagram.sourceFile);
-        const stem = basename(source).replace(/\.sysml$/i, '');
-        return resolve(dirname(source), `${stem}${VIEW_LAYOUT_EXTENSION}`);
-    }
-    return resolve(projectRoot, '.memo', 'views', `${safeId(diagram.id)}${VIEW_LAYOUT_EXTENSION}`);
-}
-function legacyLayoutPath(projectRoot, diagramId) {
-    return resolve(projectRoot, '.memo', 'layouts', `${diagramId}.yaml`);
-}
-export function loadViewLayout(projectRoot, diagram) {
-    const companion = viewLayoutPath(projectRoot, diagram);
-    if (existsSync(companion)) {
-        try {
-            const artifact = parse(readFileSync(companion, 'utf8'));
-            if (artifact.format === 'memo.viewlayout/v2' || artifact.format === 'memo.viewlayout/v1' || artifact.format === 'memo.sysmlview/v2')
-                return artifact.layouts?.[diagram.id] ?? null;
-            if (artifact.format === 'memo.sysmlview/v1' && artifact.diagramId === diagram.id)
-                return artifact.layout ?? null;
-        }
-        catch { /* malformed companion is ignored */ }
-    }
-    // Read-only compatibility with the previous hidden YAML sidecar. Saving
-    // writes the new companion, providing migration without destructive moves.
-    const legacy = legacyLayoutPath(projectRoot, diagram.id);
-    if (!existsSync(legacy))
-        return null;
-    try {
-        return parse(readFileSync(legacy, 'utf8'));
-    }
-    catch {
-        return null;
-    }
-}
+import { existsSync, readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { importsLayoutPackage, layoutToStatements, readFileLayouts, replaceViewLayout, scanViewLayouts, stripLayout, } from '../model/view-layout-block.js';
+import { atomicWrite, commitSource } from './persistor.js';
+// ─── Where a view's layout lives ─────────────────────────────────────────────
+//
+// In the view. `@MemoLayout…` statements inside the `view` declaration
+// (`model/view-layout-block.ts` reads and writes them), so a layout is reviewed,
+// diffed, compiled and pinned with the view it belongs to. It used to be a
+// `.viewlayout` companion beside the file, which none of those could see.
+//
+// A diagram that is not a declared view has nowhere to keep a layout and keeps
+// none: it is laid out automatically each time. That is deliberate. A hidden
+// store for the diagrams that were never declared is the same split this
+// replaced.
+// ─────────────────────────────────────────────────────────────────────────────
 /**
  * Whether a layout says anything the model does not already say: a moved node,
- * a routed connector, or a canvas setting the user changed. A companion exists
- * to record overrides, so a layout that holds none is not worth a file — the
- * view renders identically without it.
+ * a routed connector, a note, or a canvas setting the user changed. A layout
+ * that holds none is not worth a statement — the view draws identically without.
  */
 export function isDefaultViewLayout(layout) {
     if (Object.keys(layout.nodes ?? {}).length > 0)
         return false;
-    if (Object.keys(layout.edges ?? {}).length > 0)
+    if (Object.values(layout.edges ?? {}).some(edge => Object.keys(edge).length > 0))
         return false;
     if (Object.keys(layout.annotations ?? {}).length > 0)
         return false;
     const canvas = layout.canvas;
     if (!canvas)
         return true;
-    // Automatic layout and still connectors are the defaults; every other
-    // canvas field is unset until the user sets it.
     return canvas.autoLayout !== false
-        && canvas.flowAnimation !== true
         && Object.keys(canvas.portWalls ?? {}).length === 0
-        && canvas.zoom === undefined
-        && canvas.pan === undefined
         && canvas.grid === undefined
-        && canvas.snap === undefined;
-}
-/** Existing companion entries, keyed by diagram id; empty for a new file. */
-function readViewLayouts(path) {
-    if (!existsSync(path))
-        return {};
-    try {
-        const existing = parse(readFileSync(path, 'utf8'));
-        if (existing.format === 'memo.viewlayout/v2' || existing.format === 'memo.viewlayout/v1' || existing.format === 'memo.sysmlview/v2')
-            return existing.layouts ?? {};
-        if (existing.diagramId && existing.layout)
-            return { [existing.diagramId]: existing.layout };
-    }
-    catch { /* replace malformed companion */ }
-    return {};
+        && canvas.snap === undefined
+        && canvas.coordinateSpace === undefined
+        && canvas.layout === undefined;
 }
 /**
- * Persist a diagram's overrides beside its SysML source. Returns the companion
- * path, or null when there was nothing to persist — a layout that carries no
- * override drops its entry instead, and the companion is removed once it holds
- * no entries at all, so a purely visual toggle never dirties the project.
+ * Every declared view's saved layout, keyed by diagram id, re-keying node
+ * entries whose id the model no longer uses.
+ *
+ * A layout written before element ids were qualified keys its nodes by the
+ * short name that was then an id — `coffeeMachine`, not
+ * `Kitchen::coffeeMachine`. Without `resolveNodeId` those entries match no node
+ * and every hand-placed box silently returns to automatic placement. Ports are
+ * unaffected: they are nested under their owner and keyed by the name the
+ * source declares. The remap is read-only; the next save writes the new spelling.
  */
-export function saveViewLayout(projectRoot, diagram, layout) {
-    const path = viewLayoutPath(projectRoot, diagram);
-    const existingLayouts = readViewLayouts(path);
-    if (isDefaultViewLayout(layout)) {
-        if (!(diagram.id in existingLayouts)) {
-            if (existsSync(path) && Object.keys(existingLayouts).length === 0)
-                rmSync(path, { force: true });
-            return null;
-        }
-        const remaining = { ...existingLayouts };
-        delete remaining[diagram.id];
-        if (Object.keys(remaining).length === 0) {
-            rmSync(path, { force: true });
-            return null;
-        }
-        writeFileSync(path, stringify({
-            format: 'memo.viewlayout/v1',
-            ...(diagram.sourceFile ? { viewSource: diagram.sourceFile } : {}),
-            layouts: remaining,
-        }), 'utf8');
-        return path;
-    }
-    mkdirSync(dirname(path), { recursive: true });
-    const artifact = {
-        // v2 records each node's coordinate frame (`parent`). v1 files still
-        // load — a node with no recorded frame is left where it is rather than
-        // rebased on a guess — and are rewritten as v2 on the next save.
-        format: 'memo.viewlayout/v2',
-        ...(diagram.sourceFile ? { viewSource: diagram.sourceFile } : {}),
-        layouts: { ...existingLayouts, [diagram.id]: layout },
-    };
-    writeFileSync(path, stringify(artifact), 'utf8');
-    return path;
-}
-export function loadViewLayouts(projectRoot, diagrams) {
+export function loadViewLayouts(projectRoot, diagrams, resolveNodeId) {
+    const byFile = new Map();
     const layouts = {};
     for (const diagram of diagrams) {
-        const layout = loadViewLayout(projectRoot, diagram);
+        if (!diagram.sourceFile || !diagram.elementId)
+            continue;
+        let fileLayouts = byFile.get(diagram.sourceFile);
+        if (!fileLayouts) {
+            const path = resolve(projectRoot, diagram.sourceFile);
+            fileLayouts = existsSync(path) ? readFileLayouts(readFileSync(path, 'utf8')) : {};
+            byFile.set(diagram.sourceFile, fileLayouts);
+        }
+        const layout = fileLayouts[diagram.elementId];
         if (layout)
-            layouts[diagram.id] = layout;
+            layouts[diagram.id] = resolveNodeId ? withResolvedNodes(layout, resolveNodeId) : layout;
     }
     return layouts;
 }
+/**
+ * Write a diagram's layout into the `view` that declares it. A layout that
+ * holds nothing removes the view's statements. The compiler checks the result
+ * before it reaches disk, like every other write.
+ */
+export async function saveViewLayout(projectRoot, diagram, layout, outlines) {
+    if (!diagram.sourceFile || !diagram.elementId) {
+        return { success: false, reason: `"${diagram.name}" is not a declared view, so it has no place to keep a layout` };
+    }
+    const absolute = resolve(projectRoot, diagram.sourceFile);
+    if (!existsSync(absolute))
+        return { success: false, reason: `${diagram.sourceFile} does not exist` };
+    const text = readFileSync(absolute, 'utf8');
+    const updated = replaceViewLayout(text, diagram.elementId, isDefaultViewLayout(layout) ? null : layout);
+    if (updated === undefined) {
+        return { success: false, reason: `${diagram.elementId} was not found in ${diagram.sourceFile}` };
+    }
+    if (updated === text)
+        return { success: true, changed: false };
+    // The compiler checks a write that adds something it must resolve: the import.
+    // A write that only replaces layout statements in a file that already has it
+    // is checked here instead, because the statements come from a closed
+    // generator over sanitised values and a whole-project compile on every drag
+    // is not a price worth paying for a check this narrow can make: nothing but
+    // the view's own statements changed, and they read back as written.
+    if (!importsLayoutPackage(text) || !onlyThisViewChanged(text, updated, diagram.elementId, layout)) {
+        const committed = await commitSource(absolute, diagram.sourceFile, updated, outlines);
+        if (!committed.success)
+            return { success: false, reason: committed.error };
+        return { success: true, filePath: diagram.sourceFile, changed: true };
+    }
+    try {
+        atomicWrite(absolute, updated);
+    }
+    catch (e) {
+        return { success: false, reason: `Could not write ${diagram.sourceFile}: ${String(e)}` };
+    }
+    return { success: true, filePath: diagram.sourceFile, changed: true };
+}
+/** Whether `updated` differs from `text` only in the layout statements of `viewId`, and states what `layout` says. */
+function onlyThisViewChanged(text, updated, viewId, layout) {
+    if (stripLayout(updated) !== stripLayout(text))
+        return false;
+    const view = scanViewLayouts(updated).find(candidate => candidate.id === viewId);
+    if (!view)
+        return false;
+    const wanted = isDefaultViewLayout(layout) ? 0 : layoutToStatements(layout, '').length;
+    return view.statements.length === wanted;
+}
+/** A copy of `layout` whose node keys are the ids the current model uses. */
+function withResolvedNodes(layout, resolveNodeId) {
+    const nodes = {};
+    let changed = false;
+    for (const [savedId, node] of Object.entries(layout.nodes ?? {})) {
+        const resolved = resolveNodeId(savedId) ?? savedId;
+        if (resolved !== savedId)
+            changed = true;
+        // A saved id that resolves onto one already present loses: the entry
+        // written under the current spelling is the more recent of the two.
+        nodes[resolved] = nodes[resolved] ?? node;
+    }
+    return changed ? { ...layout, nodes } : layout;
+}
 //# sourceMappingURL=view-layout-store.js.map

package/packages/tools/lib/server/view-layout-store.js.map

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

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

@@ -1,4 +1,5 @@
 import type { DiagramDTO, MemoModelDTO } from '../types/index.js';
+import type { OutlineSource } from '../authoring/outline-source.js';
 export interface ViewWriteResult {
     success: boolean;
     /** Why the view could not be declared. Never a reason to write it elsewhere. */
@@ -25,7 +26,9 @@ export interface ViewWriteResult {
  * would freeze the answer and quietly stop being true.
  */
 export declare function selectionQueryLines(diagram: DiagramDTO): string[];
-export declare function writeViewDeclaration(projectRoot: string, model: MemoModelDTO, diagram: DiagramDTO): Promise<ViewWriteResult>;
+export declare function writeViewDeclaration(projectRoot: string, model: MemoModelDTO, diagram: DiagramDTO, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<ViewWriteResult>;
 /**
  * Change WHAT a declared view shows, by editing its `expose` members.
  *
@@ -38,7 +41,24 @@ export declare function writeViewDeclaration(projectRoot: string, model: MemoMod
  * authored view follows, and it is what makes a screen layout pick up a region
  * added later without another edit.
  */
-export declare function updateViewExpose(projectRoot: string, model: MemoModelDTO, diagram: DiagramDTO, elementIds: string[] | undefined): Promise<ViewWriteResult & {
+export declare function updateViewExpose(projectRoot: string, model: MemoModelDTO, diagram: DiagramDTO, elementIds: string[] | undefined, 
+/** Outlines of the project's files, from the selected compiler. */
+outlines: OutlineSource): Promise<ViewWriteResult & {
     exposed?: string[];
 }>;
+/**
+ * Put display statements beside the view's other `attribute :>>` statements, as
+ * an authored view reads; with none, at the end of the body.
+ */
+export declare function placeDisplayStatements(declaration: string, statements: string, indent: string): string;
+/**
+ * State how a view shows itself, in the view's own declaration.
+ *
+ * `display` maps an attribute the view declares (`portDisplay`, `connectionDisplay`, `flowAnimation`,
+ * `showPortText`, `showConnectionText`) to the SysML value to write. Each is one `attribute :>> name = value;`
+ * statement in the view's body, replaced when the view already says it and added when it does not. Only
+ * those statements are touched: a view carries `expose` members, a selection query, identity and layout,
+ * none of which a regenerated declaration would keep.
+ */
+export declare function updateViewDisplay(projectRoot: string, model: MemoModelDTO, diagram: DiagramDTO, display: Record<string, string>, outlines: OutlineSource): Promise<ViewWriteResult>;
 //# sourceMappingURL=view-writer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"view-writer.d.ts","sourceRoot":"","sources":["../../src/server/view-writer.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,UAAU,EAAe,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAI/E,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mDAAmD;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAuFD;;;;;;GAMG;AACH;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,EAAE,CAajE;AAED,wBAAsB,oBAAoB,CACtC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,GAC9D,OAAO,CAAC,eAAe,CAAC,CA8E1B;AAiBD;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CAClC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,GAChG,OAAO,CAAC,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAqCnD"}
+{"version":3,"file":"view-writer.d.ts","sourceRoot":"","sources":["../../src/server/view-writer.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,UAAU,EAAe,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAG/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mDAAmD;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAuFD;;;;;;GAMG;AACH;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,EAAE,CAajE;AAED,wBAAsB,oBAAoB,CACtC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU;AAC7D,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,eAAe,CAAC,CAmF1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CAClC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS;AAC/F,mEAAmE;AACnE,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAuCnD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAOtG;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACnC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9F,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,eAAe,CAAC,CA8B1B"}