@micacms/runtime 0.4.1 → 0.5.0-rc.2

package/dist/services/media.js

@@ -1,17 +1,7 @@
 /**
- * Media uploads.
- *
- * Every uploaded byte passes through here, so this is where the file is judged:
- * size, and the real content type read from the bytes rather than from the
- * browser's claim.
- *
- * An upload is a *file in the content repository*. There is no media table, no
- * generated key and no object store — a media value is the path to a file a
- * reviewer can see in the diff.
- *
- * The filename therefore matters. It is derived from what the editor uploaded,
- * slugified so it is safe as a path segment, and made unique inside its own
- * directory rather than globally.
+ * Media uploads. Every upload is checked here for size and for its real content
+ * type, read from the bytes. An upload is a file in the content repository; its
+ * name is slugified and unique in its own directory.
  */
 import path from "node:path";
 import { contentPath, ContentPathError, MEDIA_DIR, slugify } from "@micacms/core";
@@ -21,17 +11,10 @@ import { detectFileType, isAccepted, isImageType, SVG_TYPE } from "../lib/file-t
 /** Where uploads go when they are not attached to a particular entry. */
 export const SHARED_MEDIA_DIR = "media";
 export function createMediaService(deps) {
-    const { connector, maxBytes } = deps;
-    /**
-     * A name that is unique in `directory`.
-     *
-     * Scoped to the directory rather than to the whole repository, because that
-     * is where a collision would actually overwrite something — and because
-     * `haus-a/media/exterior.jpg` and `haus-b/media/exterior.jpg` are two
-     * perfectly reasonable files with the same name.
-     */
+    const { files, maxBytes } = deps;
+    /** A name that is unique in `directory`. Only there can a collision overwrite a file. */
     const uniqueName = async (directory, filename) => {
-        const taken = new Set((await connector.list(directory)).filter((item) => item.type === "file").map((item) => item.name));
+        const taken = new Set((await files.list(directory)).filter((item) => item.type === "file").map((item) => item.name));
         const extension = path.extname(filename);
         const stem = filename.slice(0, filename.length - extension.length);
         let candidate = filename;
@@ -40,14 +23,7 @@ export function createMediaService(deps) {
         return candidate;
     };
     return {
-        /**
-         * Reads and checks an upload, without writing it.
-         *
-         * Separate from the commit so that an entry and the media it references go
-         * into the repository in *one* change set. Uploading first and saving
-         * second would leave an orphaned file behind whenever the editor changed
-         * their mind.
-         */
+        /** Reads and checks an upload, without writing it. */
         async prepare(input) {
             const { file } = input;
             const directory = uploadDirectory(input.directory ?? SHARED_MEDIA_DIR);
@@ -57,7 +33,7 @@ export function createMediaService(deps) {
                 throw new ApiError("payload_too_large", `The file is ${formatBytes(file.size)}. The limit is ${formatBytes(maxBytes)}.`);
             }
             const contents = new Uint8Array(await file.arrayBuffer());
-            // From the bytes, never from the browser's claim about them.
+            // From the bytes, never from the browser's claim.
             const detected = detectFileType(contents);
             if (!detected) {
                 throw new ApiError("unsupported_media_type", "This file type is not supported.");
@@ -80,16 +56,13 @@ export function createMediaService(deps) {
             };
         },
         /**
-         * Every media file in the repository, for the editor's picker.
-         *
-         * A walk of the content tree rather than a table scan. Content trees are
-         * small, and the alternative — an index Mica maintains — would be a second
-         * source of truth that could disagree with the repository.
+         * Every media file in the repository. A tree walk is sufficient because
+         * content trees are small.
          */
         async list() {
             const found = [];
             const walk = async (directory) => {
-                for (const item of await connector.list(directory)) {
+                for (const item of await files.list(directory)) {
                     const child = directory === "" ? item.name : `${directory}/${item.name}`;
                     if (item.type === "directory") {
                         await walk(child);
@@ -97,7 +70,7 @@ export function createMediaService(deps) {
                     }
                     if (!isMediaName(item.name))
                         continue;
-                    const bytes = await connector.readBinary(child);
+                    const bytes = await files.readBinary(child);
                     if (!bytes)
                         continue;
                     const mimeType = typeOf(bytes, item.name);
@@ -116,7 +89,7 @@ export function createMediaService(deps) {
             return found.sort((a, b) => a.path.localeCompare(b.path));
         },
         async read(mediaPath) {
-            const bytes = await connector.readBinary(contentPath(mediaPath));
+            const bytes = await files.readBinary(contentPath(mediaPath));
             if (!bytes)
                 return null;
             const mimeType = typeOf(bytes, mediaPath);
@@ -142,24 +115,12 @@ function uploadDirectory(directory) {
     }
     return clean;
 }
-/* ------------------------------------------------------------------ */
-/**
- * A filename that is safe as a path segment and still recognisable.
- *
- * Slugified rather than sanitised: the result is part of a URL in the built
- * site and part of a path in a Git repository, and both are better off without
- * spaces, accents or case.
- */
+/** A slugified filename: safe as a path segment and as part of a URL. */
 function safeName(original, extension) {
     const stem = slugify(path.basename(original).replace(/\.[^.]*$/, "")).slice(0, 80);
     return `${stem || "upload"}.${extension}`;
 }
-/**
- * Extension to media type, for the formats byte-sniffing does not identify.
- *
- * A fallback, never the first answer: a file's own bytes are the only thing
- * that cannot be renamed to lie.
- */
+/** Extension to media type, only for formats that byte-sniffing does not identify. */
 const BY_EXTENSION = {
     svg: "image/svg+xml",
     pdf: "application/pdf",
@@ -171,9 +132,8 @@ const BY_EXTENSION = {
     xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
 };
 /**
- * The bytes are authoritative; the extension is the fallback for formats the
- * sniffer does not cover. An SVG name counts even when its bytes do not look
- * like one, so that a leading comment cannot slip one past the refusal.
+ * The bytes win over the extension, except that an SVG name always counts, so a
+ * leading comment cannot hide an SVG.
  */
 function typeOf(bytes, name) {
     const byName = mimeFromName(name);

package/dist/services/media.js.map

@@ -1 +1 @@
-{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/services/media.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/services/media.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Media uploads. Every upload is checked here for size and for its real content\n * type, read from the bytes. An upload is a file in the content repository; its\n * name is slugified and unique in its own directory.\n */\n\nimport path from \"node:path\";\n\nimport { contentPath, ContentPathError, MEDIA_DIR, slugify } from \"@micacms/core\";\nimport type { ContentFiles } from \"../workspace/files.js\";\nimport { imageSize } from \"image-size\";\n\nimport { ApiError, badRequest } from \"../lib/errors.js\";\nimport { detectFileType, isAccepted, isImageType, SVG_TYPE } from \"../lib/file-type.js\";\n\n/** Where uploads go when they are not attached to a particular entry. */\nexport const SHARED_MEDIA_DIR = \"media\";\n\nexport interface MediaServiceDeps {\n  files: ContentFiles;\n  maxBytes: number;\n}\n\nexport interface MediaFile {\n  /** Path relative to the content root: the value a `media()` field holds. */\n  path: string;\n  filename: string;\n  mimeType: string;\n  size: number;\n  width: number | null;\n  height: number | null;\n}\n\nexport function createMediaService(deps: MediaServiceDeps) {\n  const { files, maxBytes } = deps;\n\n  /** A name that is unique in `directory`. Only there can a collision overwrite a file. */\n  const uniqueName = async (directory: string, filename: string): Promise<string> => {\n    const taken = new Set(\n      (await files.list(directory)).filter((item) => item.type === \"file\").map((item) => item.name),\n    );\n\n    const extension = path.extname(filename);\n    const stem = filename.slice(0, filename.length - extension.length);\n\n    let candidate = filename;\n    for (let n = 2; taken.has(candidate); n += 1) candidate = `${stem}-${n}${extension}`;\n    return candidate;\n  };\n\n  return {\n    /** Reads and checks an upload, without writing it. */\n    async prepare(input: {\n      file: File;\n      /** Directory to place the file in, relative to the content root. */\n      directory?: string;\n      accept?: \"image\" | \"document\" | \"any\";\n    }): Promise<{ file: MediaFile; contents: Uint8Array }> {\n      const { file } = input;\n      const directory = uploadDirectory(input.directory ?? SHARED_MEDIA_DIR);\n\n      if (file.size === 0) throw badRequest(\"The file is empty.\");\n      if (file.size > maxBytes) {\n        throw new ApiError(\n          \"payload_too_large\",\n          `The file is ${formatBytes(file.size)}. The limit is ${formatBytes(maxBytes)}.`,\n        );\n      }\n\n      const contents = new Uint8Array(await file.arrayBuffer());\n      // From the bytes, never from the browser's claim.\n      const detected = detectFileType(contents);\n\n      if (!detected) {\n        throw new ApiError(\"unsupported_media_type\", \"This file type is not supported.\");\n      }\n      if (detected.mimeType === SVG_TYPE) throw refuseSvg();\n      if (!isAccepted(detected.mimeType, input.accept ?? \"any\")) {\n        throw new ApiError(\n          \"unsupported_media_type\",\n          `A ${input.accept} was expected, but this is a ${detected.mimeType}.`,\n        );\n      }\n\n      const filename = await uniqueName(directory, safeName(file.name, detected.extension));\n\n      return {\n        contents,\n        file: {\n          path: `${directory}/${filename}`,\n          filename,\n          mimeType: detected.mimeType,\n          size: contents.byteLength,\n          ...dimensions(contents, detected.mimeType),\n        },\n      };\n    },\n\n    /**\n     * Every media file in the repository. A tree walk is sufficient because\n     * content trees are small.\n     */\n    async list(): Promise<MediaFile[]> {\n      const found: MediaFile[] = [];\n\n      const walk = async (directory: string): Promise<void> => {\n        for (const item of await files.list(directory)) {\n          const child = directory === \"\" ? item.name : `${directory}/${item.name}`;\n\n          if (item.type === \"directory\") {\n            await walk(child);\n            continue;\n          }\n\n          if (!isMediaName(item.name)) continue;\n\n          const bytes = await files.readBinary(child);\n          if (!bytes) continue;\n\n          const mimeType = typeOf(bytes, item.name);\n          if (mimeType === SVG_TYPE) continue;\n\n          found.push({\n            path: child,\n            filename: item.name,\n            mimeType,\n            size: bytes.byteLength,\n            ...dimensions(bytes, mimeType),\n          });\n        }\n      };\n\n      await walk(\"\");\n      return found.sort((a, b) => a.path.localeCompare(b.path));\n    },\n\n    async read(mediaPath: string): Promise<{ bytes: Uint8Array; mimeType: string } | null> {\n      const bytes = await files.readBinary(contentPath(mediaPath));\n      if (!bytes) return null;\n\n      const mimeType = typeOf(bytes, mediaPath);\n      if (mimeType === SVG_TYPE) throw refuseSvg();\n      return { bytes, mimeType };\n    },\n  };\n}\n\nexport type MediaService = ReturnType<typeof createMediaService>;\n\n/** An upload goes into a `media/` folder inside the content root, and nowhere else. */\nfunction uploadDirectory(directory: string): string {\n  let clean: string;\n  try {\n    clean = contentPath(directory);\n  } catch (error) {\n    if (error instanceof ContentPathError) throw badRequest(error.message);\n    throw error;\n  }\n  if (clean.split(\"/\").at(-1) !== MEDIA_DIR) {\n    throw badRequest(`Uploads go into a \"${MEDIA_DIR}\" folder, not \"${directory}\".`);\n  }\n  return clean;\n}\n\n/** A slugified filename: safe as a path segment and as part of a URL. */\nfunction safeName(original: string, extension: string): string {\n  const stem = slugify(path.basename(original).replace(/\\.[^.]*$/, \"\")).slice(0, 80);\n  return `${stem || \"upload\"}.${extension}`;\n}\n\n/** Extension to media type, only for formats that byte-sniffing does not identify. */\nconst BY_EXTENSION: Record<string, string> = {\n  svg: \"image/svg+xml\",\n  pdf: \"application/pdf\",\n  txt: \"text/plain\",\n  csv: \"text/csv\",\n  doc: \"application/msword\",\n  docx: \"application/vnd.openxmlformats-officedocument.wordprocessingml.document\",\n  xls: \"application/vnd.ms-excel\",\n  xlsx: \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\n};\n\n/**\n * The bytes win over the extension, except that an SVG name always counts, so a\n * leading comment cannot hide an SVG.\n */\nfunction typeOf(bytes: Uint8Array, name: string): string {\n  const byName = mimeFromName(name);\n  if (byName === SVG_TYPE) return SVG_TYPE;\n  return detectFileType(bytes)?.mimeType ?? byName;\n}\n\nconst refuseSvg = () =>\n  new ApiError(\n    \"unsupported_media_type\",\n    \"Mica does not accept SVG files, because they can contain scripts. Use PNG or WebP instead.\",\n  );\n\nfunction mimeFromName(name: string): string {\n  const extension = path.extname(name).slice(1).toLowerCase();\n  return BY_EXTENSION[extension] ?? \"application/octet-stream\";\n}\n\n/** Files a `media()` field could plausibly point at. */\nfunction isMediaName(name: string): boolean {\n  return /\\.(jpe?g|png|webp|avif|gif|tiff?|pdf|docx?|xlsx?|txt|csv)$/i.test(name);\n}\n\nfunction dimensions(\n  bytes: Uint8Array,\n  mimeType: string,\n): { width: number | null; height: number | null } {\n  if (bytes.byteLength === 0 || !isImageType(mimeType)) {\n    return { width: null, height: null };\n  }\n  try {\n    const size = imageSize(Buffer.from(bytes));\n    return { width: size.width ?? null, height: size.height ?? null };\n  } catch {\n    // A format image-size cannot read is still a valid upload.\n    return { width: null, height: null };\n  }\n}\n\nexport function formatBytes(bytes: number): string {\n  if (bytes < 1024) return `${bytes} B`;\n  if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} kB`;\n  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;\n}\n"]}

package/dist/services/staging.d.ts

@@ -1,174 +1,42 @@
 /**
- * Content staging: the orchestration between "saved" and "published".
- *
- * Two implementations of one service, because the two deployment shapes have
- * genuinely different draft workspaces:
- *
- *   - working tree  (`staging-local.ts`): the checkout is the draft. Autosave
- *     writes files the Astro dev server can hot-reload, which is the whole
- *     value of local mode; Recent changes is `git status`, and Publish is a
- *     real commit and push through the developer's own Git.
- *   - draft store   (this file): the repository is remote and writing through
- *     its API would already be a commit, so saves accumulate in SQLite and
- *     Publish turns the whole set into one provider-side commit.
- *
- * The editor sees one API either way. What differs is only what Saved means —
- * and the two must stay visibly different words in the UI, because in neither
- * mode does Saved imply that a change is in Git.
+ * The staging service on a Git working tree. Autosave has already written the
+ * files; Publish commits the reviewed paths.
+ *
+ *   - Every Git operation is limited to an explicit path set, so other work in
+ *     the same checkout is never swept in.
+ *   - Only the reviewed files are published, as the editor saw them. Drafts of
+ *     other entries stay drafts.
+ *   - When the push fails, the commit stays as `committed-pending-push`; a
+ *     retry pushes and never commits again.
  */
-import type { Author, RepositoryConnector } from "@micacms/connectors";
-import { type ContentChange, type ContentSource, type DraftStore, type FieldIssue, type PublishResult, type Site } from "@micacms/core";
-/** Where the change happened, in words an editor recognises. */
-export type ChangeOwner = {
-    kind: "entry";
-    collection: string;
-    slug: string;
-    label: string;
-    /** The slug before a pending rename. Set on the files of both slugs. */
-    renamedFrom?: string;
-} | {
-    kind: "singleton";
-    name: string;
-    label: string;
-} | {
-    kind: "order";
-    collection: string;
-    label: string;
-} | {
-    kind: "media";
-    label: string;
-} | {
-    kind: "other";
-    label: string;
-};
-export interface AnnotatedChange extends ContentChange {
-    owner: ChangeOwner;
-}
-/** One thing that would make the staged result unpublishable. */
-export interface StagingProblem {
-    /** The file the problem is about, relative to the content root. */
-    path: string;
-    label: string;
-    issues: FieldIssue[];
-}
-export interface StagingValidation {
-    ok: boolean;
-    problems: StagingProblem[];
-}
-export interface StagingStatus {
-    /** How this deployment stages. The UI words differ with it. */
-    workspace: "working-tree" | "draft-store";
-    publish: {
-        enabled: boolean;
-        reason?: string;
-    };
+import { type Site } from "@micacms/core";
+import type { Logger } from "../lib/logger.js";
+import type { ContentFiles } from "../workspace/files.js";
+import { type WorkspaceLocks } from "../workspace/locks.js";
+import type { OwnerPolicy } from "../workspace/policy.js";
+import { type GitTree } from "../workspace/tree.js";
+import { type ContentStagingService } from "./changes.js";
+export interface WorkingTreeStagingDeps {
+    model: Site;
     /**
-     * What the pending changes are based on: HEAD for a working tree, the
-     * branch head for a draft store. Sent back with Publish as `expectedBase`.
+     * The working tree's files without the lock wrapper: this service holds the
+     * locks around whole operations.
      */
-    baseRevision: string | null;
-    /** The branch a publication lands on, where the workspace knows it. */
-    branch: string | null;
-    /** Commits created and not yet pushed. Working tree only. */
-    ahead: number | null;
-    changes: AnnotatedChange[];
-    validation: StagingValidation;
-    /** When the pending set last moved. Null when nothing is pending. */
-    updatedAt: string | null;
-}
-export interface PublishInput {
-    /** Subject line of the commit. Written by the editor, for `git log`. */
-    message: string;
-    /** The base the editor reviewed. A repository that moved past it refuses. */
-    expectedBase: string | null;
-    author?: Author;
-}
-export interface ContentStagingService {
-    status(): Promise<StagingStatus>;
-    publish(input: PublishInput): Promise<PublishResult>;
-    discard(paths: string[]): Promise<{
-        discarded: string[];
-    }>;
-    /** Retries the push after `committed-pending-push`. Working tree only. */
-    push(): Promise<PublishResult>;
-    /** The document a pending change touches, before and after that change. */
-    compare(target: CompareTarget): Promise<Comparison>;
-}
-/** One thing an editor recognises on the Publish page, named for comparison. */
-export type CompareTarget = 
-/** `from` names the published slug of a renamed entry. */
-{
-    kind: "entry";
-    collection: string;
-    slug: string;
-    from?: string;
-} | {
-    kind: "singleton";
-    name: string;
-} | {
-    kind: "order";
-    collection: string;
-};
-/**
- * A document on both sides of the pending change set.
- *
- * Raw field data, deliberately: the editor holds the model and can name,
- * order and render every field, so the friendly comparison is its job. What
- * only the server can do is read the same document from two places.
- */
-export interface Comparison {
-    /** As the repository has it — null when the change creates the document. */
-    before: Record<string, unknown> | null;
-    /** As staged for publication — null when the change deletes it. */
-    after: Record<string, unknown> | null;
-}
-/**
- * Reads one document from the repository (`published`) and from the pending
- * workspace (`staged`) — the whole of a before/after comparison, shared by
- * both staging implementations since a `ContentSource` is all it needs.
- *
- * An order target compares the collection's ordering rather than a document:
- * each side becomes `{ order: [{ slug, title }] }`, in position order.
- */
-export declare function compareSources(model: Site, published: ContentSource, staged: ContentSource, target: CompareTarget): Promise<Comparison>;
-/**
- * Annotates a change set with owners and validates the entries it touches.
- *
- * One pass on purpose: naming a change and validating it both need the same
- * read of the same entries, and content trees are small enough to read the
- * affected collections whole.
- *
- * Validation is scoped to *changed* documents. Content that was already in
- * the repository is not this publication's problem — refusing
- * to publish a fixed typo because somebody once hand-committed a broken entry
- * elsewhere would make the editor hostage to history it cannot touch.
- */
-export declare function analyseChanges(model: Site, source: ContentSource, changes: ContentChange[], 
-/** The repository's side. When given, renamed entries are detected. */
-published?: ContentSource): Promise<{
-    changes: AnnotatedChange[];
-    validation: StagingValidation;
-}>;
-/**
- * Which piece of content a file belongs to.
- *
- * The path layout is the model's own (`layout.ts`), so this is a reading of
- * it, not a second convention: `collection/slug/…` or `collection/slug.json`,
- * `singleton.json` or `singleton/…`, and the shared `media/` directory.
- */
-export declare function classifyPath(model: Site, path: string): ChangeOwner;
-export interface DraftStagingDeps {
-    model: Site;
-    drafts: DraftStore;
-    /** The real repository. The one thing here that writes to it. */
-    repository: RepositoryConnector;
-    /** The staged overlay the rest of the application reads through. */
-    overlay: RepositoryConnector;
-    /** Revision of `.mica/schema.json` when the model was loaded. */
+    files: ContentFiles;
+    contentRoot: string;
     schemaRevision: string | null;
+    /** `MICA_LOCAL_PUBLISH`, for the default developer policy. */
+    publishEnabled: boolean;
+    logger: Logger;
+    /** Defaults to the developer. */
+    policy?: OwnerPolicy;
+    /** Shared with the services that write content. */
+    locks?: WorkspaceLocks;
+    /**
+     * Set by a managed clone, whose Git runs in an isolated environment. Without
+     * it, the developer's Git finds the tree.
+     */
+    tree?: GitTree;
 }
-export declare function createDraftStagingService(deps: DraftStagingDeps): ContentStagingService;
-export declare function describeProblems(problems: StagingProblem[]): string;
-/** Field issues with the file path folded in, for the flat API envelope. */
-export declare function flattenProblems(problems: StagingProblem[]): FieldIssue[];
+export declare function createWorkingTreeStagingService(deps: WorkingTreeStagingDeps): ContentStagingService;
 //# sourceMappingURL=staging.d.ts.map

package/dist/services/staging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staging.d.ts","sourceRoot":"","sources":["../../src/services/staging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"staging.d.ts","sourceRoot":"","sources":["../../src/services/staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAmD,KAAK,IAAI,EAAE,MAAM,eAAe,CAAC;AAG3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EASL,KAAK,OAAO,EAEb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAQL,KAAK,qBAAqB,EAK3B,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,IAAI,CAAC;IACZ;;;OAGG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8DAA8D;IAC9D,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,mDAAmD;IACnD,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,sBAAsB,GAC3B,qBAAqB,CA8OvB"}