@micacms/runtime 0.4.1 → 0.5.0-rc.2

package/dist/workspace/locks.js

@@ -0,0 +1,76 @@
+/**
+ * The two locks of a shared working tree: `remote` (fetch and push, one at a
+ * time) and `tree` (read/write; saves, discards, commits and fast-forwards
+ * write). A save during a commit could otherwise put half an entry into the
+ * commit, and a read during a fast-forward could see a half-written file.
+ *
+ * Both wait, they do not refuse. Take `remote` first, then `tree`, so two
+ * operations never wait on each other. No network call may run while `tree` is
+ * held: a slow push must not block autosave.
+ */
+export function createWorkspaceLocks() {
+    return { remote: createMutex(), tree: createReadWriteLock() };
+}
+export function createMutex() {
+    const lock = createReadWriteLock();
+    return { run: (fn) => lock.write(fn) };
+}
+export function createReadWriteLock() {
+    let readers = 0;
+    let writing = false;
+    const queue = [];
+    const admit = () => {
+        while (queue.length > 0) {
+            const next = queue[0];
+            if (next.kind === "write") {
+                if (writing || readers > 0)
+                    return;
+                queue.shift();
+                writing = true;
+                next.start();
+                return;
+            }
+            if (writing)
+                return;
+            queue.shift();
+            readers += 1;
+            next.start();
+        }
+    };
+    const acquire = (kind) => new Promise((resolve) => {
+        queue.push({ kind, start: resolve });
+        admit();
+    });
+    const release = (kind) => {
+        if (kind === "write")
+            writing = false;
+        else
+            readers -= 1;
+        admit();
+    };
+    const hold = (kind) => async (fn) => {
+        await acquire(kind);
+        try {
+            return await fn();
+        }
+        finally {
+            release(kind);
+        }
+    };
+    return { read: hold("read"), write: hold("write") };
+}
+/**
+ * Files behind the tree lock. The staging service does not use it: it holds the
+ * lock around whole operations.
+ */
+export function lockedFiles(files, tree) {
+    return {
+        origin: files.origin,
+        read: (path) => tree.read(() => files.read(path)),
+        list: (path) => tree.read(() => files.list(path)),
+        readBinary: (path) => tree.read(() => files.readBinary(path)),
+        revision: (path) => tree.read(() => files.revision(path)),
+        apply: (input) => tree.write(() => files.apply(input)),
+    };
+}
+//# sourceMappingURL=locks.js.map

package/dist/workspace/locks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"locks.js","sourceRoot":"","sources":["../../src/workspace/locks.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The two locks of a shared working tree: `remote` (fetch and push, one at a\n * time) and `tree` (read/write; saves, discards, commits and fast-forwards\n * write). A save during a commit could otherwise put half an entry into the\n * commit, and a read during a fast-forward could see a half-written file.\n *\n * Both wait, they do not refuse. Take `remote` first, then `tree`, so two\n * operations never wait on each other. No network call may run while `tree` is\n * held: a slow push must not block autosave.\n */\n\nimport type { ContentFiles } from \"./files.js\";\n\n/** Runs one function at a time, in arrival order. */\nexport interface Mutex {\n  run<T>(fn: () => Promise<T>): Promise<T>;\n}\n\n/** Many readers or one writer, in arrival order. A waiting writer holds back later readers. */\nexport interface ReadWriteLock {\n  read<T>(fn: () => Promise<T>): Promise<T>;\n  write<T>(fn: () => Promise<T>): Promise<T>;\n}\n\nexport interface WorkspaceLocks {\n  remote: Mutex;\n  tree: ReadWriteLock;\n}\n\nexport function createWorkspaceLocks(): WorkspaceLocks {\n  return { remote: createMutex(), tree: createReadWriteLock() };\n}\n\nexport function createMutex(): Mutex {\n  const lock = createReadWriteLock();\n  return { run: (fn) => lock.write(fn) };\n}\n\nexport function createReadWriteLock(): ReadWriteLock {\n  let readers = 0;\n  let writing = false;\n  const queue: Array<{ kind: \"read\" | \"write\"; start: () => void }> = [];\n\n  const admit = (): void => {\n    while (queue.length > 0) {\n      const next = queue[0]!;\n      if (next.kind === \"write\") {\n        if (writing || readers > 0) return;\n        queue.shift();\n        writing = true;\n        next.start();\n        return;\n      }\n      if (writing) return;\n      queue.shift();\n      readers += 1;\n      next.start();\n    }\n  };\n\n  const acquire = (kind: \"read\" | \"write\"): Promise<void> =>\n    new Promise((resolve) => {\n      queue.push({ kind, start: resolve });\n      admit();\n    });\n\n  const release = (kind: \"read\" | \"write\"): void => {\n    if (kind === \"write\") writing = false;\n    else readers -= 1;\n    admit();\n  };\n\n  const hold =\n    (kind: \"read\" | \"write\") =>\n    async <T>(fn: () => Promise<T>): Promise<T> => {\n      await acquire(kind);\n      try {\n        return await fn();\n      } finally {\n        release(kind);\n      }\n    };\n\n  return { read: hold(\"read\"), write: hold(\"write\") };\n}\n\n/**\n * Files behind the tree lock. The staging service does not use it: it holds the\n * lock around whole operations.\n */\nexport function lockedFiles(\n  files: ContentFiles,\n  tree: ReadWriteLock,\n): ContentFiles {\n  return {\n    origin: files.origin,\n    read: (path) => tree.read(() => files.read(path)),\n    list: (path) => tree.read(() => files.list(path)),\n    readBinary: (path) => tree.read(() => files.readBinary(path)),\n    revision: (path) => tree.read(() => files.revision(path)),\n    apply: (input) => tree.write(() => files.apply(input)),\n  };\n}\n"]}

