@openrails/contentkit-ui 0.85.1 → 0.86.0

package/dist/react/detail.js

@@ -1,42 +1,49 @@
 import { keyOf as e, useContentScope as t, useResource as n } from "./use-resource.js";
-import { useMemo as r } from "react";
+import { parseVersionCode as r } from "../urls.js";
+import { useVersionParam as i } from "./location.js";
+import { useMemo as a } from "react";
 //#region src/react/detail.ts
-function i(e) {
+function o(e) {
 	return (e?.versions ?? []).filter((e) => e.live).sort((e, t) => e.position - t.position);
 }
-function a(e, t) {
-	let n = i(e);
+function s(e, t) {
+	let n = o(e);
 	return (t ? n.find((e) => e.languages.includes(t)) : void 0) ?? n[0] ?? null;
 }
-function o(o, s = {}) {
-	let { client: c, store: l, scope: u, language: d } = t(s.client), f = s.language ?? d, p = o ? e("content-detail", u, o, f) : null, m = n(l, p, {
+function c(e, t) {
+	if (!t) return;
+	let n = r(t);
+	return e.find((e) => e.id === t) ?? (n ? e.find((e) => e.code === n) : void 0);
+}
+function l(r, l = {}) {
+	let { client: u, store: d, scope: f, language: p } = t(l.client), m = l.language ?? p, [h] = i({ location: l.location }), g = l.version === void 0 ? h : l.version, _ = r ? e("content-detail", f, r, m) : null, v = n(d, _, {
 		type: "content-detail",
-		id: o ?? void 0
-	}, (e) => c.contents.get(o, f, e)), h = m.data ?? null;
-	return r(() => {
-		let e = i(h), t = e.find((e) => e.id === s.version) ?? a(h, f);
+		id: r ?? void 0
+	}, (e) => u.contents.get(r, m, e)), y = v.data ?? null;
+	return a(() => {
+		let e = o(y), t = c(e, g) ?? s(y, m);
 		return {
-			content: h,
+			content: y,
 			versions: e,
 			version: t,
-			decision: t?.decision ?? h?.decision ?? null,
+			decision: t?.decision ?? y?.decision ?? null,
 			languages: [...new Set(e.flatMap((e) => e.languages))],
-			loading: !!p && (m.loading || !m.loaded),
-			error: m.error,
-			reload: m.reload
+			loading: !!_ && (v.loading || !v.loaded),
+			error: v.error,
+			reload: v.reload
 		};
 	}, [
-		h,
-		s.version,
-		f,
-		p,
-		m.loading,
-		m.loaded,
-		m.error,
-		m.reload
+		y,
+		g,
+		m,
+		_,
+		v.loading,
+		v.loaded,
+		v.error,
+		v.reload
 	]);
 }
 //#endregion
-export { a as defaultVersion, i as liveVersions, o as useContentDetail };
+export { s as defaultVersion, c as findVersion, o as liveVersions, l as useContentDetail };
 
 //# sourceMappingURL=detail.js.map

package/dist/react/detail.js.map

@@ -1 +1 @@
-{"version":3,"file":"detail.js","names":[],"sources":["../../src/react/detail.ts"],"sourcesContent":["import { useMemo } from \"react\";\nimport type { ContentKitClient } from \"../client/client.js\";\nimport type { ContentKitError } from \"../client/errors.js\";\nimport type { Content, Decision, Version } from \"../client/generated/wire.js\";\nimport { keyOf, useContentScope, useResource } from \"./use-resource.js\";\n\n/** A content's live versions, first first. */\nexport function liveVersions(c: Content | null | undefined): Version[] {\n  return (c?.versions ?? []).filter((v) => v.live).sort((a, b) => a.position - b.position);\n}\n\n/** The version a reader of language opens by default: the first live one serving it, else the first live one. */\nexport function defaultVersion(c: Content | null | undefined, language?: string): Version | null {\n  const live = liveVersions(c);\n  return (language ? live.find((v) => v.languages.includes(language)) : undefined) ?? live[0] ?? null;\n}\n\nexport interface UseContentDetail {\n  content: Content | null;\n  /** Live versions, first first. */\n  versions: Version[];\n  /** The version shown: the one asked for when live, else the language's default. */\n  version: Version | null;\n  /** The shown version's access decision: allowed, what is sold, previews. */\n  decision: Decision | null;\n  /** Every language a live version serves, in version order. */\n  languages: string[];\n  loading: boolean;\n  error?: ContentKitError;\n  reload: () => void;\n}\n\n/**\n * A content page's data: text in the reader's language, live versions with\n * their segments and access decisions, groups, attributes and the version to show.\n */\nexport function useContentDetail(id: string | null | undefined, o: { language?: string; version?: string | null; client?: ContentKitClient } = {}): UseContentDetail {\n  const { client, store, scope, language: provided } = useContentScope(o.client);\n  const language = o.language ?? provided;\n  const key = id ? keyOf(\"content-detail\", scope, id, language) : null;\n  const r = useResource<Content>(store, key, { type: \"content-detail\", id: id ?? undefined }, (s) => client.contents.get(id!, language, s));\n  const content = r.data ?? null;\n  return useMemo(() => {\n    const versions = liveVersions(content);\n    const version = versions.find((v) => v.id === o.version) ?? defaultVersion(content, language);\n    return {\n      content,\n      versions,\n      version,\n      decision: version?.decision ?? content?.decision ?? null,\n      languages: [...new Set(versions.flatMap((v) => v.languages))],\n      loading: !!key && (r.loading || !r.loaded),\n      error: r.error,\n      reload: r.reload,\n    };\n  }, [content, o.version, language, key, r.loading, r.loaded, r.error, r.reload]);\n}\n"],"mappings":";;;AAOA,SAAgB,EAAa,GAA0C;CACrE,QAAQ,GAAG,YAAY,CAAC,EAAA,CAAG,QAAQ,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ;AACzF;AAGA,SAAgB,EAAe,GAA+B,GAAmC;CAC/F,IAAM,IAAO,EAAa,CAAC;CAC3B,QAAQ,IAAW,EAAK,MAAM,MAAM,EAAE,UAAU,SAAS,CAAQ,CAAC,IAAI,KAAA,MAAc,EAAK,MAAM;AACjG;AAqBA,SAAgB,EAAiB,GAA+B,IAA+E,CAAC,GAAqB;CACnK,IAAM,EAAE,WAAQ,UAAO,UAAO,UAAU,MAAa,EAAgB,EAAE,MAAM,GACvE,IAAW,EAAE,YAAY,GACzB,IAAM,IAAK,EAAM,kBAAkB,GAAO,GAAI,CAAQ,IAAI,MAC1D,IAAI,EAAqB,GAAO,GAAK;EAAE,MAAM;EAAkB,IAAI,KAAM,KAAA;CAAU,IAAI,MAAM,EAAO,SAAS,IAAI,GAAK,GAAU,CAAC,CAAC,GAClI,IAAU,EAAE,QAAQ;CAC1B,OAAO,QAAc;EACnB,IAAM,IAAW,EAAa,CAAO,GAC/B,IAAU,EAAS,MAAM,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,EAAe,GAAS,CAAQ;EAC5F,OAAO;GACL;GACA;GACA;GACA,UAAU,GAAS,YAAY,GAAS,YAAY;GACpD,WAAW,CAAC,GAAG,IAAI,IAAI,EAAS,SAAS,MAAM,EAAE,SAAS,CAAC,CAAC;GAC5D,SAAS,CAAC,CAAC,MAAQ,EAAE,WAAW,CAAC,EAAE;GACnC,OAAO,EAAE;GACT,QAAQ,EAAE;EACZ;CACF,GAAG;EAAC;EAAS,EAAE;EAAS;EAAU;EAAK,EAAE;EAAS,EAAE;EAAQ,EAAE;EAAO,EAAE;CAAM,CAAC;AAChF"}
+{"version":3,"file":"detail.js","names":[],"sources":["../../src/react/detail.ts"],"sourcesContent":["import { useMemo } from \"react\";\nimport type { ContentKitClient } from \"../client/client.js\";\nimport type { ContentKitError } from \"../client/errors.js\";\nimport type { Content, Decision, Version } from \"../client/generated/wire.js\";\nimport { parseVersionCode } from \"../urls/index.js\";\nimport { useVersionParam } from \"./location.js\";\nimport { keyOf, useContentScope, useResource } from \"./use-resource.js\";\n\n/** A content's live versions, first first. */\nexport function liveVersions(c: Content | null | undefined): Version[] {\n  return (c?.versions ?? []).filter((v) => v.live).sort((a, b) => a.position - b.position);\n}\n\n/** The version a reader of language opens by default: the first live one serving it, else the first live one. */\nexport function defaultVersion(c: Content | null | undefined, language?: string): Version | null {\n  const live = liveVersions(c);\n  return (language ? live.find((v) => v.languages.includes(language)) : undefined) ?? live[0] ?? null;\n}\n\n/** The version selected names: its code (any spelling, the page's ?v=) or its id; undefined when none. */\nexport function findVersion(versions: readonly Version[], selected: string | null | undefined): Version | undefined {\n  if (!selected) return undefined;\n  const code = parseVersionCode(selected);\n  return versions.find((v) => v.id === selected) ?? (code ? versions.find((v) => v.code === code) : undefined);\n}\n\nexport interface UseContentDetail {\n  content: Content | null;\n  /** Live versions, first first. */\n  versions: Version[];\n  /** The version shown: the one asked for (?v=) when live, else the language's default. */\n  version: Version | null;\n  /** The shown version's access decision: allowed, what is sold, previews. */\n  decision: Decision | null;\n  /** Every language a live version serves, in version order. */\n  languages: string[];\n  loading: boolean;\n  error?: ContentKitError;\n  reload: () => void;\n}\n\nexport interface ContentDetailOptions {\n  language?: string;\n  /** The version to show, by code or id; default the page's ?v=. Unknown or not live: the language's default. */\n  version?: string | null;\n  /** The page's location for its ?v=; default window.location. */\n  location?: string;\n  client?: ContentKitClient;\n}\n\n/**\n * A content page's data: text in the reader's language, live versions with\n * their segments and access decisions, groups, attributes and the version to show.\n */\nexport function useContentDetail(id: string | null | undefined, o: ContentDetailOptions = {}): UseContentDetail {\n  const { client, store, scope, language: provided } = useContentScope(o.client);\n  const language = o.language ?? provided;\n  const [param] = useVersionParam({ location: o.location });\n  const selected = o.version === undefined ? param : o.version;\n  const key = id ? keyOf(\"content-detail\", scope, id, language) : null;\n  const r = useResource<Content>(store, key, { type: \"content-detail\", id: id ?? undefined }, (s) => client.contents.get(id!, language, s));\n  const content = r.data ?? null;\n  return useMemo(() => {\n    const versions = liveVersions(content);\n    const version = findVersion(versions, selected) ?? defaultVersion(content, language);\n    return {\n      content,\n      versions,\n      version,\n      decision: version?.decision ?? content?.decision ?? null,\n      languages: [...new Set(versions.flatMap((v) => v.languages))],\n      loading: !!key && (r.loading || !r.loaded),\n      error: r.error,\n      reload: r.reload,\n    };\n  }, [content, selected, language, key, r.loading, r.loaded, r.error, r.reload]);\n}\n"],"mappings":";;;;;AASA,SAAgB,EAAa,GAA0C;CACrE,QAAQ,GAAG,YAAY,CAAC,EAAA,CAAG,QAAQ,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ;AACzF;AAGA,SAAgB,EAAe,GAA+B,GAAmC;CAC/F,IAAM,IAAO,EAAa,CAAC;CAC3B,QAAQ,IAAW,EAAK,MAAM,MAAM,EAAE,UAAU,SAAS,CAAQ,CAAC,IAAI,KAAA,MAAc,EAAK,MAAM;AACjG;AAGA,SAAgB,EAAY,GAA8B,GAA0D;CAClH,IAAI,CAAC,GAAU;CACf,IAAM,IAAO,EAAiB,CAAQ;CACtC,OAAO,EAAS,MAAM,MAAM,EAAE,OAAO,CAAQ,MAAM,IAAO,EAAS,MAAM,MAAM,EAAE,SAAS,CAAI,IAAI,KAAA;AACpG;AA8BA,SAAgB,EAAiB,GAA+B,IAA0B,CAAC,GAAqB;CAC9G,IAAM,EAAE,WAAQ,UAAO,UAAO,UAAU,MAAa,EAAgB,EAAE,MAAM,GACvE,IAAW,EAAE,YAAY,GACzB,CAAC,KAAS,EAAgB,EAAE,UAAU,EAAE,SAAS,CAAC,GAClD,IAAW,EAAE,YAAY,KAAA,IAAY,IAAQ,EAAE,SAC/C,IAAM,IAAK,EAAM,kBAAkB,GAAO,GAAI,CAAQ,IAAI,MAC1D,IAAI,EAAqB,GAAO,GAAK;EAAE,MAAM;EAAkB,IAAI,KAAM,KAAA;CAAU,IAAI,MAAM,EAAO,SAAS,IAAI,GAAK,GAAU,CAAC,CAAC,GAClI,IAAU,EAAE,QAAQ;CAC1B,OAAO,QAAc;EACnB,IAAM,IAAW,EAAa,CAAO,GAC/B,IAAU,EAAY,GAAU,CAAQ,KAAK,EAAe,GAAS,CAAQ;EACnF,OAAO;GACL;GACA;GACA;GACA,UAAU,GAAS,YAAY,GAAS,YAAY;GACpD,WAAW,CAAC,GAAG,IAAI,IAAI,EAAS,SAAS,MAAM,EAAE,SAAS,CAAC,CAAC;GAC5D,SAAS,CAAC,CAAC,MAAQ,EAAE,WAAW,CAAC,EAAE;GACnC,OAAO,EAAE;GACT,QAAQ,EAAE;EACZ;CACF,GAAG;EAAC;EAAS;EAAU;EAAU;EAAK,EAAE;EAAS,EAAE;EAAQ,EAAE;EAAO,EAAE;CAAM,CAAC;AAC/E"}

package/dist/react/folder.d.ts

@@ -49,6 +49,11 @@ export interface UseMediaFolder {
     uploads: FileInfo[];
     /** The upload queue; a file leaves it once the editor read lists it. */
     queue: UseUploadQueue;
+    /**
+     * Uploads on the server not yet added and not in the queue: an earlier
+     * visit's, or another editor's. commit() adds them; remove() discards them.
+     */
+    pending: FileInfo[];
     /**
      * Files added before the item and its editor read (the upload rules) were
      * known. They are screened and queued when the rules arrive, or refused
@@ -68,7 +73,7 @@ export interface UseMediaFolder {
     edit: (path: string, edit: Edit | null) => Promise<void>;
     /** Uploads file in place of the upload at path (same position and meta, no edit). */
     replace: (path: string, file: File) => Promise<void>;
-    /** Commits the uploaded files in queue order. */
+    /** Commits the uploaded files in queue order, then the pending ones. */
     commit: () => Promise<FileInfo[]>;
     /** Stops every upload, aborts its multipart upload and empties the queue (before deleting a draft). */
     discard: () => void;
@@ -81,7 +86,7 @@ export interface UseMediaFolder {
      * Leaving the page now interrupts it.
      */
     busy: boolean;
-    /** The item's uploads plus the files on their way in (waiting, queued, uploading, uploaded, being added); failed uploads are not counted. */
+    /** The item's uploads plus the files on their way in (waiting, queued, uploading, uploaded, pending, being added); failed uploads are not counted. */
     fileCount: number;
     /** The last update's or commit's failure; cleared by the next success. */
     error?: ContentKitError;

package/dist/react/folder.js

@@ -4,238 +4,256 @@ import { stem as i } from "../client/media/client.js";
 import { filesFor as a, isPattern as o, ruleDir as s, ruleFor as c, screenFiles as ee, uniqueName as te, uploadRules as l } from "../client/media/rules.js";
 import { useContentKitClient as u, useErrorReporter as d } from "./context.js";
 import { useUploadQueue as ne } from "./upload.js";
-import { useMediaRead as re } from "./read.js";
-import { useCallback as f, useEffect as p, useMemo as m, useRef as h, useState as g } from "react";
+import { useMediaRead as f } from "./read.js";
+import { useCallback as p, useEffect as m, useMemo as h, useRef as g, useState as _ } from "react";
 //#region src/react/folder.ts
-var ie = {
+var re = {
 	start: 0,
 	end: 2 ** 53 - 1,
 	chunk: 200
-}, _ = (e, t) => t.slice(s(e.path).length);
-function v(e, t) {
+}, v = (e, t) => t.slice(s(e.path).length);
+function y(e, t) {
 	let n;
 	for (let r of e?.files ?? []) !r.upload && r.from === t.path && r.url && r.type.startsWith("image/") && (!n || (r.w ?? Infinity) < (n.w ?? Infinity)) && (n = r);
 	return n;
 }
-var ae = {
+var ie = {
 	kind: "",
 	id: ""
-}, oe = (e) => e ? r(e) : "", y = /* @__PURE__ */ new WeakMap();
-function se(t) {
-	let n = y.get(t);
-	return n || y.set(t, n = new e("forbidden", "the editor read states no upload rules", { status: 403 })), n;
+}, ae = (e) => e ? r(e) : "", b = /* @__PURE__ */ new WeakMap();
+function oe(t) {
+	let n = b.get(t);
+	return n || b.set(t, n = new e("forbidden", "the editor read states no upload rules", { status: 403 })), n;
 }
-function ce(e, t) {
+function se(e, t) {
 	return e.filter((e) => e.status !== "failed" && !(e.status === "committed" && t.has(e.path)));
 }
-function b(r, v = {}) {
-	let y = u(v.client), b = d(v.onError), x = r ?? null, S = oe(x), C = x ?? ae, w = re(C, {
+function x(r, y = {}) {
+	let b = u(y.client), x = d(y.onError), S = r ?? null, C = ae(S), w = S ?? ie, T = f(w, {
 		editor: !0,
-		window: ie,
-		poll: v.poll,
-		client: y,
-		read: x ? void 0 : null
-	}), T = l(w.read), E = v.paths?.join("\n"), D = m(() => E === void 0 ? T.filter((e) => o(e.path) && !e.named).map((e) => e.path) : E.split("\n").filter(Boolean), [E, T]), O = m(() => {
-		let e = T.length ? T : D.map((e) => ({ path: e }));
-		return D.map((t) => ({
+		window: re,
+		poll: y.poll,
+		client: b,
+		read: S ? void 0 : null
+	}), E = l(T.read), D = y.paths?.join("\n"), O = h(() => D === void 0 ? E.filter((e) => o(e.path) && !e.named).map((e) => e.path) : D.split("\n").filter(Boolean), [D, E]), k = h(() => {
+		let e = E.length ? E : O.map((e) => ({ path: e }));
+		return O.map((t) => ({
 			path: t,
-			rule: T.find((e) => e.path === t),
-			files: a(w.read, { path: t }, e)
+			rule: E.find((e) => e.path === t),
+			files: a(T.read, { path: t }, e)
 		}));
 	}, [
-		D,
-		T,
-		w.read
-	]), k = m(() => O.flatMap((e) => e.files), [O]), A = m(() => new Set(k.map((e) => e.path)), [k]), j = ne({
-		client: y,
-		ref: C,
-		path: `${s(D[0] ?? "{name}")}{name}`,
-		concurrency: v.concurrency
-	}), M = j.queue, N = m(() => j.items.filter((e) => !(e.status === "committed" && A.has(e.path))), [j.items, A]), le = {
-		...j,
-		items: N
-	}, [ue, P] = g([]), [F, I] = g([]), L = h([]), [R, de] = g(0), [z, fe] = g(!1), [pe, B] = g(), [me, V] = g(), H = me?.key === S ? me.error : void 0, U = h(v);
-	U.current = v;
-	let W = !!x && !!w.read?.uploads, G = x ? w.read ? w.read.uploads ? void 0 : se(w.read) : w.error : void 0, K = h({
-		groups: O,
-		ref: C,
-		listed: A,
-		ready: W,
-		loadError: G
+		O,
+		E,
+		T.read
+	]), A = h(() => k.flatMap((e) => e.files), [k]), j = h(() => new Set(A.map((e) => e.path)), [A]), M = h(() => {
+		let e = E.length ? E : O.map((e) => ({ path: e }));
+		return (T.read?.files ?? []).filter((t) => t.upload && t.unattached && O.includes(c(e, t.path)?.path ?? ""));
+	}, [
+		T.read,
+		E,
+		O
+	]), N = ne({
+		client: b,
+		ref: w,
+		path: `${s(O[0] ?? "{name}")}{name}`,
+		concurrency: y.concurrency
+	}), P = N.queue, F = h(() => N.items.filter((e) => !(e.status === "committed" && j.has(e.path))), [N.items, j]), ce = {
+		...N,
+		items: F
+	}, I = h(() => {
+		let e = new Set(N.items.map((e) => i(e.path)));
+		return M.filter((t) => !e.has(i(t.path)));
+	}, [M, N.items]), [le, L] = _([]), [R, z] = _([]), B = g([]), [ue, de] = _(0), [V, fe] = _(!1), [pe, H] = _(), [me, U] = _(), W = me?.key === C ? me.error : void 0, G = g(y);
+	G.current = y;
+	let K = !!S && !!T.read?.uploads, q = S ? T.read ? T.read.uploads ? void 0 : oe(T.read) : T.error : void 0, J = g({
+		groups: k,
+		ref: w,
+		listed: j,
+		unattached: M,
+		leftover: I,
+		ready: K,
+		loadError: q
 	});
-	K.current = {
-		groups: O,
-		ref: C,
-		listed: A,
-		ready: W,
-		loadError: G
+	J.current = {
+		groups: k,
+		ref: w,
+		listed: j,
+		unattached: M,
+		leftover: I,
+		ready: K,
+		loadError: q
 	};
-	let he = f((e) => {
-		let { groups: t, listed: n } = K.current, r = t.map((e) => e.rule ?? {
+	let he = p((e) => {
+		let { groups: t, listed: n, unattached: r, leftover: i } = J.current, a = t.map((e) => e.rule ?? {
 			path: e.path,
 			types: [],
 			max_bytes: 0
-		}), i = ce(M.getSnapshot().items, n), a = (e, t) => c(r, e)?.path === t.path, o = ee(e, r, (e) => t.find((t) => t.path === e.path).files.length + i.filter((t) => a(t.path, e)).length), l = /* @__PURE__ */ new Map(), u = (e) => {
-			let n = l.get(e.path);
+		}), o = se(P.getSnapshot().items, n), l = (e, t) => c(a, e)?.path === t.path, u = ee(e, a, (e) => t.find((t) => t.path === e.path).files.length + i.filter((t) => l(t.path, e)).length + o.filter((t) => l(t.path, e)).length), d = /* @__PURE__ */ new Map(), ne = (e) => {
+			let n = d.get(e.path);
 			if (!n) {
-				let r = t.find((t) => t.path === e.path);
-				n = [...r.files.map((e) => _(r, e.path)), ...i.filter((t) => a(t.path, e)).map((e) => _(r, e.path))], l.set(e.path, n);
+				let i = t.find((t) => t.path === e.path);
+				n = [i.files, r].flat().filter((t) => l(t.path, e)).map((e) => v(i, e.path)), n.push(...o.filter((t) => l(t.path, e)).map((e) => v(i, e.path))), d.set(e.path, n);
 			}
 			return n;
-		}, d = /* @__PURE__ */ new Map();
-		for (let { file: e, rule: t } of o.accepted) {
-			let n = u(t), r = U.current.name?.(e) ?? te(e.name, n);
-			n.push(r), d.set(e, s(t.path) + r);
+		}, f = /* @__PURE__ */ new Map();
+		for (let { file: e, rule: t } of u.accepted) {
+			let n = ne(t), r = G.current.name?.(e) ?? te(e.name, n);
+			n.push(r), f.set(e, s(t.path) + r);
 		}
-		d.size && (M.add(d.keys(), { path: (e) => d.get(e) }), M.start(), V(void 0)), P(o.refused);
-		for (let e of o.refused) b(e.error, "upload", e.file.name);
-	}, [M, b]), q = f(() => {
-		let e = L.current, { ready: t, loadError: n } = K.current;
-		return !e.length || !t && !n ? !1 : (L.current = [], I([]), t ? he(e) : P(e.map((e) => ({
+		f.size && (P.add(f.keys(), { path: (e) => f.get(e) }), P.start(), U(void 0)), L(u.refused);
+		for (let e of u.refused) x(e.error, "upload", e.file.name);
+	}, [P, x]), Y = p(() => {
+		let e = B.current, { ready: t, loadError: n } = J.current;
+		return !e.length || !t && !n ? !1 : (B.current = [], z([]), t ? he(e) : L(e.map((e) => ({
 			file: e,
 			error: n
 		}))), !0);
-	}, [he]), ge = f((e) => {
+	}, [he]), ge = p((e) => {
 		let t = [...e];
-		t.length && (L.current = [...L.current, ...t], q() || I(L.current));
-	}, [q]);
-	p(() => void q(), [
-		q,
-		W,
-		G
+		t.length && (B.current = [...B.current, ...t], Y() || z(B.current));
+	}, [Y]);
+	m(() => void Y(), [
+		Y,
+		K,
+		q
 	]);
-	let J = f(async (e, t) => {
+	let X = p(async (e, t) => {
 		de((e) => e + 1);
 		try {
-			t ? await t() : await y.media.commit(K.current.ref, e), B(void 0);
+			t ? await t() : await b.media.commit(J.current.ref, e), H(void 0);
 		} catch (e) {
 			let t = n(e);
-			throw t.code !== "aborted" && B(t), b(t, "folder.update"), t;
+			throw t.code !== "aborted" && H(t), x(t, "folder.update"), t;
 		} finally {
 			de((e) => e - 1);
 		}
-	}, [y, b]), Y = f(async () => {
+	}, [b, x]), Z = p(async () => {
 		fe(!0);
 		try {
-			let e = await M.commit(void 0, { head: U.current.commit === "auto" });
-			return B(void 0), e;
+			let e = await P.commit(void 0, {
+				head: G.current.commit === "auto",
+				attach: J.current.leftover.map((e) => e.path)
+			});
+			return H(void 0), e;
 		} catch (e) {
 			let t = n(e);
-			throw B(t), b(t, "folder.commit"), t;
+			throw H(t), x(t, "folder.commit"), t;
 		} finally {
 			fe(!1);
 		}
-	}, [M, b]);
-	p(() => {
-		for (let e of j.items) e.status === "committed" && (A.has(e.path) || !w.loading) && M.remove(e.id);
+	}, [P, x]);
+	m(() => {
+		for (let e of N.items) e.status === "committed" && (j.has(e.path) || !T.loading) && P.remove(e.id);
 	}, [
-		j.items,
-		A,
-		w.loading,
-		M
+		N.items,
+		j,
+		T.loading,
+		P
 	]);
-	let X = v.commit === "auto", Z = N.find((e) => e.status !== "committed")?.status === "uploaded";
-	p(() => {
-		X && Z && !z && !H && Y().catch((e) => V({
-			key: S,
+	let _e = y.commit === "auto", ve = F.find((e) => e.status !== "committed")?.status === "uploaded" || I.length > 0 && !T.loading;
+	m(() => {
+		_e && ve && !V && !W && Z().catch((e) => U({
+			key: C,
 			error: n(e)
 		}));
 	}, [
-		X,
+		_e,
+		ve,
+		V,
+		W,
 		Z,
-		z,
-		H,
-		Y,
-		S
+		C
 	]);
-	let _e = f(async () => (V(void 0), Y()), [Y]), Q = h(/* @__PURE__ */ new Set());
-	p(() => {
-		for (let e of j.items) e.status === "failed" && e.error && !Q.current.has(e.error) && (Q.current.add(e.error), b(e.error, "upload", e.file.name));
-		j.blocked && !Q.current.has(j.blocked) && (Q.current.add(j.blocked), b(j.blocked, "upload"));
+	let ye = p(async () => (U(void 0), Z()), [Z]), Q = g(/* @__PURE__ */ new Set());
+	m(() => {
+		for (let e of N.items) e.status === "failed" && e.error && !Q.current.has(e.error) && (Q.current.add(e.error), x(e.error, "upload", e.file.name));
+		N.blocked && !Q.current.has(N.blocked) && (Q.current.add(N.blocked), x(N.blocked, "upload"));
 	}, [
-		j.items,
-		j.blocked,
-		b
+		N.items,
+		N.blocked,
+		x
 	]);
-	let $ = h(null);
-	p(() => {
-		if (!w.read) return;
-		let e = k.filter((e) => e.failed);
-		if ($.current?.key !== S) {
+	let $ = g(null);
+	m(() => {
+		if (!T.read) return;
+		let e = A.filter((e) => e.failed);
+		if ($.current?.key !== C) {
 			$.current = {
-				key: S,
+				key: C,
 				seen: new Set(e.map((e) => `${e.path}:${e.failed.of}`))
 			};
 			return;
 		}
 		for (let n of e) {
 			let e = `${n.path}:${n.failed.of}`;
-			$.current.seen.has(e) || ($.current.seen.add(e), b(t(n.failed), "folder.process", n.path.split("/").pop()));
+			$.current.seen.has(e) || ($.current.seen.add(e), x(t(n.failed), "folder.process", n.path.split("/").pop()));
 		}
 	}, [
-		w.read,
-		k,
-		b,
-		S
-	]), p(() => void (w.error && b(w.error, "folder.load")), [w.error, b]);
-	let ve = F.length > 0 || z || R > 0 || X && Z && !H || N.some((e) => e.status === "uploading" || e.status === "queued" && !j.blocked), ye = k.length + F.length + ce(N, A).length, be = (e) => K.current.groups.find((t) => c([{ path: t.path }], e));
+		T.read,
+		A,
+		x,
+		C
+	]), m(() => void (T.error && x(T.error, "folder.load")), [T.error, x]);
+	let be = R.length > 0 || V || ue > 0 || _e && ve && !W || F.some((e) => e.status === "uploading" || e.status === "queued" && !N.blocked), xe = A.length + R.length + se(F, j).length + I.length, Se = (e) => J.current.groups.find((t) => c([{ path: t.path }], e));
 	return {
-		ref: x,
-		options: v,
-		read: w,
-		groups: O,
-		uploads: k,
-		queue: le,
-		waiting: F,
+		ref: S,
+		options: y,
+		read: T,
+		groups: k,
+		uploads: A,
+		queue: ce,
+		pending: I,
+		waiting: R,
 		add: ge,
-		refused: ue,
-		dismiss: f(() => P([]), []),
-		move: f((e, t) => J([{
+		refused: le,
+		dismiss: p(() => L([]), []),
+		move: p((e, t) => X([{
 			op: "move",
 			path: e,
 			index: t
-		}]), [J]),
-		remove: f((e) => J(e.map((e) => ({
+		}]), [X]),
+		remove: p((e) => X(e.map((e) => ({
 			op: "remove",
 			path: e
-		}))), [J]),
-		rename: f((t, n) => {
-			let r = be(t), a = (r ? s(r.path) : t.slice(0, t.lastIndexOf("/") + 1)) + n.trim();
+		}))), [X]),
+		rename: p((t, n) => {
+			let r = Se(t), a = (r ? s(r.path) : t.slice(0, t.lastIndexOf("/") + 1)) + n.trim();
 			if (i(a) === i(t)) return Promise.resolve();
 			if (r?.files.some((e) => i(e.path) === i(a))) {
 				let t = new e("conflict", `${n} exists`, { status: 409 });
-				return B(t), Promise.reject(t);
+				return H(t), Promise.reject(t);
 			}
-			return J([{
+			return X([{
 				op: "rename",
 				path: t,
 				to: a
 			}]);
-		}, [J]),
-		edit: f((e, t) => J([{
+		}, [X]),
+		edit: p((e, t) => X([{
 			op: "edit",
 			path: e,
 			...t ? { edit: t } : {}
-		}]), [J]),
-		replace: f((e, t) => J([], () => y.media.put(t, {
-			ref: K.current.ref,
+		}]), [X]),
+		replace: p((e, t) => X([], () => b.media.put(t, {
+			ref: J.current.ref,
 			path: i(e),
 			wait: !1
-		})), [J, y]),
-		commit: _e,
-		discard: f(() => {
-			L.current = [], I([]);
-			for (let e of M.getSnapshot().items) M.remove(e.id);
-			M.pause();
-		}, [M]),
-		updating: R > 0,
-		committing: z,
-		busy: ve,
-		fileCount: ye,
-		error: pe ?? H
+		})), [X, b]),
+		commit: ye,
+		discard: p(() => {
+			B.current = [], z([]);
+			for (let e of P.getSnapshot().items) P.remove(e.id);
+			P.pause();
+		}, [P]),
+		updating: ue > 0,
+		committing: V,
+		busy: be,
+		fileCount: xe,
+		error: pe ?? W
 	};
 }
 //#endregion
-export { _ as nameIn, v as thumbnailOf, b as useMediaFolder };
+export { v as nameIn, y as thumbnailOf, x as useMediaFolder };
 
 //# sourceMappingURL=folder.js.map