@akanjs/signal 0.9.56 → 0.9.57

package/esm/src/signalDecorators.js

@@ -6,13 +6,12 @@ import {
   JSON,
   scalarArgMap
 } from "@akanjs/base";
-import { applyMixins, capitalize, lowerlize } from "@akanjs/common";
+import { applyMixins, capitalize } from "@akanjs/common";
 import { constantInfo } from "@akanjs/constant";
 import { sliceInit } from ".";
 import { makeApiBuilder } from "./apiInfo";
 import { makeInternalApiBuilder } from "./internalApiInfo";
 import { signalInfo } from "./signalInfo";
-const ssoTypes = ["github", "google", "facebook", "apple", "naver", "kakao"];
 class SignalStorage {
 }
 const getAllSignalRefs = () => {
@@ -33,21 +32,7 @@ const done = (data) => data;
 const subscribe = () => void 0;
 const signalTypes = ["graphql", "restapi"];
 const endpointTypes = ["Query", "Mutation", "Message", "Pubsub", "Process", "Schedule", "ResolveField"];
-const guardTypes = ["Public", "None", "User", "Admin", "SuperAdmin", "Every", "Owner"];
-const roleTypes = ["Public", "User", "Admin", "SuperAdmin"];
 const argTypes = ["Body", "Param", "Query", "Upload", "Msg", "Room"];
-const internalArgTypes = [
-  "Account",
-  "Me",
-  "Self",
-  "UserIp",
-  "Access",
-  "Parent",
-  "Req",
-  "Res",
-  "Ws",
-  "Job"
-];
 const getDefaultArg = (argRef) => {
   const [modelRef, arrDepth] = getNonArrayModel(argRef);
   if (arrDepth)
@@ -58,232 +43,10 @@ const getDefaultArg = (argRef) => {
   else
     return {};
 };
-const createArgMetaDecorator = (type) => {
-  return function(option = {}) {
-    return function(prototype, key, idx) {
-      const argMetas = getArgMetasOnPrototype(prototype, key);
-      argMetas[idx] = { key, idx, type, option };
-      setArgMetasOnPrototype(prototype, key, argMetas);
-    };
-  };
-};
-const Account = createArgMetaDecorator("Account");
 const defaultAccount = {
-  __InternalArg__: "Account",
   appName: baseEnv.appName,
   environment: baseEnv.environment
 };
-const Self = createArgMetaDecorator("Self");
-const Me = createArgMetaDecorator("Me");
-const UserIp = createArgMetaDecorator("UserIp");
-const Access = createArgMetaDecorator("Access");
-const Req = createArgMetaDecorator("Req");
-const Res = createArgMetaDecorator("Res");
-const Ws = createArgMetaDecorator("Ws");
-const Job = createArgMetaDecorator("Job");
-const getQuery = (allow) => function(returns, signalOption = {}, guards = []) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns,
-      signalOption,
-      key,
-      descriptor,
-      guards: [allow, ...guards],
-      type: "Query"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getMutation = (allow) => function(returns, signalOption = {}, guards = []) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns,
-      signalOption,
-      key,
-      descriptor,
-      guards: [allow, ...guards],
-      type: "Mutation"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getMessage = (allow) => function(returns, signalOption = {}, guards = []) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns,
-      signalOption,
-      key,
-      descriptor,
-      guards: [allow, ...guards],
-      type: "Message"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getPubsub = (allow) => function(returns, signalOption = {}, guards = []) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns,
-      signalOption,
-      key,
-      descriptor,
-      guards: [allow, ...guards],
-      type: "Pubsub"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getProcess = (serverMode) => function(returns, signalOption = {}) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns,
-      signalOption: { ...signalOption, serverMode: lowerlize(serverMode) },
-      key,
-      descriptor,
-      guards: ["None"],
-      type: "Process"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getScheduleInit = (scheduleType) => function(signalOption = {}) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns: () => JSON,
-      signalOption: { enabled: true, ...signalOption, scheduleType: lowerlize(scheduleType) },
-      key,
-      descriptor,
-      guards: ["None"],
-      type: "Schedule"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getScheduleCron = () => function(cron, signalOption = {}) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns: () => JSON,
-      signalOption: { enabled: true, lock: true, ...signalOption, scheduleType: "cron", scheduleCron: cron },
-      key,
-      descriptor,
-      guards: ["None"],
-      type: "Schedule"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getScheduleInterval = () => function(interval, signalOption = {}) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns: () => JSON,
-      signalOption: { enabled: true, lock: true, ...signalOption, scheduleType: "interval", scheduleTime: interval },
-      key,
-      descriptor,
-      guards: ["None"],
-      type: "Schedule"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const getScheduleTimeout = () => function(timeout, signalOption = {}) {
-  return (prototype, key, descriptor) => {
-    const metadataMap = getGqlMetaMapOnPrototype(prototype);
-    metadataMap.set(key, {
-      returns: () => JSON,
-      signalOption: { enabled: true, lock: true, ...signalOption, scheduleType: "timeout", scheduleTime: timeout },
-      key,
-      descriptor,
-      guards: ["None"],
-      type: "Schedule"
-    });
-    setGqlMetaMapOnPrototype(prototype, metadataMap);
-  };
-};
-const Query = {
-  Public: getQuery("Public"),
-  Every: getQuery("Every"),
-  Admin: getQuery("Admin"),
-  User: getQuery("User"),
-  SuperAdmin: getQuery("SuperAdmin"),
-  None: getQuery("None"),
-  Owner: getQuery("Owner")
-};
-const Mutation = {
-  Public: getMutation("Public"),
-  Every: getMutation("Every"),
-  Admin: getMutation("Admin"),
-  User: getMutation("User"),
-  SuperAdmin: getMutation("SuperAdmin"),
-  None: getMutation("None"),
-  Owner: getMutation("Owner")
-};
-const Message = {
-  Public: getMessage("Public"),
-  Every: getMessage("Every"),
-  Admin: getMessage("Admin"),
-  User: getMessage("User"),
-  SuperAdmin: getMessage("SuperAdmin"),
-  None: getMessage("None"),
-  Owner: getMessage("Owner")
-};
-const Pubsub = {
-  Public: getPubsub("Public"),
-  Every: getPubsub("Every"),
-  Admin: getPubsub("Admin"),
-  User: getPubsub("User"),
-  SuperAdmin: getPubsub("SuperAdmin"),
-  None: getPubsub("None"),
-  Owner: getPubsub("Owner")
-};
-const Process = {
-  Federation: getProcess("Federation"),
-  Batch: getProcess("Batch"),
-  All: getProcess("All")
-};
-const Schedule = {
-  Init: getScheduleInit("Init"),
-  Cron: getScheduleCron(),
-  Interval: getScheduleInterval(),
-  Timeout: getScheduleTimeout(),
-  Destroy: getScheduleInit("Destroy")
-};
-function ResolveField(returns, argsOption = {}) {
-  return function(target, key, descriptor) {
-    const metadataMap = getResolveFieldMetaMapOnPrototype(target);
-    metadataMap.set(key, { returns, argsOption, key, descriptor });
-    Reflect.defineMetadata("resolveField", metadataMap, target);
-  };
-}
-const getArg = (type) => function(name, returns, argsOption = {}) {
-  return function(prototype, key, idx) {
-    const argMetas = getArgMetasOnPrototype(prototype, key);
-    argMetas[idx] = { name, returns, argsOption, key, idx, type };
-    setArgMetasOnPrototype(prototype, key, argMetas);
-  };
-};
-const Arg = {
-  Body: getArg("Body"),
-  Param: getArg("Param"),
-  Query: getArg("Query"),
-  Upload: getArg("Upload"),
-  Msg: getArg("Msg"),
-  Room: getArg("Room")
-};
-function Parent() {
-  return function(prototype, key, idx) {
-    const argMetas = getArgMetasOnPrototype(prototype, key);
-    argMetas[idx] = { key, idx, type: "Parent" };
-    setArgMetasOnPrototype(prototype, key, argMetas);
-  };
-}
 function internal(srv, internalBuilder, ...libInternals) {
   const sigRef = libInternals.at(0) ?? class Internal {
   };
@@ -311,37 +74,44 @@ function slice(srv, option, sliceBuilder, ...libSlices) {
     updateModel: `update${className}`,
     removeModel: `remove${className}`
   };
-  const getGuard = option.guards?.get ?? "Public";
-  const cruGuard = option.guards?.cru ?? "Public";
-  const init = sliceInit(srv.cnst.full, srv.cnst.light, srv.cnst.insight);
+  const rootGuards = option.guards?.root ? Array.isArray(option.guards.root) ? option.guards.root : [option.guards.root] : [];
+  const getGuards = option.guards?.get ? Array.isArray(option.guards.get) ? option.guards.get : [option.guards.get] : [];
+  const cruGuards = option.guards?.cru ? Array.isArray(option.guards.cru) ? option.guards.cru : [option.guards.cru] : [];
+  const init = sliceInit(modelName, srv.cnst.full, srv.cnst.light, srv.cnst.insight);
   const { query, mutation } = makeApiBuilder();
   const buildSlice = {
-    [""]: init("Admin").search("query", JSON).exec(function(query2) {
-      return query2 ?? {};
-    }),
+    ...rootGuards.length > 0 ? {
+      [""]: init({ guards: rootGuards }).search("query", JSON).exec(function(query2) {
+        return query2 ?? {};
+      })
+    } : {},
     ...sliceBuilder(init)
   };
   const buildEndpoint = {
-    [names.model]: query(srv.cnst.full, getGuard).param(names.modelId, ID).exec(async function(modelId) {
-      const service = this[names.modelService];
-      return await service[names.getModel](modelId);
-    }),
-    [names.lightModel]: query(srv.cnst.light, getGuard).param(names.modelId, ID).exec(async function(modelId) {
-      const service = this[names.modelService];
-      return await service[names.getModel](modelId);
-    }),
-    [names.createModel]: mutation(srv.cnst.full, cruGuard).body("data", srv.cnst.input).exec(async function(data) {
-      const service = this[names.modelService];
-      return await service[names.createModel](data);
-    }),
-    [names.updateModel]: mutation(srv.cnst.full, cruGuard).param(names.modelId, ID).body("data", srv.cnst.input).exec(async function(modelId, data) {
-      const service = this[names.modelService];
-      return await service[names.updateModel](modelId, data);
-    }),
-    [names.removeModel]: mutation(srv.cnst.full, { partial: ["removedAt"] }, cruGuard).param(names.modelId, ID).exec(async function(modelId) {
-      const service = this[names.modelService];
-      return await service[names.removeModel](modelId);
-    })
+    ...getGuards.length > 0 ? {
+      [names.model]: query(srv.cnst.full, { guards: getGuards }).param(names.modelId, ID).exec(async function(modelId) {
+        const service = this[names.modelService];
+        return await service[names.getModel](modelId);
+      }),
+      [names.lightModel]: query(srv.cnst.light, { guards: getGuards }).param(names.modelId, ID).exec(async function(modelId) {
+        const service = this[names.modelService];
+        return await service[names.getModel](modelId);
+      })
+    } : {},
+    ...cruGuards.length > 0 ? {
+      [names.createModel]: mutation(srv.cnst.full, { guards: cruGuards }).body("data", srv.cnst.input).exec(async function(data) {
+        const service = this[names.modelService];
+        return await service[names.createModel](data);
+      }),
+      [names.updateModel]: mutation(srv.cnst.full, { guards: cruGuards }).param(names.modelId, ID).body("data", srv.cnst.input).exec(async function(modelId, data) {
+        const service = this[names.modelService];
+        return await service[names.updateModel](modelId, data);
+      }),
+      [names.removeModel]: mutation(srv.cnst.full, { partial: ["removedAt"], guards: cruGuards }).param(names.modelId, ID).exec(async function(modelId) {
+        const service = this[names.modelService];
+        return await service[names.removeModel](modelId);
+      })
+    } : {}
   };
   Object.entries(buildSlice).forEach(([key, slice2]) => {
     if (!srv.cnst)
@@ -353,8 +123,8 @@ function slice(srv, option, sliceBuilder, ...libSlices) {
   });
   return sigRef;
 }
-function endpoint(srv, builder, ...libSignals) {
-  const sigRef = libSignals.at(0) ?? class Signal {
+function endpoint(srv, builder, ...libEndpoints) {
+  const sigRef = libEndpoints.at(0) ?? class Signal {
   };
   signalInfo.setRefNameTemp(sigRef, srv.refName);
   const apiInfoMap = builder(makeApiBuilder());
@@ -363,36 +133,39 @@ function endpoint(srv, builder, ...libSignals) {
   });
   return sigRef;
 }
-const mergeSignals = (signalRef, internalRef, sliceRef) => {
-  applyMixins(signalRef, [internalRef]);
-  const gqlMetaMap = getGqlMetaMapOnPrototype(signalRef.prototype);
-  const resolveFieldMetaMap = getResolveFieldMetaMapOnPrototype(signalRef.prototype);
-  setResolveFieldMetaMapOnPrototype(signalRef.prototype, resolveFieldMetaMap);
+const mergeSignals = (endpointRef, internalRef, sliceRef) => {
+  applyMixins(endpointRef, [internalRef]);
+  const gqlMetaMap = getGqlMetaMapOnPrototype(endpointRef.prototype);
+  const resolveFieldMetaMap = getResolveFieldMetaMapOnPrototype(endpointRef.prototype);
+  setResolveFieldMetaMapOnPrototype(endpointRef.prototype, resolveFieldMetaMap);
   const internalGqlMetaMap = getGqlMetaMapOnPrototype(internalRef.prototype);
   const internalResolveFieldMetaMap = getResolveFieldMetaMapOnPrototype(internalRef.prototype);
   internalGqlMetaMap.forEach((value, key) => {
     gqlMetaMap.set(key, value);
     const [argMetas, internalArgMetas] = getArgMetas(internalRef, key);
-    setArgMetas(signalRef, key, argMetas, internalArgMetas);
+    setArgMetas(endpointRef, key, argMetas, internalArgMetas);
   });
   internalResolveFieldMetaMap.forEach((value, key) => {
     resolveFieldMetaMap.set(key, value);
     const [argMetas, internalArgMetas] = getArgMetas(internalRef, key);
-    setArgMetas(signalRef, key, argMetas, internalArgMetas);
+    setArgMetas(endpointRef, key, argMetas, internalArgMetas);
   });
   if (sliceRef) {
     const sliceGqlMetaMap = getGqlMetaMapOnPrototype(sliceRef.prototype);
-    applyMixins(signalRef, [sliceRef], /* @__PURE__ */ new Set([...gqlMetaMap.keys()]));
+    applyMixins(endpointRef, [sliceRef], /* @__PURE__ */ new Set([...gqlMetaMap.keys()]));
     sliceGqlMetaMap.forEach((value, key) => {
       if (gqlMetaMap.has(key))
         return;
       gqlMetaMap.set(key, value);
       const [argMetas, internalArgMetas] = getArgMetas(sliceRef, key);
-      setArgMetas(signalRef, key, argMetas, internalArgMetas);
+      setArgMetas(endpointRef, key, argMetas, internalArgMetas);
     });
   }
-  setGqlMetaMapOnPrototype(signalRef.prototype, gqlMetaMap);
-  return signalRef;
+  setGqlMetaMapOnPrototype(endpointRef.prototype, gqlMetaMap);
+  return endpointRef;
+};
+const serverSignalOf = (sigRef) => {
+  return sigRef;
 };
 const getSigMeta = (sigRef) => {
   const sigMeta = Reflect.getMetadata("signal", sigRef.prototype);
@@ -477,28 +250,9 @@ const copySignal = (sigRef) => {
   return CopiedSignal;
 };
 export {
-  Access,
-  Account,
-  Arg,
-  Job,
-  Me,
-  Message,
-  Mutation,
-  Parent,
-  Process,
-  Pubsub,
-  Query,
-  Req,
-  Res,
-  ResolveField,
-  Schedule,
-  Self,
   SignalStorage,
-  UserIp,
-  Ws,
   argTypes,
   copySignal,
-  createArgMetaDecorator,
   defaultAccount,
   done,
   emit,
@@ -516,18 +270,15 @@ export {
   getResolveFieldMetas,
   getSigMeta,
   getSignalRefsOnStorage,
-  guardTypes,
   internal,
-  internalArgTypes,
   mergeSignals,
   resolve,
-  roleTypes,
+  serverSignalOf,
   setArgMetas,
   setGqlMetaMapOnPrototype,
   setSigMeta,
   setSignalRefOnStorage,
   signalTypes,
   slice,
-  ssoTypes,
   subscribe
 };

package/esm/src/signalInfo.js

@@ -129,7 +129,14 @@ const signalInfo = {
       const refName2 = isGqlScalar ? scalarNameMap.get(returnRef) : constantInfo.getRefName(returnRef);
       serializedSignal.endpoint[key] = {
         type: 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] = getNonArrayModel(argMeta.returns());
@@ -158,6 +165,7 @@ const signalInfo = {
     return signalInfo.buildFetch(signalInfo.serializedSignals);
   },
   buildFetch(signals = [], cnstInfo = 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/esm/src/sliceInfo.js

@@ -1,4 +1,9 @@
-import { arraiedModel, Enum, getNonArrayModel, Int } from "@akanjs/base";
+import {
+  arraiedModel,
+  getNonArrayModel,
+  Int,
+  isEnum
+} from "@akanjs/base";
 import { capitalize } from "@akanjs/common";
 import {
   getGqlMetaMapOnPrototype,
@@ -7,31 +12,28 @@ import {
 } from "./signalDecorators";
 import { signalInfo } from "./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;
   }
@@ -40,12 +42,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;
   }
@@ -70,11 +74,15 @@ class SliceInfo {
     const gqlMetaMap = getGqlMetaMapOnPrototype(sigRef.prototype);
     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
@@ -132,7 +140,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);
@@ -158,7 +165,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);
@@ -171,7 +177,7 @@ class SliceInfo {
     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);
 export {
   SliceInfo,
   sliceInit

package/package.json

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