package/dist/workspace/policy.d.ts

@@ -0,0 +1,92 @@
+/**
+ * What changes with the owner of a working tree: whether Publish may run and
+ * how a commit reaches the remote. The app that keeps a managed clone supplies
+ * its policy; `developer.ts` is the developer's.
+ */
+import type { PublishResult } from "@micacms/core";
+import type { Author } from "./files.js";
+import type { GitTree } from "./tree.js";
+export type PublishAvailability = {
+    enabled: true;
+} | {
+    enabled: false;
+    reason: string;
+};
+/** One piece of content that an editor changed and the website changed too. */
+export interface SyncConflict {
+    /** Identifies the group in `resolve`. */
+    group: string;
+    label: string;
+    /** Content-relative paths of the group, on either side. */
+    paths: string[];
+    upstream: "changed" | "deleted" | "added";
+    /** What the comparison shows, when the group is one document. */
+    target?: {
+        kind: "entry";
+        collection: string;
+        slug: string;
+    } | {
+        kind: "singleton";
+        name: string;
+    } | {
+        kind: "order";
+        collection: string;
+    };
+}
+/** Where a clone that Mica keeps stands against its remote. Managed owners only. */
+export interface SyncStatus {
+    lastSyncAt: string | null;
+    /** Upstream commits not yet in the clone. */
+    behind: number;
+    error: {
+        code: string;
+        message: string;
+        since: string;
+    } | null;
+    /** The content model changed upstream; a restart applies it. */
+    restartRequired: boolean;
+    /** A publication committed and not yet pushed. Mica retries it. */
+    pendingPush: {
+        revision: string;
+        reason: string;
+    } | null;
+    /** The last publication the host refused; it is a draft again. */
+    refused: {
+        reason: string;
+        at: string;
+    } | null;
+    conflicts: SyncConflict[];
+}
+/** What the System page says about the repository, beyond what the runtime knows. */
+export interface RepositoryDescription {
+    /** The remote URL, without credentials. */
+    url: string;
+    branch: string;
+    /** Bytes the clone takes on the data volume. */
+    cloneBytes: number | null;
+}
+export interface OwnerPolicy {
+    readonly owner: "developer" | "managed";
+    publishAvailability(): PublishAvailability;
+    /**
+     * Runs with the remote lock held, before the tree lock. A managed clone syncs
+     * here and must not take the remote lock again. Throws an `ApiError` when
+     * Publish must wait.
+     */
+    prepare(tree: GitTree): Promise<void>;
+    /** Who a commit names as its author, given the signed-in editor. Undefined leaves it to Git. */
+    commitAuthor(editor: Author | undefined): Author | undefined;
+    /**
+     * Sends HEAD to the remote. A failure returns `committed-pending-push`, not
+     * an exception: the commit is real.
+     */
+    push(tree: GitTree, revision: string): Promise<PublishResult>;
+    syncStatus?(): SyncStatus;
+    sync?(): Promise<void>;
+    /** Keeps the editor's version of a conflicting group, or takes the website's. */
+    resolve?(group: string, choice: "mine" | "website"): Promise<void>;
+    /** The ref that holds the website's version, for a conflict's comparison. */
+    upstreamRef?: string;
+    describe?(): Promise<RepositoryDescription>;
+}
+//# sourceMappingURL=policy.d.ts.map

package/dist/workspace/policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/workspace/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzF,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAC1C,iEAAiE;IACjE,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5I;AAED,oFAAoF;AACpF,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/D,gEAAgE;IAChE,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzD,kEAAkE;IAClE,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,qFAAqF;AACrF,MAAM,WAAW,qBAAqB;IACpC,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,mBAAmB,IAAI,mBAAmB,CAAC;IAC3C;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,gGAAgG;IAChG,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IAC7D;;;OAGG;IACH,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAI9D,UAAU,CAAC,IAAI,UAAU,CAAC;IAC1B,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,iFAAiF;IACjF,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC7C"}

package/dist/workspace/policy.js

@@ -0,0 +1,7 @@
+/**
+ * What changes with the owner of a working tree: whether Publish may run and
+ * how a commit reaches the remote. The app that keeps a managed clone supplies
+ * its policy; `developer.ts` is the developer's.
+ */
+export {};
+//# sourceMappingURL=policy.js.map

