@wssto2/vue-core 0.4.13 → 0.4.14

package/dist/{routeResource-DstM0hvf.js → routeResource-BwEFXzIX.js}

@@ -1,23 +1,27 @@
-import { computed as f, toValue as x, shallowRef as R, watch as w, getCurrentScope as C, onScopeDispose as I, provide as j, hasInjectionContext as A, inject as F } from "vue";
+import { computed as f, toValue as A, shallowRef as w, watch as R, getCurrentScope as C, onScopeDispose as I, provide as j, hasInjectionContext as E, inject as F } from "vue";
 import { useRoute as M } from "vue-router";
 import { M as h } from "./context-Ch1r4fdN.js";
 import { useI18n as S } from "vue-i18n";
 import { a as p } from "./error-CD7x0Jrz.js";
-function _(e) {
+import { a as _ } from "./describeError-CvGmajU0.js";
+function D(e) {
   if (!/^\d+$/.test(e)) return null;
   const n = Number(e);
   return Number.isSafeInteger(n) && n > 0 ? n : null;
 }
-const E = (e) => typeof e == "object" && e !== null && "state" in e && "reload" in e && "id" in e, N = (e) => typeof e == "object" && e !== null && "id" in e;
-function D(e) {
-  const { t: n } = S(), o = E(e.for) ? e.for : null, s = f(() => o ? o.id.value : x(e.for)), d = f(() => o !== null && o.data.value === null), t = R({ status: "loading" });
-  let u = null, a = 0, v = null;
-  const g = e.errorMessage ?? ((r) => p(r) && r.kind === "network" ? n("core.resource.offline") : p(r) && r.kind === "forbidden" ? n("core.no_access.body") : n("core.resource.unavailable"));
+const N = (e) => typeof e == "object" && e !== null && "state" in e && "reload" in e && "id" in e, O = (e) => typeof e == "object" && e !== null && "id" in e;
+function V(e) {
+  const { t: n } = S(), s = N(e.for) ? e.for : null, a = f(() => s ? s.id.value : A(e.for)), d = f(() => s !== null && s.data.value === null), t = w({ status: "loading" });
+  let u = null, l = 0, v = null;
+  const k = _(), g = e.errorMessage ?? ((r) => {
+    const o = k?.(r);
+    return o !== void 0 ? o : p(r) && r.kind === "network" ? n("core.resource.offline") : p(r) && r.kind === "forbidden" ? n("core.no_access.body") : n("core.resource.unavailable");
+  });
   function m() {
-    return v?.abort(), v = null, ++a;
+    return v?.abort(), v = null, ++l;
   }
   async function y() {
-    const r = s.value, l = m();
+    const r = a.value, o = m();
     if (d.value) {
       u = null, t.value = { status: "loading" };
       return;
@@ -32,51 +36,51 @@ function D(e) {
     v = b;
     try {
       const c = await e.load(r, { signal: b.signal });
-      if (l !== a) return;
+      if (o !== l) return;
       u = r, t.value = { status: "loaded", value: c };
     } catch (c) {
-      if (l !== a) return;
+      if (o !== l) return;
       p(c) && c.kind === "notFound" ? (u = null, t.value = { status: "failed", reason: "notFound", error: n("core.resource.not_found.body") }) : i ? t.value = { status: "stale", value: i.value, error: g(c) } : (u = null, t.value = { status: "failed", reason: "unavailable", error: g(c) });
     }
   }
-  function k(r) {
-    const l = s.value, i = e.identify ? e.identify(r) : N(r) ? r.id : l;
-    return l === null || i !== l ? !1 : (m(), u = l, t.value = { status: "loaded", value: r }, !0);
+  function x(r) {
+    const o = a.value, i = e.identify ? e.identify(r) : O(r) ? r.id : o;
+    return o === null || i !== o ? !1 : (m(), u = o, t.value = { status: "loaded", value: r }, !0);
   }
-  return w([s, d], () => void y(), { immediate: !0, flush: "sync" }), C() && I(m), {
-    id: s,
+  return R([a, d], () => void y(), { immediate: !0, flush: "sync" }), C() && I(m), {
+    id: a,
     state: f(() => t.value),
     data: f(() => "value" in t.value ? t.value.value : null),
     reload: y,
-    update: k
+    update: x
   };
 }
-function B(e) {
-  const n = M(), o = e.parse ?? _, s = R(null);
+function J(e) {
+  const n = M(), s = e.parse ?? D, a = w(null);
   let d = !1;
-  w(
+  R(
     () => n.params[e.param],
     (u) => {
       if (u === void 0 && d) return;
       d = !0;
-      const a = Array.isArray(u) ? u[0] : u;
-      s.value = a === void 0 ? null : o(a);
+      const l = Array.isArray(u) ? u[0] : u;
+      a.value = l === void 0 ? null : s(l);
     },
     { immediate: !0, flush: "sync" }
   );
-  const t = D({ ...e, for: s });
+  const t = V({ ...e, for: a });
   return e.key && j(e.key, t), t;
 }
-function G(e) {
+function K(e) {
   const n = e.description ?? "route resource";
-  if (!A()) throw new h(n, "outside-setup");
-  const o = F(e, null);
-  if (!o) throw new h(n, "not-provided");
-  return o;
+  if (!E()) throw new h(n, "outside-setup");
+  const s = F(e, null);
+  if (!s) throw new h(n, "not-provided");
+  return s;
 }
 export {
-  B as a,
-  G as b,
-  _ as p,
-  D as u
+  J as a,
+  K as b,
+  D as p,
+  V as u
 };

package/dist/state/index.js

@@ -7,7 +7,7 @@ import { _ as q } from "../EmptyState.vue_vue_type_script_setup_true_lang-50p-Mp
 import { defineComponent as m, computed as k, openBlock as e, createElementBlock as n, normalizeClass as p, createVNode as d, unref as i, createElementVNode as u, renderSlot as f, createBlock as S, toDisplayString as l, createCommentVNode as c } from "vue";
 import { _ as x } from "../Icon.vue_vue_type_script_lang-D7oC-d-S.js";
 import { useI18n as g } from "vue-i18n";
-import { u as J } from "../useLoad-CYRVx6HW.js";
+import { u as J } from "../useLoad-DuEsLECT.js";
 import { D as Q, W as X, u as Y } from "../useWaitStatus-fsacMl4W.js";
 const b = ["amber", "lime", "teal", "cyan", "blue", "indigo", "violet", "fuchsia", "pink"], V = /* @__PURE__ */ m({
   __name: "FieldNote",

package/dist/state/useLoad.d.ts

@@ -3,6 +3,13 @@ import type { AsyncState } from "./async";
 export interface LoadContext {
     /** Aborted when the load is no longer wanted: a newer load or an `update` superseded it, the watch source changed, the scope ended. */
     readonly signal: AbortSignal;
+    /**
+     * Ends this load with nothing to show and nothing to report, for a page that is leaving instead (a 403 that
+     * redirects): the state stays as it is (loading, or the value on screen) and no error flashes on the way out.
+     *
+     *   if (isForbidden(error)) { void router.replace(elsewhere); return abandon(); }
+     */
+    readonly abandon: () => never;
 }
 export interface LoadOptions {
     /**

package/dist/{status-DfAac6vw.js → status-OZUHZpWl.js}

@@ -1,5 +1,5 @@
 import { a, r as o } from "./http-D_D9YbLH.js";
-import { i as r } from "./index-BEDhdJQE.js";
+import { i as r } from "./index-RNF5-9uf.js";
 const n = ["active", "locked", "inactive", "all"];
 function l(i) {
   return a({

package/dist/useLoad-DuEsLECT.js

@@ -0,0 +1,43 @@
+import { shallowRef as S, watch as k, getCurrentScope as C, onScopeDispose as D, computed as v } from "vue";
+import { useI18n as E } from "vue-i18n";
+import { u as x } from "./describeError-CvGmajU0.js";
+const f = Symbol("vue-core.load.abandoned");
+function M(m, t = {}) {
+  const { t: g } = E(), b = x(), p = t.errorMessage ?? ((a) => b(a, { fallback: g("core.resource.unavailable") })), e = S({ status: "loading" });
+  let u = 0, s = null;
+  function n() {
+    return s?.abort(), s = null, ++u;
+  }
+  async function l() {
+    const a = n(), i = e.value, r = "value" in i ? i : null;
+    e.value = r ? { status: "refreshing", value: r.value } : { status: "loading" };
+    const c = new AbortController();
+    s = c;
+    try {
+      const o = await m({ signal: c.signal, abandon: w });
+      a === u && (e.value = { status: "loaded", value: o });
+    } catch (o) {
+      if (a !== u || o === f) return;
+      const d = p(o);
+      e.value = r ? { status: "stale", value: r.value, error: d } : { status: "failed", error: d };
+    }
+  }
+  function w() {
+    throw f;
+  }
+  function h(a) {
+    n(), e.value = { status: "loaded", value: a };
+  }
+  function y() {
+    e.value = { status: "loading" }, l();
+  }
+  return t.watch !== void 0 ? k(t.watch, y, { immediate: t.immediate ?? !0 }) : (t.immediate ?? !0) && l(), C() && D(n), {
+    state: v(() => e.value),
+    data: v(() => "value" in e.value ? e.value.value : null),
+    reload: l,
+    update: h
+  };
+}
+export {
+  M as u
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wssto2/vue-core",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "goCore": "v1.7.0",
   "description": "Shared Vue 3 library for go-core applications: app shell, list / record / form pages and their controls.",
   "keywords": [

package/dist/useLoad-CYRVx6HW.js

@@ -1,39 +0,0 @@
-import { shallowRef as h, watch as k, getCurrentScope as y, onScopeDispose as C, computed as v } from "vue";
-import { useI18n as D } from "vue-i18n";
-import { u as E } from "./describeError-Ctga6GcS.js";
-function I(f, t = {}) {
-  const { t: m } = D(), g = E(), p = t.errorMessage ?? ((a) => g(a, { fallback: m("core.resource.unavailable") })), e = h({ status: "loading" });
-  let s = 0, u = null;
-  function l() {
-    return u?.abort(), u = null, ++s;
-  }
-  async function o() {
-    const a = l(), i = e.value, r = "value" in i ? i : null;
-    e.value = r ? { status: "refreshing", value: r.value } : { status: "loading" };
-    const c = new AbortController();
-    u = c;
-    try {
-      const n = await f({ signal: c.signal });
-      a === s && (e.value = { status: "loaded", value: n });
-    } catch (n) {
-      if (a !== s) return;
-      const d = p(n);
-      e.value = r ? { status: "stale", value: r.value, error: d } : { status: "failed", error: d };
-    }
-  }
-  function w(a) {
-    l(), e.value = { status: "loaded", value: a };
-  }
-  function b() {
-    e.value = { status: "loading" }, o();
-  }
-  return t.watch !== void 0 ? k(t.watch, b, { immediate: t.immediate ?? !0 }) : (t.immediate ?? !0) && o(), y() && C(l), {
-    state: v(() => e.value),
-    data: v(() => "value" in e.value ? e.value.value : null),
-    reload: o,
-    update: w
-  };
-}
-export {
-  I as u
-};