@akanjs/next 0.0.149 → 0.0.151

package/bootCsr.d.ts

@@ -1 +1 @@
-export declare const bootCsr: (context: Record<string, () => Promise<unknown>>, rootPath: string, entryPath?: string) => Promise<void>;
+export declare const bootCsr: (context: Record<string, () => Promise<unknown>>) => Promise<void>;

package/cjs/bootCsr.js

@@ -38,15 +38,33 @@ var import_react = __toESM(require("react"));
 var ReactDOM = __toESM(require("react-dom/client"));
 var import_useCsrValues = require("./useCsrValues");
 const supportLanguages = ["en", "ko"];
-const bootCsr = async (context, rootPath, entryPath = "/route") => {
+const bootCsr = async (context) => {
+  window.document.body.style.overflow = "hidden";
+  const pathname = window.location.pathname;
+  if (pathname === "/404")
+    return;
   const [, jwt] = await Promise.all([import_client.device.init({ supportLanguages }), import_client.storage.getItem("jwt")]);
+  if (!pathname.startsWith(`/${import_client.device.lang}`))
+    window.location.replace(`/${import_client.device.lang}${pathname}`);
   if (jwt)
     (0, import_client.initAuth)({ jwt });
   import_common.Logger.verbose(`Set default language: ${import_client.device.lang}`);
+  const basePaths = process.env.basePaths?.split(",");
+  const currentBasePath = basePaths ? pathname.split("/")[2] : void 0;
+  if (currentBasePath && basePaths && !basePaths.includes(currentBasePath))
+    throw new Error(`Invalid path: ${pathname}`);
+  const baseLayoutPaths = ["/", "/:lang", ...currentBasePath ? [`/:lang/${currentBasePath}`] : []];
+  const otherBasePaths = basePaths?.filter((path) => path !== currentBasePath) ?? [];
   const pages = {};
   await Promise.all(
     Object.entries(context).map(async ([key, value]) => {
-      pages[key] = await value();
+      if (basePaths) {
+        const pageBasePath = key.split("/")[2];
+        if (pageBasePath && otherBasePaths.includes(pageBasePath))
+          return;
+      }
+      const getPageContent = value;
+      pages[key] = await getPageContent();
     })
   );
   const getPageState = (csrConfig) => {
@@ -96,13 +114,10 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       }
     });
   }
-  const pathname = window.location.pathname;
-  const initialPath = import_client.device.lang + entryPath;
-  window.document.body.style.overflow = "hidden";
   const getPathRoutes = (route, parentRootLayouts = [], parentLayouts = [], parentPaths = []) => {
     const parentPath = parentPaths.filter((path2) => path2 !== "/").join("");
     const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
-    const isRoot = ["/", "/:lang"].includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
+    const isRoot = baseLayoutPaths.includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
     const path = parentPath + currentPathSegment;
     const pathSegments = [...parentPaths, ...currentPathSegment ? [currentPathSegment] : []];
     const RootLayouts = [...parentRootLayouts, ...isRoot && route.Layout ? [route.Layout] : []];
@@ -149,14 +164,9 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null)
     ));
   };
-  if (pathname !== `/${initialPath}`) {
-    window.location.replace(initialPath);
-    return;
-  } else {
-    const el = document.getElementById("root");
-    if (!el)
-      throw new Error("No root element");
-    const root = ReactDOM.createRoot(el);
-    root.render(/* @__PURE__ */ import_react.default.createElement(RouterProvider, null));
-  }
+  const el = document.getElementById("root");
+  if (!el)
+    throw new Error("No root element");
+  const root = ReactDOM.createRoot(el);
+  root.render(/* @__PURE__ */ import_react.default.createElement(RouterProvider, null));
 };

package/cjs/index.js

