@akanjs/ui 0.9.55 → 0.9.57

package/cjs/Data/TableList.js

@@ -83,10 +83,7 @@ function TableList({
   const cols = (0, import_react.useMemo)(() => {
     const firstCol = {
       ...(0, import_Item.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 [
       {
@@ -106,7 +103,7 @@ function TableList({
       },
       ...columns.slice(1).map((col) => ({
         ...(0, import_Item.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/cjs/Field.js

@@ -304,7 +304,7 @@ const ToggleSelect = ({
   btnClassName
 }) => {
   const { l } = (0, import_client.usePage)();
-  const isEnum = items instanceof import_base.Enum;
+  const isEnumValue = (0, import_base.isEnum)(items);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: (0, import_client.clsx)("flex flex-col", className), children: [
     label ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Label, { className: labelClassName, nullable, label, desc }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -313,10 +313,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);
@@ -346,17 +346,17 @@ const MultiToggleSelect = ({
   disabled
 }) => {
   const { l } = (0, import_client.usePage)();
-  const isEnum = items instanceof import_base.Enum;
+  const isEnumValue = (0, import_base.isEnum)(items);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: (0, import_client.clsx)("flex flex-col", className), children: [
     label ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Label, { className: labelClassName, nullable: !!minlength, label, desc }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       import_ToggleSelect.ToggleSelect.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);
@@ -1174,7 +1174,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/cjs/Model/EditModal.js

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

package/cjs/Model/Remove.js

@@ -26,10 +26,9 @@ var import_client = require("@akanjs/client");
 var import_common = require("@akanjs/common");
 var import_store = require("@akanjs/store");
 var import_react = require("react");
-var import_ai = require("react-icons/ai");
 var import_Button = require("../Button");
 var import_Modal = require("../Modal");
-function Remove({ className, name, modelId, sliceName, modal, redirect }) {
+function Remove({ className, name, modelId, sliceName, modal, redirect, children }) {
   const { l } = (0, import_client.usePage)();
   const [modalOpen, setModalOpen] = (0, import_react.useState)(false);
   const storeDo = import_store.st.do;
@@ -41,20 +40,16 @@ function Remove({ className, name, modelId, sliceName, modal, redirect }) {
     }),
     []
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "inline size-full", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-      "button",
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      "div",
       {
-        className: (0, import_client.clsx)("btn text-error btn-sm size-full flex-nowrap whitespace-nowrap", className),
+        className: (0, import_client.clsx)("cursor-pointer", className),
         onClick: (e) => {
           e.stopPropagation();
           setModalOpen(true);
         },
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ai.AiOutlineDelete, {}),
-          " ",
-          l("base.remove")
-        ]
+        children
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(

package/cjs/Model/ViewEditModal.js

@@ -94,7 +94,20 @@ function ViewEditModal({
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Title, {}),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dropdown dropdown-end", children: [
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { tabIndex: 0, className: "btn btn-square m-1", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_bi.BiDotsVertical, {}) }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { tabIndex: 0, className: "dropdown-content menu bg-base-100 rounded-box z-[1] p-2 shadow-sm", children: model ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Remove.default, { sliceName, modelId: model.id, modal: null }) }) : null })
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { tabIndex: 0, className: "dropdown-content menu bg-base-100 rounded-box z-[1] p-2 shadow-sm", children: model ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+            import_Remove.default,
+            {
+              className: "text-error flex items-center gap-2",
+              sliceName,
+              modelId: model.id,
+              modal: null,
+              children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_bi.BiTrash, {}),
+                " ",
+                l("base.remove")
+              ]
+            }
+          ) }) }) : null })
         ] })
       ] }),
       action: modelModal === "view" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(

package/cjs/Select.js

@@ -53,7 +53,7 @@ const Select = ({
   const { l } = (0, import_client.usePage)();
   const [isOpen, setIsOpen] = (0, import_react.useState)(false);
   const labeledOptions = (0, import_react.useMemo)(
-    () => options instanceof import_base.Enum ? options.values.map((v) => ({
+    () => (0, import_base.isEnum)(options) ? options.values.map((v) => ({
       label: typeof v === "string" ? v : typeof v === "object" ? JSON.stringify(v) : String(v),
       value: v
     })) : options[0]?.label && options[0]?.value ? options : options.map((v) => ({ label: v, value: v })),

package/cjs/Signal/Arg.js

@@ -43,7 +43,7 @@ var import_Object = __toESM(require("./Object"));
 function Arg({ argType, value, onChange }) {
   return argType === "ID" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.ID, { value, onChange }) : argType === "Int" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.Int, { value, onChange }) : argType === "Float" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.Float, { value, onChange }) : argType === "String" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.String, { value, onChange }) : argType === "Boolean" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.Boolean, { value, onChange }) : argType === "Date" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.Date, { value, onChange }) : argType === "JSON" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.Json, { value, onChange }) : argType === "Upload" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Arg.Upload, { value, onChange }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {});
 }
