@shwfed/nuxt 0.1.71 → 0.1.73

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.1.71",
+  "version": "0.1.73",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/app.vue

@@ -18,7 +18,8 @@ import { useFavorite } from "../composables/useFavorite";
 import { useNavigationTabs } from "../composables/useNavigationTabs";
 import { commandActionSchema, executeCommandAction } from "../utils/command";
 import { createPaletteItemValue, normalizeCommandsForPalette, splitNavigationForPalette } from "../utils/command-palette";
-import { isRouteActive, normalizeRoutePath } from "../utils/route";
+import { resolveNavigationTitle } from "../utils/navigation-title";
+import { isRouteActive } from "../utils/route";
 import { applyRootNavigationFallback } from "../utils/sidebar-fallback";
 const { $dsl, $logout, $md, $api, $toast } = useNuxtApp();
 const { t } = useI18n();
@@ -50,23 +51,24 @@ const { start: startProfileCloseTimer, stop: stopProfileCloseTimer } = useTimeou
 const { meta_k } = useMagicKeys();
 whenever(() => meta_k?.value, () => ui.isCommandPaletteOpen = !ui.isCommandPaletteOpen);
 setGlobalDslContext(await props.dsl?.pipe(Effect.scoped).pipe(Effect.runPromise) ?? {});