@@ -33,6 +33,7 @@ __export(next_exports, {
   useHistory: () => import_useHistory.useHistory,
   useInterval: () => import_useInterval.useInterval,
   useLocation: () => import_useLocation.useLocation,
+  usePage: () => import_usePage.usePage,
   usePurchase: () => import_usePurchase.usePurchase,
   usePushNoti: () => import_usePushNoti.usePushNoti,
   useThrottle: () => import_useThrottle.useThrottle
@@ -57,4 +58,5 @@ var import_createNextMiddleware = require("./createNextMiddleware");
 var import_useThrottle = require("./useThrottle");
 var import_useHistory = require("./useHistory");
 var import_useLocation = require("./useLocation");
+var import_usePage = require("./usePage");
 //! PageAgent csr에서 말썽 일으킨다

package/cjs/usePage.js

@@ -0,0 +1,24 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var usePage_exports = {};
+__export(usePage_exports, {
+  usePage: () => usePage
+});
+module.exports = __toCommonJS(usePage_exports);
+var import_makePageProto = require("./makePageProto");
+const usePage = (0, import_makePageProto.makePageProto)([]);

package/esm/bootCsr.js

@@ -11,15 +11,33 @@ import React from "react";
 import * as ReactDOM from "react-dom/client";
 import { useCsrValues } from "./useCsrValues";
 const supportLanguages = ["en", "ko"];
-const bootCsr = async (context, rootPath, entryPath = "/route") => {
+const bootCsr = async (context) => {
+  window.document.body.style.overflow = "hidden";
+  const pathname = window.location.pathname;
+  if (pathname === "/404")
+    return;
   const [, jwt] = await Promise.all([device.init({ supportLanguages }), storage.getItem("jwt")]);
+  if (!pathname.startsWith(`/${device.lang}`))
+    window.location.replace(`/${device.lang}${pathname}`);
   if (jwt)
     initAuth({ jwt });
   Logger.verbose(`Set default language: ${device.lang}`);
+  const basePaths = process.env.basePaths?.split(",");
+  const currentBasePath = basePaths ? pathname.split("/")[2] : void 0;
+  if (currentBasePath && basePaths && !basePaths.includes(currentBasePath))
+    throw new Error(`Invalid path: ${pathname}`);
+  const baseLayoutPaths = ["/", "/:lang", ...currentBasePath ? [`/:lang/${currentBasePath}`] : []];
+  const otherBasePaths = basePaths?.filter((path) => path !== currentBasePath) ?? [];
   const pages = {};
   await Promise.all(
     Object.entries(context).map(async ([key, value]) => {
-      pages[key] = await value();
+      if (basePaths) {
+        const pageBasePath = key.split("/")[2];
+        if (pageBasePath && otherBasePaths.includes(pageBasePath))
+          return;
+      }
+      const getPageContent = value;
+      pages[key] = await getPageContent();
     })
   );
   const getPageState = (csrConfig) => {
@@ -69,13 +87,10 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       }
     });
   }
-  const pathname = window.location.pathname;
-  const initialPath = device.lang + entryPath;
-  window.document.body.style.overflow = "hidden";
   const getPathRoutes = (route, parentRootLayouts = [], parentLayouts = [], parentPaths = []) => {
     const parentPath = parentPaths.filter((path2) => path2 !== "/").join("");
     const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
-    const isRoot = ["/", "/:lang"].includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
+    const isRoot = baseLayoutPaths.includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
     const path = parentPath + currentPathSegment;
     const pathSegments = [...parentPaths, ...currentPathSegment ? [currentPathSegment] : []];
     const RootLayouts = [...parentRootLayouts, ...isRoot && route.Layout ? [route.Layout] : []];
@@ -122,16 +137,11 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       /* @__PURE__ */ React.createElement(React.Fragment, null)
     ));
   };
-  if (pathname !== `/${initialPath}`) {
-    window.location.replace(initialPath);
-    return;
-  } else {
-    const el = document.getElementById("root");
-    if (!el)
-      throw new Error("No root element");
-    const root = ReactDOM.createRoot(el);
-    root.render(/* @__PURE__ */ React.createElement(RouterProvider, null));
-  }
+  const el = document.getElementById("root");
+  if (!el)
+    throw new Error("No root element");
+  const root = ReactDOM.createRoot(el);
+  root.render(/* @__PURE__ */ React.createElement(RouterProvider, null));
 };
 export {
   bootCsr

package/esm/index.js

@@ -18,6 +18,7 @@ import { createNextMiddleware } from "./createNextMiddleware";
 import { useThrottle } from "./useThrottle";
 import { useHistory } from "./useHistory";
 import { useLocation } from "./useLocation";
+import { usePage } from "./usePage";
 export {
   bootCsr,
   createNextMiddleware,
@@ -35,6 +36,7 @@ export {
   useHistory,
   useInterval,
   useLocation,
+  usePage,
   usePurchase,
   usePushNoti,
   useThrottle

package/esm/usePage.js

@@ -0,0 +1,5 @@
+import { makePageProto } from "./makePageProto";
+const usePage = makePageProto([]);
+export {
+  usePage
+};

package/index.d.ts

@@ -18,3 +18,4 @@ export { createNextMiddleware } from "./createNextMiddleware";
 export { useThrottle } from "./useThrottle";
 export { useHistory } from "./useHistory";
 export { useLocation } from "./useLocation";
+export { usePage } from "./usePage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/next",
-  "version": "0.0.149",
+  "version": "0.0.151",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/usePage.d.ts

@@ -0,0 +1,74 @@
+import { Translation } from "@akanjs/dictionary";
+export declare const usePage: () => {
+    path: string;
+    l: {
+        (key: `${string}.${string}` | `${string}.${number}`, param?: {
+            [key: string]: string | number;
+        } | undefined): string;
+        rich(key: `${string}.${string}` | `${string}.${number}`, param?: {
+            [key: string]: string | number;
+        } | undefined): import("react").ReactNode;
+        field<ModelKey extends string | number>(model: ModelKey, field: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey]): string;
+        desc<ModelKey extends string | number>(model: ModelKey, field: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey]): string;
+        enum<ModelKey extends string | number>(model: ModelKey, field: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey], value: string): string;
+        enumdesc<ModelKey extends string | number>(model: ModelKey, field: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey], value: string): string;
+        api<ModelKey extends string | number>(model: ModelKey, endpoint: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey]): string;
+        apidesc<ModelKey extends string | number>(model: ModelKey, endpoint: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey]): string;
+        arg<ModelKey extends string | number>(model: ModelKey, endpoint: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey], arg: string): string;
+        argdesc<ModelKey extends string | number>(model: ModelKey, endpoint: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey], arg: string): string;
+        qry<ModelKey extends string | number>(model: ModelKey, queryKey: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey]): string;
+        qrydesc<ModelKey extends string | number>(model: ModelKey, queryKey: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey]): string;
+        qarg<ModelKey extends string | number>(model: ModelKey, queryKey: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey], arg: string): string;
+        qargdesc<ModelKey extends string | number>(model: ModelKey, queryKey: keyof {
+            [key: string]: {
+                [key: string]: Translation;
+            };
+        }[ModelKey], arg: string): string;
+        trans(translation: Record<"en" | "ko" | (string & {}), import("react").ReactNode>): import("react").ReactNode;
+    };
+    lang: string;
+};