package/dist/workspace/policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/workspace/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG","sourcesContent":["/**\n * What changes with the owner of a working tree: whether Publish may run and\n * how a commit reaches the remote. The app that keeps a managed clone supplies\n * its policy; `developer.ts` is the developer's.\n */\n\nimport type { PublishResult } from \"@micacms/core\";\n\nimport type { Author } from \"./files.js\";\n\nimport type { GitTree } from \"./tree.js\";\n\nexport type PublishAvailability = { enabled: true } | { enabled: false; reason: string };\n\n/** One piece of content that an editor changed and the website changed too. */\nexport interface SyncConflict {\n  /** Identifies the group in `resolve`. */\n  group: string;\n  label: string;\n  /** Content-relative paths of the group, on either side. */\n  paths: string[];\n  upstream: \"changed\" | \"deleted\" | \"added\";\n  /** What the comparison shows, when the group is one document. */\n  target?: { kind: \"entry\"; collection: string; slug: string } | { kind: \"singleton\"; name: string } | { kind: \"order\"; collection: string };\n}\n\n/** Where a clone that Mica keeps stands against its remote. Managed owners only. */\nexport interface SyncStatus {\n  lastSyncAt: string | null;\n  /** Upstream commits not yet in the clone. */\n  behind: number;\n  error: { code: string; message: string; since: string } | null;\n  /** The content model changed upstream; a restart applies it. */\n  restartRequired: boolean;\n  /** A publication committed and not yet pushed. Mica retries it. */\n  pendingPush: { revision: string; reason: string } | null;\n  /** The last publication the host refused; it is a draft again. */\n  refused: { reason: string; at: string } | null;\n  conflicts: SyncConflict[];\n}\n\n/** What the System page says about the repository, beyond what the runtime knows. */\nexport interface RepositoryDescription {\n  /** The remote URL, without credentials. */\n  url: string;\n  branch: string;\n  /** Bytes the clone takes on the data volume. */\n  cloneBytes: number | null;\n}\n\nexport interface OwnerPolicy {\n  readonly owner: \"developer\" | \"managed\";\n  publishAvailability(): PublishAvailability;\n  /**\n   * Runs with the remote lock held, before the tree lock. A managed clone syncs\n   * here and must not take the remote lock again. Throws an `ApiError` when\n   * Publish must wait.\n   */\n  prepare(tree: GitTree): Promise<void>;\n  /** Who a commit names as its author, given the signed-in editor. Undefined leaves it to Git. */\n  commitAuthor(editor: Author | undefined): Author | undefined;\n  /**\n   * Sends HEAD to the remote. A failure returns `committed-pending-push`, not\n   * an exception: the commit is real.\n   */\n  push(tree: GitTree, revision: string): Promise<PublishResult>;\n\n  /* A clone that Mica keeps answers these; the developer's checkout does not. */\n\n  syncStatus?(): SyncStatus;\n  sync?(): Promise<void>;\n  /** Keeps the editor's version of a conflicting group, or takes the website's. */\n  resolve?(group: string, choice: \"mine\" | \"website\"): Promise<void>;\n  /** The ref that holds the website's version, for a conflict's comparison. */\n  upstreamRef?: string;\n  describe?(): Promise<RepositoryDescription>;\n}\n"]}

package/dist/workspace/tree.d.ts

@@ -0,0 +1,73 @@
+/**
+ * Git operations on a working tree whose content root is the draft workspace.
+ * The owner policy does the push. Every operation is limited to paths under the
+ * content root, never `git add -A` over the repository, so other work in the
+ * same checkout is never swept into a commit.
+ */
+import type { ContentChange, ContentSource } from "@micacms/core";
+import type { Author } from "./files.js";
+import { type GitRunner, type GitRunnerOptions } from "./git.js";
+/**
+ * Makes every path argument literal: `tour[1].json` is not a pattern that also
+ * matches `tour1.json`.
+ */
+export declare const LITERAL = "--literal-pathspecs";
+/** A content root inside a Git repository. */
+export interface GitTree {
+    /** Runs in the repository root. */
+    git: GitRunner;
+    /** Content root relative to the repository root; "" when they coincide. */
+    prefix: string;
+    /** Absolute path of the content root. */
+    contentRoot: string;
+}
+/** A changed file plus what only Git status knows about it. */
+export interface TreeChange extends ContentChange {
+    /** Not yet known to Git — discarding means deleting, not restoring. */
+    untracked: boolean;
+    /** Mid-merge conflict markers. Unpublishable until resolved with Git tools. */
+    conflicted: boolean;
+}
+/**
+ * Finds the repository the content root sits in, freshly each time: a
+ * `git init` after startup should start working, not require a restart.
+ */
+export declare function locateTree(contentRoot: string, options?: GitRunnerOptions): Promise<GitTree | {
+    reason: string;
+}>;
+/** The content root's changes, as `git status` sees them. */
+export declare function listTreeChanges(tree: GitTree): Promise<TreeChange[]>;
+/**
+ * Stages and commits only `paths` (content-root relative) and returns the new
+ * HEAD. The pathspec limits both steps, so all other staged or unstaged work
+ * stays. Without `author`, Git's configured identity applies.
+ */
+export declare function commitPaths(tree: GitTree, paths: string[], message: string, author?: Author): Promise<string>;
+/**
+ * Commits `paths` again with the message, author and date of `original`, after
+ * a rejected push. Returns the new HEAD.
+ */
+export declare function recommitPaths(tree: GitTree, paths: string[], original: string): Promise<string>;
+/** Puts one changed file back to its HEAD version, or removes it if HEAD has none. */
+export declare function discardChange(tree: GitTree, change: TreeChange): Promise<void>;
+/** HEAD's commit id, or null before the first commit. */
+export declare function headRevision(tree: GitTree): Promise<string | null>;
+/** The checked-out branch, or null when there is none to name. */
+export declare function currentBranch(tree: GitTree): Promise<string | null>;
+/** Commits waiting to be pushed, or null when there is no upstream to say. */
+export declare function aheadOfUpstream(tree: GitTree): Promise<number | null>;
+/**
+ * The content root as `ref` has it, read from Git's object store, because the
+ * working tree holds the drafts.
+ */
+export declare function headSource(tree: GitTree, ref?: string): ContentSource;
+/**
+ * Parses `git status --porcelain=v1 -z` into content-root-relative changes.
+ * `-z` never changes a path; a rename is two fields and becomes a create and a
+ * delete. `.mica/` is excluded: the developer commits the manifest, and the
+ * drift check guards model changes.
+ */
+export declare function parseStatus(raw: string, prefix: string): TreeChange[];
+/** A content-root-relative path as Git sees it, from the repository root. */
+export declare function inRepo(prefix: string, path: string): string;
+//# sourceMappingURL=tree.d.ts.map