-const ArgTable = ({ sigMeta, gqlMeta, argMetas }) => {
+const ArgTable = ({ refName, gqlKey, argMetas }) => {
   const { l } = (0, import_client.usePage)();
   const onCopy = (text) => {
     void navigator.clipboard.writeText(text);
@@ -58,14 +58,14 @@ const ArgTable = ({ sigMeta, gqlMeta, argMetas }) => {
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("th", { className: "text-center", children: "Description" })
     ] }) }),
     argMetas.map((argMeta, idx) => {
-      const [argRef, argArrDepth] = (0, import_base.getNonArrayModel)(argMeta.returns());
+      const argRef = import_constant.constantInfo.getModelRef(argMeta.refName, argMeta.modelType);
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("tbody", { className: "font-normal", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("tr", { children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { children: argMeta.name }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "text-center", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Object.default.Type, { objRef: argRef, arrDepth: argArrDepth }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "text-center", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Object.default.Type, { objRef: argRef, arrDepth: argMeta.arrDepth }) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { width: argMeta.argsOption.enum ? "20%" : "10%", className: "text-center", children: argMeta.argsOption.enum ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex flex-col gap-2", children: argMeta.argsOption.enum.map((opt, idx2) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           "button",
           {
-            "data-tip": l.enum(sigMeta.refName, argMeta.name, opt),
+            "data-tip": l._(`${argMeta.argsOption.enum?.refName}.${opt}`),
             onClick: () => {
               onCopy(opt);
             },
@@ -74,19 +74,19 @@ const ArgTable = ({ sigMeta, gqlMeta, argMetas }) => {
           },
           idx2
         ) }, idx2)) }) : "-" }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "text-center", children: l.arg(sigMeta.refName, gqlMeta.key, argMeta.name) }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "text-center", children: l.argdesc(sigMeta.refName, gqlMeta.key, argMeta.name) })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "text-center", children: l._(`${refName}.signal.${gqlKey}.arg.${argMeta.name}`) }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "text-center", children: l._(`${refName}.signal.${gqlKey}.arg.${argMeta.name}.desc`) })
       ] }) }, idx);
     })
   ] });
 };
 Arg.Table = ArgTable;
-const ArgParam = ({ argMeta, value, onChange }) => {
-  const [argRef, argArrDepth] = (0, import_base.getNonArrayModel)(argMeta.returns());
+const ArgParam = ({ gqlKey, argMeta, value, onChange }) => {
+  const argRef = import_constant.constantInfo.getModelRef(argMeta.refName, argMeta.modelType);
   if (!(0, import_base.isGqlScalar)(argRef))
-    throw new Error(`Param arg - ${argMeta.key}/${argMeta.name} must be scalar`);
-  else if (argArrDepth > 0)
-    throw new Error(`Param arg - ${argMeta.key}/${argMeta.name} must not be array`);
+    throw new Error(`Param arg - ${gqlKey}/${argMeta.name} must be scalar`);
+  else if (argMeta.arrDepth > 0)
+    throw new Error(`Param arg - ${gqlKey}/${argMeta.name} must not be array`);
   const argType = (0, import_constant.getGqlTypeStr)(argRef);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex w-full items-center gap-2", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-36 pl-2", children: [
@@ -97,19 +97,19 @@ const ArgParam = ({ argMeta, value, onChange }) => {
   ] });
 };
 Arg.Param = ArgParam;
