@akanjs/ui 0.9.55 → 0.9.57

package/cjs/Signal/RestApi.js

@@ -43,55 +43,67 @@ var import_Copy = require("../Copy");
 var import__ = require(".");
 var import_Arg = __toESM(require("./Arg"));
 var import_Response = __toESM(require("./Response"));
+const getControllerPath = (gqlKey, gqlMeta) => {
+  return gqlMeta.signalOption?.path ?? [
+    gqlMeta.signalOption?.name ?? gqlKey,
+    ...gqlMeta.args.filter((argMeta) => argMeta.type === "Param").map((argMeta) => `:${argMeta.name}`)
+  ].join("/");
+};
 function RestApi() {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {});
 }
-const RestApiEndpoints = ({ refName, endpoints, openAll, httpUri }) => {
-  const sigRefs = (0, import_signal.getSignalRefsOnStorage)(refName);
-  if (!sigRefs.length)
+const RestApiEndpoints = ({ refName, prefix, endpoints, openAll, httpUri }) => {
+  const signals = global.signals;
+  const signal = signals.find((signal2) => signal2.refName === refName);
+  if (!signal)
     return null;
   const tryRoles = import_store.st.use.tryRoles();
-  const gqlInfos = sigRefs.reduce(
-    (acc, sigRef) => [...acc, ...(0, import_signal.getGqlMetas)(sigRef).map((gqlMeta) => ({ key: gqlMeta.key, gqlMeta, sigRef }))],
-    []
-  ).filter(({ key }) => !endpoints || endpoints.includes(key)).sort((a, b) => a.key > b.key ? 1 : -1).filter(({ gqlMeta }) => gqlMeta.signalOption.onlyFor !== "graphql").filter(({ gqlMeta }) => {
-    if (gqlMeta.type === "Pubsub" || gqlMeta.type === "Message")
+  const gqlInfos = Object.entries(signal.endpoint).filter(([key, gqlMeta]) => !endpoints || endpoints.includes(key)).sort(([keyA], [keyB]) => keyA > keyB ? 1 : -1).filter(([key, gqlMeta]) => gqlMeta.signalOption?.onlyFor !== "graphql").filter(([key, gqlMeta]) => {
+    if (gqlMeta.type === "pubsub" || gqlMeta.type === "message")
       return false;
-    if (gqlMeta.guards.includes("Public") && tryRoles.includes("Public"))
+    if (gqlMeta.signalOption?.guards?.includes("Public") && tryRoles.includes("Public"))
       return true;
-    if ((gqlMeta.guards.includes("User") || gqlMeta.guards.includes("Every")) && tryRoles.includes("User"))
+    if ((gqlMeta.signalOption?.guards?.includes("User") || gqlMeta.signalOption?.guards?.includes("Every")) && tryRoles.includes("User"))
       return true;
-    if ((gqlMeta.guards.includes("Admin") || gqlMeta.guards.includes("Every")) && tryRoles.includes("Admin"))
+    if ((gqlMeta.signalOption?.guards?.includes("Admin") || gqlMeta.signalOption?.guards?.includes("Every")) && tryRoles.includes("Admin"))
       return true;
-    if (gqlMeta.guards.includes("SuperAdmin") && tryRoles.includes("SuperAdmin"))
+    if ((gqlMeta.signalOption?.guards?.includes("SuperAdmin") || gqlMeta.signalOption?.guards?.includes("Every")) && tryRoles.includes("SuperAdmin"))
       return true;
     return false;
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: gqlInfos.map(({ gqlMeta, sigRef }, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RestApiEndpoint, { sigRef, gqlMeta, open: openAll, httpUri }, idx)) });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: gqlInfos.map(([gqlKey, gqlMeta], idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    RestApiEndpoint,
+    {
+      prefix,
+      refName,
+      gqlKey,
+      gqlMeta,
+      open: openAll,
+      httpUri
+    },
+    idx
+  )) });
 };
 RestApi.Endpoints = RestApiEndpoints;
-const RestApiEndpoint = ({ sigRef, gqlMeta, open, httpUri }) => {
+const RestApiEndpoint = ({ refName, prefix, gqlKey, gqlMeta, open, httpUri }) => {
   const { l } = (0, import_client.usePage)();
-  const sigMeta = (0, import_signal.getSigMeta)(sigRef);
   const [viewStatus, setViewStatus] = (0, import_react.useState)("doc");
-  const [argMetas] = (0, import_signal.getArgMetas)(sigRef, gqlMeta.key);
-  const queryArgMetas = argMetas.filter((argMeta) => argMeta.type === "Query");
-  const paramArgMetas = argMetas.filter((argMeta) => argMeta.type === "Param");
-  const bodyArgMetas = argMetas.filter((argMeta) => argMeta.type === "Body");
-  const uploadArgMetas = argMetas.filter((argMeta) => argMeta.type === "Upload");
-  const prefix = (0, import_signal.getControllerPrefix)(sigMeta);
-  const path = (0, import_signal.getControllerPath)(gqlMeta, paramArgMetas);
+  const queryArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Query");
+  const paramArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Param");
+  const bodyArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Body");
+  const uploadArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Upload");
+  const path = getControllerPath(gqlKey, gqlMeta);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "collapse-arrow bg-base-300 collapse my-1", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked: open }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "collapse-title", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-3", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: `btn btn-xs w-16 ${gqlMeta.type === "Query" ? "btn-success" : "btn-accent"}`, children: gqlMeta.type === "Query" ? "GET" : "POST" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: `btn btn-xs w-16 ${gqlMeta.type === "query" ? "btn-success" : "btn-accent"}`, children: gqlMeta.type === "query" ? "GET" : "POST" }),
       prefix ? `/${prefix}` : "",
       "/",
       path,
       " ",
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "text-lg", children: [
         "(",
-        l.api(sigMeta.refName, gqlMeta.key),
+        l._(`${refName}.signal.${gqlKey}`),
         ")"
       ] })
     ] }) }),
