@akanjs/client 0.9.47 → 0.9.49

package/cjs/src/index.js

@@ -22,3 +22,5 @@ __reExport(src_exports, require("./storage"), module.exports);
 __reExport(src_exports, require("./device"), module.exports);
 __reExport(src_exports, require("./createFont"), module.exports);
 __reExport(src_exports, require("./locale"), module.exports);
+__reExport(src_exports, require("./useClient"), module.exports);
+__reExport(src_exports, require("./makePageProto"), module.exports);

package/cjs/src/locale.js

@@ -18,12 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var locale_exports = {};
 __export(locale_exports, {
-  dictionaryContext: () => dictionaryContext,
-  useDictionary: () => useDictionary
+  dictionaryContext: () => dictionaryContext
 });
 module.exports = __toCommonJS(locale_exports);
 var import_react = require("react");
 const dictionaryContext = (0, import_react.createContext)({});
-const useDictionary = () => {
-  return (0, import_react.useContext)(dictionaryContext);
-};

package/cjs/src/makePageProto.js

@@ -0,0 +1,156 @@
+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 makePageProto_exports = {};
+__export(makePageProto_exports, {
+  makePageProto: () => makePageProto
+});
+module.exports = __toCommonJS(makePageProto_exports);
+var import_base = require("@akanjs/base");
+var import_client = require("@akanjs/client");
+var import_common = require("@akanjs/common");
+var import_dictionary2 = require("@akanjs/dictionary");
+var import_signal = require("@akanjs/signal");
+const clientTranslate = ({ lang, dictKey, param }) => {
+  const translator = import_base.baseClientEnv.side === "server" ? global.serverTranslator : import_dictionary2.serverTranslator;
+  return translator.getTransSync(lang, dictKey, param) ?? dictKey;
+};
+const getPageInfo = () => {
+  if (import_base.baseClientEnv.side !== "server") {
+    return {
+      locale: window.location.pathname.split("/")[1] ?? "en",
+      path: "/" + window.location.pathname.split("/").slice(2).join("/")
+    };
+  }
+  const locale = (0, import_client.getHeader)("x-locale") ?? "en";
+  const path = (0, import_client.getHeader)("x-path") ?? "/";
+  return { locale, path };
+};
+const msg = {
+  info: () => null,
+  success: () => null,
+  error: () => null,
+  warning: () => null,
+  loading: () => null
+};
+const makePageProto = (cnst) => {
+  class Revert extends Error {
+    constructor(key, data) {
+      super(key);
+    }
+  }
+  return {
+    Revert,
+    msg,
+    usePage: () => {
+      const { locale, path } = getPageInfo();
+      const lang = locale;
+      const l = (key, param) => clientTranslate({ lang, dictKey: key, param });
+      l.rich = (key, param) => /* @__PURE__ */ React.createElement(
+        "span",
+        {
+          dangerouslySetInnerHTML: {
+            __html: clientTranslate({
+              lang,
+              dictKey: key,
+              param: {
+                ...param,
+                // strong: (chunks: string) => `<b>${chunks}</b>`,
+                // "bg-primary": (chunks: string) => `<span className="bg-primary text-base-100">${chunks}</span>`,
+                // primary: (chunks: string) => `<span className="bg-base-100 text-primary">${chunks}</span>`,
+                br: `<br />`
+              }
+            })
+          }
+        }
+      );
+      l.field = (model, field) => {
+        const key = `${model}.${field}`;
+        return l(key);
+      };
+      l.desc = (model, field) => {
+        const key = `${model}.desc-${field}`;
+        return l(key);
+      };
+      l.enum = (model, field, value) => {
+        const key = `${model}.enum-${field}-${value}`;
+        return l(key);
+      };
+      l.enumdesc = (model, field, value) => {
+        const key = `${model}.enumdesc-${field}-${value}`;
+        return l(key);
+      };
+      l.api = (model, endpoint) => {
+        const key = `${model}.api-${endpoint}`;
+        return l(key);
+      };
+      l.apidesc = (model, endpoint) => {
+        const key = `${model}.apidesc-${endpoint}`;
+        return l(key);
+      };
+      l.arg = (model, endpoint, arg) => {
+        const key = `${model}.arg-${endpoint}-${arg}`;
+        return l(key);
+      };
+      l.argdesc = (model, endpoint, arg) => {
+        const key = `${model}.argdesc-${endpoint}-${arg}`;
+        return l(key);
+      };
+      l.qry = (model, queryKey) => {
+        const key = `${model}.qry-${queryKey}`;
+        return l(key);
+      };
+      l.qrydesc = (model, queryKey) => {
+        const key = `${model}.qrydesc-${queryKey}`;
+        return l(key);
+      };
+      l.qarg = (model, queryKey, arg) => {
+        const key = `${model}.qarg-${queryKey}-${arg}`;
+        return l(key);
+      };
+      l.qargdesc = (model, queryKey, arg) => {
+        const key = `${model}.qargdesc-${queryKey}-${arg}`;
+        return l(key);
+      };
+      l.trans = (translation) => {
+        return translation[lang] ?? "unknown translation";
+      };
+      return { path, l, lang };
+    },
+    fetch: import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch,
+    sig: {},
+    registerClient: async (lang) => {
+      while (!global.builtFetch) {
+        try {
+          const [dictionary, { fetch, signals }] = await Promise.all([
+            lang ? import_dictionary2.serverTranslator.init(lang) : import_dictionary2.serverTranslator.initAllLanguages(global.dictionary),
+            import_signal.signalInfo.registerClient(cnst)
+          ]);
+          global.builtFetch = fetch;
+          global.signals = signals;
+          global.dictionary = dictionary;
+          global.serverTranslator = import_dictionary2.serverTranslator;
+          return { dictionary, signals };
+        } catch (e) {
+          import_common.Logger.error(e instanceof Error ? e.message : String(e));
+          await (0, import_common.sleep)(3e3);
+        }
+      }
+      throw new Error("Unreachable");
+    }
+  };
+};