package/dist/workspace/tree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../src/workspace/tree.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,eAAe,CAAC;AAGlF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAuB,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEtF;;;GAGG;AACH,eAAO,MAAM,OAAO,wBAAwB,CAAC;AAE7C,8CAA8C;AAC9C,MAAM,WAAW,OAAO;IACtB,mCAAmC;IACnC,GAAG,EAAE,SAAS,CAAC;IACf,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,+DAA+D;AAC/D,MAAM,WAAW,UAAW,SAAQ,aAAa;IAC/C,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,+EAA+E;IAC/E,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAoBvC;AAED,6DAA6D;AAC7D,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAQ1E;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIrG;AAsBD,sFAAsF;AACtF,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBpF;AAED,yDAAyD;AACzD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAElE;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEnE;AAED,8EAA8E;AAC9E,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAK3E;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,GAAG,aAAa,CAyBrE;AAQD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAsDrE;AAQD,6EAA6E;AAC7E,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D"}

package/dist/workspace/tree.js

@@ -0,0 +1,229 @@
+/**
+ * Git operations on a working tree whose content root is the draft workspace.
+ * The owner policy does the push. Every operation is limited to paths under the
+ * content root, never `git add -A` over the repository, so other work in the
+ * same checkout is never swept into a commit.
+ */
+import { existsSync } from "node:fs";
+import { realpath, rm } from "node:fs/promises";
+import { join, relative, sep } from "node:path";
+import { within } from "@micacms/core/node";
+import { GitError, gitRunner } from "./git.js";
+/**
+ * Makes every path argument literal: `tour[1].json` is not a pattern that also
+ * matches `tour1.json`.
+ */
+export const LITERAL = "--literal-pathspecs";
+/**
+ * Finds the repository the content root sits in, freshly each time: a
+ * `git init` after startup should start working, not require a restart.
+ */
+export async function locateTree(contentRoot, options = {}) {
+    const probe = gitRunner(contentRoot, options);
+    try {
+        const repoRoot = await probe.run(["rev-parse", "--show-toplevel"]);
+        // Git resolves symlinks in the toplevel (`/private/var` for `/var` on
+        // macOS); do the same, or the prefix is wrong.
+        const resolved = await realpath(contentRoot);
+        return {
+            git: gitRunner(repoRoot, options),
+            prefix: toPosix(relative(repoRoot, resolved)),
+            contentRoot,
+        };
+    }
+    catch (error) {
+        return {
+            reason: error instanceof GitError && error.exitCode === null
+                ? error.message
+                : "The content directory is not inside a Git repository.",
+        };
+    }
+}
+/** The content root's changes, as `git status` sees them. */
+export async function listTreeChanges(tree) {
+    // `-uall`: Git otherwise collapses a new, untracked entry directory to one line.
+    // `GIT_OPTIONAL_LOCKS=0`: no `index.lock`, so a parallel commit cannot fail on it.
+    const raw = await tree.git.run([LITERAL, "status", "--porcelain=v1", "-z", "-uall", "--", tree.prefix === "" ? "." : tree.prefix], { env: { GIT_OPTIONAL_LOCKS: "0" } });
+    return parseStatus(raw, tree.prefix);
+}
+/**
+ * Stages and commits only `paths` (content-root relative) and returns the new
+ * HEAD. The pathspec limits both steps, so all other staged or unstaged work
+ * stays. Without `author`, Git's configured identity applies.
+ */
+export async function commitPaths(tree, paths, message, author) {
+    const inRepository = await stagePaths(tree, paths);
+    const as = author ? [`--author=${author.name} <${author.email}>`] : [];
+    await tree.git.run([LITERAL, "commit", "-m", message, ...as, "--", ...inRepository]);
+    return tree.git.run(["rev-parse", "HEAD"]);
+}
+/**
+ * Commits `paths` again with the message, author and date of `original`, after
+ * a rejected push. Returns the new HEAD.
+ */
+export async function recommitPaths(tree, paths, original) {
+    const inRepository = await stagePaths(tree, paths);
+    await tree.git.run([LITERAL, "commit", "-C", original, "--", ...inRepository]);
+    return tree.git.run(["rev-parse", "HEAD"]);
+}
+/**
+ * Stages `paths`, because `git commit -- <paths>` refuses a file Git has never
+ * seen. A path gone from the disk uses `rm --cached`, because `git add` refuses
+ * a deletion that is already staged (as `reset --soft` leaves it).
+ */
+async function stagePaths(tree, paths) {
+    const present = [];
+    const gone = [];
+    for (const path of paths) {
+        (existsSync(within(tree.contentRoot, path)) ? present : gone).push(inRepo(tree.prefix, path));
+    }
+    for (const batch of chunked(present, 500)) {
+        await tree.git.run([LITERAL, "add", "-A", "--", ...batch]);
+    }
+    for (const batch of chunked(gone, 500)) {
+        await tree.git.run([LITERAL, "rm", "--cached", "--ignore-unmatch", "--quiet", "--", ...batch]);
+    }
+    return paths.map((path) => inRepo(tree.prefix, path));
+}
+/** Puts one changed file back to its HEAD version, or removes it if HEAD has none. */
+export async function discardChange(tree, change) {
+    if (change.kind === "create") {
+        // Unstage a staged creation first, so the index does not point at a deleted file.
+        if (!change.untracked) {
+            await tree.git.tryRun([LITERAL, "rm", "--cached", "--force", "--", inRepo(tree.prefix, change.path)]);
+        }
+        await rm(within(tree.contentRoot, change.path), { force: true });
+        return;
+    }
+    await tree.git.run([
+        LITERAL,
+        "restore",
+        "--source=HEAD",
+        "--staged",
+        "--worktree",
+        "--",
+        inRepo(tree.prefix, change.path),
+    ]);
+}
+/** HEAD's commit id, or null before the first commit. */
+export function headRevision(tree) {
+    return tree.git.tryRun(["rev-parse", "HEAD"]);
+}
+/** The checked-out branch, or null when there is none to name. */
+export function currentBranch(tree) {
+    return tree.git.tryRun(["rev-parse", "--abbrev-ref", "HEAD"]);
+}
+/** Commits waiting to be pushed, or null when there is no upstream to say. */
+export async function aheadOfUpstream(tree) {
+    const counted = await tree.git.tryRun(["rev-list", "--count", "@{upstream}..HEAD"]);
+    if (counted === null)
+        return null;
+    const ahead = Number(counted);
+    return Number.isFinite(ahead) ? ahead : null;
+}
+/**
+ * The content root as `ref` has it, read from Git's object store, because the
+ * working tree holds the drafts.
+ */
+export function headSource(tree, ref = "HEAD") {
+    const at = (path) => `${ref}:${path === "" ? tree.prefix : inRepo(tree.prefix, path)}`;
+    return {
+        origin: ref,
+        async read(path) {
+            // "Not in HEAD" and "no commits yet" both mean that there is no published version.
+            return tree.git.tryRun(["show", at(path)]);
+        },
+        async list(path) {
+            const raw = await tree.git.tryRun(["ls-tree", "-z", at(path)]);
+            if (raw === null)
+                return [];
+            const entries = [];
+            for (const field of raw.split("\0")) {
+                const tab = field.indexOf("\t");
+                if (tab === -1)
+                    continue;
+                const type = field.slice(0, tab).split(" ")[1];
+                entries.push({ name: field.slice(tab + 1), type: type === "tree" ? "directory" : "file" });
+            }
+            return entries;
+        },
+    };
+}
+/**
+ * A save's temporary file (`*.mica-<pid>-<n>`), seen during a save or after a
+ * crash. Never content.
+ */
+const TEMPORARY_FILE = /\.mica-\d+-\d+$/;
+/**
+ * Parses `git status --porcelain=v1 -z` into content-root-relative changes.
+ * `-z` never changes a path; a rename is two fields and becomes a create and a
+ * delete. `.mica/` is excluded: the developer commits the manifest, and the
+ * drift check guards model changes.
+ */
+export function parseStatus(raw, prefix) {
+    const fields = raw.split("\0").filter((field) => field !== "");
+    const changes = [];
+    const push = (repoPath, kind, flags = {}) => {
+        const path = relativeToContent(repoPath, prefix);
+        if (path === null || path === ".mica" || path.startsWith(".mica/"))
+            return;
+        if (TEMPORARY_FILE.test(path))
+            return;
+        changes.push({
+            path,
+            kind,
+            untracked: flags.untracked ?? false,
+            conflicted: flags.conflicted ?? false,
+        });
+    };
+    for (let at = 0; at < fields.length; at += 1) {
+        const field = fields[at];
+        const x = field[0] ?? " ";
+        const y = field[1] ?? " ";
+        const repoPath = field.slice(3);
+        if (x === "?" && y === "?") {
+            push(repoPath, "create", { untracked: true });
+            continue;
+        }
+        // A merge conflict state, whatever the tree holds.
+        if (x === "U" || y === "U" || (x === "A" && y === "A") || (x === "D" && y === "D")) {
+            push(repoPath, "update", { conflicted: true });
+            continue;
+        }
+        if (x === "R" || x === "C") {
+            // The next field is the source path; only a rename deletes it.
+            const from = fields[++at];
+            push(repoPath, "create");
+            if (x === "R")
+                push(from, "delete");
+            continue;
+        }
+        if (x === "D" || y === "D") {
+            push(repoPath, "delete");
+            continue;
+        }
+        push(repoPath, x === "A" ? "create" : "update");
+    }
+    return changes;
+}
+function relativeToContent(repoPath, prefix) {
+    if (prefix === "")
+        return repoPath;
+    if (repoPath === prefix)
+        return null;
+    return repoPath.startsWith(`${prefix}/`) ? repoPath.slice(prefix.length + 1) : null;
+}
+/** A content-root-relative path as Git sees it, from the repository root. */
+export function inRepo(prefix, path) {
+    return prefix === "" ? path : join(prefix, path).split(sep).join("/");
+}
+function toPosix(path) {
+    return sep === "/" ? path : path.split(sep).join("/");
+}
+function chunked(items, size) {
+    const batches = [];
+    for (let at = 0; at < items.length; at += size)
+        batches.push(items.slice(at, at + size));
+    return batches;
+}
+//# sourceMappingURL=tree.js.map

