@frigear-nu/menu 0.1.1 → 0.1.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@frigear-nu/menu",
   "configKey": "menus",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

package/dist/runtime/app/composables/useMenu.js

@@ -1,7 +1,7 @@
 import { computed, unref } from "vue";
 import { useAsyncData, useNuxtApp, useRuntimeConfig } from "#imports";
 import { collectMenuItems, matchesMenuGroup, parseMenuPath, sortByOrder, translateMenuItem } from "../../utils/menu.js";
-import { menus } from "../utils/state.js";
+import { getAppMenuStore } from "../utils/state.js";
 function useMenuLocale() {
   const nuxtApp = useNuxtApp();
   return computed(() => nuxtApp.$i18n?.locale?.value);
@@ -30,7 +30,7 @@ export const useMenu = (path) => {
     () => `menu:${path}:${locale.value ?? ""}`,
     async () => {
       const i18n = nuxtApp.$i18n?.t && nuxtApp.$i18n.te ? nuxtApp.$i18n : void 0;
-      const registered = collectMenuItems(menus[menu], parsed).map((item) => translateMenuItem(item, i18n));
+      const registered = collectMenuItems(getAppMenuStore(nuxtApp)[menu], parsed).map((item) => translateMenuItem(item, i18n));
       const content = await loadContentItems(menu, parsed, unref(locale));
       const result = sortByOrder([...content, ...registered]);
       await nuxtApp.callHook("menus:visible", menu);

package/dist/runtime/app/plugins/menus.d.ts

@@ -1,9 +1,8 @@
 /**
- * Populates the shared menu state consumed by `useMenu`: first with every item registered at
- * build time (`extendMenu`), then by running every registered module's dynamic `runtime/menus.ts`
- * source once per app instance (server: once per request, client: once on hydration). Resets the
- * state first so repeated runs within the same server process (e.g. concurrent requests) don't
- * accumulate duplicate items.
+ * Populates this app instance's menu state, consumed by `useMenu`: first with every item registered
+ * at build time (`extendMenu`), then by running every registered module's dynamic `runtime/menus.ts`
+ * source once per app instance (server: once per request, client: once on hydration). The state is
+ * held per app instance, so concurrent server requests never share or clobber each other's menus.
  */
 declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/app/plugins/menus.js

@@ -1,19 +1,24 @@
-import { defineNuxtPlugin } from "#imports";
+import { defineNuxtPlugin, tryUseNuxtApp } from "#imports";
 import { staticItems, sources } from "#menus/sources";
-import { pushMenuItems, resetMenus } from "../utils/state.js";
+import { getAppMenuStore, pushMenuItems, resetMenus, setAppMenuStoreResolver } from "../utils/state.js";
 export default defineNuxtPlugin({
   name: "frigear-nu:menus",
-  async setup() {
-    resetMenus();
+  async setup(nuxtApp) {
+    const store = getAppMenuStore(nuxtApp);
+    setAppMenuStoreResolver(() => {
+      const app = tryUseNuxtApp();
+      return app ? getAppMenuStore(app) : void 0;
+    });
+    resetMenus(store);
     for (const [menu, groups] of Object.entries(staticItems)) {
       for (const [group, items] of Object.entries(groups)) {
-        if (items.length > 0) pushMenuItems(menu, group, items);
+        if (items.length > 0) pushMenuItems(store, menu, group, items);
       }
     }
     for (const { menu, source } of sources) {
       const items = [];
-      await source(items);
-      if (items.length > 0) pushMenuItems(menu, "", items);
+      await nuxtApp.runWithContext(() => source(items));
+      if (items.length > 0) pushMenuItems(store, menu, "", items);
     }
   }
 });

package/dist/runtime/app/utils/extend.js

@@ -1,9 +1,9 @@
 import { parseMenuPath } from "../../utils/menu.js";
-import { pushMenuItems } from "./state.js";
+import { currentMenuStore, pushMenuItems } from "./state.js";
 export function extendMenuItem(path, item) {
   const { menu, group, wildcard } = parseMenuPath(path);
   if (wildcard) {
     throw new Error(`[@frigear-nu/menu] Cannot register items into wildcard path "${path}" - wildcards are only supported when reading a menu via \`useMenu\`.`);
   }
-  pushMenuItems(menu, group, item);
+  pushMenuItems(currentMenuStore(), menu, group, item);
 }

package/dist/runtime/app/utils/state.d.ts

@@ -1,14 +1,17 @@
 import type { MenuItem } from '../../../types.js';
+/** Every menu's items, keyed by menu name then by group (`''` for the root group). */
+export type MenuStore = Record<string, Record<string, MenuItem[]>>;
+export declare function createMenuStore(): MenuStore;
 /**
- * Shared, module-scoped reactive state holding every menu's items, keyed by menu name then by
- * group (`''` for the root group). Populated client-side (and once per SSR request) by the
- * `menus` plugin, which runs every registered dynamic source.
+ * Process-wide store, used only when no Nuxt app is in scope: the Nitro `useMenu` (populated once per
+ * process from the runtime config) and calls made outside an app context. It is never read by the
+ * Vue renderer, which uses the per-app store below.
  */
-export declare const menus: Record<string, Record<string, MenuItem[]>>;
-export declare function pushMenuItems(menu: string, group: string, items: MenuItem | MenuItem[]): void;
-/**
- * Empties every registered menu/group's items in place, keeping the same reactive object/array
- * instances around rather than deleting keys, so each source run starts from a clean slate
- * without accumulating duplicates across repeated runs (e.g. concurrent server requests).
- */
-export declare function resetMenus(): void;
+export declare const processMenuStore: MenuStore;
+export declare function getAppMenuStore(nuxtApp: object): MenuStore;
+export declare function setAppMenuStoreResolver(resolver: () => MenuStore | undefined): void;
+/** The store of the Nuxt app currently in scope, or the process-wide store outside any app. */
+export declare function currentMenuStore(): MenuStore;
+export declare function pushMenuItems(store: MenuStore, menu: string, group: string, items: MenuItem | MenuItem[]): void;
+/** Empties every registered menu/group's items in place, so a (re)population never accumulates duplicates. */
+export declare function resetMenus(store: MenuStore): void;

package/dist/runtime/app/utils/state.js

@@ -1,12 +1,28 @@
 import { reactive } from "vue";
-export const menus = reactive({});
-export function pushMenuItems(menu, group, items) {
-  const groups = menus[menu] ??= {};
+export function createMenuStore() {
+  return reactive({});
+}
+export const processMenuStore = createMenuStore();
+const appStores = /* @__PURE__ */ new WeakMap();
+export function getAppMenuStore(nuxtApp) {
+  let store = appStores.get(nuxtApp);
+  if (!store) appStores.set(nuxtApp, store = createMenuStore());
+  return store;
+}
+let resolveAppStore;
+export function setAppMenuStoreResolver(resolver) {
+  resolveAppStore = resolver;
+}
+export function currentMenuStore() {
+  return resolveAppStore?.() ?? processMenuStore;
+}
+export function pushMenuItems(store, menu, group, items) {
+  const groups = store[menu] ??= {};
   const list = groups[group] ??= [];
   list.push(...Array.isArray(items) ? items : [items]);
 }
-export function resetMenus() {
-  for (const groups of Object.values(menus)) {
+export function resetMenus(store) {
+  for (const groups of Object.values(store)) {
     for (const list of Object.values(groups)) list.length = 0;
   }
 }

package/dist/runtime/server/utils.js

@@ -1,20 +1,20 @@
 import { useRuntimeConfig } from "nitropack/runtime";
 import { staticItems, sources } from "#menus/server-sources";
 import { collectMenuItems, matchesMenuGroup, parseMenuPath, sortByOrder } from "../utils/menu.js";
-import { menus, pushMenuItems, resetMenus } from "../app/utils/state.js";
+import { processMenuStore as menus, pushMenuItems, resetMenus } from "../app/utils/state.js";
 let registered;
 function registerItems() {
   registered ??= (async () => {
-    resetMenus();
+    resetMenus(menus);
     for (const [menu, groups] of Object.entries(staticItems)) {
       for (const [group, items] of Object.entries(groups)) {
-        if (items.length > 0) pushMenuItems(menu, group, items);
+        if (items.length > 0) pushMenuItems(menus, menu, group, items);
       }
     }
     for (const { menu, source } of sources) {
       const items = [];
       await source(items);
-      if (items.length > 0) pushMenuItems(menu, "", items);
+      if (items.length > 0) pushMenuItems(menus, menu, "", items);
     }
   })().catch((error) => {
     registered = void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frigear-nu/menu",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Named, shareable navigation menus - modules contribute items (extendMenu / a runtime/menus.ts source) and/or Nuxt Content, consumers read them via useMenu and render them however they like.",
   "homepage": "https://docs.frigear.dev/modules/menu",
   "repository": {
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@nuxt/kit": "^4.6.1",
-    "@frigear-nu/module-kit": "1.1.1",
+    "@frigear-nu/module-kit": "1.1.2",
     "zod": "^4.6.5"
   },
   "devDependencies": {