@@ -99,9 +111,9 @@ const RestApiEndpoint = ({ sigRef, gqlMeta, open, httpUri }) => {
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mt-4 text-lg", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Description" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("hr", { className: "my-2 border-[0.1px] border-gray-400" }),
-        gqlMeta.guards.some((guard) => guard !== "None") ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-2 pb-3 pl-3 text-base font-normal", children: [
+        gqlMeta.signalOption?.guards?.some((guard) => guard !== "None") ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-2 pb-3 pl-3 text-base font-normal", children: [
           "- Guards:",
-          gqlMeta.guards.map((guard) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          gqlMeta.signalOption.guards.map((guard) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
             "span",
             {
               className: `badge ${guard === "Public" ? "badge-success" : guard === "SuperAdmin" ? "badge-error" : guard === "Admin" ? "badge-error" : guard === "User" ? "badge-accent" : guard === "Owner" ? "badge-accent" : guard === "Every" ? "badge-warning" : ""}`,
@@ -112,7 +124,7 @@ const RestApiEndpoint = ({ sigRef, gqlMeta, open, httpUri }) => {
         ] }) : null,
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "pb-3 pl-3 text-base font-normal", children: [
           "- ",
-          l.apidesc(sigMeta.refName, gqlMeta.key)
+          l._(`${refName}.signal.${gqlKey}.desc`)
         ] })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "my-4 flex w-full gap-5 px-5", children: [
@@ -143,87 +155,57 @@ const RestApiEndpoint = ({ sigRef, gqlMeta, open, httpUri }) => {
           }
         )
       ] }),
-      viewStatus === "doc" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        RestApiInterface,
-        {
-          sigRef,
-          gqlMeta,
-          queryArgMetas,
-          paramArgMetas,
-          bodyArgMetas,
-          uploadArgMetas
-        }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        RestApiTry,
-        {
-          sigRef,
-          gqlMeta,
-          queryArgMetas,
-          paramArgMetas,
-          bodyArgMetas,
-          uploadArgMetas,
-          httpUri
-        }
-      )
+      viewStatus === "doc" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RestApiInterface, { refName, gqlKey, gqlMeta }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RestApiTry, { refName, gqlKey, gqlMeta, httpUri })
     ] })
   ] });
 };
 RestApi.Endpoint = RestApiEndpoint;