package/dist/workspace/tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/workspace/tree.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Git operations on a working tree whose content root is the draft workspace.\n * The owner policy does the push. Every operation is limited to paths under the\n * content root, never `git add -A` over the repository, so other work in the\n * same checkout is never swept into a commit.\n */\n\nimport { existsSync } from \"node:fs\";\nimport { realpath, rm } from \"node:fs/promises\";\nimport { join, relative, sep } from \"node:path\";\n\nimport type { ContentChange, ContentSource, DirectoryEntry } from \"@micacms/core\";\nimport { within } from \"@micacms/core/node\";\n\nimport type { Author } from \"./files.js\";\nimport { GitError, gitRunner, type GitRunner, type GitRunnerOptions } from \"./git.js\";\n\n/**\n * Makes every path argument literal: `tour[1].json` is not a pattern that also\n * matches `tour1.json`.\n */\nexport const LITERAL = \"--literal-pathspecs\";\n\n/** A content root inside a Git repository. */\nexport interface GitTree {\n  /** Runs in the repository root. */\n  git: GitRunner;\n  /** Content root relative to the repository root; \"\" when they coincide. */\n  prefix: string;\n  /** Absolute path of the content root. */\n  contentRoot: string;\n}\n\n/** A changed file plus what only Git status knows about it. */\nexport interface TreeChange extends ContentChange {\n  /** Not yet known to Git — discarding means deleting, not restoring. */\n  untracked: boolean;\n  /** Mid-merge conflict markers. Unpublishable until resolved with Git tools. */\n  conflicted: boolean;\n}\n\n/**\n * Finds the repository the content root sits in, freshly each time: a\n * `git init` after startup should start working, not require a restart.\n */\nexport async function locateTree(\n  contentRoot: string,\n  options: GitRunnerOptions = {},\n): Promise<GitTree | { reason: string }> {\n  const probe = gitRunner(contentRoot, options);\n  try {\n    const repoRoot = await probe.run([\"rev-parse\", \"--show-toplevel\"]);\n    // Git resolves symlinks in the toplevel (`/private/var` for `/var` on\n    // macOS); do the same, or the prefix is wrong.\n    const resolved = await realpath(contentRoot);\n    return {\n      git: gitRunner(repoRoot, options),\n      prefix: toPosix(relative(repoRoot, resolved)),\n      contentRoot,\n    };\n  } catch (error) {\n    return {\n      reason:\n        error instanceof GitError && error.exitCode === null\n          ? error.message\n          : \"The content directory is not inside a Git repository.\",\n    };\n  }\n}\n\n/** The content root's changes, as `git status` sees them. */\nexport async function listTreeChanges(tree: GitTree): Promise<TreeChange[]> {\n  // `-uall`: Git otherwise collapses a new, untracked entry directory to one line.\n  // `GIT_OPTIONAL_LOCKS=0`: no `index.lock`, so a parallel commit cannot fail on it.\n  const raw = await tree.git.run(\n    [LITERAL, \"status\", \"--porcelain=v1\", \"-z\", \"-uall\", \"--\", tree.prefix === \"\" ? \".\" : tree.prefix],\n    { env: { GIT_OPTIONAL_LOCKS: \"0\" } },\n  );\n  return parseStatus(raw, tree.prefix);\n}\n\n/**\n * Stages and commits only `paths` (content-root relative) and returns the new\n * HEAD. The pathspec limits both steps, so all other staged or unstaged work\n * stays. Without `author`, Git's configured identity applies.\n */\nexport async function commitPaths(\n  tree: GitTree,\n  paths: string[],\n  message: string,\n  author?: Author,\n): Promise<string> {\n  const inRepository = await stagePaths(tree, paths);\n  const as = author ? [`--author=${author.name} <${author.email}>`] : [];\n  await tree.git.run([LITERAL, \"commit\", \"-m\", message, ...as, \"--\", ...inRepository]);\n  return tree.git.run([\"rev-parse\", \"HEAD\"]);\n}\n\n/**\n * Commits `paths` again with the message, author and date of `original`, after\n * a rejected push. Returns the new HEAD.\n */\nexport async function recommitPaths(tree: GitTree, paths: string[], original: string): Promise<string> {\n  const inRepository = await stagePaths(tree, paths);\n  await tree.git.run([LITERAL, \"commit\", \"-C\", original, \"--\", ...inRepository]);\n  return tree.git.run([\"rev-parse\", \"HEAD\"]);\n}\n\n/**\n * Stages `paths`, because `git commit -- <paths>` refuses a file Git has never\n * seen. A path gone from the disk uses `rm --cached`, because `git add` refuses\n * a deletion that is already staged (as `reset --soft` leaves it).\n */\nasync function stagePaths(tree: GitTree, paths: string[]): Promise<string[]> {\n  const present: string[] = [];\n  const gone: string[] = [];\n  for (const path of paths) {\n    (existsSync(within(tree.contentRoot, path)) ? present : gone).push(inRepo(tree.prefix, path));\n  }\n  for (const batch of chunked(present, 500)) {\n    await tree.git.run([LITERAL, \"add\", \"-A\", \"--\", ...batch]);\n  }\n  for (const batch of chunked(gone, 500)) {\n    await tree.git.run([LITERAL, \"rm\", \"--cached\", \"--ignore-unmatch\", \"--quiet\", \"--\", ...batch]);\n  }\n  return paths.map((path) => inRepo(tree.prefix, path));\n}\n\n/** Puts one changed file back to its HEAD version, or removes it if HEAD has none. */\nexport async function discardChange(tree: GitTree, change: TreeChange): Promise<void> {\n  if (change.kind === \"create\") {\n    // Unstage a staged creation first, so the index does not point at a deleted file.\n    if (!change.untracked) {\n      await tree.git.tryRun([LITERAL, \"rm\", \"--cached\", \"--force\", \"--\", inRepo(tree.prefix, change.path)]);\n    }\n    await rm(within(tree.contentRoot, change.path), { force: true });\n    return;\n  }\n  await tree.git.run([\n    LITERAL,\n    \"restore\",\n    \"--source=HEAD\",\n    \"--staged\",\n    \"--worktree\",\n    \"--\",\n    inRepo(tree.prefix, change.path),\n  ]);\n}\n\n/** HEAD's commit id, or null before the first commit. */\nexport function headRevision(tree: GitTree): Promise<string | null> {\n  return tree.git.tryRun([\"rev-parse\", \"HEAD\"]);\n}\n\n/** The checked-out branch, or null when there is none to name. */\nexport function currentBranch(tree: GitTree): Promise<string | null> {\n  return tree.git.tryRun([\"rev-parse\", \"--abbrev-ref\", \"HEAD\"]);\n}\n\n/** Commits waiting to be pushed, or null when there is no upstream to say. */\nexport async function aheadOfUpstream(tree: GitTree): Promise<number | null> {\n  const counted = await tree.git.tryRun([\"rev-list\", \"--count\", \"@{upstream}..HEAD\"]);\n  if (counted === null) return null;\n  const ahead = Number(counted);\n  return Number.isFinite(ahead) ? ahead : null;\n}\n\n/**\n * The content root as `ref` has it, read from Git's object store, because the\n * working tree holds the drafts.\n */\nexport function headSource(tree: GitTree, ref = \"HEAD\"): ContentSource {\n  const at = (path: string) => `${ref}:${path === \"\" ? tree.prefix : inRepo(tree.prefix, path)}`;\n\n  return {\n    origin: ref,\n\n    async read(path) {\n      // \"Not in HEAD\" and \"no commits yet\" both mean that there is no published version.\n      return tree.git.tryRun([\"show\", at(path)]);\n    },\n\n    async list(path) {\n      const raw = await tree.git.tryRun([\"ls-tree\", \"-z\", at(path)]);\n      if (raw === null) return [];\n\n      const entries: DirectoryEntry[] = [];\n      for (const field of raw.split(\"\\0\")) {\n        const tab = field.indexOf(\"\\t\");\n        if (tab === -1) continue;\n        const type = field.slice(0, tab).split(\" \")[1];\n        entries.push({ name: field.slice(tab + 1), type: type === \"tree\" ? \"directory\" : \"file\" });\n      }\n      return entries;\n    },\n  };\n}\n\n/**\n * A save's temporary file (`*.mica-<pid>-<n>`), seen during a save or after a\n * crash. Never content.\n */\nconst TEMPORARY_FILE = /\\.mica-\\d+-\\d+$/;\n\n/**\n * Parses `git status --porcelain=v1 -z` into content-root-relative changes.\n * `-z` never changes a path; a rename is two fields and becomes a create and a\n * delete. `.mica/` is excluded: the developer commits the manifest, and the\n * drift check guards model changes.\n */\nexport function parseStatus(raw: string, prefix: string): TreeChange[] {\n  const fields = raw.split(\"\\0\").filter((field) => field !== \"\");\n  const changes: TreeChange[] = [];\n\n  const push = (\n    repoPath: string,\n    kind: TreeChange[\"kind\"],\n    flags: { untracked?: boolean; conflicted?: boolean } = {},\n  ) => {\n    const path = relativeToContent(repoPath, prefix);\n    if (path === null || path === \".mica\" || path.startsWith(\".mica/\")) return;\n    if (TEMPORARY_FILE.test(path)) return;\n    changes.push({\n      path,\n      kind,\n      untracked: flags.untracked ?? false,\n      conflicted: flags.conflicted ?? false,\n    });\n  };\n\n  for (let at = 0; at < fields.length; at += 1) {\n    const field = fields[at]!;\n    const x = field[0] ?? \" \";\n    const y = field[1] ?? \" \";\n    const repoPath = field.slice(3);\n\n    if (x === \"?\" && y === \"?\") {\n      push(repoPath, \"create\", { untracked: true });\n      continue;\n    }\n\n    // A merge conflict state, whatever the tree holds.\n    if (x === \"U\" || y === \"U\" || (x === \"A\" && y === \"A\") || (x === \"D\" && y === \"D\")) {\n      push(repoPath, \"update\", { conflicted: true });\n      continue;\n    }\n\n    if (x === \"R\" || x === \"C\") {\n      // The next field is the source path; only a rename deletes it.\n      const from = fields[++at]!;\n      push(repoPath, \"create\");\n      if (x === \"R\") push(from, \"delete\");\n      continue;\n    }\n\n    if (x === \"D\" || y === \"D\") {\n      push(repoPath, \"delete\");\n      continue;\n    }\n\n    push(repoPath, x === \"A\" ? \"create\" : \"update\");\n  }\n\n  return changes;\n}\n\nfunction relativeToContent(repoPath: string, prefix: string): string | null {\n  if (prefix === \"\") return repoPath;\n  if (repoPath === prefix) return null;\n  return repoPath.startsWith(`${prefix}/`) ? repoPath.slice(prefix.length + 1) : null;\n}\n\n/** A content-root-relative path as Git sees it, from the repository root. */\nexport function inRepo(prefix: string, path: string): string {\n  return prefix === \"\" ? path : join(prefix, path).split(sep).join(\"/\");\n}\n\nfunction toPosix(path: string): string {\n  return sep === \"/\" ? path : path.split(sep).join(\"/\");\n}\n\nfunction chunked<T>(items: T[], size: number): T[][] {\n  const batches: T[][] = [];\n  for (let at = 0; at < items.length; at += size) batches.push(items.slice(at, at + size));\n  return batches;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micacms/runtime",
-  "version": "0.4.1",
+  "version": "0.5.0-rc.2",
   "type": "module",
   "description": "The Mica single-site runtime: the Hono API, application services and staging orchestration, authentication-neutral. Composed by @micacms/editor locally and @micacms/self-hosted behind OIDC.",
   "license": "MIT",