-const ArgQuery = ({ argMeta, value, onChange }) => {
-  const [argRef, argArrDepth] = (0, import_base.getNonArrayModel)(argMeta.returns());
+const ArgQuery = ({ gqlKey, argMeta, value, onChange }) => {
+  const argRef = import_constant.constantInfo.getModelRef(argMeta.refName, argMeta.modelType);
   if (!(0, import_base.isGqlScalar)(argRef))
-    throw new Error(`Query arg - ${argMeta.key}/${argMeta.name} must be scalar`);
-  else if (argArrDepth > 1)
-    throw new Error(`Query arg - ${argMeta.key}/${argMeta.name} must not be more than 2D array`);
+    throw new Error(`Query arg - ${gqlKey}/${argMeta.name} must be scalar`);
+  else if (argMeta.arrDepth > 1)
+    throw new Error(`Query arg - ${gqlKey}/${argMeta.name} must not be more than 2D array`);
   const argType = (0, import_constant.getGqlTypeStr)(argRef);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-2", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-36 pl-2", children: [
       "- ",
       argMeta.name
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "w-full", children: argArrDepth && Array.isArray(value) ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "w-full", children: argMeta.arrDepth > 0 && Array.isArray(value) ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       value.map((val, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-2", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           Arg,
@@ -146,12 +146,12 @@ const ArgQuery = ({ argMeta, value, onChange }) => {
   ] });
 };
 Arg.Query = ArgQuery;
-const ArgFormData = ({ argMeta, value, onChange }) => {
-  const [argRef, argArrDepth] = (0, import_base.getNonArrayModel)(argMeta.returns());
+const ArgFormData = ({ gqlKey, argMeta, value, onChange }) => {
+  const argRef = import_constant.constantInfo.getModelRef(argMeta.refName, argMeta.modelType);
   if ((0, import_constant.getGqlTypeStr)(argRef) !== "Upload")
-    throw new Error(`FormData arg - ${argMeta.key}/${argMeta.name} must be Upload`);
-  else if (argArrDepth < 1)
-    throw new Error(`FormData arg - ${argMeta.key}/${argMeta.name} must be array`);
+    throw new Error(`FormData arg - ${gqlKey}/${argMeta.name} must be Upload`);
+  else if (argMeta.arrDepth < 1)
+    throw new Error(`FormData arg - ${gqlKey}/${argMeta.name} must be array`);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex w-full items-center gap-2", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-36 pl-2", children: [
       "- ",

package/cjs/Signal/Doc.js

@@ -49,12 +49,20 @@ var import_WebSocket = __toESM(require("./WebSocket"));
 function Doc() {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {});
 }
-const DocSetting = () => {
+const DocSetting = ({
+  guardNames = ["Public"],
+  roleTypes = ["Public", "User", "Admin", "SuperAdmin"],
+  roleKeys = { me: "Admin", self: "User" }
+}) => {
   const trySignalType = import_store.st.use.trySignalType();
   const tryRoles = import_store.st.use.tryRoles();
   const tryAccount = import_store.st.use.tryAccount();
-  const tryRoleForAll = import_signal.roleTypes.every((roleType) => tryRoles.includes(roleType));
+  (0, import_react.useEffect)(() => {
+    import_store.st.set({ tryRoles: [...roleTypes] });
+  }, []);
+  const tryRoleForAll = roleTypes.every((roleType) => tryRoles.includes(roleType));
   const baseUrl = trySignalType === "graphql" ? import_signal.client.uri : import_signal.client.uri.replace("/graphql", "");
+  const currentRoles = Object.entries(roleKeys).filter(([key, roleType]) => !!tryAccount[key]).map(([key, roleType]) => roleType);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex w-full flex-wrap items-center justify-between gap-4", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex flex-1 items-center gap-1", children: [
       "BaseURL:",
@@ -101,12 +109,12 @@ const DocSetting = () => {
           className: `btn btn-secondary btn-sm ${tryRoleForAll ? "" : "btn-outline"}`,
           onClick: () => {
             if (!tryRoleForAll)
-              import_store.st.do.setTryRoles([...import_signal.roleTypes]);
+              import_store.st.do.setTryRoles([...roleTypes]);
           },
           children: "All"
         }
       ),
-      import_signal.roleTypes.map((roleType) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      roleTypes.map((roleType) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         "button",
         {
           className: `btn btn-secondary btn-sm ${!tryRoleForAll && tryRoles.includes(roleType) ? "" : "btn-outline"}`,
@@ -125,14 +133,10 @@ const DocSetting = () => {
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-1", children: [
       "Auth:",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DocAuthModal, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", { className: `btn btn-sm ${!tryAccount.me && !tryAccount.self ? "btn-neutral" : "btn-warning"} `, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DocAuthModal, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", { className: `btn btn-sm ${currentRoles.length > 0 ? "btn-warning" : "btn-neutral"} `, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_bi.BiLock, {}),
         " ",
-        [
-          tryAccount.me ? "Admin" : null,
-          tryAccount.self ? "User" : null,
-          !tryAccount.me && !tryAccount.self ? "Public" : null
-        ].filter((roleType) => !!roleType).join(",")
+        currentRoles.length > 0 ? currentRoles.join(", ") : "Public"
       ] }) })
     ] })
   ] });