-const RestApiInterface = ({
-  sigRef,
-  gqlMeta,
-  queryArgMetas,
-  paramArgMetas,
-  bodyArgMetas,
-  uploadArgMetas
-}) => {
-  const sigMeta = (0, import_signal.getSigMeta)(sigRef);
-  const [returnRef, arrDepth] = (0, import_base.getNonArrayModel)(gqlMeta.returns());
+const RestApiInterface = ({ refName, gqlKey, gqlMeta }) => {
+  const returnRef = import_constant.constantInfo.getModelRef(gqlMeta.returns.refName, gqlMeta.returns.modelType);
   const isReturnModelType = !(0, import_base.isGqlScalar)(returnRef);
+  const uploadArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Upload");
+  const paramArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Param");
+  const queryArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Query");
+  const bodyArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Body");
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex w-full flex-col gap-4", children: [
     uploadArgMetas.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Form data upload" }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { sigMeta, gqlMeta, argMetas: uploadArgMetas }) })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { refName, gqlKey, argMetas: uploadArgMetas }) })
     ] }) : null,
     paramArgMetas.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Parameters" }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { sigMeta, gqlMeta, argMetas: paramArgMetas }) })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { refName, gqlKey, argMetas: paramArgMetas }) })
     ] }) : null,
     queryArgMetas.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Query" }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { sigMeta, gqlMeta, argMetas: queryArgMetas }) })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { refName, gqlKey, argMetas: queryArgMetas }) })
     ] }) : null,
     bodyArgMetas.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Body" }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { sigMeta, gqlMeta, argMetas: bodyArgMetas }) })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { refName, gqlKey, argMetas: bodyArgMetas }) })
     ] }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-bold", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex w-full flex-col gap-2 rounded-md font-normal md:flex-row", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full md:w-1/2", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Response Type" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "bg-base-100 max-h-[500px] overflow-auto rounded-md p-4 md:h-[500px]", children: [
           "Returns: ",
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import__.Signal.Object.Type, { objRef: returnRef, arrDepth }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import__.Signal.Object.Type, { objRef: returnRef, arrDepth: gqlMeta.returns.arrDepth }),
           isReturnModelType ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import__.Signal.Object.Detail, { objRef: returnRef }) : null
         ] })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full md:w-1/2", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-lg font-extrabold", children: "Response Example" }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Response.default.Example, { sigRef, gqlMeta })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Response.default.Example, { gqlMeta })
       ] })
     ] }) })
   ] });
 };
 RestApi.Interface = RestApiInterface;