package/cjs/src/router.js

@@ -173,8 +173,7 @@ class Router {
       import_common.Logger.log(`redirect to:${pathname}`);
       (0, import_navigation.redirect)(pathname);
     } else {
-      const { pathname } = getPathInfo(href, this.#lang, this.#prefix);
-      this.#instance.replace(pathname);
+      this.#instance.replace(href);
     }
     return void 0;
   }

package/cjs/src/useClient.js

@@ -0,0 +1,29 @@
+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 useClient_exports = {};
+__export(useClient_exports, {
+  Revert: () => Revert,
+  fetch: () => fetch,
+  msg: () => msg,
+  registerClient: () => registerClient,
+  sig: () => sig,
+  usePage: () => usePage
+});
+module.exports = __toCommonJS(useClient_exports);
+var import_makePageProto = require("./makePageProto");
+const { msg, Revert, usePage, fetch, sig, registerClient } = (0, import_makePageProto.makePageProto)({});

package/esm/src/index.js

@@ -6,3 +6,5 @@ export * from "./storage";
 export * from "./device";
 export * from "./createFont";
 export * from "./locale";
+export * from "./useClient";
+export * from "./makePageProto";

package/esm/src/locale.js

@@ -1,10 +1,6 @@
 "use client";
-import { createContext, useContext } from "react";
+import { createContext } from "react";
 const dictionaryContext = createContext({});
-const useDictionary = () => {
-  return useContext(dictionaryContext);
-};
 export {
-  dictionaryContext,
-  useDictionary
+  dictionaryContext
 };

package/esm/src/makePageProto.js