@@ -186,18 +190,7 @@ const DocAuthModal = ({ children }) => {
             /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Input.Input, { inputClassName: "w-full", value: jwt ?? "", onChange: setJwt, validate: () => true })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex items-center gap-2", children: [
-              "Account Decoded",
-              !decodedAccount?.me && !decodedAccount?.self ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "badge badge-primary", children: "Public" }) : null,
-              decodedAccount?.me?.roles.map((role) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "badge badge-warning", children: [
-                "Admin-",
-                role
-              ] }, role)),
-              decodedAccount?.self?.roles.map((role) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "badge badge-neutral", children: [
-                "User-",
-                role
-              ] }, role))
-            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex items-center gap-2", children: "Account Decoded" }),
             /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "relative", children: [
               /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
                 import_Input.Input.TextArea,
@@ -222,10 +215,8 @@ const DocAuthModal = ({ children }) => {
 };
 Doc.AuthModal = DocAuthModal;
 const DocSignals = () => {
-  const sigRefs = (0, import_signal.getAllSignalRefs)();
-  const refNames = [...new Set(sigRefs.map((sigRef) => (0, import_signal.getSigMeta)(sigRef).refName))].sort(
-    (a, b) => (0, import_common.lowerlize)(a) > (0, import_common.lowerlize)(b) ? 1 : -1
-  );
+  const signals = global.signals;
+  const refNames = signals.map((signal) => signal.refName).sort((a, b) => (0, import_common.lowerlize)(a) > (0, import_common.lowerlize)(b) ? 1 : -1);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: refNames.map((refName, idx) => {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "px-5 pb-5 text-3xl font-bold", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DocSignal, { refName }) }, idx);
   }) });
@@ -246,7 +237,7 @@ const Zone = ({ refName, openAll }) => {
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-3xl font-bold", children: refName }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mb-5", children: [
       " - ",
-      l.field(refName, "modelDesc")
+      l._(`${refName}.modelDesc`)
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "text-2xl font-bold", children: "APIs" }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DocSetting, {}),

package/cjs/Signal/GraphQL.js

@@ -48,43 +48,39 @@ function GraphQL() {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {});
 }
 const GraphQLEndpoints = ({ refName, openAll }) => {
-  const sigRefs = (0, import_signal.getSignalRefsOnStorage)(refName);
+  const signals = global.signals;
+  const signal = signals.find((signal2) => signal2.refName === refName);
   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 === "Pubsub" || gqlMeta.type === "Message")