-const RestApiTry = ({
-  sigRef,
-  gqlMeta,
-  queryArgMetas,
-  paramArgMetas,
-  bodyArgMetas,
-  uploadArgMetas,
-  httpUri = import_base.baseClientEnv.serverHttpUri
-}) => {
-  const sigMeta = (0, import_signal.getSigMeta)(sigRef);
+const RestApiTry = ({ prefix, refName, gqlKey, gqlMeta, httpUri = import_base.baseClientEnv.serverHttpUri }) => {
+  const queryArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Query");
+  const paramArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Param");
+  const bodyArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Body");
+  const uploadArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Upload");
   const tryJwt = import_store.st.use.tryJwt();
   const paramExample = (0, import_react.useMemo)(() => (0, import_signal.getExampleData)(paramArgMetas, "restapi"), []);
   const queryExample = (0, import_react.useMemo)(() => (0, import_signal.getExampleData)(queryArgMetas, "restapi"), []);
@@ -236,16 +218,15 @@ const RestApiTry = ({
     status: "idle",
     data: null
   });
-  const method = gqlMeta.type === "Query" ? "GET" : "POST";
-  const prefix = (0, import_signal.getControllerPrefix)(sigMeta);
-  const path = (0, import_signal.getControllerPath)(gqlMeta, paramArgMetas);
+  const method = gqlMeta.type === "query" ? "GET" : "POST";
+  const path = getControllerPath(gqlKey, gqlMeta);
   const queryString = new URLSearchParams(
     Object.fromEntries(
       queryArgMetas.map((argMeta) => {
         const value = queryRequest[argMeta.name];
         if (value === void 0 || value === null || value === "" || Array.isArray(value) && value.length === 0)
           return null;
-        const [argRef] = (0, import_base.getNonArrayModel)(argMeta.returns());
+        const argRef = import_constant.constantInfo.getModelRef(argMeta.refName, argMeta.modelType);
         if ((0, import_constant.getGqlTypeStr)(argRef) === "JSON")
           return [argMeta.name, btoa(value)];
         return [argMeta.name, value];
@@ -303,6 +284,7 @@ const RestApiTry = ({
       uploadArgMetas.map((argMeta) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_Arg.default.FormData,
         {
+          gqlKey,
           argMeta,
           value: uploadRequest[argMeta.name],
           onChange: (fileList) => {
@@ -317,6 +299,7 @@ const RestApiTry = ({
       paramArgMetas.map((argMeta, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_Arg.default.Param,
         {
+          gqlKey,
           argMeta,
           value: paramRequest[argMeta.name],
           onChange: (value) => {
@@ -331,6 +314,7 @@ const RestApiTry = ({
       queryArgMetas.map((argMeta, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_Arg.default.Query,
         {
+          gqlKey,
           argMeta,
           value: queryRequest[argMeta.name] ?? "",
           onChange: (value) => {

package/cjs/Signal/WebSocket.js

@@ -32,7 +32,6 @@ __export(WebSocket_exports, {
 });
 module.exports = __toCommonJS(WebSocket_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_signal = require("@akanjs/signal");
 var import_store = require("@akanjs/store");
 var import_Message = __toESM(require("./Message"));
 var import_PubSub = __toESM(require("./PubSub"));
@@ -40,29 +39,29 @@ function WebSocket() {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {});
 }
 const WebSocketEndpoints = ({ refName, openAll }) => {
-  const sigRefs = (0, import_signal.getSignalRefsOnStorage)(refName);
+  const signals = global.signals;
+  const signal = signals.find((signal2) => signal2.refName === refName);
+  if (!signal)
+    return null;
   const tryRoles = import_store.st.use.tryRoles();
-  const gqlInfos = sigRefs.reduce(
-    (acc, sigRef) => [...acc, ...(0, import_signal.getGqlMetas)(sigRef).map((gqlMeta) => ({ key: gqlMeta.key, gqlMeta, sigRef }))],
-    []
-  ).sort((a, b) => a.key > b.key ? 1 : -1).filter(({ gqlMeta }) => gqlMeta.signalOption.onlyFor !== "restapi").filter(({ gqlMeta }) => {
-    if (gqlMeta.type === "Query" || gqlMeta.type === "Mutation")
+  const gqlInfos = Object.entries(signal.endpoint).sort(([keyA], [keyB]) => keyA > keyB ? 1 : -1).filter(([key, gqlMeta]) => gqlMeta.signalOption?.onlyFor !== "restapi").filter(([key, gqlMeta]) => {
+    if (gqlMeta.type === "pubsub" || gqlMeta.type === "message")
       return false;
-    if (gqlMeta.guards.includes("Public") && tryRoles.includes("Public"))
+    if (gqlMeta.signalOption?.guards?.includes("Public") && tryRoles.includes("Public"))
       return true;
-    if ((gqlMeta.guards.includes("User") || gqlMeta.guards.includes("Every")) && tryRoles.includes("User"))
+    if ((gqlMeta.signalOption?.guards?.includes("User") || gqlMeta.signalOption?.guards?.includes("Every")) && tryRoles.includes("User"))
       return true;
-    if ((gqlMeta.guards.includes("Admin") || gqlMeta.guards.includes("Every")) && tryRoles.includes("Admin"))
+    if ((gqlMeta.signalOption?.guards?.includes("Admin") || gqlMeta.signalOption?.guards?.includes("Every")) && tryRoles.includes("Admin"))
       return true;
-    if (gqlMeta.guards.includes("SuperAdmin") && tryRoles.includes("SuperAdmin"))
+    if ((gqlMeta.signalOption?.guards?.includes("SuperAdmin") || gqlMeta.signalOption?.guards?.includes("Every")) && tryRoles.includes("SuperAdmin"))
       return true;
     return false;
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: gqlInfos.map(({ gqlMeta, sigRef }, idx) => {
-    if (gqlMeta.type === "Pubsub") {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_PubSub.default.Endpoint, { sigRef, gqlMeta, open: openAll }, idx);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: gqlInfos.map(([gqlKey, gqlMeta], idx) => {
+    if (gqlMeta.type === "pubsub") {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_PubSub.default.Endpoint, { refName, gqlKey, gqlMeta, open: openAll }, idx);
     } else {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Message.default.Endpoint, { sigRef, gqlMeta, open: openAll }, idx);
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Message.default.Endpoint, { refName, gqlKey, gqlMeta, open: openAll }, idx);
     }
   }) });
 };

package/cjs/System/CSR.js

@@ -23,6 +23,7 @@ __export(CSR_exports, {
 });
 module.exports = __toCommonJS(CSR_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
+var import_base = require("@akanjs/base");
 var import_client = require("@akanjs/client");
 var import_next = require("@akanjs/next");
 var import_store = require("@akanjs/store");
@@ -49,10 +50,7 @@ const CSRProvider = ({
   fonts,
   layoutStyle = "web",
   reconnect,
-  of,
-  fetchPing,
-  fetchMe,
-  fetchSelf
+  of
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_Load.Load.Page,
@@ -60,9 +58,10 @@ const CSRProvider = ({
       of,
       loader: async () => {
         const { lang } = await params;
-        return { lang };
+        const fetch = import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch;
+        return { lang, fetch };
       },
-      render: ({ lang }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+      render: ({ lang, fetch }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.Client.Wrapper, { theme, lang, reconnect, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           CSRWrapper,
           {
@@ -80,10 +79,6 @@ const CSRProvider = ({
           import_Common.Common.Wrapper,
           {
             fetch,
-            environment: env.environment,
-            fetchPing,
-            fetchMe,
-            fetchSelf,
             render: ({ mePromise, selfPromise }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
               /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.Client.Inner, {}),
               /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CSRInner, {}),

package/cjs/System/Common.js

@@ -22,20 +22,20 @@ __export(Common_exports, {
 module.exports = __toCommonJS(Common_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_ko = require("dayjs/locale/ko");
+var import_base = require("@akanjs/base");
 var import_client = require("@akanjs/client");
 var import_Load = require("../Load");
 const Common = () => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {});
 };
 const CommonWrapper = ({
-  fetch,
-  environment,
-  render,
-  fetchPing,
-  fetchMe = (props, option) => fetch.me?.(props, option),
-  fetchSelf = (props, option) => fetch.getSelf?.(props, option)
+  fetch = import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch,
+  render
 }) => {
   const account = (0, import_client.getAccount)();
+  const fetchPing = (option) => fetch.ping(option);
+  const fetchMe = (props, option) => fetch.me?.(props, option);
+  const fetchSelf = (props, option) => fetch.getSelf?.(props, option);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_Load.Load.Page,
     {

package/cjs/System/SSR.js

@@ -22,6 +22,7 @@ __export(SSR_exports, {
 });
 module.exports = __toCommonJS(SSR_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
+var import_base = require("@akanjs/base");
 var import_client = require("@akanjs/client");
 var import_react = require("react");
 var import_Load = require("../Load");
@@ -43,10 +44,7 @@ const SSRProvider = ({
   fonts,
   layoutStyle = "web",
   reconnect,
-  of,
-  fetchPing,
-  fetchMe,
-  fetchSelf
+  of
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_Load.Load.Page,
@@ -56,16 +54,13 @@ const SSRProvider = ({
         const { lang } = await params;
         if (!import_client.router.isInitialized)
           import_client.router.init({ type: "next", side: "server", lang, prefix });
-        return { lang };
+        const fetch = import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch;
+        return { lang, fetch };
       },
-      render: ({ lang }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      render: ({ lang, fetch }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_Common.Common.Wrapper,
         {
           fetch,
-          environment: env.environment,
-          fetchPing,
-          fetchMe,
-          fetchSelf,
           render: ({ mePromise, selfPromise }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
             SSRWrapper,
             {

package/esm/Data/Insight.js

@@ -12,7 +12,7 @@ function Insight({
   const refName = st.slice[sliceName].refName;
   return /* @__PURE__ */ jsx("div", { className: clsx("stats my-2 flex w-full flex-wrap justify-center py-2 shadow-sm", className), children: /* @__PURE__ */ jsx("div", { className: "stats", children: columns?.map(
     (column, idx) => insight[column] !== void 0 && /* @__PURE__ */ jsxs("div", { className: "stat mx-1 flex items-center rounded-none", children: [
-      /* @__PURE__ */ jsx("div", { className: "stat-title", children: l.field(refName, column) }),
+      /* @__PURE__ */ jsx("div", { className: "stat-title", children: l._(`${refName}.${column}`) }),
       /* @__PURE__ */ jsx("div", { className: "stat-value text-xl", children: insight[column].toLocaleString() })
     ] }, idx)
   ) }) });

package/esm/Data/Item.js

@@ -70,7 +70,7 @@ function Item({
     return !["id", "status", "createdAt"].includes(key);
   }).map((column, idx) => {
     const key = typeof column === "string" ? column : column.key;
-    const title2 = typeof column !== "string" && column.title ? column.title : l.field(sliceName, key);
+    const title2 = typeof column !== "string" && column.title ? column.title : l._(`${sliceName}.${key}`);
     const render = convToAntdColumn(column).render ?? ((v, m, i) => JSON.stringify(v, null, 2));
     const modelKeyLength = model[key]?.length;
     if (convToAntdColumn(column).render) {

package/esm/Data/ListContainer.js

@@ -79,7 +79,7 @@ function ListContainer({
   useEffect(() => {
     void storeDo[namesOfSlice.initModel]();
   }, []);
-  const RenderTitle = renderTitle ?? ((model) => `${l(`${refName}.modelName`)} - ${model.id ? model.id : "New"}`);
+  const RenderTitle = renderTitle ?? ((model) => `${l._(`${refName}.modelName`)} - ${model.id ? model.id : "New"}`);
   const ModelDashboard = () => {
     const summary = storeUse.summary();
     const summaryLoading = storeUse.summaryLoading();
@@ -107,11 +107,11 @@ function ListContainer({
             onClick: () => {
               const header = columns.map((column) => {
                 if (typeof column === "string")
-                  return l.field(sliceName, column);
+                  return l._(`${sliceName}.${column}`);
                 else if (column.title)
                   return column.title;
                 else
-                  return l.field(sliceName, column.key);
+                  return l._(`${sliceName}.${column.key}`);
               }).join("	");
               const body = modelList.map((model) => {
                 const line = columns.map((column) => {
@@ -170,7 +170,7 @@ ${body}`], { type: "text/csv;charset=utf-8" });
       {
         value: sortOfModel,
         options: fetch[names.modelSortKeys]?.map((sortKey) => ({
-          label: l.field(refName, sortKey),
+          label: l._(`${refName}.${sortKey}`),
           value: sortKey
         })) ?? [],
         onChange: (sortKey) => void storeDo[namesOfSlice.setSortOfModel](sortKey)
@@ -181,7 +181,7 @@ ${body}`], { type: "text/csv;charset=utf-8" });
     /* @__PURE__ */ jsxs("div", { className: "mb-3 flex flex-wrap justify-between", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex pb-1", children: [
         /* @__PURE__ */ jsxs("p", { className: "prose text-lg", children: [
-          title ?? l.field(sliceName, "modelName"),
+          title ?? l._(`${sliceName}.modelName`),
           "(",
           modelInsight.count,
           ")"

package/esm/Data/TableList.js

@@ -51,10 +51,7 @@ function TableList({
   const cols = useMemo(() => {
     const firstCol = {
       ...convToAntdColumn(columns[0]),
-      title: typeof columns[0] !== "string" && columns[0].title ? columns[0].title : l.field(
-        sliceName,
-        typeof columns[0] === "string" ? columns[0] : columns[0].key
-      )
+      title: typeof columns[0] !== "string" && columns[0].title ? columns[0].title : l._(`${sliceName}.${typeof columns[0] === "string" ? columns[0] : columns[0].key}`)
     };
     return [
       {
@@ -74,7 +71,7 @@ function TableList({
       },
       ...columns.slice(1).map((col) => ({
         ...convToAntdColumn(col),
-        title: typeof col !== "string" && col.title ? col.title : l.field(sliceName, typeof col === "string" ? col : col.key)
+        title: typeof col !== "string" && col.title ? col.title : l._(`${sliceName}.${typeof col === "string" ? col : col.key}`)
       })),
       ...actions ? [
         {

package/esm/Field.js

@@ -1,6 +1,6 @@
 "use client";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { dayjs, Enum } from "@akanjs/base";
+import { dayjs, isEnum } from "@akanjs/base";
 import { clsx, usePage } from "@akanjs/client";
 import { capitalize, formatPhone, isPhoneNumber, lowerlize } from "@akanjs/common";
 import { st } from "@akanjs/store";
@@ -282,7 +282,7 @@ const ToggleSelect = ({
   btnClassName
 }) => {
   const { l } = usePage();
-  const isEnum = items instanceof Enum;
+  const isEnumValue = isEnum(items);
   return /* @__PURE__ */ jsxs("div", { className: clsx("flex flex-col", className), children: [
     label ? /* @__PURE__ */ jsx(Label, { className: labelClassName, nullable, label, desc }) : null,
     /* @__PURE__ */ jsx(
@@ -291,10 +291,10 @@ const ToggleSelect = ({
         className: "mt-2",
         nullable: !!nullable,
         btnClassName,
-        items: model && field ? (isEnum ? items.values : items).map((item) => ({
-          label: l.enum(model, field, item),
+        items: model && field ? (isEnumValue ? items.values : items).map((item) => ({
+          label: l._(`${items.refName}.${item}`),
           value: item
-        })) : isEnum ? items.values : items,
+        })) : isEnumValue ? items.values : items,
         value,
         onChange: (value2, idx) => {
           onChange(value2);
@@ -324,17 +324,17 @@ const MultiToggleSelect = ({
   disabled
 }) => {
   const { l } = usePage();
-  const isEnum = items instanceof Enum;
+  const isEnumValue = isEnum(items);
   return /* @__PURE__ */ jsxs("div", { className: clsx("flex flex-col", className), children: [
     label ? /* @__PURE__ */ jsx(Label, { className: labelClassName, nullable: !!minlength, label, desc }) : null,
     /* @__PURE__ */ jsx(
       UtilToggleSelect.Multi,
       {
         nullable: !minlength,
-        items: model && field ? (isEnum ? items.values : items).map((item) => ({
-          label: l.enum(model, field, item),
+        items: model && field ? (isEnumValue ? items.values : items).map((item) => ({
+          label: l._(`${items.refName}.${item}`),
           value: item
-        })) : isEnum ? items.values : items,
+        })) : isEnumValue ? items.values : items,
         value,
         onChange: (values) => {
           onChange(values);
@@ -1152,7 +1152,9 @@ const Children = ({
           return renderSelected(model);
         },
         onChange: (modelIds) => {
-          onChange(modelIds.map((id) => modelList.get(id)).filter((model) => model !== void 0));
+          onChange(
+            modelIds.map((id) => modelList.get(id)).filter((model) => model !== void 0)
+          );
         },
         onSearch
       }

package/esm/Model/EditModal.js

@@ -177,7 +177,7 @@ function EditModal({
           children: [
             modelFormId ? /* @__PURE__ */ jsx(AiOutlineSave, {}) : /* @__PURE__ */ jsx(AiOutlinePlus, {}),
             l(modelFormId ? "base.updateModel" : "base.createModel", {
-              model: l.field(names.model, "modelName")
+              model: l._(`${names.model}.modelName`)
             })
           ]
         }

package/esm/Model/Remove.js

@@ -1,13 +1,12 @@
 "use client";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { clsx, msg, router, usePage } from "@akanjs/client";
 import { capitalize } from "@akanjs/common";
 import { st } from "@akanjs/store";
 import { useMemo, useState } from "react";
-import { AiOutlineDelete } from "react-icons/ai";
 import { Button } from "../Button";
 import { Modal } from "../Modal";
-function Remove({ className, name, modelId, sliceName, modal, redirect }) {
+function Remove({ className, name, modelId, sliceName, modal, redirect, children }) {
   const { l } = usePage();
   const [modalOpen, setModalOpen] = useState(false);
   const storeDo = st.do;
@@ -19,20 +18,16 @@ function Remove({ className, name, modelId, sliceName, modal, redirect }) {
     }),
     []
   );
-  return /* @__PURE__ */ jsxs("div", { className: "inline size-full", children: [
-    /* @__PURE__ */ jsxs(
-      "button",
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(
+      "div",
       {
-        className: clsx("btn text-error btn-sm size-full flex-nowrap whitespace-nowrap", className),
+        className: clsx("cursor-pointer", className),
         onClick: (e) => {
           e.stopPropagation();
           setModalOpen(true);
         },
-        children: [
-          /* @__PURE__ */ jsx(AiOutlineDelete, {}),
-          " ",
-          l("base.remove")
-        ]
+        children
       }
     ),
     /* @__PURE__ */ jsx(