@openrails/contentkit-ui 0.98.6 → 0.99.1

package/dist/client/media/queue.js

@@ -80,9 +80,9 @@ var a = 2 ** 31 - 1, o = class {
 			let e = n.findIndex((e) => e.status !== "uploaded" && e.status !== "committed");
 			e >= 0 && (n = n.slice(0, e));
 		}
-		let r = n.filter((e) => e.status === "uploaded"), i = t.attach ?? [];
-		if (r.length === 0 && i.length === 0) return [];
-		let o = r.flatMap((e) => {
+		let i = n.filter((e) => e.status === "uploaded"), o = t.attach ?? [];
+		if (i.length === 0 && o.length === 0) return [];
+		let s = i.flatMap((e) => {
 			let t = {
 				op: "attach",
 				path: e.path,
@@ -93,6 +93,7 @@ var a = 2 ** 31 - 1, o = class {
 			let n = {
 				op: "put",
 				path: e.path,
+				source_name: e.result.sourceName,
 				blob: e.result.blob,
 				create_id: e.id,
 				index: a,
@@ -100,44 +101,54 @@ var a = 2 ** 31 - 1, o = class {
 			};
 			return e.result.processOnUpload ? [n, t] : [n];
 		});
-		for (let e of i) o.push({
+		for (let e of o) s.push({
 			op: "attach",
 			path: e,
 			index: a
 		});
-		let s = Object.fromEntries(r.map((e) => [e.result.blob, {
+		let c = Object.fromEntries(i.map((e) => [e.result.blob, {
 			file: e.file,
 			type: e.result.type
-		}])), c = JSON.stringify(o);
-		this.batch?.input !== c && (this.batch = {
-			input: c,
+		}])), l = JSON.stringify(s);
+		this.batch?.input !== l && (this.batch = {
+			input: l,
 			operationID: crypto.randomUUID()
 		});
-		let l = this.batch, u = await this.client.commit(this.o.ref, o, {
+		let u = this.batch, d = await this.client.commit(this.o.ref, s, {
 			signal: e,
-			sources: s,
-			operationID: l.operationID,
+			sources: c,
+			operationID: u.operationID,
 			onState: (e) => {
-				l.input = JSON.stringify(e.ops), l.operationID = e.operation_id;
+				u.input = JSON.stringify(e.ops), u.operationID = e.operation_id;
 				let t = !1;
 				for (let n of e.ops) {
 					if (n.op !== "put" || !n.blob) continue;
-					let e = r.find((e) => e.id === n.create_id);
+					let e = i.find((e) => e.id === n.create_id);
 					if (!e?.result) continue;
-					let i = this.find(e.id);
-					i?.result && i.result.blob === e.result.blob && i.result.blob !== n.blob && (t = this.set(i.id, { result: {
-						...i.result,
+					let r = this.find(e.id);
+					r?.result && r.result.blob === e.result.blob && r.result.blob !== n.blob && (t = this.set(r.id, { result: {
+						...r.result,
 						blob: n.blob
 					} }) || t);
 				}
 				t && this.changed();
 			}
 		});
-		for (let e of r) this.set(e.id, {
-			status: "committed",
-			unattached: !1
-		});
-		return this.changed(), u.filter((e) => !e.unattached);
+		for (let e of i) {
+			let t = d.find((t) => t.create_id === e.id) ?? d.find((t) => r(t.path, e.path));
+			this.set(e.id, {
+				status: "committed",
+				unattached: !1,
+				...t ? {
+					path: t.path,
+					result: {
+						...e.result,
+						path: t.path
+					}
+				} : {}
+			});
+		}
+		return this.changed(), d.filter((e) => !e.unattached);
 	}
 	dispose() {
 		this.started = !1, this.disposed = !0;
@@ -147,21 +158,26 @@ var a = 2 ** 31 - 1, o = class {
 	stage(t) {
 		let n = this.find(t);
 		if (!n?.result) return;
-		let { blob: a, type: o } = n.result, s = {
+		let { blob: a, type: o, sourceName: s } = n.result, c = {
 			op: "put",
 			path: n.path,
+			source_name: s,
 			blob: a,
 			create_id: n.id,
 			unattached: !0,
 			...n.meta ? { meta: n.meta } : {}
-		}, c = this.client.commit(this.o.ref, [s], { sources: { [a]: {
+		}, l = this.client.commit(this.o.ref, [c], { sources: { [a]: {
 			file: n.file,
 			type: o
 		} } }).then((e) => {
-			let a = e.find((e) => e.unattached && r(e.path, i(n.path)));
+			let a = e.find((e) => e.unattached && e.create_id === t) ?? e.find((e) => e.unattached && r(e.path, i(n.path)));
 			return a && this.find(t) && this.patch(t, {
 				unattached: !0,
-				path: a.path
+				path: a.path,
+				result: {
+					...n.result,
+					path: a.path
+				}
 			}), this.schedulePoll(), a;
 		}, (n) => {
 			n instanceof e && n.code === "conflict" && this.patch(t, {
@@ -169,7 +185,7 @@ var a = 2 ** 31 - 1, o = class {
 				error: n
 			});
 		}).finally(() => this.staging.delete(t));
-		this.staging.set(t, c);
+		this.staging.set(t, l);
 	}
 	schedulePoll() {
 		this.poll || this.disposed || (this.poll = setTimeout(() => {

package/dist/client/media/queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.js","names":[],"sources":["../../../src/client/media/queue.ts"],"sourcesContent":["import { ContentKitError, toContentKitError } from \"../errors.js\";\nimport type { FileInfo, Op, RefBody } from \"../generated/wire.js\";\nimport { fill } from \"../public.js\";\nimport { samePath, stem, type MediaClient, type Progress, type UploadedFile, type UploadState } from \"./client.js\";\n\nexport type ItemStatus = \"queued\" | \"uploading\" | \"uploaded\" | \"failed\" | \"committed\";\n\nexport interface QueueItem {\n  readonly id: string;\n  readonly file: File;\n  /** The upload path the commit puts; the server's canonical one once uploaded. */\n  path: string;\n  meta?: Record<string, unknown>;\n  status: ItemStatus;\n  progress?: Progress;\n  error?: ContentKitError;\n  result?: UploadedFile;\n  /** Resumable multipart state while uploading or after a failure. */\n  state?: UploadState;\n  /**\n   * Committed unattached for processing on upload (the host's\n   * ProcessOnUpload): commit() attaches it, remove() discards it.\n   */\n  unattached?: boolean;\n  /** The server's view of an unattached upload while it processes (editor read): dims, pending, failed, progress. */\n  processing?: FileInfo;\n  /** Processing finished (placed and outputs written, or failed). */\n  processed?: boolean;\n}\n\nexport interface QueueSnapshot {\n  readonly items: readonly QueueItem[];\n  /** A rate, quota or permission refusal: no new uploads start until start(). */\n  readonly blocked?: ContentKitError;\n  /** Every item is uploaded (or committed) and none is in flight. */\n  readonly ready: boolean;\n}\n\nexport interface QueueOptions {\n  ref: RefBody;\n  /** Each file's upload path: a template whose {name} is the file's name, e.g. \"originals/{name}\". */\n  path: string;\n  /** Files uploading at once. Default 2. */\n  concurrency?: number;\n  /** Start uploads as files are added. Default true. */\n  autoStart?: boolean;\n  /** Called with every item state change, to persist resumable state. */\n  onState?: (item: QueueItem, state: UploadState | null) => void;\n  /** Milliseconds between processing polls of unattached uploads. Default 2000. */\n  pollInterval?: number;\n}\n\n/** An op index past the end of the list: the upload is appended. */\nconst END = 2 ** 31 - 1;\n\n/**\n * An ordered file queue for one item: uploads in the background, keeps the\n * order the user arranges, and commits the uploads as puts appended in that\n * order. Framework-free; the React hooks wrap it.\n */\nexport class ItemUploadQueue {\n  private items: QueueItem[] = [];\n  private blocked?: ContentKitError;\n  private running = new Map<string, AbortController>();\n  private listeners = new Set<() => void>();\n  private snap!: QueueSnapshot;\n  private started: boolean;\n  /** In-flight unattached commits, by item id. */\n  private staging = new Map<string, Promise<FileInfo | undefined>>();\n  private poll?: ReturnType<typeof setTimeout>;\n  private disposed = false;\n  private batch?: { input: string; operationID: string };\n\n  constructor(\n    private readonly client: MediaClient,\n    private readonly o: QueueOptions,\n  ) {\n    this.started = o.autoStart ?? true;\n    this.publish();\n  }\n\n  subscribe = (fn: () => void): (() => void) => {\n    this.listeners.add(fn);\n    return () => this.listeners.delete(fn);\n  };\n\n  getSnapshot = (): QueueSnapshot => this.snap;\n\n  /** Queues files; state restores a multipart upload saved through onState before a reload. */\n  add(\n    files: Iterable<File>,\n    opts: { path?: (f: File) => string; state?: (f: File) => UploadState | undefined } = {},\n  ): QueueItem[] {\n    const added = [...files].map(\n      (file): QueueItem => ({\n        id: crypto.randomUUID(),\n        file,\n        path: opts.path?.(file) ?? fill(this.o.path, { name: file.name }),\n        status: \"queued\",\n        state: opts.state?.(file),\n      }),\n    );\n    this.items.push(...added);\n    this.changed();\n    return added;\n  }\n\n  /** Moves an item to index (before commit). */\n  move(id: string, index: number): void {\n    const from = this.items.findIndex((i) => i.id === id);\n    if (from < 0) return;\n    const [item] = this.items.splice(from, 1);\n    this.items.splice(Math.max(0, Math.min(index, this.items.length)), 0, item!);\n    this.changed();\n  }\n\n  update(id: string, patch: Pick<Partial<QueueItem>, \"path\" | \"meta\">): void {\n    const item = this.find(id);\n    if (item?.unattached && patch.path && patch.path !== item.path) {\n      void this.client.commit(this.o.ref, [{ op: \"rename\", path: item.path, to: patch.path }]).then(\n        (files) => {\n          const f = files.find((x) => samePath(x.path, stem(patch.path!)));\n          if (f) this.patch(id, { path: f.path });\n        },\n        () => {},\n      );\n    }\n    this.patch(id, patch);\n  }\n\n  /**\n   * Removes an item, discarding its multipart upload if one is open, or its\n   * unattached upload (the commit removes it and its outputs).\n   */\n  remove(id: string): void {\n    const item = this.find(id);\n    if (!item) return;\n    this.running.get(id)?.abort();\n    if (item.state) void this.client.discard(item.state).catch(() => {});\n    const staged = this.staging.get(id);\n    if (item.unattached || staged) {\n      void (staged ?? Promise.resolve())\n        .then((file) => {\n          if (file || item.unattached) {\n            return this.client.commit(this.o.ref, [{ op: \"remove\", path: file?.path ?? item.path }]);\n          }\n        })\n        .catch(() => {});\n    }\n    this.o.onState?.(item, null);\n    this.items = this.items.filter((i) => i.id !== id);\n    this.changed();\n  }\n\n  /** Re-queues a failed item; a multipart upload resumes from its state. */\n  retry(id: string): void {\n    this.patch(id, { status: \"queued\", error: undefined });\n  }\n\n  /** Starts uploading (autoStart false) or lifts a block after a refusal. */\n  start(): void {\n    this.started = true;\n    this.blocked = undefined;\n    this.changed();\n  }\n\n  /** Stops starting uploads and pauses running ones (they stay resumable). */\n  pause(): void {\n    this.started = false;\n    for (const c of this.running.values()) c.abort();\n    this.changed();\n  }\n\n  /**\n   * Commits every uploaded item, in queue order, after the item's uploads:\n   * unattached ones are attached (no reprocessing), the rest put. With head,\n   * only the uploaded items before the first one still uploading or failed\n   * (a draft committing files as they finish). attach adds unattached\n   * uploads the queue does not hold (an earlier visit's) after them. Returns\n   * the item's attached uploads in order.\n   */\n  async commit(signal?: AbortSignal, o: { head?: boolean; attach?: readonly string[] } = {}): Promise<FileInfo[]> {\n    await Promise.all(this.staging.values());\n    let items = this.items;\n    if (o.head) {\n      // Only the uploaded head of the queue, so files land in the order added.\n      const end = items.findIndex((i) => i.status !== \"uploaded\" && i.status !== \"committed\");\n      if (end >= 0) items = items.slice(0, end);\n    }\n    const ready = items.filter((i) => i.status === \"uploaded\");\n    const strays = o.attach ?? [];\n    if (ready.length === 0 && strays.length === 0) return [];\n    const ops = ready.flatMap((i): Op[] => {\n      const attach: Op = { op: \"attach\", path: i.path, index: END, ...(i.meta ? { meta: i.meta } : {}) };\n      if (i.unattached) return [attach];\n      const put: Op = { op: \"put\", path: i.path, blob: i.result!.blob, create_id: i.id, index: END, ...(i.meta ? { meta: i.meta } : {}) };\n      // A lost staging response may hide a successful unattached create.\n      return i.result!.processOnUpload ? [put, attach] : [put];\n    });\n    for (const path of strays) ops.push({ op: \"attach\", path, index: END });\n    const sources = Object.fromEntries(ready.map((i) => [i.result!.blob, { file: i.file, type: i.result!.type }]));\n    const input = JSON.stringify(ops);\n    if (this.batch?.input !== input) this.batch = { input, operationID: crypto.randomUUID() };\n    const batch = this.batch;\n    const files = await this.client.commit(this.o.ref, ops, {\n      signal,\n      sources,\n      operationID: batch.operationID,\n      onState: (body) => {\n        batch.input = JSON.stringify(body.ops);\n        batch.operationID = body.operation_id;\n        let changed = false;\n        for (const op of body.ops) {\n          if (op.op !== \"put\" || !op.blob) continue;\n          const original = ready.find((i) => i.id === op.create_id);\n          if (!original?.result) continue;\n          const current = this.find(original.id);\n          if (current?.result && current.result.blob === original.result.blob && current.result.blob !== op.blob) {\n            changed = this.set(current.id, { result: { ...current.result, blob: op.blob } }) || changed;\n          }\n        }\n        if (changed) this.changed();\n      },\n    });\n    for (const i of ready) this.set(i.id, { status: \"committed\", unattached: false });\n    this.changed();\n    return files.filter((f) => !f.unattached);\n  }\n\n  /** Aborts running uploads and stops polling; call on unmount. */\n  dispose(): void {\n    this.started = false;\n    this.disposed = true;\n    for (const c of this.running.values()) c.abort();\n    clearTimeout(this.poll);\n    this.listeners.clear();\n  }\n\n  /** Commits an uploaded file unattached, so the host processes it now. */\n  private stage(id: string): void {\n    const item = this.find(id);\n    if (!item?.result) return;\n    const { blob, type } = item.result;\n    const op: Op = { op: \"put\", path: item.path, blob, create_id: item.id, unattached: true, ...(item.meta ? { meta: item.meta } : {}) };\n    const p = this.client\n      .commit(this.o.ref, [op], { sources: { [blob]: { file: item.file, type } } })\n      .then(\n        (files) => {\n          const f = files.find((x) => x.unattached && samePath(x.path, stem(item.path)));\n          if (f && this.find(id)) this.patch(id, { unattached: true, path: f.path });\n          this.schedulePoll();\n          return f;\n        },\n        (error: unknown) => {\n          if (error instanceof ContentKitError && error.code === \"conflict\") {\n            this.patch(id, { status: \"failed\", error });\n          }\n          // Other failures leave it uploaded; commit() retries the same create.\n          return undefined;\n        },\n      )\n      .finally(() => this.staging.delete(id));\n    this.staging.set(id, p);\n  }\n\n  private schedulePoll(): void {\n    if (this.poll || this.disposed) return;\n    this.poll = setTimeout(() => {\n      this.poll = undefined;\n      void this.refresh().finally(() => {\n        if (this.items.some((i) => i.unattached && !i.processed)) this.schedulePoll();\n      });\n    }, this.o.pollInterval ?? 2000);\n  }\n\n  /** Reads the processing state of unattached uploads still processing. */\n  private async refresh(): Promise<void> {\n    const pending = this.items.filter((i) => i.unattached && !i.processed);\n    if (pending.length === 0) return;\n    let files: FileInfo[];\n    try {\n      files = (await this.client.read(this.o.ref, { editor: true })).files;\n    } catch {\n      return;\n    }\n    const byPath = new Map(files.filter((f) => f.upload).map((f) => [f.path, f]));\n    let changed = false;\n    for (const i of pending) {\n      const f = byPath.get(i.path);\n      if (!f) continue;\n      changed = this.set(i.id, { processing: f, processed: !!f.failed || (!f.pending?.length && !f.staged) }) || changed;\n    }\n    if (changed) this.changed();\n  }\n\n  private find(id: string): QueueItem | undefined {\n    return this.items.find((i) => i.id === id);\n  }\n\n  private patch(id: string, patch: Partial<QueueItem>): void {\n    if (this.set(id, patch)) this.changed();\n  }\n\n  private set(id: string, patch: Partial<QueueItem>): boolean {\n    const i = this.items.findIndex((x) => x.id === id);\n    if (i >= 0) this.items[i] = { ...this.items[i]!, ...patch };\n    return i >= 0;\n  }\n\n  private changed(): void {\n    this.pump();\n    this.publish();\n    for (const fn of this.listeners) fn();\n  }\n\n  private publish(): void {\n    this.snap = {\n      items: [...this.items],\n      blocked: this.blocked,\n      ready:\n        this.running.size === 0 &&\n        this.items.length > 0 &&\n        this.items.every((i) => i.status === \"uploaded\" || i.status === \"committed\"),\n    };\n  }\n\n  private pump(): void {\n    if (!this.started || this.blocked) return;\n    const limit = this.o.concurrency ?? 2;\n    for (const item of this.items) {\n      if (this.running.size >= limit) return;\n      if (item.status === \"queued\" && !this.running.has(item.id)) this.run(item.id);\n    }\n  }\n\n  private run(id: string): void {\n    const item = this.find(id)!;\n    const ctl = new AbortController();\n    this.running.set(id, ctl);\n    this.set(id, { status: \"uploading\", progress: undefined, error: undefined });\n    this.client\n      .upload(item.file, {\n        ref: this.o.ref,\n        path: item.path,\n        signal: ctl.signal,\n        resume: item.state,\n        onProgress: (progress) => this.patch(id, { progress }),\n        onState: (state) => {\n          this.patch(id, { state: state ?? undefined });\n          const cur = this.find(id);\n          if (cur) this.o.onState?.(cur, state);\n        },\n      })\n      .then(\n        (result) => {\n          this.running.delete(id);\n          this.patch(id, { status: \"uploaded\", result, path: result.path, state: undefined });\n          if (result.processOnUpload) this.stage(id);\n        },\n        (e: unknown) => {\n          this.running.delete(id);\n          const error = toContentKitError(e);\n          if (error.code === \"aborted\") {\n            this.patch(id, { status: \"queued\" });\n            return;\n          }\n          if (error.blocksQueue) {\n            // Refused for every file: keep it queued behind the block.\n            this.blocked = error;\n            this.patch(id, { status: \"queued\", error });\n            return;\n          }\n          this.patch(id, { status: \"failed\", error });\n        },\n      );\n  }\n}\n"],"mappings":";;;;AAqDA,IAAM,IAAM,KAAK,KAAK,GAOT,IAAb,MAA6B;CAcR;CACA;CAdnB,QAA6B,CAAC;CAC9B;CACA,0BAAkB,IAAI,IAA6B;CACnD,4BAAoB,IAAI,IAAgB;CACxC;CACA;CAEA,0BAAkB,IAAI,IAA2C;CACjE;CACA,WAAmB;CACnB;CAEA,YACE,GACA,GACA;EAEA,AAJiB,KAAA,SAAA,GACA,KAAA,IAAA,GAEjB,KAAK,UAAU,EAAE,aAAa,IAC9B,KAAK,QAAQ;CACf;CAEA,aAAa,OACX,KAAK,UAAU,IAAI,CAAE,SACR,KAAK,UAAU,OAAO,CAAE;CAGvC,oBAAmC,KAAK;CAGxC,IACE,GACA,IAAqF,CAAC,GACzE;EACb,IAAM,IAAQ,CAAC,GAAG,CAAK,CAAC,CAAC,KACtB,OAAqB;GACpB,IAAI,OAAO,WAAW;GACtB;GACA,MAAM,EAAK,OAAO,CAAI,KAAK,EAAK,KAAK,EAAE,MAAM,EAAE,MAAM,EAAK,KAAK,CAAC;GAChE,QAAQ;GACR,OAAO,EAAK,QAAQ,CAAI;EAC1B,EACF;EAGA,OAFA,KAAK,MAAM,KAAK,GAAG,CAAK,GACxB,KAAK,QAAQ,GACN;CACT;CAGA,KAAK,GAAY,GAAqB;EACpC,IAAM,IAAO,KAAK,MAAM,WAAW,MAAM,EAAE,OAAO,CAAE;EACpD,IAAI,IAAO,GAAG;EACd,IAAM,CAAC,KAAQ,KAAK,MAAM,OAAO,GAAM,CAAC;EAExC,AADA,KAAK,MAAM,OAAO,KAAK,IAAI,GAAG,KAAK,IAAI,GAAO,KAAK,MAAM,MAAM,CAAC,GAAG,GAAG,CAAK,GAC3E,KAAK,QAAQ;CACf;CAEA,OAAO,GAAY,GAAwD;EACzE,IAAM,IAAO,KAAK,KAAK,CAAE;EAUzB,AATI,GAAM,cAAc,EAAM,QAAQ,EAAM,SAAS,EAAK,QACxD,KAAU,OAAO,OAAO,KAAK,EAAE,KAAK,CAAC;GAAE,IAAI;GAAU,MAAM,EAAK;GAAM,IAAI,EAAM;EAAK,CAAC,CAAC,CAAC,CAAC,MACtF,MAAU;GACT,IAAM,IAAI,EAAM,MAAM,MAAM,EAAS,EAAE,MAAM,EAAK,EAAM,IAAK,CAAC,CAAC;GAC/D,AAAI,KAAG,KAAK,MAAM,GAAI,EAAE,MAAM,EAAE,KAAK,CAAC;EACxC,SACM,CAAC,CACT,GAEF,KAAK,MAAM,GAAI,CAAK;CACtB;CAMA,OAAO,GAAkB;EACvB,IAAM,IAAO,KAAK,KAAK,CAAE;EACzB,IAAI,CAAC,GAAM;EAEX,AADA,KAAK,QAAQ,IAAI,CAAE,CAAC,EAAE,MAAM,GACxB,EAAK,SAAO,KAAU,OAAO,QAAQ,EAAK,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC;EACnE,IAAM,IAAS,KAAK,QAAQ,IAAI,CAAE;EAYlC,CAXI,EAAK,cAAc,OACf,KAAU,QAAQ,QAAQ,EAAA,CAC7B,MAAM,MAAS;GACd,IAAI,KAAQ,EAAK,YACf,OAAO,KAAK,OAAO,OAAO,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI;IAAU,MAAM,GAAM,QAAQ,EAAK;GAAK,CAAC,CAAC;EAE3F,CAAC,CAAC,CACD,YAAY,CAAC,CAAC,GAEnB,KAAK,EAAE,UAAU,GAAM,IAAI,GAC3B,KAAK,QAAQ,KAAK,MAAM,QAAQ,MAAM,EAAE,OAAO,CAAE,GACjD,KAAK,QAAQ;CACf;CAGA,MAAM,GAAkB;EACtB,KAAK,MAAM,GAAI;GAAE,QAAQ;GAAU,OAAO,KAAA;EAAU,CAAC;CACvD;CAGA,QAAc;EAGZ,AAFA,KAAK,UAAU,IACf,KAAK,UAAU,KAAA,GACf,KAAK,QAAQ;CACf;CAGA,QAAc;EACZ,KAAK,UAAU;EACf,KAAK,IAAM,KAAK,KAAK,QAAQ,OAAO,GAAG,EAAE,MAAM;EAC/C,KAAK,QAAQ;CACf;CAUA,MAAM,OAAO,GAAsB,IAAoD,CAAC,GAAwB;EAC9G,MAAM,QAAQ,IAAI,KAAK,QAAQ,OAAO,CAAC;EACvC,IAAI,IAAQ,KAAK;EACjB,IAAI,EAAE,MAAM;GAEV,IAAM,IAAM,EAAM,WAAW,MAAM,EAAE,WAAW,cAAc,EAAE,WAAW,WAAW;GACtF,AAAI,KAAO,MAAG,IAAQ,EAAM,MAAM,GAAG,CAAG;EAC1C;EACA,IAAM,IAAQ,EAAM,QAAQ,MAAM,EAAE,WAAW,UAAU,GACnD,IAAS,EAAE,UAAU,CAAC;EAC5B,IAAI,EAAM,WAAW,KAAK,EAAO,WAAW,GAAG,OAAO,CAAC;EACvD,IAAM,IAAM,EAAM,SAAS,MAAY;GACrC,IAAM,IAAa;IAAE,IAAI;IAAU,MAAM,EAAE;IAAM,OAAO;IAAK,GAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;GAAG;GACjG,IAAI,EAAE,YAAY,OAAO,CAAC,CAAM;GAChC,IAAM,IAAU;IAAE,IAAI;IAAO,MAAM,EAAE;IAAM,MAAM,EAAE,OAAQ;IAAM,WAAW,EAAE;IAAI,OAAO;IAAK,GAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;GAAG;GAElI,OAAO,EAAE,OAAQ,kBAAkB,CAAC,GAAK,CAAM,IAAI,CAAC,CAAG;EACzD,CAAC;EACD,KAAK,IAAM,KAAQ,GAAQ,EAAI,KAAK;GAAE,IAAI;GAAU;GAAM,OAAO;EAAI,CAAC;EACtE,IAAM,IAAU,OAAO,YAAY,EAAM,KAAK,MAAM,CAAC,EAAE,OAAQ,MAAM;GAAE,MAAM,EAAE;GAAM,MAAM,EAAE,OAAQ;EAAK,CAAC,CAAC,CAAC,GACvG,IAAQ,KAAK,UAAU,CAAG;EAChC,AAAI,KAAK,OAAO,UAAU,MAAO,KAAK,QAAQ;GAAE;GAAO,aAAa,OAAO,WAAW;EAAE;EACxF,IAAM,IAAQ,KAAK,OACb,IAAQ,MAAM,KAAK,OAAO,OAAO,KAAK,EAAE,KAAK,GAAK;GACtD;GACA;GACA,aAAa,EAAM;GACnB,UAAU,MAAS;IAEjB,AADA,EAAM,QAAQ,KAAK,UAAU,EAAK,GAAG,GACrC,EAAM,cAAc,EAAK;IACzB,IAAI,IAAU;IACd,KAAK,IAAM,KAAM,EAAK,KAAK;KACzB,IAAI,EAAG,OAAO,SAAS,CAAC,EAAG,MAAM;KACjC,IAAM,IAAW,EAAM,MAAM,MAAM,EAAE,OAAO,EAAG,SAAS;KACxD,IAAI,CAAC,GAAU,QAAQ;KACvB,IAAM,IAAU,KAAK,KAAK,EAAS,EAAE;KACrC,AAAI,GAAS,UAAU,EAAQ,OAAO,SAAS,EAAS,OAAO,QAAQ,EAAQ,OAAO,SAAS,EAAG,SAChG,IAAU,KAAK,IAAI,EAAQ,IAAI,EAAE,QAAQ;MAAE,GAAG,EAAQ;MAAQ,MAAM,EAAG;KAAK,EAAE,CAAC,KAAK;IAExF;IACA,AAAI,KAAS,KAAK,QAAQ;GAC5B;EACF,CAAC;EACD,KAAK,IAAM,KAAK,GAAO,KAAK,IAAI,EAAE,IAAI;GAAE,QAAQ;GAAa,YAAY;EAAM,CAAC;EAEhF,OADA,KAAK,QAAQ,GACN,EAAM,QAAQ,MAAM,CAAC,EAAE,UAAU;CAC1C;CAGA,UAAgB;EAEd,AADA,KAAK,UAAU,IACf,KAAK,WAAW;EAChB,KAAK,IAAM,KAAK,KAAK,QAAQ,OAAO,GAAG,EAAE,MAAM;EAE/C,AADA,aAAa,KAAK,IAAI,GACtB,KAAK,UAAU,MAAM;CACvB;CAGA,MAAc,GAAkB;EAC9B,IAAM,IAAO,KAAK,KAAK,CAAE;EACzB,IAAI,CAAC,GAAM,QAAQ;EACnB,IAAM,EAAE,SAAM,YAAS,EAAK,QACtB,IAAS;GAAE,IAAI;GAAO,MAAM,EAAK;GAAM;GAAM,WAAW,EAAK;GAAI,YAAY;GAAM,GAAI,EAAK,OAAO,EAAE,MAAM,EAAK,KAAK,IAAI,CAAC;EAAG,GAC7H,IAAI,KAAK,OACZ,OAAO,KAAK,EAAE,KAAK,CAAC,CAAE,GAAG,EAAE,SAAS,GAAG,IAAO;GAAE,MAAM,EAAK;GAAM;EAAK,EAAE,EAAE,CAAC,CAAC,CAC5E,MACE,MAAU;GACT,IAAM,IAAI,EAAM,MAAM,MAAM,EAAE,cAAc,EAAS,EAAE,MAAM,EAAK,EAAK,IAAI,CAAC,CAAC;GAG7E,OAFI,KAAK,KAAK,KAAK,CAAE,KAAG,KAAK,MAAM,GAAI;IAAE,YAAY;IAAM,MAAM,EAAE;GAAK,CAAC,GACzE,KAAK,aAAa,GACX;EACT,IACC,MAAmB;GAClB,AAAI,aAAiB,KAAmB,EAAM,SAAS,cACrD,KAAK,MAAM,GAAI;IAAE,QAAQ;IAAU;GAAM,CAAC;EAI9C,CACF,CAAC,CACA,cAAc,KAAK,QAAQ,OAAO,CAAE,CAAC;EACxC,KAAK,QAAQ,IAAI,GAAI,CAAC;CACxB;CAEA,eAA6B;EACvB,KAAK,QAAQ,KAAK,aACtB,KAAK,OAAO,iBAAiB;GAE3B,AADA,KAAK,OAAO,KAAA,GACZ,KAAU,QAAQ,CAAC,CAAC,cAAc;IAChC,AAAI,KAAK,MAAM,MAAM,MAAM,EAAE,cAAc,CAAC,EAAE,SAAS,KAAG,KAAK,aAAa;GAC9E,CAAC;EACH,GAAG,KAAK,EAAE,gBAAgB,GAAI;CAChC;CAGA,MAAc,UAAyB;EACrC,IAAM,IAAU,KAAK,MAAM,QAAQ,MAAM,EAAE,cAAc,CAAC,EAAE,SAAS;EACrE,IAAI,EAAQ,WAAW,GAAG;EAC1B,IAAI;EACJ,IAAI;GACF,KAAS,MAAM,KAAK,OAAO,KAAK,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAK,CAAC,EAAA,CAAG;EACjE,QAAQ;GACN;EACF;EACA,IAAM,IAAS,IAAI,IAAI,EAAM,QAAQ,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,GACxE,IAAU;EACd,KAAK,IAAM,KAAK,GAAS;GACvB,IAAM,IAAI,EAAO,IAAI,EAAE,IAAI;GACtB,MACL,IAAU,KAAK,IAAI,EAAE,IAAI;IAAE,YAAY;IAAG,WAAW,CAAC,CAAC,EAAE,UAAW,CAAC,EAAE,SAAS,UAAU,CAAC,EAAE;GAAQ,CAAC,KAAK;EAC7G;EACA,AAAI,KAAS,KAAK,QAAQ;CAC5B;CAEA,KAAa,GAAmC;EAC9C,OAAO,KAAK,MAAM,MAAM,MAAM,EAAE,OAAO,CAAE;CAC3C;CAEA,MAAc,GAAY,GAAiC;EACzD,AAAI,KAAK,IAAI,GAAI,CAAK,KAAG,KAAK,QAAQ;CACxC;CAEA,IAAY,GAAY,GAAoC;EAC1D,IAAM,IAAI,KAAK,MAAM,WAAW,MAAM,EAAE,OAAO,CAAE;EAEjD,OADI,KAAK,MAAG,KAAK,MAAM,KAAK;GAAE,GAAG,KAAK,MAAM;GAAK,GAAG;EAAM,IACnD,KAAK;CACd;CAEA,UAAwB;EAEtB,AADA,KAAK,KAAK,GACV,KAAK,QAAQ;EACb,KAAK,IAAM,KAAM,KAAK,WAAW,EAAG;CACtC;CAEA,UAAwB;EACtB,KAAK,OAAO;GACV,OAAO,CAAC,GAAG,KAAK,KAAK;GACrB,SAAS,KAAK;GACd,OACE,KAAK,QAAQ,SAAS,KACtB,KAAK,MAAM,SAAS,KACpB,KAAK,MAAM,OAAO,MAAM,EAAE,WAAW,cAAc,EAAE,WAAW,WAAW;EAC/E;CACF;CAEA,OAAqB;EACnB,IAAI,CAAC,KAAK,WAAW,KAAK,SAAS;EACnC,IAAM,IAAQ,KAAK,EAAE,eAAe;EACpC,KAAK,IAAM,KAAQ,KAAK,OAAO;GAC7B,IAAI,KAAK,QAAQ,QAAQ,GAAO;GAChC,AAAI,EAAK,WAAW,YAAY,CAAC,KAAK,QAAQ,IAAI,EAAK,EAAE,KAAG,KAAK,IAAI,EAAK,EAAE;EAC9E;CACF;CAEA,IAAY,GAAkB;EAC5B,IAAM,IAAO,KAAK,KAAK,CAAE,GACnB,IAAM,IAAI,gBAAgB;EAGhC,AAFA,KAAK,QAAQ,IAAI,GAAI,CAAG,GACxB,KAAK,IAAI,GAAI;GAAE,QAAQ;GAAa,UAAU,KAAA;GAAW,OAAO,KAAA;EAAU,CAAC,GAC3E,KAAK,OACF,OAAO,EAAK,MAAM;GACjB,KAAK,KAAK,EAAE;GACZ,MAAM,EAAK;GACX,QAAQ,EAAI;GACZ,QAAQ,EAAK;GACb,aAAa,MAAa,KAAK,MAAM,GAAI,EAAE,YAAS,CAAC;GACrD,UAAU,MAAU;IAClB,KAAK,MAAM,GAAI,EAAE,OAAO,KAAS,KAAA,EAAU,CAAC;IAC5C,IAAM,IAAM,KAAK,KAAK,CAAE;IACxB,AAAI,KAAK,KAAK,EAAE,UAAU,GAAK,CAAK;GACtC;EACF,CAAC,CAAC,CACD,MACE,MAAW;GAGV,AAFA,KAAK,QAAQ,OAAO,CAAE,GACtB,KAAK,MAAM,GAAI;IAAE,QAAQ;IAAY;IAAQ,MAAM,EAAO;IAAM,OAAO,KAAA;GAAU,CAAC,GAC9E,EAAO,mBAAiB,KAAK,MAAM,CAAE;EAC3C,IACC,MAAe;GACd,KAAK,QAAQ,OAAO,CAAE;GACtB,IAAM,IAAQ,EAAkB,CAAC;GACjC,IAAI,EAAM,SAAS,WAAW;IAC5B,KAAK,MAAM,GAAI,EAAE,QAAQ,SAAS,CAAC;IACnC;GACF;GACA,IAAI,EAAM,aAAa;IAGrB,AADA,KAAK,UAAU,GACf,KAAK,MAAM,GAAI;KAAE,QAAQ;KAAU;IAAM,CAAC;IAC1C;GACF;GACA,KAAK,MAAM,GAAI;IAAE,QAAQ;IAAU;GAAM,CAAC;EAC5C,CACF;CACJ;AACF"}
+{"version":3,"file":"queue.js","names":[],"sources":["../../../src/client/media/queue.ts"],"sourcesContent":["import { ContentKitError, toContentKitError } from \"../errors.js\";\nimport type { FileInfo, Op, RefBody } from \"../generated/wire.js\";\nimport { fill } from \"../public.js\";\nimport { samePath, stem, type MediaClient, type Progress, type UploadedFile, type UploadState } from \"./client.js\";\n\nexport type ItemStatus = \"queued\" | \"uploading\" | \"uploaded\" | \"failed\" | \"committed\";\n\nexport interface QueueItem {\n  readonly id: string;\n  readonly file: File;\n  /** The upload path the commit puts; the server's canonical one once uploaded. */\n  path: string;\n  meta?: Record<string, unknown>;\n  status: ItemStatus;\n  progress?: Progress;\n  error?: ContentKitError;\n  result?: UploadedFile;\n  /** Resumable multipart state while uploading or after a failure. */\n  state?: UploadState;\n  /**\n   * Committed unattached for processing on upload (the host's\n   * ProcessOnUpload): commit() attaches it, remove() discards it.\n   */\n  unattached?: boolean;\n  /** The server's view of an unattached upload while it processes (editor read): dims, pending, failed, progress. */\n  processing?: FileInfo;\n  /** Processing finished (placed and outputs written, or failed). */\n  processed?: boolean;\n}\n\nexport interface QueueSnapshot {\n  readonly items: readonly QueueItem[];\n  /** A rate, quota or permission refusal: no new uploads start until start(). */\n  readonly blocked?: ContentKitError;\n  /** Every item is uploaded (or committed) and none is in flight. */\n  readonly ready: boolean;\n}\n\nexport interface QueueOptions {\n  ref: RefBody;\n  /** Each file's upload path: a template whose {name} is the file's name, e.g. \"originals/{name}\". */\n  path: string;\n  /** Files uploading at once. Default 2. */\n  concurrency?: number;\n  /** Start uploads as files are added. Default true. */\n  autoStart?: boolean;\n  /** Called with every item state change, to persist resumable state. */\n  onState?: (item: QueueItem, state: UploadState | null) => void;\n  /** Milliseconds between processing polls of unattached uploads. Default 2000. */\n  pollInterval?: number;\n}\n\n/** An op index past the end of the list: the upload is appended. */\nconst END = 2 ** 31 - 1;\n\n/**\n * An ordered file queue for one item: uploads in the background, keeps the\n * order the user arranges, and commits the uploads as puts appended in that\n * order. Framework-free; the React hooks wrap it.\n */\nexport class ItemUploadQueue {\n  private items: QueueItem[] = [];\n  private blocked?: ContentKitError;\n  private running = new Map<string, AbortController>();\n  private listeners = new Set<() => void>();\n  private snap!: QueueSnapshot;\n  private started: boolean;\n  /** In-flight unattached commits, by item id. */\n  private staging = new Map<string, Promise<FileInfo | undefined>>();\n  private poll?: ReturnType<typeof setTimeout>;\n  private disposed = false;\n  private batch?: { input: string; operationID: string };\n\n  constructor(\n    private readonly client: MediaClient,\n    private readonly o: QueueOptions,\n  ) {\n    this.started = o.autoStart ?? true;\n    this.publish();\n  }\n\n  subscribe = (fn: () => void): (() => void) => {\n    this.listeners.add(fn);\n    return () => this.listeners.delete(fn);\n  };\n\n  getSnapshot = (): QueueSnapshot => this.snap;\n\n  /** Queues files; state restores a multipart upload saved through onState before a reload. */\n  add(\n    files: Iterable<File>,\n    opts: { path?: (f: File) => string; state?: (f: File) => UploadState | undefined } = {},\n  ): QueueItem[] {\n    const added = [...files].map(\n      (file): QueueItem => ({\n        id: crypto.randomUUID(),\n        file,\n        path: opts.path?.(file) ?? fill(this.o.path, { name: file.name }),\n        status: \"queued\",\n        state: opts.state?.(file),\n      }),\n    );\n    this.items.push(...added);\n    this.changed();\n    return added;\n  }\n\n  /** Moves an item to index (before commit). */\n  move(id: string, index: number): void {\n    const from = this.items.findIndex((i) => i.id === id);\n    if (from < 0) return;\n    const [item] = this.items.splice(from, 1);\n    this.items.splice(Math.max(0, Math.min(index, this.items.length)), 0, item!);\n    this.changed();\n  }\n\n  update(id: string, patch: Pick<Partial<QueueItem>, \"path\" | \"meta\">): void {\n    const item = this.find(id);\n    if (item?.unattached && patch.path && patch.path !== item.path) {\n      void this.client.commit(this.o.ref, [{ op: \"rename\", path: item.path, to: patch.path }]).then(\n        (files) => {\n          const f = files.find((x) => samePath(x.path, stem(patch.path!)));\n          if (f) this.patch(id, { path: f.path });\n        },\n        () => {},\n      );\n    }\n    this.patch(id, patch);\n  }\n\n  /**\n   * Removes an item, discarding its multipart upload if one is open, or its\n   * unattached upload (the commit removes it and its outputs).\n   */\n  remove(id: string): void {\n    const item = this.find(id);\n    if (!item) return;\n    this.running.get(id)?.abort();\n    if (item.state) void this.client.discard(item.state).catch(() => {});\n    const staged = this.staging.get(id);\n    if (item.unattached || staged) {\n      void (staged ?? Promise.resolve())\n        .then((file) => {\n          if (file || item.unattached) {\n            return this.client.commit(this.o.ref, [{ op: \"remove\", path: file?.path ?? item.path }]);\n          }\n        })\n        .catch(() => {});\n    }\n    this.o.onState?.(item, null);\n    this.items = this.items.filter((i) => i.id !== id);\n    this.changed();\n  }\n\n  /** Re-queues a failed item; a multipart upload resumes from its state. */\n  retry(id: string): void {\n    this.patch(id, { status: \"queued\", error: undefined });\n  }\n\n  /** Starts uploading (autoStart false) or lifts a block after a refusal. */\n  start(): void {\n    this.started = true;\n    this.blocked = undefined;\n    this.changed();\n  }\n\n  /** Stops starting uploads and pauses running ones (they stay resumable). */\n  pause(): void {\n    this.started = false;\n    for (const c of this.running.values()) c.abort();\n    this.changed();\n  }\n\n  /**\n   * Commits every uploaded item, in queue order, after the item's uploads:\n   * unattached ones are attached (no reprocessing), the rest put. With head,\n   * only the uploaded items before the first one still uploading or failed\n   * (a draft committing files as they finish). attach adds unattached\n   * uploads the queue does not hold (an earlier visit's) after them. Returns\n   * the item's attached uploads in order.\n   */\n  async commit(signal?: AbortSignal, o: { head?: boolean; attach?: readonly string[] } = {}): Promise<FileInfo[]> {\n    await Promise.all(this.staging.values());\n    let items = this.items;\n    if (o.head) {\n      // Only the uploaded head of the queue, so files land in the order added.\n      const end = items.findIndex((i) => i.status !== \"uploaded\" && i.status !== \"committed\");\n      if (end >= 0) items = items.slice(0, end);\n    }\n    const ready = items.filter((i) => i.status === \"uploaded\");\n    const strays = o.attach ?? [];\n    if (ready.length === 0 && strays.length === 0) return [];\n    const ops = ready.flatMap((i): Op[] => {\n      const attach: Op = { op: \"attach\", path: i.path, index: END, ...(i.meta ? { meta: i.meta } : {}) };\n      if (i.unattached) return [attach];\n      const put: Op = { op: \"put\", path: i.path, source_name: i.result!.sourceName, blob: i.result!.blob, create_id: i.id, index: END, ...(i.meta ? { meta: i.meta } : {}) };\n      // A lost staging response may hide a successful unattached create.\n      return i.result!.processOnUpload ? [put, attach] : [put];\n    });\n    for (const path of strays) ops.push({ op: \"attach\", path, index: END });\n    const sources = Object.fromEntries(ready.map((i) => [i.result!.blob, { file: i.file, type: i.result!.type }]));\n    const input = JSON.stringify(ops);\n    if (this.batch?.input !== input) this.batch = { input, operationID: crypto.randomUUID() };\n    const batch = this.batch;\n    const files = await this.client.commit(this.o.ref, ops, {\n      signal,\n      sources,\n      operationID: batch.operationID,\n      onState: (body) => {\n        batch.input = JSON.stringify(body.ops);\n        batch.operationID = body.operation_id;\n        let changed = false;\n        for (const op of body.ops) {\n          if (op.op !== \"put\" || !op.blob) continue;\n          const original = ready.find((i) => i.id === op.create_id);\n          if (!original?.result) continue;\n          const current = this.find(original.id);\n          if (current?.result && current.result.blob === original.result.blob && current.result.blob !== op.blob) {\n            changed = this.set(current.id, { result: { ...current.result, blob: op.blob } }) || changed;\n          }\n        }\n        if (changed) this.changed();\n      },\n    });\n    for (const i of ready) {\n      const file = files.find((f) => f.create_id === i.id) ?? files.find((f) => samePath(f.path, i.path));\n      this.set(i.id, { status: \"committed\", unattached: false, ...(file ? { path: file.path, result: { ...i.result!, path: file.path } } : {}) });\n    }\n    this.changed();\n    return files.filter((f) => !f.unattached);\n  }\n\n  /** Aborts running uploads and stops polling; call on unmount. */\n  dispose(): void {\n    this.started = false;\n    this.disposed = true;\n    for (const c of this.running.values()) c.abort();\n    clearTimeout(this.poll);\n    this.listeners.clear();\n  }\n\n  /** Commits an uploaded file unattached, so the host processes it now. */\n  private stage(id: string): void {\n    const item = this.find(id);\n    if (!item?.result) return;\n    const { blob, type, sourceName } = item.result;\n    const op: Op = { op: \"put\", path: item.path, source_name: sourceName, blob, create_id: item.id, unattached: true, ...(item.meta ? { meta: item.meta } : {}) };\n    const p = this.client\n      .commit(this.o.ref, [op], { sources: { [blob]: { file: item.file, type } } })\n      .then(\n        (files) => {\n          const f = files.find((x) => x.unattached && x.create_id === id) ?? files.find((x) => x.unattached && samePath(x.path, stem(item.path)));\n          if (f && this.find(id)) this.patch(id, { unattached: true, path: f.path, result: { ...item.result!, path: f.path } });\n          this.schedulePoll();\n          return f;\n        },\n        (error: unknown) => {\n          if (error instanceof ContentKitError && error.code === \"conflict\") {\n            this.patch(id, { status: \"failed\", error });\n          }\n          // Other failures leave it uploaded; commit() retries the same create.\n          return undefined;\n        },\n      )\n      .finally(() => this.staging.delete(id));\n    this.staging.set(id, p);\n  }\n\n  private schedulePoll(): void {\n    if (this.poll || this.disposed) return;\n    this.poll = setTimeout(() => {\n      this.poll = undefined;\n      void this.refresh().finally(() => {\n        if (this.items.some((i) => i.unattached && !i.processed)) this.schedulePoll();\n      });\n    }, this.o.pollInterval ?? 2000);\n  }\n\n  /** Reads the processing state of unattached uploads still processing. */\n  private async refresh(): Promise<void> {\n    const pending = this.items.filter((i) => i.unattached && !i.processed);\n    if (pending.length === 0) return;\n    let files: FileInfo[];\n    try {\n      files = (await this.client.read(this.o.ref, { editor: true })).files;\n    } catch {\n      return;\n    }\n    const byPath = new Map(files.filter((f) => f.upload).map((f) => [f.path, f]));\n    let changed = false;\n    for (const i of pending) {\n      const f = byPath.get(i.path);\n      if (!f) continue;\n      changed = this.set(i.id, { processing: f, processed: !!f.failed || (!f.pending?.length && !f.staged) }) || changed;\n    }\n    if (changed) this.changed();\n  }\n\n  private find(id: string): QueueItem | undefined {\n    return this.items.find((i) => i.id === id);\n  }\n\n  private patch(id: string, patch: Partial<QueueItem>): void {\n    if (this.set(id, patch)) this.changed();\n  }\n\n  private set(id: string, patch: Partial<QueueItem>): boolean {\n    const i = this.items.findIndex((x) => x.id === id);\n    if (i >= 0) this.items[i] = { ...this.items[i]!, ...patch };\n    return i >= 0;\n  }\n\n  private changed(): void {\n    this.pump();\n    this.publish();\n    for (const fn of this.listeners) fn();\n  }\n\n  private publish(): void {\n    this.snap = {\n      items: [...this.items],\n      blocked: this.blocked,\n      ready:\n        this.running.size === 0 &&\n        this.items.length > 0 &&\n        this.items.every((i) => i.status === \"uploaded\" || i.status === \"committed\"),\n    };\n  }\n\n  private pump(): void {\n    if (!this.started || this.blocked) return;\n    const limit = this.o.concurrency ?? 2;\n    for (const item of this.items) {\n      if (this.running.size >= limit) return;\n      if (item.status === \"queued\" && !this.running.has(item.id)) this.run(item.id);\n    }\n  }\n\n  private run(id: string): void {\n    const item = this.find(id)!;\n    const ctl = new AbortController();\n    this.running.set(id, ctl);\n    this.set(id, { status: \"uploading\", progress: undefined, error: undefined });\n    this.client\n      .upload(item.file, {\n        ref: this.o.ref,\n        path: item.path,\n        signal: ctl.signal,\n        resume: item.state,\n        onProgress: (progress) => this.patch(id, { progress }),\n        onState: (state) => {\n          this.patch(id, { state: state ?? undefined });\n          const cur = this.find(id);\n          if (cur) this.o.onState?.(cur, state);\n        },\n      })\n      .then(\n        (result) => {\n          this.running.delete(id);\n          this.patch(id, { status: \"uploaded\", result, path: result.path, state: undefined });\n          if (result.processOnUpload) this.stage(id);\n        },\n        (e: unknown) => {\n          this.running.delete(id);\n          const error = toContentKitError(e);\n          if (error.code === \"aborted\") {\n            this.patch(id, { status: \"queued\" });\n            return;\n          }\n          if (error.blocksQueue) {\n            // Refused for every file: keep it queued behind the block.\n            this.blocked = error;\n            this.patch(id, { status: \"queued\", error });\n            return;\n          }\n          this.patch(id, { status: \"failed\", error });\n        },\n      );\n  }\n}\n"],"mappings":"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"}

package/dist/client/media/rules.d.ts

@@ -33,6 +33,10 @@ export interface Screened {
         error: ContentKitError;
     }[];
 }
+/** ZIP ingestion's numeric, case-insensitive order, then original UTF-8 name. */
+export declare function naturalNameCompare(left: string, right: string): number;
+/** Sort only new page files within each rule, retaining every non-page slot. */
+export declare function sortPageFiles(accepted: readonly Screened["accepted"][number][]): Screened["accepted"];
 /**
  * Checks files against the rules before any upload: a type some rule takes
  * (the first that does), its size, and the rule's file cap counting
@@ -42,6 +46,8 @@ export interface Screened {
 export declare function screenFiles(files: Iterable<File>, rules: readonly UploadRule[], have?: (rule: UploadRule) => number): Screened;
 /** name, or name-2, name-3… so its stem is not among taken (names or paths without the directory). */
 export declare function uniqueName(name: string, taken: Iterable<string>): string;
+/** Preserve numeric page/range identities; a collision must not invent a joined range. */
+export declare function uniquePageName(name: string, taken: Iterable<string>): string;
 /** "16:9" style label of a width/height ratio: 2.4 → "2.4:1", 0.4167 → "1:2.4". */
 export declare function ratioLabel(r: number): string;
 /** The kind's public preset for an upload path: the one named name, else the first with an aspect, else the first. */

package/dist/client/media/rules.js

@@ -49,7 +49,49 @@ function m(e) {
 	let n = Object.entries(f).filter(([, e]) => t.includes(e)).map(([e]) => `.${e}`);
 	return [...t, ...n].join(",");
 }
-function h(t, n, r = () => 0) {
+var h = new TextEncoder(), g = (e) => e >= 48 && e <= 57, _ = (e) => e >= 65 && e <= 90 ? e + 32 : e;
+function v(e, t) {
+	let n = h.encode(e), r = h.encode(t), i = 0, a = 0;
+	for (; i < n.length && a < r.length;) if (g(n[i]) && g(r[a])) {
+		let e = i, t = a;
+		for (; e < n.length && g(n[e]);) e++;
+		for (; t < r.length && g(r[t]);) t++;
+		let o = i, s = a;
+		for (; o < e && n[o] === 48;) o++;
+		for (; s < t && r[s] === 48;) s++;
+		if (e - o !== t - s) return e - o - (t - s);
+		for (; o < e;) {
+			if (n[o] !== r[s]) return n[o] - r[s];
+			o++, s++;
+		}
+		i = e, a = t;
+	} else {
+		let e = _(n[i]) - _(r[a]);
+		if (e) return e;
+		i++, a++;
+	}
+	let o = n.length - i - (r.length - a);
+	if (o) return o;
+	for (let e = 0; e < Math.min(n.length, r.length); e++) if (n[e] !== r[e]) return n[e] - r[e];
+	return n.length - r.length;
+}
+function y(e) {
+	let t = /* @__PURE__ */ new Map();
+	for (let n of e) {
+		if (!n.rule.page) continue;
+		let e = t.get(n.rule.path);
+		e || t.set(n.rule.path, e = {
+			files: [],
+			next: 0
+		}), e.files.push(n);
+	}
+	for (let e of t.values()) e.files.sort((e, t) => v(e.file.name, t.file.name));
+	return e.map((e) => {
+		let n = e.rule.page ? t.get(e.rule.path) : void 0;
+		return n ? n.files[n.next++] : e;
+	});
+}
+function b(t, n, r = () => 0) {
 	let i = {
 		accepted: [],
 		refused: []
@@ -104,7 +146,7 @@ function h(t, n, r = () => 0) {
 	}
 	return i;
 }
-function g(e, t) {
+function x(e, t) {
 	let n = new Set([...t].map(i));
 	if (!n.has(i(e))) return e;
 	let r = e.lastIndexOf("."), a = r > 0 ? e.slice(0, r) : e, o = r > 0 ? e.slice(r) : "";
@@ -113,21 +155,33 @@ function g(e, t) {
 		if (!n.has(i(t))) return t;
 	}
 }
-function _(e) {
+function S(e, t) {
+	let n = (e) => {
+		let t = i(e);
+		return /^\d+(?:-\d+)?$/.test(t) ? t.split("-").map((e) => e.replace(/^0+/, "") || "0").join("-") : t;
+	}, r = new Set([...t].map(n));
+	if (!r.has(n(e))) return e;
+	let a = e.lastIndexOf("."), o = a > 0 ? e.slice(0, a) : e, s = a > 0 ? e.slice(a) : "";
+	for (let e = 2;; e++) {
+		let t = `${o} (${e})${s}`;
+		if (!r.has(n(t))) return t;
+	}
+}
+function C(e) {
 	let t = (e) => String(Math.round(e * 100) / 100);
 	return e >= 1 ? `${t(e)}:1` : `1:${t(1 / e)}`;
 }
-function v(e, t, n, r) {
+function w(e, t, n, r) {
 	let i = e.filter((e) => e.kind === t && u([{ path: e.from }], n));
 	return (r ? i.find((e) => e.name === r) : void 0) ?? i.find((e) => e.aspect) ?? i[0];
 }
-function y(e, t, n) {
-	return !e.default || e.first || e.to.includes(s) ? null : x(e, t, n);
+function T(e, t, n) {
+	return !e.default || e.first || e.to.includes(s) ? null : D(e, t, n);
 }
-function b(e, t) {
-	return e.stable ? x(e, t) : null;
+function E(e, t) {
+	return e.stable ? D(e, t) : null;
 }
-function x(e, i, a) {
+function D(e, i, a) {
 	let o = r(e.aspect);
 	return {
 		preset: e.name,
@@ -140,6 +194,6 @@ function x(e, i, a) {
 	};
 }
 //#endregion
-export { m as acceptOf, y as defaultImage, d as filesFor, c as isPattern, v as presetFor, _ as ratioLabel, l as ruleDir, u as ruleFor, h as screenFiles, b as stableImage, g as uniqueName, o as uploadRules, p as withMediaType };
+export { m as acceptOf, T as defaultImage, d as filesFor, c as isPattern, v as naturalNameCompare, w as presetFor, C as ratioLabel, l as ruleDir, u as ruleFor, b as screenFiles, y as sortPageFiles, E as stableImage, x as uniqueName, S as uniquePageName, o as uploadRules, p as withMediaType };
 
 //# sourceMappingURL=rules.js.map

package/dist/client/media/rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"rules.js","names":[],"sources":["../../../src/client/media/rules.ts"],"sourcesContent":["import { ContentKitError } from \"../errors.js\";\nimport type { ErrorDetails, PresetRule, ReadResult, UploadRule } from \"../generated/wire.js\";\nimport { fill, publicURL, type PublicPreset } from \"../public.js\";\nimport { ratio } from \"../aspect.js\";\nimport { stem } from \"./client.js\";\n\nconst NO_RULES: UploadRule[] = [];\n\n/** An editor read's upload rules (a viewer read has none): one empty list, so memos keyed on them hold. */\nexport const uploadRules = (read: ReadResult | null | undefined): UploadRule[] => read?.uploads ?? NO_RULES;\n\nconst NAME = \"{name}\";\n\n/** A pattern path (\"originals/{name}\") holds many files; a literal (\"cover\") one. */\nexport const isPattern = (path: string) => path.endsWith(NAME);\n\n/** The directory of a pattern (\"originals/\"), or the literal itself. */\nexport const ruleDir = (path: string) => (isPattern(path) ? path.slice(0, -NAME.length) : path);\n\n/** The rule an upload path (with or without its extension) falls under: a literal wins over a pattern. */\nexport function ruleFor<R extends { path: string }>(rules: readonly R[], path: string): R | undefined {\n  const s = stem(path);\n  return (\n    rules.find((r) => !isPattern(r.path) && r.path === s) ??\n    rules.find((r) => {\n      if (!isPattern(r.path)) return false;\n      const dir = ruleDir(r.path);\n      return s.startsWith(dir) && s.length > dir.length && !s.slice(dir.length).includes(\"/\");\n    })\n  );\n}\n\n/** Uploads of the read under rule (attached, in manifest order). */\nexport function filesFor(read: ReadResult | null | undefined, rule: { path: string }, rules: readonly { path: string }[] = [rule]) {\n  return (read?.files ?? []).filter((f) => f.upload && !f.unattached && ruleFor(rules, f.path)?.path === rule.path);\n}\n\nconst BY_EXTENSION: Record<string, string> = {\n  jpg: \"image/jpeg\",\n  jpeg: \"image/jpeg\",\n  png: \"image/png\",\n  webp: \"image/webp\",\n  gif: \"image/gif\",\n  avif: \"image/avif\",\n  mp4: \"video/mp4\",\n  m4v: \"video/mp4\",\n  mov: \"video/quicktime\",\n  mkv: \"video/x-matroska\",\n  webm: \"video/webm\",\n  m4a: \"audio/mp4\",\n  mp3: \"audio/mpeg\",\n  vtt: \"text/vtt\",\n  srt: \"application/x-subrip\",\n  ass: \"text/x-ass\",\n  ssa: \"text/x-ssa\",\n  zip: \"application/zip\",\n};\n\n/** The file with a content type from its extension when the browser left it empty or nonstandard (.mkv, .mov, .srt). */\nexport function withMediaType(file: File, allowed?: readonly string[]): File {\n  if (file.type && (!allowed || allowed.includes(file.type))) return file;\n  const type = BY_EXTENSION[file.name.split(\".\").pop()?.toLowerCase() ?? \"\"];\n  return type && type !== file.type ? new File([file], file.name, { type, lastModified: file.lastModified }) : file;\n}\n\n/** `accept` for a file input from the rules' types (plus the extensions browsers leave untyped). */\nexport function acceptOf(rules: readonly UploadRule[]): string | undefined {\n  const types = [...new Set(rules.flatMap((r) => r.types))];\n  if (!types.length) return undefined;\n  const exts = Object.entries(BY_EXTENSION).filter(([, t]) => types.includes(t)).map(([e]) => `.${e}`);\n  return [...types, ...exts].join(\",\");\n}\n\nexport interface Screened {\n  /** Files to upload, each with its rule (typed by extension when needed). */\n  accepted: { file: File; rule: UploadRule }[];\n  /** Files the server would refuse, with the refusal it would answer. */\n  refused: { file: File; error: ContentKitError }[];\n}\n\n/**\n * Checks files against the rules before any upload: a type some rule takes\n * (the first that does), its size, and the rule's file cap counting\n * have(rule) files already there. A rule without types, size or cap lets\n * that check through; the server decides.\n */\nexport function screenFiles(files: Iterable<File>, rules: readonly UploadRule[], have: (rule: UploadRule) => number = () => 0): Screened {\n  const out: Screened = { accepted: [], refused: [] };\n  const counts = new Map<UploadRule, number>();\n  const allowed = [...new Set(rules.flatMap((r) => r.types))];\n  for (const picked of files) {\n    const file = withMediaType(picked, allowed);\n    const rule = rules.find((r) => !r.types.length || r.types.includes(file.type));\n    if (!rule) {\n      const details: ErrorDetails = { type: file.type || undefined, allowed };\n      out.refused.push({ file, error: new ContentKitError(\"type_not_allowed\", `${file.name}: type not allowed`, { status: 415, details }) });\n      continue;\n    }\n    if (rule.max_bytes > 0 && file.size > rule.max_bytes) {\n      const details: ErrorDetails = { type: file.type, size: file.size, max_bytes: rule.max_bytes };\n      out.refused.push({ file, error: new ContentKitError(\"too_large\", `${file.name}: too large`, { status: 413, details }) });\n      continue;\n    }\n    const n = counts.get(rule) ?? have(rule);\n    if (rule.max && n >= rule.max) {\n      const details: ErrorDetails = { max: rule.max };\n      out.refused.push({ file, error: new ContentKitError(\"too_many_files\", `${file.name}: at most ${rule.max} files`, { status: 409, details }) });\n      continue;\n    }\n    counts.set(rule, n + 1);\n    out.accepted.push({ file, rule });\n  }\n  return out;\n}\n\n/** name, or name-2, name-3… so its stem is not among taken (names or paths without the directory). */\nexport function uniqueName(name: string, taken: Iterable<string>): string {\n  const stems = new Set([...taken].map(stem));\n  if (!stems.has(stem(name))) return name;\n  const dot = name.lastIndexOf(\".\");\n  const base = dot > 0 ? name.slice(0, dot) : name;\n  const ext = dot > 0 ? name.slice(dot) : \"\";\n  for (let n = 2; ; n++) {\n    const candidate = `${base}-${n}${ext}`;\n    if (!stems.has(stem(candidate))) return candidate;\n  }\n}\n\n/** \"16:9\" style label of a width/height ratio: 2.4 → \"2.4:1\", 0.4167 → \"1:2.4\". */\nexport function ratioLabel(r: number): string {\n  const round = (v: number) => String(Math.round(v * 100) / 100);\n  return r >= 1 ? `${round(r)}:1` : `1:${round(1 / r)}`;\n}\n\n/** The kind's public preset for an upload path: the one named name, else the first with an aspect, else the first. */\nexport function presetFor(presets: readonly PresetRule[], kind: string, path: string, name?: string): PresetRule | undefined {\n  const at = presets.filter((p) => p.kind === kind && ruleFor([{ path: p.from }], path));\n  return (name ? at.find((p) => p.name === name) : undefined) ?? at.find((p) => p.aspect) ?? at[0];\n}\n\n/**\n * The kind's default image for a preset, at every width: what the gateway\n * serves for an item without its own (a URL from the template never names a\n * current file). null when the preset has no default (`rule.default`).\n */\nexport function defaultImage(rule: PresetRule, id: string, version?: string): PublicPreset | null {\n  if (!rule.default || rule.first || rule.to.includes(NAME)) return null;\n  return logicalImage(rule, id, version);\n}\n\n/**\n * A Stable preset's image of an item (`rule.stable`, e.g. the content\n * model's `avatars`): URLs built from the id that show its current image,\n * else the default. null for any other preset.\n */\nexport function stableImage(rule: PresetRule, id: string): PublicPreset | null {\n  return rule.stable ? logicalImage(rule, id) : null;\n}\n\nfunction logicalImage(rule: PresetRule, id: string, version?: string): PublicPreset {\n  const r = ratio(rule.aspect);\n  return {\n    preset: rule.name,\n    aspect: rule.aspect,\n    renditions: rule.widths.map((w) => ({ url: publicURL(rule.base, rule.namespace, rule.kind, id, fill(rule.to, { w }), version, rule.root), w, ...(r ? { h: Math.round(w / r) } : {}) })),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"rules.js","names":[],"sources":["../../../src/client/media/rules.ts"],"sourcesContent":["import { ContentKitError } from \"../errors.js\";\nimport type { ErrorDetails, PresetRule, ReadResult, UploadRule } from \"../generated/wire.js\";\nimport { fill, publicURL, type PublicPreset } from \"../public.js\";\nimport { ratio } from \"../aspect.js\";\nimport { stem } from \"./client.js\";\n\nconst NO_RULES: UploadRule[] = [];\n\n/** An editor read's upload rules (a viewer read has none): one empty list, so memos keyed on them hold. */\nexport const uploadRules = (read: ReadResult | null | undefined): UploadRule[] => read?.uploads ?? NO_RULES;\n\nconst NAME = \"{name}\";\n\n/** A pattern path (\"originals/{name}\") holds many files; a literal (\"cover\") one. */\nexport const isPattern = (path: string) => path.endsWith(NAME);\n\n/** The directory of a pattern (\"originals/\"), or the literal itself. */\nexport const ruleDir = (path: string) => (isPattern(path) ? path.slice(0, -NAME.length) : path);\n\n/** The rule an upload path (with or without its extension) falls under: a literal wins over a pattern. */\nexport function ruleFor<R extends { path: string }>(rules: readonly R[], path: string): R | undefined {\n  const s = stem(path);\n  return (\n    rules.find((r) => !isPattern(r.path) && r.path === s) ??\n    rules.find((r) => {\n      if (!isPattern(r.path)) return false;\n      const dir = ruleDir(r.path);\n      return s.startsWith(dir) && s.length > dir.length && !s.slice(dir.length).includes(\"/\");\n    })\n  );\n}\n\n/** Uploads of the read under rule (attached, in manifest order). */\nexport function filesFor(read: ReadResult | null | undefined, rule: { path: string }, rules: readonly { path: string }[] = [rule]) {\n  return (read?.files ?? []).filter((f) => f.upload && !f.unattached && ruleFor(rules, f.path)?.path === rule.path);\n}\n\nconst BY_EXTENSION: Record<string, string> = {\n  jpg: \"image/jpeg\",\n  jpeg: \"image/jpeg\",\n  png: \"image/png\",\n  webp: \"image/webp\",\n  gif: \"image/gif\",\n  avif: \"image/avif\",\n  mp4: \"video/mp4\",\n  m4v: \"video/mp4\",\n  mov: \"video/quicktime\",\n  mkv: \"video/x-matroska\",\n  webm: \"video/webm\",\n  m4a: \"audio/mp4\",\n  mp3: \"audio/mpeg\",\n  vtt: \"text/vtt\",\n  srt: \"application/x-subrip\",\n  ass: \"text/x-ass\",\n  ssa: \"text/x-ssa\",\n  zip: \"application/zip\",\n};\n\n/** The file with a content type from its extension when the browser left it empty or nonstandard (.mkv, .mov, .srt). */\nexport function withMediaType(file: File, allowed?: readonly string[]): File {\n  if (file.type && (!allowed || allowed.includes(file.type))) return file;\n  const type = BY_EXTENSION[file.name.split(\".\").pop()?.toLowerCase() ?? \"\"];\n  return type && type !== file.type ? new File([file], file.name, { type, lastModified: file.lastModified }) : file;\n}\n\n/** `accept` for a file input from the rules' types (plus the extensions browsers leave untyped). */\nexport function acceptOf(rules: readonly UploadRule[]): string | undefined {\n  const types = [...new Set(rules.flatMap((r) => r.types))];\n  if (!types.length) return undefined;\n  const exts = Object.entries(BY_EXTENSION).filter(([, t]) => types.includes(t)).map(([e]) => `.${e}`);\n  return [...types, ...exts].join(\",\");\n}\n\nexport interface Screened {\n  /** Files to upload, each with its rule (typed by extension when needed). */\n  accepted: { file: File; rule: UploadRule }[];\n  /** Files the server would refuse, with the refusal it would answer. */\n  refused: { file: File; error: ContentKitError }[];\n}\n\nconst encoder = new TextEncoder();\nconst digit = (n: number) => n >= 48 && n <= 57;\nconst lowerASCII = (n: number) => n >= 65 && n <= 90 ? n + 32 : n;\n\n/** ZIP ingestion's numeric, case-insensitive order, then original UTF-8 name. */\nexport function naturalNameCompare(left: string, right: string): number {\n  const a = encoder.encode(left), b = encoder.encode(right);\n  let i = 0, j = 0;\n  while (i < a.length && j < b.length) {\n    if (digit(a[i]!) && digit(b[j]!)) {\n      let ae = i, be = j;\n      while (ae < a.length && digit(a[ae]!)) ae++;\n      while (be < b.length && digit(b[be]!)) be++;\n      let av = i, bv = j;\n      while (av < ae && a[av] === 48) av++;\n      while (bv < be && b[bv] === 48) bv++;\n      if (ae - av !== be - bv) return ae - av - (be - bv);\n      while (av < ae) {\n        if (a[av] !== b[bv]) return a[av]! - b[bv]!;\n        av++; bv++;\n      }\n      i = ae; j = be;\n    } else {\n      const difference = lowerASCII(a[i]!) - lowerASCII(b[j]!);\n      if (difference) return difference;\n      i++; j++;\n    }\n  }\n  const remaining = a.length - i - (b.length - j);\n  if (remaining) return remaining;\n  for (let at = 0; at < Math.min(a.length, b.length); at++) if (a[at] !== b[at]) return a[at]! - b[at]!;\n  return a.length - b.length;\n}\n\n/** Sort only new page files within each rule, retaining every non-page slot. */\nexport function sortPageFiles(accepted: readonly Screened[\"accepted\"][number][]): Screened[\"accepted\"] {\n  const groups = new Map<string, { files: Screened[\"accepted\"]; next: number }>();\n  for (const entry of accepted) {\n    if (!entry.rule.page) continue;\n    let group = groups.get(entry.rule.path);\n    if (!group) groups.set(entry.rule.path, group = { files: [], next: 0 });\n    group.files.push(entry);\n  }\n  for (const group of groups.values()) group.files.sort((a, b) => naturalNameCompare(a.file.name, b.file.name));\n  return accepted.map((entry) => {\n    const group = entry.rule.page ? groups.get(entry.rule.path) : undefined;\n    return group ? group.files[group.next++]! : entry;\n  });\n}\n\n/**\n * Checks files against the rules before any upload: a type some rule takes\n * (the first that does), its size, and the rule's file cap counting\n * have(rule) files already there. A rule without types, size or cap lets\n * that check through; the server decides.\n */\nexport function screenFiles(files: Iterable<File>, rules: readonly UploadRule[], have: (rule: UploadRule) => number = () => 0): Screened {\n  const out: Screened = { accepted: [], refused: [] };\n  const counts = new Map<UploadRule, number>();\n  const allowed = [...new Set(rules.flatMap((r) => r.types))];\n  for (const picked of files) {\n    const file = withMediaType(picked, allowed);\n    const rule = rules.find((r) => !r.types.length || r.types.includes(file.type));\n    if (!rule) {\n      const details: ErrorDetails = { type: file.type || undefined, allowed };\n      out.refused.push({ file, error: new ContentKitError(\"type_not_allowed\", `${file.name}: type not allowed`, { status: 415, details }) });\n      continue;\n    }\n    if (rule.max_bytes > 0 && file.size > rule.max_bytes) {\n      const details: ErrorDetails = { type: file.type, size: file.size, max_bytes: rule.max_bytes };\n      out.refused.push({ file, error: new ContentKitError(\"too_large\", `${file.name}: too large`, { status: 413, details }) });\n      continue;\n    }\n    const n = counts.get(rule) ?? have(rule);\n    if (rule.max && n >= rule.max) {\n      const details: ErrorDetails = { max: rule.max };\n      out.refused.push({ file, error: new ContentKitError(\"too_many_files\", `${file.name}: at most ${rule.max} files`, { status: 409, details }) });\n      continue;\n    }\n    counts.set(rule, n + 1);\n    out.accepted.push({ file, rule });\n  }\n  return out;\n}\n\n/** name, or name-2, name-3… so its stem is not among taken (names or paths without the directory). */\nexport function uniqueName(name: string, taken: Iterable<string>): string {\n  const stems = new Set([...taken].map(stem));\n  if (!stems.has(stem(name))) return name;\n  const dot = name.lastIndexOf(\".\");\n  const base = dot > 0 ? name.slice(0, dot) : name;\n  const ext = dot > 0 ? name.slice(dot) : \"\";\n  for (let n = 2; ; n++) {\n    const candidate = `${base}-${n}${ext}`;\n    if (!stems.has(stem(candidate))) return candidate;\n  }\n}\n\n/** Preserve numeric page/range identities; a collision must not invent a joined range. */\nexport function uniquePageName(name: string, taken: Iterable<string>): string {\n  const key = (value: string) => {\n    const base = stem(value);\n    return /^\\d+(?:-\\d+)?$/.test(base) ? base.split(\"-\").map((n) => n.replace(/^0+/, \"\") || \"0\").join(\"-\") : base;\n  };\n  const names = new Set([...taken].map(key));\n  if (!names.has(key(name))) return name;\n  const dot = name.lastIndexOf(\".\");\n  const base = dot > 0 ? name.slice(0, dot) : name;\n  const ext = dot > 0 ? name.slice(dot) : \"\";\n  for (let n = 2; ; n++) {\n    const candidate = `${base} (${n})${ext}`;\n    if (!names.has(key(candidate))) return candidate;\n  }\n}\n\n/** \"16:9\" style label of a width/height ratio: 2.4 → \"2.4:1\", 0.4167 → \"1:2.4\". */\nexport function ratioLabel(r: number): string {\n  const round = (v: number) => String(Math.round(v * 100) / 100);\n  return r >= 1 ? `${round(r)}:1` : `1:${round(1 / r)}`;\n}\n\n/** The kind's public preset for an upload path: the one named name, else the first with an aspect, else the first. */\nexport function presetFor(presets: readonly PresetRule[], kind: string, path: string, name?: string): PresetRule | undefined {\n  const at = presets.filter((p) => p.kind === kind && ruleFor([{ path: p.from }], path));\n  return (name ? at.find((p) => p.name === name) : undefined) ?? at.find((p) => p.aspect) ?? at[0];\n}\n\n/**\n * The kind's default image for a preset, at every width: what the gateway\n * serves for an item without its own (a URL from the template never names a\n * current file). null when the preset has no default (`rule.default`).\n */\nexport function defaultImage(rule: PresetRule, id: string, version?: string): PublicPreset | null {\n  if (!rule.default || rule.first || rule.to.includes(NAME)) return null;\n  return logicalImage(rule, id, version);\n}\n\n/**\n * A Stable preset's image of an item (`rule.stable`, e.g. the content\n * model's `avatars`): URLs built from the id that show its current image,\n * else the default. null for any other preset.\n */\nexport function stableImage(rule: PresetRule, id: string): PublicPreset | null {\n  return rule.stable ? logicalImage(rule, id) : null;\n}\n\nfunction logicalImage(rule: PresetRule, id: string, version?: string): PublicPreset {\n  const r = ratio(rule.aspect);\n  return {\n    preset: rule.name,\n    aspect: rule.aspect,\n    renditions: rule.widths.map((w) => ({ url: publicURL(rule.base, rule.namespace, rule.kind, id, fill(rule.to, { w }), version, rule.root), w, ...(r ? { h: Math.round(w / r) } : {}) })),\n  };\n}\n"],"mappings":"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"}

package/dist/client/versions.d.ts

@@ -1,11 +1,15 @@
-import { FileDownload, ForkBody, Pending, ReaderMeta, ReaderPlan } from './generated/wire.js';
+import { FileDownload, ForkBody, PageReview, PageReviewPatch, Pending, ReaderMeta, ReaderPlan } from './generated/wire.js';
 import { Http } from './http.js';
 /** A version's answer while it is prepared (202). */
 export declare const isPending: (x: unknown) => x is Pending;
-/** Content versions: reader plans, reader metadata, forks and downloads. */
+/** Content versions: page review, reader plans, reader metadata, forks and downloads. */
 export declare class VersionsClient {
     private readonly http;
     constructor(http: Http);
+    /** Editors: retained page sources, automatic decisions and manual overrides. */
+    pages(content: string, version: string, signal?: AbortSignal): Promise<PageReview>;
+    /** Editors: changes choices or order against the review's current revision. */
+    updatePages(content: string, version: string, patch: PageReviewPatch): Promise<PageReview>;
     /** The version's reader plan for this viewer; Pending while it has no current publication. */
     reader(content: string, version: string, signal?: AbortSignal): Promise<ReaderPlan | Pending>;
     /** Editors: replaces the version's reader metadata (anchors, audio cues, defaults). */

package/dist/client/versions.js

@@ -5,6 +5,32 @@ var n = (e) => !!e && typeof e == "object" && "status" in e && !("pages" in e) &
 	constructor(e) {
 		this.http = e;
 	}
+	pages(t, n, r) {
+		return e(this.http, "GET", "/contents/{id}/versions/{version}/pages", {
+			params: {
+				id: t,
+				version: n
+			},
+			signal: r
+		});
+	}
+	async updatePages(t, n, r) {
+		let i = this.http.captureChanges(), a = await e(this.http, "PATCH", "/contents/{id}/versions/{version}/pages", {
+			params: {
+				id: t,
+				version: n
+			},
+			body: r
+		});
+		return i({
+			type: "content.changed",
+			id: t
+		}), i({
+			type: "reader.changed",
+			content: t,
+			version: n
+		}), a;
+	}
 	reader(t, n, r) {
 		return e(this.http, "GET", "/contents/{id}/versions/{version}/reader", {
 			params: {

package/dist/client/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","names":[],"sources":["../../src/client/versions.ts"],"sourcesContent":["import type { FileDownload, ForkBody, Pending, ReaderMeta, ReaderPlan } from \"./generated/wire.js\";\nimport type { Http } from \"./http.js\";\nimport { call, routeURL } from \"./route.js\";\n\n/** A version's answer while it is prepared (202). */\nexport const isPending = (x: unknown): x is Pending => !!x && typeof x === \"object\" && \"status\" in x && !(\"pages\" in x) && !(\"url\" in x);\n\n/** Content versions: reader plans, reader metadata, forks and downloads. */\nexport class VersionsClient {\n  constructor(private readonly http: Http) {}\n\n  /** The version's reader plan for this viewer; Pending while it has no current publication. */\n  reader(content: string, version: string, signal?: AbortSignal): Promise<ReaderPlan | Pending> {\n    return call(this.http, \"GET\", \"/contents/{id}/versions/{version}/reader\", { params: { id: content, version }, signal });\n  }\n  /** Editors: replaces the version's reader metadata (anchors, audio cues, defaults). */\n  async setReader(content: string, version: string, meta: ReaderMeta): Promise<void> {\n    const emit = this.http.captureChanges();\n    await call(this.http, \"PUT\", \"/contents/{id}/versions/{version}/reader\", { params: { id: content, version }, body: meta });\n    emit({ type: \"reader.changed\", content, version });\n  }\n  /** Editors: fills a version without media from a sibling, in a durable job. */\n  fork(content: string, version: string, body: ForkBody): Promise<Pending> {\n    return call(this.http, \"POST\", \"/contents/{id}/versions/{version}/fork\", { params: { id: content, version }, body });\n  }\n  /**\n   * Grants the version's download, what its kind serves (the original, a\n   * rendition, its pages as a zip), charged to the viewer's download quota:\n   * `url` (absolute) serves it as an attachment until `expires_at`. Pending\n   * while it is prepared (ask again).\n   */\n  async download(content: string, version: string, signal?: AbortSignal): Promise<FileDownload | Pending> {\n    const url = routeURL(this.http, \"GET\", \"/contents/{id}/versions/{version}/download\", { params: { id: content, version } });\n    const out = await this.http.request<FileDownload | Pending>(url, { signal });\n    if (isPending(out)) return out;\n    // A marked zip's URL is the archive route's, relative to this one.\n    const base = new URL(url, globalThis.location?.href ?? \"http://localhost/\");\n    return { ...out, url: new URL(out.url, base).toString() };\n  }\n}\n"],"mappings":";;AAKA,IAAa,KAAa,MAA6B,CAAC,CAAC,KAAK,OAAO,KAAM,YAAY,YAAY,KAAK,EAAE,WAAW,MAAM,EAAE,SAAS,IAGzH,IAAb,MAA4B;CACG;CAA7B,YAAY,GAA6B;EAAZ,KAAA,OAAA;CAAa;CAG1C,OAAO,GAAiB,GAAiB,GAAqD;EAC5F,OAAO,EAAK,KAAK,MAAM,OAAO,4CAA4C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG;EAAO,CAAC;CACxH;CAEA,MAAM,UAAU,GAAiB,GAAiB,GAAiC;EACjF,IAAM,IAAO,KAAK,KAAK,eAAe;EAEtC,AADA,MAAM,EAAK,KAAK,MAAM,OAAO,4CAA4C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG,MAAM;EAAK,CAAC,GACzH,EAAK;GAAE,MAAM;GAAkB;GAAS;EAAQ,CAAC;CACnD;CAEA,KAAK,GAAiB,GAAiB,GAAkC;EACvE,OAAO,EAAK,KAAK,MAAM,QAAQ,0CAA0C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG;EAAK,CAAC;CACrH;CAOA,MAAM,SAAS,GAAiB,GAAiB,GAAuD;EACtG,IAAM,IAAM,EAAS,KAAK,MAAM,OAAO,8CAA8C,EAAE,QAAQ;GAAE,IAAI;GAAS;EAAQ,EAAE,CAAC,GACnH,IAAM,MAAM,KAAK,KAAK,QAAgC,GAAK,EAAE,UAAO,CAAC;EAC3E,IAAI,EAAU,CAAG,GAAG,OAAO;EAE3B,IAAM,IAAO,IAAI,IAAI,GAAK,WAAW,UAAU,QAAQ,mBAAmB;EAC1E,OAAO;GAAE,GAAG;GAAK,KAAK,IAAI,IAAI,EAAI,KAAK,CAAI,CAAC,CAAC,SAAS;EAAE;CAC1D;AACF"}
+{"version":3,"file":"versions.js","names":[],"sources":["../../src/client/versions.ts"],"sourcesContent":["import type { FileDownload, ForkBody, PageReview, PageReviewPatch, Pending, ReaderMeta, ReaderPlan } from \"./generated/wire.js\";\nimport type { Http } from \"./http.js\";\nimport { call, routeURL } from \"./route.js\";\n\n/** A version's answer while it is prepared (202). */\nexport const isPending = (x: unknown): x is Pending => !!x && typeof x === \"object\" && \"status\" in x && !(\"pages\" in x) && !(\"url\" in x);\n\n/** Content versions: page review, reader plans, reader metadata, forks and downloads. */\nexport class VersionsClient {\n  constructor(private readonly http: Http) {}\n\n  /** Editors: retained page sources, automatic decisions and manual overrides. */\n  pages(content: string, version: string, signal?: AbortSignal): Promise<PageReview> {\n    return call(this.http, \"GET\", \"/contents/{id}/versions/{version}/pages\", { params: { id: content, version }, signal });\n  }\n  /** Editors: changes choices or order against the review's current revision. */\n  async updatePages(content: string, version: string, patch: PageReviewPatch): Promise<PageReview> {\n    const emit = this.http.captureChanges();\n    const next: PageReview = await call(this.http, \"PATCH\", \"/contents/{id}/versions/{version}/pages\", { params: { id: content, version }, body: patch });\n    emit({ type: \"content.changed\", id: content });\n    emit({ type: \"reader.changed\", content, version });\n    return next;\n  }\n  /** The version's reader plan for this viewer; Pending while it has no current publication. */\n  reader(content: string, version: string, signal?: AbortSignal): Promise<ReaderPlan | Pending> {\n    return call(this.http, \"GET\", \"/contents/{id}/versions/{version}/reader\", { params: { id: content, version }, signal });\n  }\n  /** Editors: replaces the version's reader metadata (anchors, audio cues, defaults). */\n  async setReader(content: string, version: string, meta: ReaderMeta): Promise<void> {\n    const emit = this.http.captureChanges();\n    await call(this.http, \"PUT\", \"/contents/{id}/versions/{version}/reader\", { params: { id: content, version }, body: meta });\n    emit({ type: \"reader.changed\", content, version });\n  }\n  /** Editors: fills a version without media from a sibling, in a durable job. */\n  fork(content: string, version: string, body: ForkBody): Promise<Pending> {\n    return call(this.http, \"POST\", \"/contents/{id}/versions/{version}/fork\", { params: { id: content, version }, body });\n  }\n  /**\n   * Grants the version's download, what its kind serves (the original, a\n   * rendition, its pages as a zip), charged to the viewer's download quota:\n   * `url` (absolute) serves it as an attachment until `expires_at`. Pending\n   * while it is prepared (ask again).\n   */\n  async download(content: string, version: string, signal?: AbortSignal): Promise<FileDownload | Pending> {\n    const url = routeURL(this.http, \"GET\", \"/contents/{id}/versions/{version}/download\", { params: { id: content, version } });\n    const out = await this.http.request<FileDownload | Pending>(url, { signal });\n    if (isPending(out)) return out;\n    // A marked zip's URL is the archive route's, relative to this one.\n    const base = new URL(url, globalThis.location?.href ?? \"http://localhost/\");\n    return { ...out, url: new URL(out.url, base).toString() };\n  }\n}\n"],"mappings":";;AAKA,IAAa,KAAa,MAA6B,CAAC,CAAC,KAAK,OAAO,KAAM,YAAY,YAAY,KAAK,EAAE,WAAW,MAAM,EAAE,SAAS,IAGzH,IAAb,MAA4B;CACG;CAA7B,YAAY,GAA6B;EAAZ,KAAA,OAAA;CAAa;CAG1C,MAAM,GAAiB,GAAiB,GAA2C;EACjF,OAAO,EAAK,KAAK,MAAM,OAAO,2CAA2C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG;EAAO,CAAC;CACvH;CAEA,MAAM,YAAY,GAAiB,GAAiB,GAA6C;EAC/F,IAAM,IAAO,KAAK,KAAK,eAAe,GAChC,IAAmB,MAAM,EAAK,KAAK,MAAM,SAAS,2CAA2C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG,MAAM;EAAM,CAAC;EAGpJ,OAFA,EAAK;GAAE,MAAM;GAAmB,IAAI;EAAQ,CAAC,GAC7C,EAAK;GAAE,MAAM;GAAkB;GAAS;EAAQ,CAAC,GAC1C;CACT;CAEA,OAAO,GAAiB,GAAiB,GAAqD;EAC5F,OAAO,EAAK,KAAK,MAAM,OAAO,4CAA4C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG;EAAO,CAAC;CACxH;CAEA,MAAM,UAAU,GAAiB,GAAiB,GAAiC;EACjF,IAAM,IAAO,KAAK,KAAK,eAAe;EAEtC,AADA,MAAM,EAAK,KAAK,MAAM,OAAO,4CAA4C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG,MAAM;EAAK,CAAC,GACzH,EAAK;GAAE,MAAM;GAAkB;GAAS;EAAQ,CAAC;CACnD;CAEA,KAAK,GAAiB,GAAiB,GAAkC;EACvE,OAAO,EAAK,KAAK,MAAM,QAAQ,0CAA0C;GAAE,QAAQ;IAAE,IAAI;IAAS;GAAQ;GAAG;EAAK,CAAC;CACrH;CAOA,MAAM,SAAS,GAAiB,GAAiB,GAAuD;EACtG,IAAM,IAAM,EAAS,KAAK,MAAM,OAAO,8CAA8C,EAAE,QAAQ;GAAE,IAAI;GAAS;EAAQ,EAAE,CAAC,GACnH,IAAM,MAAM,KAAK,KAAK,QAAgC,GAAK,EAAE,UAAO,CAAC;EAC3E,IAAI,EAAU,CAAG,GAAG,OAAO;EAE3B,IAAM,IAAO,IAAI,IAAI,GAAK,WAAW,UAAU,QAAQ,mBAAmB;EAC1E,OAAO;GAAE,GAAG;GAAK,KAAK,IAAI,IAAI,EAAI,KAAK,CAAI,CAAC,CAAC,SAAS;EAAE;CAC1D;AACF"}

package/dist/components/admin/page-review.d.ts

@@ -0,0 +1,13 @@
+import { ContentKitUiAppearance } from '../../appearance.js';
+import { ContentKitClient } from '../../client/client.js';
+import { ContentKitErrorHandler } from '../../react/context.js';
+export interface PageReviewProps {
+    content: string;
+    version: string;
+    client?: ContentKitClient;
+    onError?: ContentKitErrorHandler;
+    className?: string;
+    appearance?: ContentKitUiAppearance;
+}
+/** Review automatic page choices without holding up ordinary publication. */
+export declare function PageReview({ content, version, client, onError, className, appearance }: PageReviewProps): import('react').JSX.Element;