@akanjs/client 0.9.55 → 0.9.57

package/cjs/src/cookie.js

@@ -31,8 +31,6 @@ __export(cookie_exports, {
   getAccount: () => getAccount,
   getCookie: () => getCookie,
   getHeader: () => getHeader,
-  getMe: () => getMe,
-  getSelf: () => getSelf,
   headers: () => headers,
   initAuth: () => initAuth,
   removeCookie: () => removeCookie,
@@ -49,7 +47,6 @@ var import_core = require("@capacitor/core");
 var import_js_cookie = __toESM(require("js-cookie"));
 var import_jwt_decode = require("jwt-decode");
 var import_react = __toESM(require("react"));
-var import_router = require("./router");
 var import_storage = require("./storage");
 const cookies = import_base.baseClientEnv.side === "server" ? () => {
   const nextHeaders = require("next/headers");
@@ -99,30 +96,6 @@ const getAccount = () => {
     return import_signal2.defaultAccount;
   return account;
 };
-function getMe(option) {
-  const me = getAccount().me;
-  if (!me && option) {
-    if (option.unauthorize === "notFound")
-      import_router.router.notFound();
-    else if (import_base.baseClientEnv.side === "client")
-      import_router.router.replace(option.unauthorize);
-    else
-      import_react.default.use(import_router.router.redirect(option.unauthorize));
-  }
-  return me;
-}
-function getSelf(option) {
-  const self = getAccount().self;
-  if (!self && option) {
-    if (option.unauthorize === "notFound")
-      import_router.router.notFound();
-    else if (import_base.baseClientEnv.side === "client")
-      import_router.router.replace(option.unauthorize);
-    else
-      import_react.default.use(import_router.router.redirect(option.unauthorize));
-  }
-  return self;
-}
 const setAuth = ({ jwt }) => {
   import_signal.client.setJwt(jwt);
   setCookie("jwt", jwt);

package/cjs/src/makePageProto.js

@@ -60,6 +60,7 @@ const makePageProto = (cnst) => {
       const { locale, path } = getPageInfo();
       const lang = locale;
       const l = (key, param) => clientTranslate({ lang, dictKey: key, param });
+      l._ = (key, param) => clientTranslate({ lang, dictKey: key, param });
       l.rich = (key, param) => /* @__PURE__ */ React.createElement(
         "span",
         {
@@ -78,54 +79,6 @@ const makePageProto = (cnst) => {
           }
         }
       );
-      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";
       };

package/esm/src/cookie.js

@@ -6,7 +6,6 @@ import { CapacitorCookies } from "@capacitor/core";
 import Cookies from "js-cookie";
 import { jwtDecode } from "jwt-decode";
 import React from "react";
-import { router } from "./router";
 import { storage } from "./storage";
 const cookies = baseClientEnv.side === "server" ? () => {
   const nextHeaders = require("next/headers");
@@ -56,30 +55,6 @@ const getAccount = () => {
     return defaultAccount;
   return account;
 };
-function getMe(option) {
-  const me = getAccount().me;
-  if (!me && option) {
-    if (option.unauthorize === "notFound")
-      router.notFound();
-    else if (baseClientEnv.side === "client")
-      router.replace(option.unauthorize);
-    else
-      React.use(router.redirect(option.unauthorize));
-  }
-  return me;
-}
-function getSelf(option) {
-  const self = getAccount().self;
-  if (!self && option) {
-    if (option.unauthorize === "notFound")
-      router.notFound();
-    else if (baseClientEnv.side === "client")
-      router.replace(option.unauthorize);
-    else
-      React.use(router.redirect(option.unauthorize));
-  }
-  return self;
-}
 const setAuth = ({ jwt }) => {
   client.setJwt(jwt);
   setCookie("jwt", jwt);
@@ -102,8 +77,6 @@ export {
   getAccount,
   getCookie,
   getHeader,
-  getMe,
-  getSelf,
   headers,
   initAuth,
   removeCookie,

package/esm/src/makePageProto.js

@@ -38,6 +38,7 @@ const makePageProto = (cnst) => {
       const { locale, path } = getPageInfo();
       const lang = locale;
       const l = (key, param) => clientTranslate({ lang, dictKey: key, param });
+      l._ = (key, param) => clientTranslate({ lang, dictKey: key, param });
       l.rich = (key, param) => /* @__PURE__ */ React.createElement(
         "span",
         {
@@ -56,54 +57,6 @@ const makePageProto = (cnst) => {
           }
         }
       );
-      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";
       };

package/package.json

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

package/src/cookie.d.ts

@@ -1,4 +1,4 @@
-import { type Account, type Me, type Self } from "@akanjs/signal";
+import { type Account } from "@akanjs/signal";
 export declare const cookies: () => Map<string, {
     name: string;
     value: string;
@@ -10,12 +10,10 @@ export declare const removeCookie: (key: string, options?: {
 }) => boolean | undefined;
 export declare const headers: () => Map<string, string>;
 export declare const getHeader: (key: string) => string | undefined;
-export declare const getAccount: () => Account;
+export declare const getAccount: <AddData = unknown>() => Account<AddData>;
 export interface GetOption {
     unauthorize: string;
 }
-export declare function getMe<O extends GetOption | undefined>(option?: O): O extends GetOption ? Me : Me | undefined;
-export declare function getSelf<O extends GetOption | undefined>(option?: O): O extends GetOption ? Self : Self | undefined;
 interface SetAuthOption {
     jwt: string;
 }

package/src/makePageProto.d.ts

@@ -1,4 +1,4 @@
-import { AllDictionary, type Translation, type TransMessage } from "@akanjs/dictionary";
+import { AllDictionary } from "@akanjs/dictionary";
 import { type ReactNode } from "react";
 export interface TransMessageOption {
     key?: string;
@@ -7,13 +7,9 @@ export interface TransMessageOption {
         [key: string]: any;
     };
 }
-export declare const makePageProto: <Locale extends {
-    [key: string]: {
-        [key: string]: Translation;
-    };
-}, Fetch, Sig>(cnst: any) => {
+export declare const makePageProto: <DictKey extends string, ErrorKey extends string, Fetch, Sig>(cnst: any) => {
     Revert: {
-        new (key: TransMessage<Locale>, data?: any): {
+        new (key: ErrorKey, data?: any): {
             name: string;
             message: string;
             stack?: string;
@@ -23,33 +19,24 @@ export declare const makePageProto: <Locale extends {
         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;
+        info: (key: DictKey, option?: TransMessageOption) => void;
+        success: (key: DictKey, option?: TransMessageOption) => void;
+        error: (key: DictKey | ErrorKey, option?: TransMessageOption) => void;
+        warning: (key: DictKey, option?: TransMessageOption) => void;
+        loading: (key: DictKey, option?: TransMessageOption) => void;
     };
     usePage: () => {
         path: string;
         l: {
-            (key: TransMessage<Locale>, param?: {
+            (key: DictKey, param?: {
+                [key: string]: string | number;
+            }): string;
+            _(key: string, param?: {
                 [key: string]: string | number;
             }): string;
-            rich(key: TransMessage<Locale>, param?: {
+            rich(key: DictKey, 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;

package/src/types.d.ts

@@ -1,3 +1,4 @@
+import { BaseInsight } from "@akanjs/base";
 import type { FetchInitForm } from "@akanjs/signal";
 import { type ClassValue } from "clsx";
 import type { ReactElement, ReactNode } from "react";
@@ -43,9 +44,7 @@ export interface ModelDashboardProps<Summary> {
     hidePresents?: boolean;
     sliceName?: string;
 }
-export interface ModelInsightProps<Insight = {
-    count: number;
-}> {
+export interface ModelInsightProps<Insight = BaseInsight> {
     className?: string;
     insight: Insight;
     sliceName?: string;