+  if (!signal)
+    return null;
+  const gqlInfos = global.Object.entries(signal.endpoint).sort(([keyA], [keyB]) => keyA > keyB ? 1 : -1).filter(([key, gqlMeta]) => gqlMeta.signalOption?.onlyFor !== "restapi").filter(([key, gqlMeta]) => {
+    if (gqlMeta.type !== "query" && gqlMeta.type !== "mutation")
       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)(GraphQLEndpoint, { sigRef, gqlMeta, open: openAll }, idx)) });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: gqlInfos.map(([gqlKey, gqlMeta], idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GraphQLEndpoint, { refName, gqlKey, gqlMeta, open: openAll }, idx)) });
 };
 GraphQL.Endpoints = GraphQLEndpoints;
-const GraphQLEndpoint = ({ sigRef, gqlMeta, open }) => {
+const GraphQLEndpoint = ({ refName, gqlKey, gqlMeta, open }) => {
   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 gqlArgMetas = argMetas.filter((argMeta) => argMeta.type !== "Upload");
-  const uploadArgMetas = argMetas.filter((argMeta) => argMeta.type === "Upload");
   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 text-xl", 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 }),
-      gqlMeta.key,
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: `btn btn-xs w-16 ${gqlMeta.type === "query" ? "btn-success" : "btn-accent"}`, children: gqlMeta.type }),
+      gqlKey,
       " ",
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "text-sm", children: [
         "(",
-        l.api(sigMeta.refName, gqlMeta.key),
+        l._(`${refName}.signal.${gqlKey}`),
         ")"
       ] })
     ] }) }),
@@ -92,9 +88,9 @@ const GraphQLEndpoint = ({ sigRef, gqlMeta, open }) => {
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "mt-4 text-lg", 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" : ""}`,
@@ -105,7 +101,7 @@ const GraphQLEndpoint = ({ sigRef, gqlMeta, open }) => {
         ] }) : 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: [
@@ -136,31 +132,25 @@ const GraphQLEndpoint = ({ sigRef, gqlMeta, open }) => {
           }
         )
       ] }),
-      viewStatus === "doc" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        GraphQLInterface,
-        {
-          sigRef,
-          gqlMeta,
-          gqlArgMetas,
-          uploadArgMetas
-        }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GraphQLTry, { sigRef, gqlMeta, gqlArgMetas, uploadArgMetas })
+      viewStatus === "doc" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GraphQLInterface, { refName, gqlKey, gqlMeta }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GraphQLTry, { gqlKey, gqlMeta })
     ] })
   ] });
 };
 GraphQL.Endpoint = GraphQLEndpoint;
-const GraphQLInterface = ({ sigRef, gqlMeta, gqlArgMetas, uploadArgMetas }) => {
-  const sigMeta = (0, import_signal.getSigMeta)(sigRef);
-  const [returnRef, arrDepth] = (0, import_base.getNonArrayModel)(gqlMeta.returns());
+const GraphQLInterface = ({ refName, gqlKey, gqlMeta }) => {
+  const returnRef = import_constant.constantInfo.getModelRef(gqlMeta.returns.refName, gqlMeta.returns.modelType);
+  const arrDepth = gqlMeta.returns.arrDepth;
   const isReturnModelType = !(0, import_base.isGqlScalar)(returnRef);
+  const uploadArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Upload");
+  const gqlArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type !== "Upload");
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex 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", 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,
     gqlArgMetas.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "text-start", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "text-start text-xl font-bold", children: "Variables" }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 mt-3 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { sigMeta, gqlMeta, argMetas: gqlArgMetas }) })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "bg-base-100 mt-3 overflow-x-auto rounded-md p-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Arg.default.Table, { refName, gqlKey, argMetas: gqlArgMetas }) })
     ] }) : 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-col", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full text-start md:w-full", children: [
@@ -173,27 +163,21 @@ const GraphQLInterface = ({ sigRef, gqlMeta, gqlArgMetas, uploadArgMetas }) => {
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full text-start md:w-full", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "text-xl font-bold", children: "Response Example" }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "mt-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Response.default.Example, { sigRef, gqlMeta }) })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "mt-3", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Response.default.Example, { gqlMeta }) })
       ] })
     ] }) })
   ] });
 };
 GraphQL.Interface = GraphQLInterface;