@@ -29,8 +29,7 @@
     "hono": "^4.13.7",
     "image-size": "^2.0.3",
     "zod": "^4.3.6",
-    "@micacms/connectors": "0.4.1",
-    "@micacms/core": "0.4.1"
+    "@micacms/core": "0.5.0-rc.2"
   },
   "devDependencies": {
     "@types/node": "^22.20.1",

package/dist/db/driver.d.ts

@@ -1,35 +0,0 @@
-/**
- * SQLite driver.
- *
- * Everything above this file talks to `SqlDatabase`, never to `node:sqlite`
- * directly, so the driver can be swapped (better-sqlite3, libsql, a Postgres
- * adapter) without touching the repositories.
- *
- * `node:sqlite` is the default because it ships with Node — no native build
- * step, no prebuilt-binary mismatch inside the container.
- */
-export type SqlValue = string | number | bigint | null | Uint8Array;
-export type SqlParams = readonly SqlValue[];
-export interface RunResult {
-    changes: number;
-    lastInsertRowid: number | bigint;
-}
-export interface SqlDatabase {
-    all<T = Record<string, unknown>>(sql: string, params?: SqlParams): T[];
-    get<T = Record<string, unknown>>(sql: string, params?: SqlParams): T | undefined;
-    run(sql: string, params?: SqlParams): RunResult;
-    exec(sql: string): void;
-    /** Runs `fn` in a transaction, rolling back if it throws. Safe to nest. */
-    transaction<T>(fn: () => T): T;
-    /** Consistent on-line snapshot to `destination`, safe while writes continue. */
-    snapshot(destination: string): void;
-    close(): void;
-}
-export interface SqliteOptions {
-    /** Milliseconds a blocked writer waits before returning SQLITE_BUSY. */
-    busyTimeoutMs?: number;
-    /** WAL is the right default for a server; `false` is useful for :memory:. */
-    wal?: boolean;
-}
-export declare function openSqlite(filename: string, options?: SqliteOptions): SqlDatabase;
-//# sourceMappingURL=driver.d.ts.map

package/dist/db/driver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/db/driver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,CAAC;AACpE,MAAM,MAAM,SAAS,GAAG,SAAS,QAAQ,EAAE,CAAC;AAE5C,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC;IACvE,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,CAAC,GAAG,SAAS,CAAC;IACjF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAChD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2EAA2E;IAC3E,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/B,gFAAgF;IAChF,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,aAAa;IAC5B,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,WAAW,CA2FrF"}