@shwfed/nuxt 0.1.70 → 0.1.72

package/dist/module.d.mts

@@ -15,6 +15,9 @@ interface ModuleOptions {
          *
          * 这个表达式可以访问到 `token` 变量，其通过 `token` 配置的表达式计算得到。
          *
+         * 仅当 `token` 与 `headers` 都配置为字符串时才会执行该表达式；
+         * 若 `token` 表达式结果不是字符串或表达式执行失败，则不会注入任何请求头。
+         *
          * @type DSL
          */
         headers?: string;
@@ -30,6 +33,8 @@ interface ModuleOptions {
          * DSL 应当返回一个布尔值，表示是否需要重定向到登陆页。该表达式可以访问到**每一个 API 响应**的响应数据，
          * 可以通过 `response` 变量访问。
          *
+         * 仅当 `expired` 与 `logoutUri` 都配置为字符串时才会执行该表达式。
+         *
          * @type DSL
          */
         expired?: string;
@@ -54,21 +59,27 @@ interface ModuleOptions {
         /**
          * 侧边栏的菜单
          *
-         * DSL 应当返回一个数组，每个元素是一个对象，对象的结构如下：
+         * DSL 应当返回一个数组，每个元素是一个分组或路由项：
          *
          * ```ts
-         * type Item = {
-         *   id: string
+         * type RouteItem = {
+         *   id: string | number
          *   title: string
-         *   path: string
-         *   disabled?: string
-         *   hidden?: string
+         *   route: string
          *   icon?: string
          *   keywords?: string[]
-         *   children?: Item[]
+         * }
+         *
+         * type GroupItem = {
+         *   id: string | number
+         *   title: string
+         *   icon?: string
+         *   children: RouteItem[]
          * }
          * ```
          *
+         * `RouteItem` 不支持 `hidden` / `disabled`，且 `children` 仅支持一层（`GroupItem -> RouteItem[]`）。
+         *
          * @type DSL
          */
         menus?: string;
@@ -108,6 +119,8 @@ interface ModuleOptions {
      * - 清理缓存：`{ type: 'request', url: '/cache/clear', method: 'POST', body: { scope: 'all' } }`
      * - 重建索引：`{ type: 'request', url: '/search/reindex', method: 'POST', query: { async: true }, headers: { 'X-Command-Source': 'palette' } }`
      *
+     * 当前模块实现会将 `commands: null` 规范化为 `undefined`，等价于不配置。
+     *
      * @type DSL
      */
     commands?: string | null;

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "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();
@@ -79,22 +80,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(navigations.value, tab);
 };
 const activeTabLabel = computed(() => {
   if (active.value === void 0)

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.70",
+  "version": "0.1.72",
   "description": "",
   "license": "MIT",
   "type": "module",