-const GraphQLTry = ({ sigRef, gqlMeta, gqlArgMetas, uploadArgMetas }) => {
+const GraphQLTry = ({ gqlKey, gqlMeta }) => {
   const tryJwt = import_store.st.use.tryJwt();
-  const [modelRef, arrDepth] = (0, import_base.getNonArrayModel)(gqlMeta.returns());
+  const modelRef = import_constant.constantInfo.getModelRef(gqlMeta.returns.refName, gqlMeta.returns.modelType);
+  const uploadArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type === "Upload");
+  const gqlArgMetas = gqlMeta.args.filter((argMeta) => argMeta.type !== "Upload");
   const isScalar = (0, import_base.isGqlScalar)(modelRef);
-  const returnRef = isScalar || arrDepth === 0 ? modelRef : import_constant.constantInfo.isFull(modelRef) ? import_constant.constantInfo.getDatabase(import_constant.constantInfo.getRefName(modelRef)).light : modelRef;
-  const gqlStr = (0, import_react.useMemo)(
-    () => (0, import_signal.getGqlStr)(
-      modelRef,
-      gqlMeta.key,
-      [...gqlArgMetas, ...uploadArgMetas].sort((a, b) => a.idx - b.idx),
-      returnRef
-    ),
-    []
-  );
-  const requestExample = (0, import_react.useMemo)(() => JSON.stringify((0, import_signal.makeRequestExample)(sigRef, gqlMeta.key), null, 2), []);
+  const returnRef = isScalar || gqlMeta.returns.arrDepth === 0 ? modelRef : import_constant.constantInfo.isFull(modelRef) ? import_constant.constantInfo.getDatabase(import_constant.constantInfo.getRefName(modelRef)).light : modelRef;
+  const gqlStr = (0, import_react.useMemo)(() => (0, import_signal.getGqlStr)(modelRef, gqlKey, gqlMeta, returnRef), []);
+  const requestExample = (0, import_react.useMemo)(() => JSON.stringify((0, import_signal.makeRequestExample)(gqlMeta), null, 2), []);
   const [gqlRequest, setGqlRequest] = (0, import_react.useState)(requestExample);
   const [uploadRequest, setUploadRequest] = (0, import_react.useState)({});
   const [response, setResponse] = (0, import_react.useState)({
@@ -203,8 +187,8 @@ const GraphQLTry = ({ sigRef, gqlMeta, gqlArgMetas, uploadArgMetas }) => {
   const onSend = async () => {
     setResponse({ status: "loading", data: null });
     const request = { ...JSON.parse(gqlRequest), ...uploadRequest };
-    const argData = [...gqlArgMetas, ...uploadArgMetas].sort((a, b) => a.idx - b.idx).map((argMeta) => request[argMeta.name]);
-    const fetchFn = import_signal.fetch[gqlMeta.key].bind(import_signal.fetch);
+    const argData = gqlMeta.args.map((argMeta) => request[argMeta.name]);
+    const fetchFn = import_signal.fetch[gqlKey].bind(import_signal.fetch);
     const data = await fetchFn(...argData, {
       token: tryJwt,
       onError: (data2) => {
@@ -219,6 +203,7 @@ const GraphQLTry = ({ sigRef, gqlMeta, gqlArgMetas, uploadArgMetas }) => {
       uploadArgMetas.map((argMeta) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_Arg.default.FormData,
         {
+          gqlKey,
           argMeta,
           value: uploadRequest[argMeta.name],
           onChange: (fileList) => {