@elaraai/e3-cloud-cli 1.0.97 → 1.1.1

package/dist/src/dataset-source.js

@@ -0,0 +1,412 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Licensed under BSL 1.1. See LICENSE for details.
+ */
+/**
+ * `dataset:<ws>.<name>`: a workspace's dataset offered to `e3-cloud files
+ * push` as the file of its value.
+ *
+ * The dataset is read from the repository `--from` names, a local
+ * repository's path or a repository's URL, defaulting as e3's `[repo]` does
+ * (`$E3_REPO`, then `.`). Its name resolves as e3's CLI resolves a flat path
+ * (e3-cli's `path-resolver`): the input, the task (its output) or the record
+ * of that name in the workspace. One that is unassigned (a task output not
+ * produced since its workspace's last deploy, an input never set, a record
+ * with no state yet), that the workspace does not hold, or that names two of
+ * them, is refused in its own row.
+ *
+ * Its bytes are its value as a deployed repository serves `e3 dataset get -f
+ * beast2`: a collection spliced from its stored segments a segment at a time
+ * (e3-core's `DatasetSegments.splice`, as the server splices them), any other
+ * value as it is stored, never held whole; so the same stored value gives the
+ * same bytes from a local repository and a deployed one, and a dataset pushed
+ * again unchanged is `unchanged`. They are read twice: once for their size,
+ * SHA-256 and header type, which the plan is given, then again as they are
+ * uploaded. Each read is pinned to the value first read (a local repository's
+ * by its hash, which names one value for ever; a deployed one's refused when
+ * the dataset names another) and its SHA-256 is checked as it ends, so a
+ * dataset a run writes again in between is refused ({@link DatasetMovedError}),
+ * never put as something else. A value of 8 MiB or less is kept from the first
+ * read and read once.
+ */
+import { createHash } from 'node:crypto';
+import { encodeBeast2For, readBeast2Type, variant } from '@elaraai/east';
+import { DatasetSegments, InvalidNameError, LocalStorage, WorkspaceNotDeployedError, WorkspaceNotFoundError, openDatasetObject, workspaceGetTree, } from '@elaraai/e3-core';
+import { ApiError, DatasetHashMismatchError, datasetGetStatus, datasetGetStream, datasetListRecursive } from '@elaraai/e3-api-client';
+import { parseDatasetPath } from '@elaraai/e3-types';
+import { filesDatasetPathText } from '@elaraai/e3-cloud-types';
+import { getValidToken } from './credentials.js';
+import { openLocalRepository } from './files-local.js';
+import { parseRepoUrl } from './utils.js';
+/** What names a dataset among a push's paths. */
+export const DATASET_ARG_PREFIX = 'dataset:';
+/** A value this size or smaller is kept from its first read, and read once. */
+const KEPT_BYTES = 8 * 1024 * 1024;
+/** How much of a stored object one read takes, for a value that is no collection. */
+const READ_BYTES = 8 * 1024 * 1024;
+/** The segments a local read of a collection reads ahead of the upload. */
+const READ_AHEAD = 2;
+/** The most of a value's head read for its type: a type section wider is malformed, not large. */
+const HEAD_TYPE_MAX_BYTES = 16 * 1024 * 1024;
+/**
+ * The repository a push reads its datasets from: `--from`, else `$E3_REPO`,
+ * else the current directory, as e3's `[repo]` defaults.
+ *
+ * @param from - `--from`, as given
+ * @returns The repository
+ */
+export function datasetRepositoryArg(from) {
+    return from !== undefined && from.length > 0 ? from : (process.env.E3_REPO ?? '.');
+}
+/**
+ * The dataset a push's path names, or null for a path that names none.
+ *
+ * @param arg - The path, as given
+ * @returns The dataset, or null
+ * @throws {Error} For `dataset:` followed by anything but `<ws>.<name>`
+ */
+export function datasetArgOf(arg) {
+    if (!arg.startsWith(DATASET_ARG_PREFIX))
+        return null;
+    const spec = arg.slice(DATASET_ARG_PREFIX.length);
+    const shape = 'name a dataset as dataset:<workspace>.<name>, the name of its input, task or record (dataset:dev.customer_book)';
+    let parsed;
+    try {
+        parsed = parseDatasetPath(spec);
+    }
+    catch (err) {
+        throw new Error(`${arg}: ${err instanceof Error ? err.message : String(err)}: ${shape}`);
+    }
+    const [name, ...rest] = parsed.path;
+    if (name === undefined || rest.length > 0)
+        throw new Error(`${arg}: ${shape}`);
+    return { arg, workspace: parsed.ws, name: name.value };
+}
+/** A dataset that no longer holds the value a push read: a run wrote it again. */
+export class DatasetMovedError extends Error {
+    constructor(arg) {
+        super(`${arg} changed while it was pushed (a run wrote it again): push it again`);
+        this.name = 'DatasetMovedError';
+    }
+}
+/** A tree path of fields. */
+function fields(...names) {
+    return names.map((name) => variant('field', name));
+}
+/**
+ * A dataset's entry by where its workspace's tree holds it, as e3's CLI
+ * names it: `inputs/<name>`, `tasks/<name>` (its output: a tree names a task's
+ * output by the task, a listing that walks into the task by `output` under
+ * it) or `records/<name>`; null for anything else, which no flat name of an
+ * input, task or record reaches.
+ */
+function entryOf(prefix, name) {
+    if (prefix.length === 1 && prefix[0] === 'inputs')
+        return { name, kind: 'input', path: fields('inputs', name) };
+    if (prefix.length === 1 && prefix[0] === 'records')
+        return { name, kind: 'record', path: fields('records', name) };
+    if (prefix.length === 1 && prefix[0] === 'tasks')
+        return { name, kind: 'task output', path: fields('tasks', name, 'output') };
+    if (prefix.length === 2 && prefix[0] === 'tasks' && name === 'output') {
+        return { name: prefix[1], kind: 'task output', path: fields('tasks', prefix[1], 'output') };
+    }
+    return null;
+}
+/** The one entry a name names, or why there is none. */
+function entryNamed(index, arg) {
+    const matches = index.filter((entry) => entry.name === arg.name);
+    const path = filesDatasetPathText(arg.workspace, arg.name);
+    if (matches.length === 1)
+        return matches[0];
+    if (matches.length > 1) {
+        return { refused: 'ambiguous', message: `${path} is ambiguous: ${arg.workspace} has ${matches.map((m) => `a ${m.kind}`).join(' and ')} named ${arg.name}` };
+    }
+    return { refused: 'not_found', message: `${arg.workspace} has no input, task or record named ${arg.name}` };
+}
+/** Why an unassigned dataset holds nothing, as its row says. */
+function unassignedWords(arg, kind) {
+    const path = filesDatasetPathText(arg.workspace, arg.name);
+    switch (kind) {
+        case 'task output': return `${path} is unassigned: its task has not produced it since ${arg.workspace}'s last deploy (run its dataflow)`;
+        case 'input': return `${path} is unassigned: no value has been set`;
+        case 'record': return `${path} is unassigned: the record has no state yet`;
+    }
+}
+/** A dataset that holds null, which e3 stores as no object: its type's encoding of null, and that encoding's hash. */
+function nullValue(arg, kind, type) {
+    const bytes = encodeBeast2For(type)(null);
+    return { arg, kind, hash: createHash('sha256').update(bytes).digest('hex'), open: () => Promise.resolve(once(bytes)) };
+}
+/** Bytes as one chunk. */
+// eslint-disable-next-line @typescript-eslint/require-await -- bytes in memory, as the async iterable a dataset's bytes are
+async function* once(bytes) {
+    yield bytes;
+}
+/**
+ * Where a push reads its datasets: a deployed repository given its URL, a
+ * local one given its path.
+ *
+ * @param from - The repository ({@link datasetRepositoryArg})
+ * @returns The repository
+ * @throws {Error} When a local path holds no repository this e3 can open, or a URL names none
+ */
+export async function datasetRepository(from) {
+    return from.startsWith('https://') || from.startsWith('http://') ? remoteRepository(from) : localRepository(await openLocalRepository(from));
+}
+/** The entries of a local workspace's tree, each with its leaf. */
+function localEntries(nodes, prefix = []) {
+    return nodes.flatMap((node) => {
+        if (node.kind === 'tree')
+            return localEntries(node.children, [...prefix, node.name]);
+        const entry = entryOf(prefix, node.name);
+        return entry === null ? [] : [{ ...entry, leaf: node }];
+    });
+}
+/** A local repository's datasets, read through e3-core. */
+function localRepository(repo) {
+    const storage = new LocalStorage();
+    const trees = new Map();
+    const treeOf = (ws) => {
+        let tree = trees.get(ws);
+        if (tree === undefined)
+            trees.set(ws, tree = workspaceGetTree(storage, repo, ws, [], { includeTypes: true, includeStatus: true }));
+        return tree;
+    };
+    return {
+        async find(args) {
+            const lookups = [];
+            for (const arg of args) {
+                let tree;
+                try {
+                    tree = await treeOf(arg.workspace);
+                }
+                catch (err) {
+                    if (!(err instanceof WorkspaceNotFoundError || err instanceof WorkspaceNotDeployedError || err instanceof InvalidNameError))
+                        throw err;
+                    lookups.push({ refused: 'not_found', message: err.message });
+                    continue;
+                }
+                const entry = entryNamed(localEntries(tree), arg);
+                if ('refused' in entry) {
+                    lookups.push(entry);
+                    continue;
+                }
+                const { leaf, kind } = entry;
+                if (leaf.refType === 'unassigned') {
+                    lookups.push({ refused: 'unassigned', message: unassignedWords(arg, kind) });
+                    continue;
+                }
+                if (leaf.refType === 'null' || leaf.hash === undefined) {
+                    lookups.push({ found: nullValue(arg, kind, leaf.datasetType) });
+                    continue;
+                }
+                const hash = leaf.hash;
+                // Pinned by its hash: what a repository holds under a hash never changes
+                lookups.push({ found: { arg, kind, hash, open: () => Promise.resolve(localBytes(storage, repo, hash)) } });
+            }
+            return lookups;
+        },
+    };
+}
+/**
+ * A stored value's bytes: a collection spliced from its segments (a record
+ * that declares an index read through its primary, as every reader reads
+ * it), any other value as stored, by ranges.
+ */
+async function* localBytes(storage, repo, hash) {
+    const opened = await openDatasetObject(storage, repo, hash);
+    if (opened.manifest !== null) {
+        yield* (await DatasetSegments.open(storage, repo, opened.hash)).splice({ readAhead: READ_AHEAD });
+        return;
+    }
+    const { size } = await storage.objects.stat(repo, opened.hash);
+    for (let at = 0; at < size; at += READ_BYTES)
+        yield await storage.objects.readRange(repo, opened.hash, at, Math.min(READ_BYTES, size - at));
+}
+/** A deployed repository's datasets, read through its API with the login e3 and e3-cloud share. */
+function remoteRepository(from) {
+    const { baseUrl, repo } = parseRepoUrl(from);
+    const options = async () => ({ token: await getValidToken(baseUrl) });
+    const indexes = new Map();
+    const indexOf = (ws) => {
+        let index = indexes.get(ws);
+        if (index === undefined) {
+            indexes.set(ws, index = (async () => {
+                const items = await datasetListRecursive(baseUrl, repo, ws, [], await options());
+                return items.flatMap((item) => {
+                    if (item.type !== 'dataset')
+                        return [];
+                    // A listing's path is a keypath, `.inputs.customers`, as e3-cli's resolver splits it
+                    const segments = item.value.path.split('.').filter((s) => s.length > 0);
+                    const name = segments.at(-1);
+                    const entry = name === undefined ? null : entryOf(segments.slice(0, -1), name);
+                    return entry === null ? [] : [entry];
+                });
+            })());
+        }
+        return index;
+    };
+    return {
+        async find(args) {
+            const lookups = [];
+            for (const arg of args) {
+                let index;
+                try {
+                    index = await indexOf(arg.workspace);
+                }
+                catch (err) {
+                    if (!(err instanceof ApiError) || !['workspace_not_found', 'workspace_not_deployed', 'invalid_name'].includes(err.code))
+                        throw err;
+                    lookups.push({ refused: 'not_found', message: `${arg.workspace}: ${err.code.replace(/_/g, ' ')}` });
+                    continue;
+                }
+                const entry = entryNamed(index, arg);
+                if ('refused' in entry) {
+                    lookups.push(entry);
+                    continue;
+                }
+                const { kind, path } = entry;
+                const status = await datasetGetStatus(baseUrl, repo, arg.workspace, path, await options());
+                if (status.refType === 'unassigned') {
+                    lookups.push({ refused: 'unassigned', message: unassignedWords(arg, kind) });
+                    continue;
+                }
+                if (status.refType === 'null' || status.hash.type === 'none') {
+                    lookups.push({ found: nullValue(arg, kind, status.type) });
+                    continue;
+                }
+                const hash = status.hash.value;
+                lookups.push({
+                    found: {
+                        arg,
+                        kind,
+                        hash,
+                        open: async () => {
+                            const read = await datasetGetStream(baseUrl, repo, arg.workspace, path, await options());
+                            if (read.hash !== hash) {
+                                // Moved since it was measured: its bytes are another value's
+                                await read.chunks.return?.(undefined);
+                                throw new DatasetMovedError(arg.arg);
+                            }
+                            return movesRaised(read.chunks, arg.arg);
+                        },
+                    },
+                });
+            }
+            return lookups;
+        },
+    };
+}
+/** A remote read's chunks, a move the client finds while they stream raised as the push's own. */
+async function* movesRaised(chunks, arg) {
+    try {
+        yield* chunks;
+    }
+    catch (err) {
+        if (err instanceof DatasetHashMismatchError)
+            throw new DatasetMovedError(arg);
+        throw err;
+    }
+}
+/** Bytes, one after another, in one new array. */
+function joined(parts) {
+    const out = new Uint8Array(parts.reduce((n, p) => n + p.length, 0));
+    let at = 0;
+    for (const part of parts) {
+        out.set(part, at);
+        at += part.length;
+    }
+    return out;
+}
+/**
+ * A dataset's value read once for its size, its SHA-256 and the type its
+ * header declares, the bytes kept when they are few; and its bytes for the
+ * upload, read again pinned to the same value and checked as they end.
+ *
+ * @param found - The dataset
+ * @returns The measures and the bytes
+ * @throws {DatasetMovedError} When it moves while it is read
+ * @throws {Error} When its bytes are no beast2, which a stored value always is
+ */
+export async function measuredDataset(found) {
+    const digest = createHash('sha256');
+    let size = 0;
+    let kept = [];
+    // The head, until its type section is in hand: a short head fails to read as
+    // a malformed one does, so it is read again as more arrives
+    let head = [];
+    let headBytes = 0;
+    let type = null;
+    let headError = null;
+    for await (const chunk of await found.open()) {
+        digest.update(chunk);
+        size += chunk.length;
+        if (kept !== null) {
+            kept.push(chunk);
+            if (size > KEPT_BYTES)
+                kept = null;
+        }
+        if (type === null && headError === null) {
+            head.push(chunk);
+            headBytes += chunk.length;
+            try {
+                type = readBeast2Type(joined(head));
+                head = [];
+            }
+            catch (err) {
+                if (headBytes >= HEAD_TYPE_MAX_BYTES) {
+                    headError = err;
+                    head = [];
+                }
+            }
+        }
+    }
+    if (type === null) {
+        try {
+            if (headError !== null)
+                throw headError;
+            type = readBeast2Type(joined(head));
+        }
+        catch (err) {
+            throw new Error(`${found.arg.arg} holds no beast2 value: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    const sha256 = digest.digest('hex');
+    const whole = kept;
+    const bytes = {
+        size,
+        ranged: whole !== null,
+        read: whole !== null ? (start) => slicesFrom(whole, start) : (start) => checkedFrom(found, start, size, sha256),
+    };
+    return { size, sha256, type, origin: { path: filesDatasetPathText(found.arg.workspace, found.arg.name), hash: found.hash }, bytes };
+}
+/** Kept bytes from an offset on. */
+// eslint-disable-next-line @typescript-eslint/require-await -- bytes in memory, as the async iterable a push reads
+async function* slicesFrom(chunks, start) {
+    let at = 0;
+    for (const chunk of chunks) {
+        const end = at + chunk.length;
+        if (end > start)
+            yield at >= start ? chunk : chunk.subarray(start - at);
+        at = end;
+    }
+}
+/**
+ * A dataset's bytes from an offset on, read again from its start (a stream
+ * reads no other way), each byte hashed, and refused as they end when they
+ * are not the bytes measured.
+ */
+async function* checkedFrom(found, start, size, sha256) {
+    const digest = createHash('sha256');
+    let at = 0;
+    for await (const chunk of await found.open()) {
+        digest.update(chunk);
+        const end = at + chunk.length;
+        if (end > start)
+            yield at >= start ? chunk : chunk.subarray(start - at);
+        at = end;
+    }
+    if (at !== size || digest.digest('hex') !== sha256)
+        throw new DatasetMovedError(found.arg.arg);
+}
+//# sourceMappingURL=dataset-source.js.map

package/dist/src/dataset-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataset-source.js","sourceRoot":"","sources":["../../src/dataset-source.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAsB,MAAM,eAAe,CAAC;AAC7F,OAAO,EACL,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,gBAAgB,GAExI,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACtI,OAAO,EAAE,gBAAgB,EAAiB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAA2B,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,iDAAiD;AACjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;AAE7C,+EAA+E;AAC/E,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAEnC,qFAAqF;AACrF,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAEnC,2EAA2E;AAC3E,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,kGAAkG;AAClG,MAAM,mBAAmB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAU7C;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAwB;IAC3D,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;AACrF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAAE,OAAO,IAAI,CAAC;IACrD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,iHAAiH,CAAC;IAChI,IAAI,MAA2C,CAAC;IAChD,IAAI,CAAC;QACH,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IAC3F,CAAC;IACD,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;IACpC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;IAC/E,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;AACzD,CAAC;AA2BD,kFAAkF;AAClF,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,GAAW;QACrB,KAAK,CAAC,GAAG,GAAG,oEAAoE,CAAC,CAAC;QAClF,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAoBD,6BAA6B;AAC7B,SAAS,MAAM,CAAC,GAAG,KAAe;IAChC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,OAAO,CAAC,MAAyB,EAAE,IAAY;IACtD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;IAChH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;IACnH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;IAC9H,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAE,EAAE,QAAQ,CAAC,EAAE,CAAC;IAChG,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,wDAAwD;AACxD,SAAS,UAAU,CAAuB,KAAmB,EAAE,GAAe;IAC5E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC,CAAC,CAAE,CAAC;IAC7C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,kBAAkB,GAAG,CAAC,SAAS,QAAQ,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IAC9J,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,SAAS,uCAAuC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;AAC9G,CAAC;AAED,gEAAgE;AAChE,SAAS,eAAe,CAAC,GAAe,EAAE,IAAiB;IACzD,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,aAAa,CAAC,CAAC,OAAO,GAAG,IAAI,sDAAsD,GAAG,CAAC,SAAS,mCAAmC,CAAC;QACzI,KAAK,OAAO,CAAC,CAAC,OAAO,GAAG,IAAI,uCAAuC,CAAC;QACpE,KAAK,QAAQ,CAAC,CAAC,OAAO,GAAG,IAAI,6CAA6C,CAAC;IAC7E,CAAC;AACH,CAAC;AAED,sHAAsH;AACtH,SAAS,SAAS,CAAC,GAAe,EAAE,IAAiB,EAAE,IAAmB;IACxE,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;AACzH,CAAC;AAED,0BAA0B;AAC1B,4HAA4H;AAC5H,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,KAAiB;IACpC,MAAM,KAAK,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAY;IAClD,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC/I,CAAC;AAOD,mEAAmE;AACnE,SAAS,YAAY,CAAC,KAA0B,EAAE,SAA4B,EAAE;IAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAgB,EAAE;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACrF,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,2DAA2D;AAC3D,SAAS,eAAe,CAAC,IAAY;IACnC,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAC;IACrD,MAAM,MAAM,GAAG,CAAC,EAAU,EAAE,EAAE;QAC5B,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS;YAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACnI,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACF,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,IAAI;YACb,MAAM,OAAO,GAAoB,EAAE,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,IAAgB,CAAC;gBACrB,IAAI,CAAC;oBACH,IAAI,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACrC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,CAAC,GAAG,YAAY,sBAAsB,IAAI,GAAG,YAAY,yBAAyB,IAAI,GAAG,YAAY,gBAAgB,CAAC;wBAAE,MAAM,GAAG,CAAC;oBACvI,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC7D,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;gBAClD,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;oBACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACpB,SAAS;gBACX,CAAC;gBACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;gBAC7B,IAAI,IAAI,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;oBAClC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC7E,SAAS;gBACX,CAAC;gBACD,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvD,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,WAAY,CAAC,EAAE,CAAC,CAAC;oBACjE,SAAS;gBACX,CAAC;gBACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,yEAAyE;gBACzE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7G,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,KAAK,SAAS,CAAC,CAAC,UAAU,CAAC,OAAqB,EAAE,IAAY,EAAE,IAAY;IAC1E,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC7B,KAAK,CAAC,CAAC,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC;QAClG,OAAO;IACT,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/D,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,UAAU;QAAE,MAAM,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;AAC9I,CAAC;AAED,mGAAmG;AACnG,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiC,CAAC;IACzD,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE;QAC7B,IAAI,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE;gBAClC,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,OAAO,EAAE,CAAC,CAAC;gBACjF,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;wBAAE,OAAO,EAAE,CAAC;oBACvC,qFAAqF;oBACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACxE,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC7B,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;oBAC/E,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,EAAE,CAAC,CAAC;QACR,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IACF,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,IAAI;YACb,MAAM,OAAO,GAAoB,EAAE,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,KAAmB,CAAC;gBACxB,IAAI,CAAC;oBACH,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACvC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,CAAC,GAAG,YAAY,QAAQ,CAAC,IAAI,CAAC,CAAC,qBAAqB,EAAE,wBAAwB,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;wBAAE,MAAM,GAAG,CAAC;oBACnI,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,SAAS,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;oBACpG,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBACrC,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;oBACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACpB,SAAS;gBACX,CAAC;gBACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;gBAC7B,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,OAAO,EAAE,CAAC,CAAC;gBAC3F,IAAI,MAAM,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;oBACpC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC7E,SAAS;gBACX,CAAC;gBACD,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC3D,SAAS;gBACX,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE;wBACL,GAAG;wBACH,IAAI;wBACJ,IAAI;wBACJ,IAAI,EAAE,KAAK,IAAI,EAAE;4BACf,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,OAAO,EAAE,CAAC,CAAC;4BACzF,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gCACvB,6DAA6D;gCAC7D,MAAO,IAAI,CAAC,MAAqC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;gCACtE,MAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;4BACvC,CAAC;4BACD,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;wBAC3C,CAAC;qBACF;iBACF,CAAC,CAAC;YACL,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,kGAAkG;AAClG,KAAK,SAAS,CAAC,CAAC,WAAW,CAAC,MAAiC,EAAE,GAAW;IACxE,IAAI,CAAC;QACH,KAAK,CAAC,CAAC,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,wBAAwB;YAAE,MAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC9E,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAcD,kDAAkD;AAClD,SAAS,MAAM,CAAC,KAA4B;IAC1C,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACpE,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClB,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,KAAmB;IACvD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,IAAI,GAAwB,EAAE,CAAC;IACnC,6EAA6E;IAC7E,4DAA4D;IAC5D,IAAI,IAAI,GAAiB,EAAE,CAAC;IAC5B,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,IAAI,GAAyB,IAAI,CAAC;IACtC,IAAI,SAAS,GAAY,IAAI,CAAC;IAC9B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;QACrB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjB,IAAI,IAAI,GAAG,UAAU;gBAAE,IAAI,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACxC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjB,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC;gBACH,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpC,IAAI,GAAG,EAAE,CAAC;YACZ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,SAAS,IAAI,mBAAmB,EAAE,CAAC;oBACrC,SAAS,GAAG,GAAG,CAAC;oBAChB,IAAI,GAAG,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,SAAS,KAAK,IAAI;gBAAE,MAAM,SAAS,CAAC;YACxC,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,2BAA2B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjH,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC;IACnB,MAAM,KAAK,GAAmB;QAC5B,IAAI;QACJ,MAAM,EAAE,KAAK,KAAK,IAAI;QACtB,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC;KAChH,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC;AACtI,CAAC;AAED,oCAAoC;AACpC,mHAAmH;AACnH,KAAK,SAAS,CAAC,CAAC,UAAU,CAAC,MAA6B,EAAE,KAAa;IACrE,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC;QAC9B,IAAI,GAAG,GAAG,KAAK;YAAE,MAAM,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACxE,EAAE,GAAG,GAAG,CAAC;IACX,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,SAAS,CAAC,CAAC,WAAW,CAAC,KAAmB,EAAE,KAAa,EAAE,IAAY,EAAE,MAAc;IAC1F,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrB,MAAM,GAAG,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC;QAC9B,IAAI,GAAG,GAAG,KAAK;YAAE,MAAM,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACxE,EAAE,GAAG,GAAG,CAAC;IACX,CAAC;IACD,IAAI,EAAE,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM;QAAE,MAAM,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjG,CAAC"}

package/dist/src/files-local.d.ts

@@ -8,7 +8,7 @@ import { type FilesBinding, type FilesManifest, type FilesProblem, type FilesPus
 import { type FilesLedger, type FilesReader } from '@elaraai/e3-cloud-files/sync';
 import type { OfferedFile } from './files-push.js';
 /** The version of the state file this CLI writes. */
-export declare const LOCAL_FILES_VERSION = 2n;
+export declare const LOCAL_FILES_VERSION = 3n;
 /** What a local repository keeps of one workspace's Files. */
 export declare const LocalFilesStateType: StructType<{
     /** The state file's version: {@link LOCAL_FILES_VERSION} */
@@ -155,6 +155,7 @@ export declare const LocalFilesStateType: StructType<{
             readonly sha256: OptionType<StringType>;
             readonly staging: OptionType<StringType>;
         }>>;
+        readonly seeds: OptionType<IntegerType>;
     }>>;
     /** The last sync's report; a dry run's is never kept */
     readonly lastSync: OptionType<StructType<{
@@ -334,6 +335,10 @@ export declare const LocalFilesStateType: StructType<{
                 }>;
             }>>;
             readonly commit: OptionType<StringType>;
+            readonly seed: OptionType<StructType<{
+                readonly commit: StringType;
+                readonly number: OptionType<IntegerType>;
+            }>>;
             readonly kept: OptionType<StringType>;
             readonly waiting: OptionType<StringType>;
         }>>;
@@ -355,7 +360,7 @@ export declare function openLocalRepository(repoArg: string): Promise<string>;
  * @throws {Error} When the name is no workspace's
  */
 export declare function statePath(repoPath: string, ws: string): string;
-/** What a repository keeps of a workspace's Files: nothing yet, before its first deploy; a first-version file lifted. */
+/** What a repository keeps of a workspace's Files: nothing yet, before its first deploy; an earlier version's file lifted. */
 export declare function readState(repoPath: string, ws: string): LocalFilesState;
 /** Keeps a workspace's Files, replacing the file whole so a reader never sees half of it. */
 export declare function writeState(repoPath: string, ws: string, state: LocalFilesState): void;
@@ -448,22 +453,12 @@ export declare function syncLocal(repoPath: string, ws: string, options?: LocalS
  * @returns Its status
  */
 export declare function statusLocal(repoPath: string, ws: string): Promise<FilesStatus>;
-/** What a local push is given. */
-export interface LocalPushOptions {
-    /** The target every file is for; null to match each by its name */
+/** What a local push's plan is given. */
+export interface LocalPlanOptions {
+    /** The target every file is for; absent to match each by its name */
     readonly as?: string;
-    /** Records whose file is taken as their state again */
-    readonly reset?: readonly string[];
-    /** Plan, and put nothing */
-    readonly dryRun?: boolean;
-    /** The profile to put with, over each binding's */
-    readonly profile?: string;
     /** Reads a bound source, when not its bucket with the developer's credentials ({@link s3Readers}) */
     readonly reader?: (binding: FilesBinding) => FilesReader;
-    /** Puts a file to a binding, when not through the developer's credentials (a test's) */
-    readonly put?: (binding: FilesBinding, key: string, file: OfferedFile) => Promise<void>;
-    /** The runner that takes a typed collection in and runs a fed mutation */
-    readonly runner?: TaskRunner;
 }
 /**
  * Plans a push on a local repository: the same plan a deployed workspace's
@@ -473,10 +468,10 @@ export interface LocalPushOptions {
  *
  * @param repoPath - The repository
  * @param ws - The workspace
- * @param files - The files offered
+ * @param files - The files offered, from disk or a repository's datasets
  * @param options - The target named, and the reader
  * @returns The plan, as the route answers one
  * @throws {Error} When the workspace has no declarations deployed
  */
-export declare function planLocal(repoPath: string, ws: string, files: readonly OfferedFile[], options?: Pick<LocalPushOptions, 'as' | 'reader'>): Promise<FilesPushPlan>;
+export declare function planLocal(repoPath: string, ws: string, files: readonly OfferedFile[], options?: LocalPlanOptions): Promise<FilesPushPlan>;
 //# sourceMappingURL=files-local.d.ts.map

package/dist/src/files-local.d.ts.map

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

package/dist/src/files-local.js

@@ -11,16 +11,19 @@
  * deployed to the workspace, where each source is bound, what each target
  * took last, and the last sync's report. It belongs to the repository, never
  * to the project, so removing the repository removes it, with the bytes the
- * syncs took in. A state file written before typed files (version 1: mappings by
- * input, no hashes) is read through `@elaraai/e3-cloud-files/compat` and
- * written at version 2 on its next write.
+ * syncs took in. A state file an earlier release wrote (version 1, before
+ * typed files: mappings by input, no hashes; version 2, before a record's
+ * seeds were counted) is read through `@elaraai/e3-cloud-files/compat`
+ * and written at version 3 on its next write.
  *
  * A sync reads each source with the developer's own cloud credentials (the
  * binding's profile, else the SDK's usual chain) and writes the inputs
  * through e3's own dataset writes, a typed file through e3's door for a
  * file (streamed to the repository's own scratch first), and a fed mutation
  * through e3's own `recordMutate` on a local runner, so the repository holds
- * what a deployed workspace's sync would.
+ * what a deployed workspace's sync would. A file a push put from a dataset
+ * names the dataset in its object's metadata, and its seed's or feed's commit
+ * records it.
  */
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { userInfo } from 'node:os';
@@ -31,13 +34,13 @@ import { LocalStorage, LocalTaskRunner, repoGet, repositoryOpen, workspaceGetDat
 import { nameProblem } from '@elaraai/e3-types';
 import { FilesBindingType, FilesLedgerType, FilesManifestType, FilesMappingType, FilesSyncReportType, filesTargetText, } from '@elaraai/e3-cloud-types';
 import { checkBindings, checkFiles, parseBucketUrl, readPackageSurface } from '@elaraai/e3-cloud-files/check';
-import { FilesLedgerTypeV1, FilesManifestTypeV1, FilesSyncReportTypeV1, liftFilesLedgerV1, liftFilesManifestV1, liftFilesSyncReportV1, } from '@elaraai/e3-cloud-files/compat';
-import { FilesSyncError, FilesUnreadableError, NO_LEDGER, ledgerKeyOf, ledgerStateOf, ledgerValueOf, planPush, syncFiles } from '@elaraai/e3-cloud-files/sync';
+import { FilesLedgerTypeV1, FilesLedgerTypeV2, FilesManifestTypeV1, FilesSyncReportTypeV1, FilesSyncReportTypeV2, liftFilesLedgerV1, liftFilesLedgerV2, liftFilesManifestV1, liftFilesSyncReportV1, liftFilesSyncReportV2, } from '@elaraai/e3-cloud-files/compat';
+import { FilesSyncError, FilesUnreadableError, NO_LEDGER, ledgerKeyOf, ledgerStateOf, ledgerValueOf, planPush, syncFiles, } from '@elaraai/e3-cloud-files/sync';
 import { globMatcher } from '@elaraai/e3-cloud-files/check';
 import { storageWriter } from '@elaraai/e3-cloud-files/storage';
 import { s3FilesReader } from '@elaraai/e3-cloud-files/s3';
 /** The version of the state file this CLI writes. */
-export const LOCAL_FILES_VERSION = 2n;
+export const LOCAL_FILES_VERSION = 3n;
 /** What a local repository keeps of one workspace's Files. */
 export const LocalFilesStateType = StructType({
     /** The state file's version: {@link LOCAL_FILES_VERSION} */
@@ -58,9 +61,18 @@ const LocalFilesStateTypeV1 = StructType({
     ledgers: DictType(StringType, FilesLedgerTypeV1),
     lastSync: OptionType(FilesSyncReportTypeV1),
 });
+/** The state file as the second version wrote it: a record's seeds not counted. */
+const LocalFilesStateTypeV2 = StructType({
+    version: IntegerType,
+    manifest: OptionType(FilesManifestType),
+    bindings: ArrayType(FilesBindingType),
+    ledgers: DictType(StringType, FilesLedgerTypeV2),
+    lastSync: OptionType(FilesSyncReportTypeV2),
+});
 const encodeState = encodeJSONFor(LocalFilesStateType);
 const decodeState = decodeJSONFor(LocalFilesStateType);
 const decodeStateV1 = decodeJSONFor(LocalFilesStateTypeV1);
+const decodeStateV2 = decodeJSONFor(LocalFilesStateTypeV2);
 const sameMapping = equalFor(FilesMappingType);
 /** A workspace's Files before its first deploy: nothing. */
 const NO_STATE = { version: LOCAL_FILES_VERSION, manifest: none, bindings: [], ledgers: new Map(), lastSync: none };
@@ -100,15 +112,26 @@ function versionOf(text) {
     const version = parsed.version;
     return typeof version === 'number' ? version : typeof version === 'string' ? Number(version) : 1;
 }
-/** What a repository keeps of a workspace's Files: nothing yet, before its first deploy; a first-version file lifted. */
+/** What a repository keeps of a workspace's Files: nothing yet, before its first deploy; an earlier version's file lifted. */
 export function readState(repoPath, ws) {
     const path = statePath(repoPath, ws);
     if (!existsSync(path))
         return NO_STATE;
     try {
         const bytes = readFileSync(path);
-        if (versionOf(new TextDecoder().decode(bytes)) >= 2)
+        const version = versionOf(new TextDecoder().decode(bytes));
+        if (version >= 3)
             return decodeState(bytes);
+        if (version === 2) {
+            const v2 = decodeStateV2(bytes);
+            return {
+                version: LOCAL_FILES_VERSION,
+                manifest: v2.manifest,
+                bindings: v2.bindings,
+                ledgers: new Map([...v2.ledgers].map(([key, ledger]) => [key, liftFilesLedgerV2(ledger)])),
+                lastSync: v2.lastSync.type === 'some' ? some(liftFilesSyncReportV2(v2.lastSync.value)) : none,
+            };
+        }
         const v1 = decodeStateV1(bytes);
         return {
             version: LOCAL_FILES_VERSION,
@@ -149,7 +172,7 @@ export function stateLedger(repoPath, ws) {
 /**
  * A reader whose failures name the source, where it is bound and the profile
  * it reads with: an expired login, a denied read or a missing bucket says
- * which binding it was.
+ * which binding it was. Where a file came from is the reader's own to say.
  */
 function naming(reader, binding) {
     const where = `source ${binding.source} (${binding.url}${binding.profile.type === 'some' ? `, profile ${binding.profile.value}` : ''})`;
@@ -173,6 +196,7 @@ function naming(reader, binding) {
         read: (object) => reader.read(object).catch(fail),
         readRange: (object, start, end) => reader.readRange(object, start, end).catch(fail),
         open: (object, options) => reader.open(object, options).catch(fail),
+        ...(reader.origin !== undefined && { origin: (object) => reader.origin(object).catch(fail) }),
     };
 }
 /**
@@ -346,7 +370,7 @@ export async function statusLocal(repoPath, ws) {
  *
  * @param repoPath - The repository
  * @param ws - The workspace
- * @param files - The files offered
+ * @param files - The files offered, from disk or a repository's datasets
  * @param options - The target named, and the reader
  * @returns The plan, as the route answers one
  * @throws {Error} When the workspace has no declarations deployed