primitive-app 3.2.0-alpha.11 → 3.2.0-alpha.13

package/dist/index.js

@@ -9343,101 +9343,118 @@ function nf(e) {
 	}
 }
 function rf(e) {
-	let { subscribeTo: t, queryParams: n, documentReady: r, loadData: a, pauseUpdates: o, reloadOnDocumentEvents: s = !0, debounceMs: c = 50, onError: l } = e, u = B(null), d = B(!1), f = B(!1), p = m(() => tf(r, !1)), h = m(() => tf(o, !1)), g = m(() => W(n) ?? null), _ = m(() => {
-		let e = g.value;
+	let { subscribeTo: t, queryParams: n, documentReady: r, loadData: a, pauseUpdates: o, reloadOnDocumentEvents: s = !0, debounceMs: c = 50, onError: l } = e, u = B(null), d = B(!1), f = 0, p = null, h = () => {
+		p === null && (p = ++f);
+	}, g = m(() => tf(r, !1)), _ = m(() => tf(o, !1)), v = m(() => W(n) ?? null), y = m(() => {
+		let e = v.value;
 		return e === null ? null : nf(e);
-	}), v = async (e) => {
-		if (!p.value) {
+	}), b = async (e) => {
+		if (!g.value) {
 			ef.debug("loadData skipped: not ready", {
 				reason: e,
-				queryParams: se(g.value)
+				queryParams: se(v.value)
 			});
 			return;
 		}
-		if (h.value) {
+		if (_.value) {
 			ef.debug("loadData skipped: paused", {
 				reason: e,
-				queryParams: se(g.value)
+				queryParams: se(v.value)
 			});
 			return;
 		}
 		ef.debug("loadData start", {
 			reason: e,
-			queryParams: se(g.value)
+			queryParams: se(v.value)
 		});
+		let t = p ?? ++f;
+		p = null;
 		try {
-			let t = await a(g.value);
-			u.value = t, d.value || (d.value = !0, f.value = !0), ef.debug("loadData success", {
+			let n = await a(v.value);
+			if (t !== f) {
+				ef.debug("loadData result dropped: a newer load started", { reason: e });
+				return;
+			}
+			u.value = n, d.value = !0, ef.debug("loadData success", {
 				reason: e,
-				queryParams: se(g.value),
-				data: t
+				queryParams: se(v.value),
+				data: n
 			});
-		} catch (t) {
+		} catch (n) {
+			if (t !== f) {
+				ef.debug("loadData error dropped: a newer load started", {
+					reason: e,
+					error: n
+				});
+				return;
+			}
 			if (l) try {
-				l(t);
+				l(n);
 			} catch (e) {
 				ef.warn("onError handler threw", { handlerError: e });
 			}
 			ef.error("loadData error", {
 				reason: e,
-				queryParams: se(g.value),
-				error: t
+				queryParams: se(v.value),
+				error: n
 			});
 		}
-	}, y = (0, $d.default)((e) => {
-		ef.debug("Reload scheduled", { reason: e }), v(e);
-	}, c), b = () => {
-		y("Manual");
-	}, x = [];
+	}, x = (0, $d.default)((e) => {
+		ef.debug("Reload scheduled", { reason: e }), b(e);
+	}, c), S = (e) => {
+		h(), x(e);
+	}, C = () => {
+		S("Manual");
+	}, w = [];
 	return I(async () => {
 		for (let e of t) try {
 			let t = e.subscribe(() => {
-				f.value && p.value && (h.value || y("Subscribed models changed"));
+				g.value && (_.value || S("Subscribed models changed"));
 			});
-			x.push(t);
+			w.push(t);
 		} catch (e) {
 			ef.warn("Failed to subscribe to model", { error: e });
 		}
 		if (tf(s, !0)) try {
 			let e = await i.getClientAsync(), t = () => {
-				f.value && p.value && (h.value || y("Document loaded"));
+				g.value && (_.value || S("Document loaded"));
 			}, n = () => {
-				f.value && p.value && (h.value || y("Document closed"));
+				g.value && (_.value || S("Document closed"));
 			};
-			e.on("documentLoaded", t), e.on("documentClosed", n), x.push(() => {
+			e.on("documentLoaded", t), e.on("documentClosed", n), w.push(() => {
 				e.off("documentLoaded", t), e.off("documentClosed", n);
 			}), ef.debug("Subscribed to js-bao document events");
 		} catch (e) {
 			ef.warn("Failed to subscribe to js-bao client events", { error: e });
 		}
 	}), re(() => {
-		for (let e of x) try {
+		for (let e of w) try {
 			e();
 		} catch {}
-	}), G(p, (e) => {
+	}), G(g, (e) => {
 		if (!e) {
-			ef.debug("documentReady became false; resetting state"), d.value = !1, f.value = !1;
+			ef.debug("documentReady became false; resetting state"), d.value = !1;
 			return;
 		}
-		h.value ? ef.debug("documentReady became true but updates are paused; not scheduling load") : (ef.debug("documentReady became true; scheduling initial load"), y("Document became ready"));
-	}, { immediate: !0 }), G(_, (e) => {
+		_.value ? ef.debug("documentReady became true but updates are paused; not scheduling load") : (ef.debug("documentReady became true; scheduling initial load"), S("Document became ready"));
+	}, { immediate: !0 }), G(y, (e) => {
 		if (e === null) {
 			ef.debug("queryParams disabled (null)");
 			return;
 		}
-		if (!p.value) {
+		if (!g.value) {
 			ef.debug("queryParams changed but document not ready; ignoring", { signature: e });
 			return;
 		}
-		if (h.value) {
+		if (_.value) {
 			ef.debug("queryParams changed but updates are paused; ignoring", { signature: e });
 			return;
 		}
-		ef.debug("queryParams changed; scheduling reload", { signature: e }), y("Queries changed");
+		ef.debug("queryParams changed; scheduling reload", { signature: e }), S("Queries changed");
 	}), {
 		data: u,
 		initialDataLoaded: d,
-		reload: b
+		reload: C
 	};
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primitive-app",
-  "version": "3.2.0-alpha.11",
+  "version": "3.2.0-alpha.13",
   "license": "UNLICENSED",
   "author": "Primitive LLC",
   "type": "module",