@@ -0,0 +1,137 @@
+import { baseClientEnv } from "@akanjs/base";
+import { getHeader } from "@akanjs/client";
+import { Logger, sleep } from "@akanjs/common";
+import { serverTranslator } from "@akanjs/dictionary";
+import { signalInfo } from "@akanjs/signal";
+const clientTranslate = ({ lang, dictKey, param }) => {
+  const translator = baseClientEnv.side === "server" ? global.serverTranslator : serverTranslator;
+  return translator.getTransSync(lang, dictKey, param) ?? dictKey;
+};
+const getPageInfo = () => {
+  if (baseClientEnv.side !== "server") {
+    return {
+      locale: window.location.pathname.split("/")[1] ?? "en",
+      path: "/" + window.location.pathname.split("/").slice(2).join("/")
+    };
+  }
+  const locale = getHeader("x-locale") ?? "en";
+  const path = getHeader("x-path") ?? "/";
+  return { locale, path };
+};
+const msg = {
+  info: () => null,
+  success: () => null,
+  error: () => null,
+  warning: () => null,
+  loading: () => null
+};
+const makePageProto = (cnst) => {
+  class Revert extends Error {
+    constructor(key, data) {
+      super(key);
+    }
+  }
+  return {
+    Revert,
+    msg,
+    usePage: () => {
+      const { locale, path } = getPageInfo();
+      const lang = locale;
+      const l = (key, param) => clientTranslate({ lang, dictKey: key, param });
+      l.rich = (key, param) => /* @__PURE__ */ React.createElement(
+        "span",
+        {
+          dangerouslySetInnerHTML: {
+            __html: clientTranslate({
+              lang,
+              dictKey: key,
+              param: {
+                ...param,
+                // strong: (chunks: string) => `<b>${chunks}</b>`,
+                // "bg-primary": (chunks: string) => `<span className="bg-primary text-base-100">${chunks}</span>`,
+                // primary: (chunks: string) => `<span className="bg-base-100 text-primary">${chunks}</span>`,
+                br: `<br />`
+              }
+            })
+          }
+        }
+      );
+      l.field = (model, field) => {
+        const key = `${model}.${field}`;
+        return l(key);
+      };
+      l.desc = (model, field) => {
+        const key = `${model}.desc-${field}`;
+        return l(key);
+      };
+      l.enum = (model, field, value) => {
+        const key = `${model}.enum-${field}-${value}`;
+        return l(key);
+      };
+      l.enumdesc = (model, field, value) => {
+        const key = `${model}.enumdesc-${field}-${value}`;
+        return l(key);
+      };
+      l.api = (model, endpoint) => {
+        const key = `${model}.api-${endpoint}`;
+        return l(key);
+      };
+      l.apidesc = (model, endpoint) => {
+        const key = `${model}.apidesc-${endpoint}`;
+        return l(key);
+      };
+      l.arg = (model, endpoint, arg) => {
+        const key = `${model}.arg-${endpoint}-${arg}`;
+        return l(key);
+      };
+      l.argdesc = (model, endpoint, arg) => {
+        const key = `${model}.argdesc-${endpoint}-${arg}`;
+        return l(key);
+      };
+      l.qry = (model, queryKey) => {
+        const key = `${model}.qry-${queryKey}`;
+        return l(key);
+      };
+      l.qrydesc = (model, queryKey) => {
+        const key = `${model}.qrydesc-${queryKey}`;
+        return l(key);
+      };
+      l.qarg = (model, queryKey, arg) => {
+        const key = `${model}.qarg-${queryKey}-${arg}`;
+        return l(key);
+      };
+      l.qargdesc = (model, queryKey, arg) => {
+        const key = `${model}.qargdesc-${queryKey}-${arg}`;
+        return l(key);
+      };
+      l.trans = (translation) => {
+        return translation[lang] ?? "unknown translation";
+      };
+      return { path, l, lang };
+    },
+    fetch: baseClientEnv.side === "server" && baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch,
+    sig: {},
+    registerClient: async (lang) => {
+      while (!global.builtFetch) {
+        try {
+          const [dictionary, { fetch, signals }] = await Promise.all([
+            lang ? serverTranslator.init(lang) : serverTranslator.initAllLanguages(global.dictionary),
+            signalInfo.registerClient(cnst)
+          ]);
+          global.builtFetch = fetch;
+          global.signals = signals;
+          global.dictionary = dictionary;
+          global.serverTranslator = serverTranslator;
+          return { dictionary, signals };
+        } catch (e) {
+          Logger.error(e instanceof Error ? e.message : String(e));
+          await sleep(3e3);
+        }
+      }
+      throw new Error("Unreachable");
+    }
+  };
+};
+export {
+  makePageProto
+};

package/esm/src/router.js

@@ -150,8 +150,7 @@ class Router {
       Logger.log(`redirect to:${pathname}`);
       redirect(pathname);
     } else {
-      const { pathname } = getPathInfo(href, this.#lang, this.#prefix);
-      this.#instance.replace(pathname);
+      this.#instance.replace(href);
     }
     return void 0;
   }

package/esm/src/useClient.js

