@hai3/framework 0.2.0-alpha.0 → 0.2.0-alpha.1

package/dist/index.js

@@ -837,22 +837,53 @@ function layout() {
 // src/plugins/navigation.ts
 import { eventBus as eventBus3 } from "@hai3/state";
 import { i18nRegistry } from "@hai3/i18n";
+
+// src/utils/basePath.ts
+function normalizeBase(base) {
+  if (!base) {
+    return "/";
+  }
+  let normalized = base.startsWith("/") ? base : `/${base}`;
+  if (normalized !== "/" && normalized.endsWith("/")) {
+    normalized = normalized.slice(0, -1);
+  }
+  return normalized;
+}
+function stripBase(pathname, base) {
+  if (base === "/") {
+    return pathname;
+  }
+  if (!pathname.startsWith(base)) {
+    return null;
+  }
+  const nextChar = pathname.charAt(base.length);
+  if (nextChar && nextChar !== "/") {
+    return null;
+  }
+  return pathname.slice(base.length) || "/";
+}
+function prependBase(path, base) {
+  if (base === "/") {
+    return path;
+  }
+  const cleanPath = path.startsWith("/") ? path : `/${path}`;
+  return `${base}${cleanPath}`;
+}
+function resolveBase(pluginConfig, appConfig) {
+  const rawBase = pluginConfig?.base ?? appConfig?.base ?? "/";
+  return normalizeBase(rawBase);
+}
+
+// src/plugins/navigation.ts
 var screenActions4 = screenActions;
 var menuActions3 = menuActions;
-function buildMenuItems(screenset) {
-  return screenset.menu.map((item) => ({
-    id: item.menuItem.screenId ?? item.menuItem.id,
-    label: item.menuItem.label,
-    icon: item.menuItem.icon
-  }));
-}
 function navigateToScreen2(payload) {
   eventBus3.emit("navigation/screen/navigated", payload);
 }
 function navigateToScreenset(payload) {
   eventBus3.emit("navigation/screenset/navigated", payload);
 }
-function navigation() {
+function navigation(config) {
   return {
     name: "navigation",
     dependencies: ["screensets"],
@@ -864,33 +895,66 @@ function navigation() {
     },
     onInit(app) {
       const dispatch = app.store.dispatch;
+      const base = resolveBase(config, app.config);
       let currentScreensetId = null;
-      async function loadScreensetTranslations(screensetId, language) {
-        await i18nRegistry.loadScreensetTranslations(screensetId, language);
-      }
-      function updateMenuForScreenset(screensetId) {
-        if (screensetId === currentScreensetId) return;
+      const loadScreensetTranslations = async (screensetId, language) => {
+        await i18nRegistry.loadScreensetTranslations(
+          screensetId,
+          language
+        );
+      };
+      const updateScreensetMenu = (screenset) => {
+        const menuItems = screenset.menu.map((item) => ({
+          id: item.menuItem.screenId ?? item.menuItem.id,
+          label: item.menuItem.label,
+          icon: item.menuItem.icon
+        }));
+        dispatch(menuActions3.setMenuItems(menuItems));
+      };
+      const activateScreenset = (screensetId) => {
+        if (screensetId === currentScreensetId) {
+          return;
+        }
         const screenset = app.screensetRegistry.get(screensetId);
-        if (!screenset) return;
+        if (!screenset) {
+          return;
+        }
         currentScreensetId = screensetId;
         loadScreensetTranslations(screensetId).catch((err) => {
           console.warn(`[HAI3] Failed to load translations for screenset ${screensetId}:`, err);
         });
-        const menuItems = buildMenuItems(screenset);
-        dispatch(menuActions3.setMenuItems(menuItems));
-      }
+        updateScreensetMenu(screenset);
+      };
+      const extractScreenId = () => {
+        const internalPath = stripBase(window.location.pathname, base);
+        if (!internalPath) {
+          return null;
+        }
+        const parts = internalPath.split("/").filter(Boolean);
+        return parts[0] || null;
+      };
+      const activateScreen = (screenId) => {
+        const screensetId = app.routeRegistry?.getScreensetForScreen(screenId);
+        if (!screensetId) {
+          return;
+        }
+        activateScreenset(screensetId);
+        dispatch(screenActions4.navigateTo(screenId));
+      };
       eventBus3.on("navigation/screen/navigated", (payload) => {
-        if (app.routeRegistry && !app.routeRegistry.hasScreen(payload.screensetId, payload.screenId)) {
+        if (!app.routeRegistry?.hasScreen(payload.screensetId, payload.screenId)) {
           console.warn(
             `Screen "${payload.screenId}" in screenset "${payload.screensetId}" not found.`
           );
           return;
         }
-        updateMenuForScreenset(payload.screensetId);
+        activateScreenset(payload.screensetId);
         dispatch(screenActions4.navigateTo(payload.screenId));
         if (typeof window !== "undefined") {
-          const url = `/${payload.screenId}`;
-          window.history.pushState(null, "", url);
+          const url = prependBase(`/${payload.screenId}`, base);
+          if (window.location.pathname !== url) {
+            window.history.pushState(null, "", url);
+          }
         }
       });
       eventBus3.on("navigation/screenset/navigated", (payload) => {
@@ -907,15 +971,18 @@ function navigation() {
       let lastLoadedLanguage = null;
       i18nRegistry.subscribe(() => {
         const currentLanguage = i18nRegistry.getLanguage();
-        if (!currentLanguage || currentLanguage === lastLoadedLanguage) return;
-        if (!currentScreensetId) return;
+        if (!currentLanguage || currentLanguage === lastLoadedLanguage) {
+          return;
+        }
+        if (!currentScreensetId) {
+          return;
+        }
         const screenset = app.screensetRegistry.get(currentScreensetId);
-        if (!screenset) return;
+        if (!screenset) {
+          return;
+        }
         lastLoadedLanguage = currentLanguage;
-        loadScreensetTranslations(currentScreensetId, currentLanguage).then(() => {
-          const menuItems = buildMenuItems(screenset);
-          dispatch(menuActions3.setMenuItems(menuItems));
-        }).catch((err) => {
+        loadScreensetTranslations(currentScreensetId, currentLanguage).then(() => updateScreensetMenu(screenset)).catch((err) => {
           console.warn(
             `[HAI3] Failed to reload translations for screenset ${currentScreensetId}:`,
             err
@@ -924,31 +991,15 @@ function navigation() {
       });
       if (typeof window !== "undefined") {
         window.addEventListener("popstate", () => {
-          const path2 = window.location.pathname;
-          const parts2 = path2.split("/").filter(Boolean);
-          if (parts2.length >= 1) {
-            const screenId = parts2[0];
-            const screensetId = app.routeRegistry?.getScreensetForScreen(screenId);
-            if (screensetId) {
-              updateMenuForScreenset(screensetId);
-              dispatch(screenActions4.navigateTo(screenId));
-            }
+          const screenId2 = extractScreenId();
+          if (screenId2) {
+            activateScreen(screenId2);
           }
         });
-        const path = window.location.pathname;
-        const parts = path.split("/").filter(Boolean);
+        const screenId = extractScreenId();
         const autoNavigate = app.config.autoNavigate !== false;
-        if (parts.length >= 1) {
-          const screenId = parts[0];
-          const screensetId = app.routeRegistry?.getScreensetForScreen(screenId);
-          if (screensetId) {
-            navigateToScreen2({ screensetId, screenId });
-          } else if (autoNavigate) {
-            const screensets2 = app.screensetRegistry.getAll();
-            if (screensets2.length > 0) {
-              navigateToScreenset({ screensetId: screensets2[0].id });
-            }
-          }
+        if (screenId) {
+          activateScreen(screenId);
         } else if (autoNavigate) {
           const screensets2 = app.screensetRegistry.getAll();
           if (screensets2.length > 0) {