@cocoar/vue-fragment-parser 1.6.4 → 1.6.5

package/dist/index.js

@@ -1,106 +1,129 @@
-import { match as d } from "path-to-regexp";
-import { useRouter as g, useRoute as R } from "vue-router";
-import { computed as v, shallowRef as y, watch as P, markRaw as w, onUnmounted as $ } from "vue";
-import { useDialog as M, getOverlayService as S, modalPreset as O } from "@cocoar/vue-ui";
-function q(r, u) {
-  const p = u.flatMap((e) => Array.isArray(e.path) ? e.path.map((a) => ({ ...e, path: a })) : [e]);
-  return r.split("#").map((e) => {
-    const [a, o] = e.split("?"), t = {}, n = p.find((c) => !!d(c.path, { decode: decodeURIComponent })(a));
-    if (n) {
-      const h = d(n.path, { decode: decodeURIComponent })(a);
-      return h && Object.assign(t, h.params), o && new URLSearchParams(o).forEach((i, l) => {
-        let m;
-        try {
-          m = JSON.parse(i);
-        } catch {
-          m = i;
-        }
-        t[l] = m;
-      }), { fragment: e, params: t, route: n };
-    }
-    return null;
-  }).filter((e) => e !== null);
+import { match as e } from "path-to-regexp";
+import { useRoute as t, useRouter as n } from "vue-router";
+import { computed as r, markRaw as i, onUnmounted as a, shallowRef as o, watch as s } from "vue";
+import { getOverlayService as c, modalPreset as l, useDialog as u } from "@cocoar/vue-ui";
+//#region src/lib/fragment-parser.ts
+function d(t, n) {
+	let r = n.flatMap((e) => Array.isArray(e.path) ? e.path.map((t) => ({
+		...e,
+		path: t
+	})) : [e]);
+	return t.split("#").map((t) => {
+		let [n, i] = t.split("?"), a = {}, o = r.find((t) => !!e(t.path, { decode: decodeURIComponent })(n));
+		if (o) {
+			let r = e(o.path, { decode: decodeURIComponent })(n);
+			return r && Object.assign(a, r.params), i && new URLSearchParams(i).forEach((e, t) => {
+				let n;
+				try {
+					n = JSON.parse(e);
+				} catch {
+					n = e;
+				}
+				a[t] = n;
+			}), {
+				fragment: t,
+				params: a,
+				route: o
+			};
+		}
+		return null;
+	}).filter((e) => e !== null);
 }
-function U() {
-  const r = g();
-  function u(s, e, a) {
-    const o = e ? "?" + Object.entries(e).filter(([, n]) => n !== void 0).map(([n, c]) => `${n}=${encodeURIComponent(String(c))}`).join("&") : "", t = `${s}${o}`;
-    if (a?.append) {
-      const n = r.currentRoute.value.hash.replace(/^#/, ""), c = n ? `${n}#${t}` : t;
-      r.push({ ...r.currentRoute.value, hash: `#${c}` });
-    } else
-      r.push({ ...r.currentRoute.value, hash: `#${t}` });
-  }
-  function p(s) {
-    const e = r.currentRoute.value.hash.replace(/^#/, "");
-    if (!e) return;
-    const a = e.split("#"), o = a.filter((t) => t.split("?")[0] !== s);
-    if (o.length !== a.length)
-      if (o.length > 0)
-        r.push({ ...r.currentRoute.value, hash: `#${o.join("#")}` });
-      else {
-        const { path: t, query: n } = r.currentRoute.value;
-        r.push({ path: t, query: n });
-      }
-  }
-  return { navigateToModal: u, closeModal: p };
+//#endregion
+//#region src/composables/useFragmentNavigation.ts
+function f() {
+	let e = n();
+	function t(t, n, r) {
+		let i = `${t}${n ? "?" + Object.entries(n).filter(([, e]) => e !== void 0).map(([e, t]) => `${e}=${encodeURIComponent(String(t))}`).join("&") : ""}`;
+		if (r?.append) {
+			let t = e.currentRoute.value.hash.replace(/^#/, ""), n = t ? `${t}#${i}` : i;
+			e.push({
+				...e.currentRoute.value,
+				hash: `#${n}`
+			});
+		} else e.push({
+			...e.currentRoute.value,
+			hash: `#${i}`
+		});
+	}
+	function r(t) {
+		let n = e.currentRoute.value.hash.replace(/^#/, "");
+		if (!n) return;
+		let r = n.split("#"), i = r.filter((e) => e.split("?")[0] !== t);
+		if (i.length !== r.length) if (i.length > 0) e.push({
+			...e.currentRoute.value,
+			hash: `#${i.join("#")}`
+		});
+		else {
+			let { path: t, query: n } = e.currentRoute.value;
+			e.push({
+				path: t,
+				query: n
+			});
+		}
+	}
+	return {
+		navigateToModal: t,
+		closeModal: r
+	};
 }
-function j(r) {
-  const u = R();
-  return { fragments: v(() => {
-    const s = u.hash.replace(/^#/, "");
-    if (!s) return [];
-    const e = r ?? u.meta?.routedFragments ?? [];
-    return e.length === 0 ? [] : q(s, e);
-  }) };
+//#endregion
+//#region src/composables/useRoutedFragments.ts
+function p(e) {
+	let n = t();
+	return { fragments: r(() => {
+		let t = n.hash.replace(/^#/, "");
+		if (!t) return [];
+		let r = e ?? n.meta?.routedFragments ?? [];
+		return r.length === 0 ? [] : d(t, r);
+	}) };
 }
-function I() {
-  const { fragments: r } = j(), { closeModal: u } = U(), { open: p } = M(), s = y(/* @__PURE__ */ new Map());
-  P(
-    r,
-    async (e) => {
-      const a = new Set(e.map((t) => t.fragment.split("?")[0])), o = new Map(s.value);
-      for (const [t, n] of o)
-        a.has(t) || (n.close(), o.delete(t));
-      for (const t of e) {
-        const n = t.fragment.split("?")[0];
-        if (o.has(n)) continue;
-        const c = t.route, f = (await c.component()).default;
-        let i;
-        if (c.type === "dialog") {
-          const l = p(
-            f,
-            c.dialogOptions ?? {},
-            { ...t.params }
-          );
-          i = { close: () => l.close(), result: l.result };
-        } else {
-          const l = S().open({
-            spec: { ...O, ...c.overlayOptions },
-            content: { kind: "component", component: w(f) },
-            inputs: {
-              ...t.params,
-              close: (m) => l.close(m)
-            }
-          });
-          i = { close: () => l.close(), result: l.afterClosed };
-        }
-        o.set(n, i), i.result.then(() => {
-          s.value.delete(n), u(n);
-        });
-      }
-      s.value = o;
-    },
-    { immediate: !0 }
-  ), $(() => {
-    for (const e of s.value.values())
-      e.close();
-    s.value.clear();
-  });
+//#endregion
+//#region src/composables/useRoutedModals.ts
+function m() {
+	let { fragments: e } = p(), { closeModal: t } = f(), { open: n } = u(), r = o(/* @__PURE__ */ new Map());
+	s(e, async (e) => {
+		let a = new Set(e.map((e) => e.fragment.split("?")[0])), o = new Map(r.value);
+		for (let [e, t] of o) a.has(e) || (t.close(), o.delete(e));
+		for (let a of e) {
+			let e = a.fragment.split("?")[0];
+			if (o.has(e)) continue;
+			let s = a.route, u = (await s.component()).default, d;
+			if (s.type === "dialog") {
+				let e = n(u, s.dialogOptions ?? {}, { ...a.params });
+				d = {
+					close: () => e.close(),
+					result: e.result
+				};
+			} else {
+				let e = c().open({
+					spec: {
+						...l,
+						...s.overlayOptions
+					},
+					content: {
+						kind: "component",
+						component: i(u)
+					},
+					inputs: {
+						...a.params,
+						close: (t) => e.close(t)
+					}
+				});
+				d = {
+					close: () => e.close(),
+					result: e.afterClosed
+				};
+			}
+			o.set(e, d), d.result.then(() => {
+				r.value.delete(e), t(e);
+			});
+		}
+		r.value = o;
+	}, { immediate: !0 }), a(() => {
+		for (let e of r.value.values()) e.close();
+		r.value.clear();
+	});
 }
-export {
-  q as parseFragment,
-  U as useFragmentNavigation,
-  j as useRoutedFragments,
-  I as useRoutedModals
-};
+//#endregion
+export { d as parseFragment, f as useFragmentNavigation, p as useRoutedFragments, m as useRoutedModals };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocoar/vue-fragment-parser",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "HTML fragment parser utility for Cocoar UI components",
   "license": "Apache-2.0",
   "repository": {
@@ -35,12 +35,12 @@
     "lint": "eslint src/"
   },
   "dependencies": {
-    "path-to-regexp": "^8.3.0"
+    "path-to-regexp": "^8.4.2"
   },
   "peerDependencies": {
+    "@cocoar/vue-ui": "1.6.5",
     "vue": "^3.5.0",
-    "vue-router": "^4.5.0",
-    "@cocoar/vue-ui": "1.6.4"
+    "vue-router": "^4.5.0"
   },
   "peerDependenciesMeta": {
     "vue-router": {
@@ -51,8 +51,8 @@
     }
   },
   "devDependencies": {
-    "vue": "^3.5.0",
-    "vue-router": "^4.5.0",
-    "@cocoar/vue-ui": "workspace:*"
+    "@cocoar/vue-ui": "workspace:*",
+    "vue": "^3.5.32",
+    "vue-router": "^5.0.4"
   }
 }