+const navigationItem = z.object({
+  id: z.union([z.string(), z.number()]),
+  title: z.string(),
+  icon: z.string().optional(),
+  route: z.string(),
+  keywords: z.array(z.string()).optional()
+});
+const navigationGroup = z.object({
+  id: z.union([z.string(), z.number()]),
+  title: z.string(),
+  icon: z.string().optional(),
+  children: z.array(navigationItem)
+});
+const navigationEntry = z.union([navigationGroup, navigationItem]);
 const navigationItems = computed(() => {
-  const item = z.object({
-    id: z.union([z.string(), z.number()]),
-    title: z.string(),
-    icon: z.string().optional(),
-    route: z.string(),
-    keywords: z.array(z.string()).optional()
-  });
-  const group = z.object({
-    id: z.union([z.string(), z.number()]),
-    title: z.string(),
-    icon: z.string().optional(),
-    children: z.array(item)
-  });
   try {
     const result = $dsl.evaluate`${config.sidebar.menus}`();
-    return z.array(z.union([group, item])).parse(result);
+    return z.array(navigationEntry).parse(result);
   } catch {
     return [];
   }
@@ -79,22 +81,7 @@ const {
 } = useFavorite("navigation", navigationItems);
 const isNavigationItemActive = (itemRoute) => isRouteActive(route.path, itemRoute);
 const getTabLabel = (tab) => {
-  const normalizedTab = normalizeRoutePath(tab);
-  for (const group of navigations.value) {
-    if ("children" in group) {
-      const matchedChild = group.children.find((child) => {
-        if (!("route" in child))
-          return false;
-        return normalizeRoutePath(child.route) === normalizedTab;
-      });
-      if (matchedChild)
-        return matchedChild.title;
-      continue;
-    }
-    if (normalizeRoutePath(group.route) === normalizedTab)
-      return group.title;
-  }
-  return normalizedTab;
+  return resolveNavigationTitle(navigationItems.value, tab);
 };
 const activeTabLabel = computed(() => {
   if (active.value === void 0)
@@ -187,6 +174,18 @@ const profileCommands = computed(() => {
     return [];
   }
 });
+const isBodyInit = (value) => {
+  return typeof value === "string" || value instanceof Blob || value instanceof ArrayBuffer || ArrayBuffer.isView(value) || value instanceof FormData || value instanceof URLSearchParams || value instanceof ReadableStream;
+};
+const toApiRequestBody = (value) => {
+  if (value === void 0 || value === null)
+    return value;
+  if (isBodyInit(value))
+    return value;
+  if (typeof value === "object")
+    return value;
+  return void 0;
+};
 const executeCommandEffect = async (effect) => {
   if (effect === void 0)
     return false;
@@ -203,7 +202,7 @@ const executeCommandEffect = async (effect) => {
       logout: $logout,
       request: async (requestAction) => $api(requestAction.url, {
         method: requestAction.method,
-        body: requestAction.body,
+        body: toApiRequestBody(requestAction.body),
         query: requestAction.query,
         headers: requestAction.headers
       })
@@ -221,7 +220,14 @@ const executeProfileCommand = async (effect) => {
   if (effect === void 0 || await executeCommandEffect(effect))
     ui.isProfileDropdownOpen = false;
 };
-const paletteNavigation = computed(() => splitNavigationForPalette(navigations.value));
+const normalizedNavigationForPalette = computed(() => {
+  try {
+    return z.array(navigationEntry).parse(navigations.value);
+  } catch {
+    return navigationItems.value;
+  }
+});
+const paletteNavigation = computed(() => splitNavigationForPalette(normalizedNavigationForPalette.value));
 const favoriteRoutesForPalette = computed(() => paletteNavigation.value.favoriteRoutes);
 const navigationForPalette = computed(() => paletteNavigation.value.navigationEntries);
 const commandForPalette = computed(() => normalizeCommandsForPalette(profileCommands.value));

package/dist/runtime/composables/useFavorite.js

@@ -20,6 +20,31 @@ export function useFavorite(key, items) {
     const [id, of] = key2.split("::");
     return [id, of];
   };
+  if (key === "navigation" && typeof window !== "undefined" && typeof localStorage !== "undefined") {
+    const legacyStorageKey = "navigation-favorites";
+    const rawLegacy = localStorage.getItem(legacyStorageKey);
+    if (rawLegacy !== null) {
+      try {
+        const parsedLegacy = JSON.parse(rawLegacy);
+        if (Array.isArray(parsedLegacy)) {
+          const next = new Set(memo.value);
+          for (const entry of parsedLegacy) {
+            if (typeof entry !== "string") {
+              continue;
+            }
+            const [groupId, itemId, extra] = entry.split("::");
+            if (extra !== void 0 || groupId === void 0 || itemId === void 0 || groupId === "" || itemId === "") {
+              continue;
+            }
+            next.add(`${itemId}::${groupId}`);
+          }
+          memo.value = next;
+          localStorage.removeItem(legacyStorageKey);
+        }
+      } catch {
+      }
+    }
+  }
   return {
     favorite: (item, of) => {
       memo.value = new Set(memo.value).add(keyed(item, of));

package/dist/runtime/utils/navigation-title.d.ts

@@ -0,0 +1,10 @@
+type NavigationLeaf = Readonly<{
+    title: string;
+    route: string;
+}>;
+type NavigationGroup = Readonly<{
+    children: Array<NavigationLeaf>;
+}>;
+type NavigationEntry = NavigationLeaf | NavigationGroup;
+export declare function resolveNavigationTitle(entries: Array<NavigationEntry>, path: string): string;
+export {};

package/dist/runtime/utils/navigation-title.js

@@ -0,0 +1,28 @@
+import { isRouteActive, normalizeRoutePath } from "./route.js";
+export function resolveNavigationTitle(entries, path) {
+  const normalizedPath = normalizeRoutePath(path);
+  let bestTitle;
+  let bestRouteLength = -1;
+  for (const entry of entries) {
+    if ("children" in entry) {
+      for (const child of entry.children) {
+        const normalizedRoute2 = normalizeRoutePath(child.route);
+        if (!isRouteActive(normalizedPath, normalizedRoute2))
+          continue;
+        if (normalizedRoute2.length <= bestRouteLength)
+          continue;
+        bestRouteLength = normalizedRoute2.length;
+        bestTitle = child.title;
+      }
+      continue;
+    }
+    const normalizedRoute = normalizeRoutePath(entry.route);
+    if (!isRouteActive(normalizedPath, normalizedRoute))
+      continue;
+    if (normalizedRoute.length <= bestRouteLength)
+      continue;
+    bestRouteLength = normalizedRoute.length;
+    bestTitle = entry.title;
+  }
+  return bestTitle ?? normalizedPath;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/nuxt",
-  "version": "0.1.71",
+  "version": "0.1.73",
   "description": "",
   "license": "MIT",
   "type": "module",