@akanjs/signal 0.9.55 → 0.9.57

package/cjs/src/signalInfo.js

@@ -143,7 +143,14 @@ const signalInfo = {
       const refName2 = isGqlScalar ? import_base.scalarNameMap.get(returnRef) : import_constant.constantInfo.getRefName(returnRef);
       serializedSignal.endpoint[key] = {
         type: (0, import_common.lowerlize)(gqlMeta.type),
-        signalOption: gqlMeta.signalOption,
+        signalOption: {
+          nullable: gqlMeta.signalOption.nullable,
+          path: gqlMeta.signalOption.path,
+          onlyFor: gqlMeta.signalOption.onlyFor,
+          partial: gqlMeta.signalOption.partial,
+          guards: gqlMeta.signalOption.guards?.map((guard) => guard.name),
+          name: gqlMeta.signalOption.name
+        },
         returns: { refName: refName2, modelType, arrDepth },
         args: argMetas.map((argMeta) => {
           const [argRef, arrDepth2] = (0, import_base.getNonArrayModel)(argMeta.returns());
@@ -172,6 +179,7 @@ const signalInfo = {
     return signalInfo.buildFetch(signalInfo.serializedSignals);
   },
   buildFetch(signals = [], cnstInfo = import_constant.constantInfo) {
+    global.signals = signals;
     const databaseSignals = signals.filter((signal) => cnstInfo.database.has(signal.refName));
     const serviceSignals = signals.filter((signal) => !cnstInfo.database.has(signal.refName));
     const fetchComponent = Object.assign(

package/cjs/src/sliceInfo.js

@@ -26,31 +26,28 @@ var import_common = require("@akanjs/common");
 var import_signalDecorators = require("./signalDecorators");
 var import_signalInfo = require("./signalInfo");
 class SliceInfo {
+  refName;
   full;
   light;
   insight;
+  argNames = [];
   args = [];
   internalArgs = [];
   signalOption;
-  guards;
   execFn = null;
-  constructor(full, light, insight, signalOptionOrGuard, ...guards) {
+  constructor(refName, full, light, insight, signalOption = {}) {
+    this.refName = refName;
     this.full = full;
     this.light = light;
     this.insight = insight;
-    this.signalOption = typeof signalOptionOrGuard === "string" ? {} : signalOptionOrGuard ?? {};
-    this.guards = [
-      .../* @__PURE__ */ new Set([
-        ...guards,
-        ...typeof signalOptionOrGuard === "string" ? [signalOptionOrGuard] : ["Public"]
-      ])
-    ];
+    this.signalOption = signalOption;
   }
   param(name, argRef, option) {
     if (this.execFn)
       throw new Error("Query function is already set");
     else if (this.args.at(-1)?.option?.nullable)
       throw new Error("Last argument is nullable");
+    this.argNames.push(name);
     this.args.push({ type: "Param", name, argRef, option });
     return this;
   }
@@ -59,12 +56,14 @@ class SliceInfo {
       throw new Error("Query function is already set");
     else if (this.args.at(-1)?.option?.nullable)
       throw new Error("Last argument is nullable");
+    this.argNames.push(name);
     this.args.push({ type: "Body", name, argRef, option });
     return this;
   }
   search(name, argRef, option) {
     if (this.execFn)
       throw new Error("Query function is already set");
+    this.argNames.push(name);
     this.args.push({ type: "Query", name, argRef, option: { ...option, nullable: true } });
     return this;
   }
@@ -89,11 +88,15 @@ class SliceInfo {
     const gqlMetaMap = (0, import_signalDecorators.getGqlMetaMapOnPrototype)(sigRef.prototype);
     const argMetas = this.args.map((arg, idx) => {
       const [singleArgRef, argArrDepth] = (0, import_base.getNonArrayModel)(arg.argRef);
-      const returnRef = (0, import_base.arraiedModel)(singleArgRef instanceof import_base.Enum ? singleArgRef.type : singleArgRef, argArrDepth);
+      const isEnumValue = (0, import_base.isEnum)(singleArgRef);
+      const returnRef = (0, import_base.arraiedModel)(
+        isEnumValue ? singleArgRef.type : singleArgRef,
+        argArrDepth
+      );
       return {
         name: arg.name,
         returns: () => returnRef,
-        argsOption: { ...arg.option, enum: arg.argRef instanceof import_base.Enum ? arg.argRef : void 0 },
+        argsOption: { ...arg.option, enum: isEnumValue ? arg.argRef : void 0 },
         key,
         idx,
         type: arg.type
@@ -151,7 +154,6 @@ class SliceInfo {
       signalOption: this.signalOption,
       key: listKey,
       descriptor: { value: listFn, writable: true, enumerable: false, configurable: true },
-      guards: this.guards,
       type: "Query"
     };
     gqlMetaMap.set(listKey, listApiMeta);
@@ -177,7 +179,6 @@ class SliceInfo {
       signalOption: this.signalOption,
       key: insightKey,
       descriptor: { value: insightFn, writable: true, enumerable: false, configurable: true },
-      guards: this.guards,
       type: "Query"
     };
     gqlMetaMap.set(insightKey, insightApiMeta);
@@ -190,4 +191,4 @@ class SliceInfo {
     (0, import_signalDecorators.setGqlMetaMapOnPrototype)(sigRef.prototype, gqlMetaMap);
   }
 }
-const sliceInit = (full, light, insight) => (signalOptionOrGuard, ...guards) => new SliceInfo(full, light, insight, signalOptionOrGuard, ...guards);
+const sliceInit = (refName, full, light, insight) => (signalOption) => new SliceInfo(refName, full, light, insight, signalOption);

package/esm/src/apiInfo.js

@@ -1,4 +1,8 @@
-import { arraiedModel, Enum, getNonArrayModel } from "@akanjs/base";
+import {
+  arraiedModel,
+  getNonArrayModel,
+  isEnum
+} from "@akanjs/base";
 import {
   getGqlMetaMapOnPrototype,
   setArgMetas,
@@ -7,34 +11,30 @@ import {
 import { signalInfo } from "./signalInfo";
 class ApiInfo {
   type;
+  argNames = [];
   args = [];
   internalArgs = [];
   returnRef;
   signalOption;
-  guards;
   execFn = null;
-  constructor(type, returnRef, signalOptionOrGuard, ...guards) {
+  constructor(type, returnRef, signalOption = {}) {
     this.type = type;
     this.returnRef = returnRef;
-    this.signalOption = typeof signalOptionOrGuard === "string" ? {} : signalOptionOrGuard ?? {};
-    this.guards = [
-      .../* @__PURE__ */ new Set([
-        ...guards,
-        ...typeof signalOptionOrGuard === "string" ? [signalOptionOrGuard] : ["Public"]
-      ])
-    ];
+    this.signalOption = signalOption;
   }
   param(name, argRef, option) {
     if (this.execFn)
       throw new Error("Query function is already set");
     else if (this.args.at(-1)?.option?.nullable)
       throw new Error("Last argument is nullable");
+    this.argNames.push(name);
     this.args.push({ type: "Param", name, argRef, option });
     return this;
   }
   body(name, argRef, option) {
     if (this.execFn)
       throw new Error("Query function is already set");
+    this.argNames.push(name);
     this.args.push({ type: "Body", name, argRef, option });
     return this;
   }
@@ -43,6 +43,7 @@ class ApiInfo {
       throw new Error("Query function is already set");
     else if (this.args.at(-1)?.option?.nullable)
       throw new Error("Last argument is nullable");
+    this.argNames.push(name);
     this.args.push({ type: "Room", name, argRef, option });
     return this;
   }
@@ -51,12 +52,14 @@ class ApiInfo {
       throw new Error("Query function is already set");
     else if (this.args.at(-1)?.option?.nullable)
       throw new Error("Last argument is nullable");
+    this.argNames.push(name);
     this.args.push({ type: "Msg", name, argRef, option });
     return this;
   }
   search(name, argRef, option) {
     if (this.execFn)
       throw new Error("Query function is already set");
+    this.argNames.push(name);
     this.args.push({ type: "Query", name, argRef, option: { ...option, nullable: true } });
     return this;
   }
@@ -86,13 +89,12 @@ class ApiInfo {
     const [singleReturnRef, returnArrDepth] = getNonArrayModel(this.returnRef);
     const apiMeta = {
       returns: () => arraiedModel(
-        singleReturnRef instanceof Enum ? singleReturnRef.type : singleReturnRef,
+        isEnum(singleReturnRef) ? singleReturnRef.type : singleReturnRef,
         returnArrDepth
       ),
       signalOption: this.signalOption,
       key,
       descriptor: { value: this.execFn, writable: true, enumerable: false, configurable: true },
-      guards: this.guards,
       type: ApiInfo.#typeTempMap[this.type]
     };
     sigRef.prototype[key] = this.execFn;
@@ -101,11 +103,15 @@ class ApiInfo {
     setGqlMetaMapOnPrototype(sigRef.prototype, metadataMap);
     const argMetas = this.args.map((arg, idx) => {
       const [singleArgRef, argArrDepth] = getNonArrayModel(arg.argRef);
-      const returnRef = arraiedModel(singleArgRef instanceof Enum ? singleArgRef.type : singleArgRef, argArrDepth);
+      const isEnumValue = isEnum(singleArgRef);
+      const returnRef = arraiedModel(
+        isEnumValue ? singleArgRef.type : singleArgRef,
+        argArrDepth
+      );
       return {
         name: arg.name,
         returns: () => returnRef,
-        argsOption: { ...arg.option, enum: arg.argRef instanceof Enum ? arg.argRef : void 0 },
+        argsOption: { ...arg.option, enum: isEnumValue ? arg.argRef : void 0 },
         key,
         idx,
         type: arg.type
@@ -121,30 +127,10 @@ class ApiInfo {
   }
 }
 const makeApiBuilder = () => ({
-  query: (returnRef, signalOptionOrGuard, ...guards) => new ApiInfo(
-    "query",
-    returnRef,
-    signalOptionOrGuard,
-    ...guards
-  ),
-  mutation: (returnRef, signalOptionOrGuard, ...guards) => new ApiInfo(
-    "mutation",
-    returnRef,
-    signalOptionOrGuard,
-    ...guards
-  ),
-  pubsub: (returnRef, signalOptionOrGuard, ...guards) => new ApiInfo(
-    "pubsub",
-    returnRef,
-    signalOptionOrGuard,
-    ...guards
-  ),
-  message: (returnRef, signalOptionOrGuard, ...guards) => new ApiInfo(
-    "message",
-    returnRef,
-    signalOptionOrGuard,
-    ...guards
-  )
+  query: (returnRef, signalOption) => new ApiInfo("query", returnRef, signalOption),
+  mutation: (returnRef, signalOption) => new ApiInfo("mutation", returnRef, signalOption),
+  pubsub: (returnRef, signalOption) => new ApiInfo("pubsub", returnRef, signalOption),
+  message: (returnRef, signalOption) => new ApiInfo("message", returnRef, signalOption)
 });
 export {
   ApiInfo,

package/esm/src/base.signal.js

@@ -1,6 +1,6 @@
 import { JSON } from "@akanjs/base";
 import { getAllDictionary, getDictionary } from "@akanjs/dictionary";
-import { endpoint, internal, mergeSignals } from "./signalDecorators";
+import { endpoint, internal, mergeSignals, serverSignalOf } from "./signalDecorators";
 import { signalInfo } from "./signalInfo";
 const srvBase = { refName: "base" };
 class BaseInternal extends internal(srvBase, ({ interval }) => ({
@@ -57,7 +57,10 @@ class BaseEndpoint extends endpoint(srvBase, ({ query, mutation, message, pubsub
 }
 class BaseSignal extends mergeSignals(BaseEndpoint, BaseInternal) {
 }
+class Base extends serverSignalOf(BaseSignal) {
+}
 export {
+  Base,
   BaseEndpoint,
   BaseInternal,
   BaseSignal

package/esm/src/doc.js

@@ -1,6 +1,5 @@
 import { arraiedModel, getNonArrayModel, isGqlScalar, JSON as GqlJSON } from "@akanjs/base";
-import { getFieldMetas, getScalarExample } from "@akanjs/constant";
-import { getArgMetas, getGqlMeta } from "./signalDecorators";
+import { constantInfo, getFieldMetas, getScalarExample } from "@akanjs/constant";
 class ResponseExampleStorage {
 }
 const getPredefinedRequestExample = (modelRef) => {
@@ -53,26 +52,25 @@ const getRequestExample = (ref) => {
   Reflect.defineMetadata(ref, example, RequestExampleStorage.prototype);
   return example;
 };
-const makeRequestExample = (sigRef, key) => {
-  const [argMetas] = getArgMetas(sigRef, key);
-  return getExampleData(argMetas);
+const makeRequestExample = (gqlMeta) => {
+  return getExampleData(gqlMeta.args);
 };
 const getExampleData = (argMetas, signalType = "graphql") => Object.fromEntries(
   argMetas.filter((argMeta) => argMeta.type !== "Upload").map((argMeta) => {
-    const [argRef, argArrDepth] = getNonArrayModel(argMeta.returns());
+    const argRef = constantInfo.getModelRef(argMeta.refName, argMeta.modelType);
     const example = argMeta.argsOption.example ?? getRequestExample(argRef);
     return [
       argMeta.name,
       arraiedModel(
         signalType === "restapi" && argRef.prototype === GqlJSON.prototype ? JSON.stringify(example, null, 2) : example,
-        argArrDepth
+        argMeta.arrDepth
       )
     ];
   })
 );
-const makeResponseExample = (sigRef, key) => {
-  const gqlMeta = getGqlMeta(sigRef, key);
-  const example = getResponseExample(gqlMeta.returns());
+const makeResponseExample = (gqlMeta) => {
+  const returnRef = constantInfo.getModelRef(gqlMeta.returns.refName, gqlMeta.returns.modelType);
+  const example = getResponseExample(arraiedModel(returnRef, gqlMeta.returns.arrDepth));
   return example;
 };
 export {

package/esm/src/internalApiInfo.js

@@ -1,4 +1,4 @@
-import { Enum, JSON } from "@akanjs/base";
+import { isEnum, JSON } from "@akanjs/base";
 import {
   getGqlMetaMapOnPrototype,
   getResolveFieldMetaMapOnPrototype,
@@ -9,6 +9,7 @@ class InternalApiInfo {
   type;
   args = [];
   internalArgs = [];
+  defaultArgs = [];
   returnRef;
   signalOption;
   execFn = null;
@@ -16,6 +17,10 @@ class InternalApiInfo {
     this.type = type;
     this.returnRef = returnRef;
     this.signalOption = signalOption;
+    if (type === "resolveField")
+      this.defaultArgs.push("Parent");
+    else if (type === "process")
+      this.defaultArgs.push("Job");
   }
   msg(name, argRef, option) {
     if (this.execFn)
@@ -59,12 +64,12 @@ class InternalApiInfo {
       Reflect.defineMetadata("resolveField", metadataMap, sigRef.prototype);
     } else {
       const metadataMap = getGqlMetaMapOnPrototype(sigRef.prototype);
+      const isEnumValue = isEnum(this.returnRef);
       const internalApiMeta = {
-        returns: () => this.returnRef instanceof Enum ? this.returnRef.type : this.returnRef,
+        returns: () => isEnumValue ? this.returnRef.type : this.returnRef,
         signalOption: this.signalOption,
         key,
         descriptor: { value: this.execFn, writable: true, enumerable: false, configurable: true },
-        guards: ["None"],
         type: InternalApiInfo.#typeTempMap[this.type]
       };
       sigRef.prototype[key] = this.execFn;
@@ -74,7 +79,7 @@ class InternalApiInfo {
     const argMetas = this.args.map((arg, idx) => ({
       name: arg.name,
       returns: () => arg.argRef,
-      argsOption: { ...arg.option, enum: arg.argRef instanceof Enum ? arg.argRef : void 0 },
+      argsOption: { ...arg.option, enum: isEnum(arg.argRef) ? arg.argRef : void 0 },
       key,
       idx,
       type: arg.type
@@ -82,7 +87,7 @@ class InternalApiInfo {
     const internalArgMetas = this.internalArgs.map((arg, idx) => ({
       type: arg.type,
       key,
-      idx,
+      idx: this.defaultArgs.length + this.args.length + idx,
       option: arg.option
     }));
     setArgMetas(sigRef, key, argMetas, internalArgMetas);