@@ -0,0 +1,10 @@
+import { makePageProto } from "./makePageProto";
+const { msg, Revert, usePage, fetch, sig, registerClient } = makePageProto({});
+export {
+  Revert,
+  fetch,
+  msg,
+  registerClient,
+  sig,
+  usePage
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/client",
-  "version": "0.9.47",
+  "version": "0.9.49",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/index.d.ts

@@ -6,3 +6,5 @@ export * from "./storage";
 export * from "./device";
 export * from "./createFont";
 export * from "./locale";
+export * from "./useClient";
+export * from "./makePageProto";

package/src/locale.d.ts

@@ -3,8 +3,3 @@ export declare const dictionaryContext: import("react").Context<{
         [key: string]: string;
     };
 }>;
-export declare const useDictionary: () => {
-    [key: string]: {
-        [key: string]: string;
-    };
-};

package/src/makePageProto.d.ts

@@ -0,0 +1,63 @@
+import { AllDictionary, type Translation, type TransMessage } from "@akanjs/dictionary";
+import { type ReactNode } from "react";
+export interface TransMessageOption {
+    key?: string;
+    duration?: number;
+    data?: {
+        [key: string]: any;
+    };
+}
+export declare const makePageProto: <Locale extends {
+    [key: string]: {
+        [key: string]: Translation;
+    };
+}, Fetch, Sig>(cnst: any) => {
+    Revert: {
+        new (key: TransMessage<Locale>, data?: any): {
+            name: string;
+            message: string;
+            stack?: string;
+        };
+        captureStackTrace(targetObject: object, constructorOpt?: Function): void;
+        prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
+        stackTraceLimit: number;
+    };
+    msg: {
+        info: (key: TransMessage<Locale>, option?: TransMessageOption) => void;
+        success: (key: TransMessage<Locale>, option?: TransMessageOption) => void;
+        error: (key: TransMessage<Locale>, option?: TransMessageOption) => void;
+        warning: (key: TransMessage<Locale>, option?: TransMessageOption) => void;
+        loading: (key: TransMessage<Locale>, option?: TransMessageOption) => void;
+    };
+    usePage: () => {
+        path: string;
+        l: {
+            (key: TransMessage<Locale>, param?: {
+                [key: string]: string | number;
+            }): string;
+            rich(key: TransMessage<Locale>, param?: {
+                [key: string]: string | number;
+            }): ReactNode;
+            field<ModelKey extends keyof Locale>(model: ModelKey, field: keyof Locale[ModelKey]): string;
+            desc<ModelKey extends keyof Locale>(model: ModelKey, field: keyof Locale[ModelKey]): string;
+            enum<ModelKey extends keyof Locale>(model: ModelKey, field: keyof Locale[ModelKey], value: string): string;
+            enumdesc<ModelKey extends keyof Locale>(model: ModelKey, field: keyof Locale[ModelKey], value: string): string;
+            api<ModelKey extends keyof Locale>(model: ModelKey, endpoint: keyof Locale[ModelKey]): string;
+            apidesc<ModelKey extends keyof Locale>(model: ModelKey, endpoint: keyof Locale[ModelKey]): string;
+            arg<ModelKey extends keyof Locale>(model: ModelKey, endpoint: keyof Locale[ModelKey], arg: string): string;
+            argdesc<ModelKey extends keyof Locale>(model: ModelKey, endpoint: keyof Locale[ModelKey], arg: string): string;
+            qry<ModelKey extends keyof Locale>(model: ModelKey, queryKey: keyof Locale[ModelKey]): string;
+            qrydesc<ModelKey extends keyof Locale>(model: ModelKey, queryKey: keyof Locale[ModelKey]): string;
+            qarg<ModelKey extends keyof Locale>(model: ModelKey, queryKey: keyof Locale[ModelKey], arg: string): string;
+            qargdesc<ModelKey extends keyof Locale>(model: ModelKey, queryKey: keyof Locale[ModelKey], arg: string): string;
+            trans<Returns extends ReactNode>(translation: Record<"en" | "ko" | (string & {}), Returns>): Returns extends string ? string : Returns;
+        };
+        lang: string;
+    };
+    fetch: Fetch;
+    sig: Sig;
+    registerClient: (lang?: string) => Promise<{
+        dictionary: AllDictionary;
+        signals: import("@akanjs/signal").SerializedSignal[];
+    }>;
+};