@akanjs/signal 0.9.51 → 0.9.53

package/cjs/src/fetchInfo.js

@@ -226,7 +226,8 @@ const databaseFetchOf = (signal, option = {}) => {
     initModel: `init${className}`,
     getModelInit: `get${className}Init`,
     addModelFiles: `add${className}Files`,
-    addFiles: `addFiles`
+    addFiles: `addFiles`,
+    modelSortKeys: `${fieldName}SortKeys`
   };
   const fetch = serviceFetchOf(signal);
   const util = {
@@ -281,7 +282,8 @@ const databaseFetchOf = (signal, option = {}) => {
     [names.getModelEdit]: async (id, option2) => {
       const modelEdit = await global.builtFetch[names.editModel](id, option2);
       return modelEdit[names.modelEdit];
-    }
+    },
+    [names.modelSortKeys]: signal.filter?.sortKeys
   };
   const sliceUtil = Object.fromEntries(
     signal.slices.reduce((acc, { sliceName, argLength, defaultArgs }) => {

package/cjs/src/internalApiInfo.js

@@ -66,29 +66,29 @@ class InternalApiInfo {
   };
   applyApiMeta(sigRef, key) {
     if (this.type === "resolveField") {
-      const metadataMap2 = (0, import_signalDecorators.getResolveFieldMetaMapOnPrototype)(sigRef.prototype);
-      metadataMap2.set(key, {
+      const metadataMap = (0, import_signalDecorators.getResolveFieldMetaMapOnPrototype)(sigRef.prototype);
+      metadataMap.set(key, {
         returns: () => this.returnRef,
         argsOption: this.signalOption,
         key,
         descriptor: { value: this.execFn, writable: true, enumerable: false, configurable: true }
       });
       sigRef.prototype[key] = this.execFn;
-      Reflect.defineMetadata("resolveField", metadataMap2, sigRef.prototype);
-      return;
+      Reflect.defineMetadata("resolveField", metadataMap, sigRef.prototype);
+    } else {
+      const metadataMap = (0, import_signalDecorators.getGqlMetaMapOnPrototype)(sigRef.prototype);
+      const internalApiMeta = {
+        returns: () => this.returnRef instanceof import_base.Enum ? 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;
+      metadataMap.set(key, internalApiMeta);
+      (0, import_signalDecorators.setGqlMetaMapOnPrototype)(sigRef.prototype, metadataMap);
     }
-    const internalApiMeta = {
-      returns: () => this.returnRef instanceof import_base.Enum ? 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;
-    const metadataMap = (0, import_signalDecorators.getGqlMetaMapOnPrototype)(sigRef.prototype);
-    metadataMap.set(key, internalApiMeta);
-    (0, import_signalDecorators.setGqlMetaMapOnPrototype)(sigRef.prototype, metadataMap);
     const argMetas = this.args.map((arg, idx) => ({
       name: arg.name,
       returns: () => arg.argRef,

package/cjs/src/signalDecorators.js

@@ -432,7 +432,7 @@ function endpoint(srv, builder, ...libSignals) {
   return sigRef;
 }
 const mergeSignals = (signalRef, internalRef, sliceRef) => {
-  (0, import_common.applyMixins)(signalRef, [internalRef, ...sliceRef ? [sliceRef] : []]);
+  (0, import_common.applyMixins)(signalRef, [internalRef]);
   const gqlMetaMap = getGqlMetaMapOnPrototype(signalRef.prototype);
   const resolveFieldMetaMap = getResolveFieldMetaMapOnPrototype(signalRef.prototype);
   setResolveFieldMetaMapOnPrototype(signalRef.prototype, resolveFieldMetaMap);
@@ -445,9 +445,12 @@ const mergeSignals = (signalRef, internalRef, sliceRef) => {
   });
   internalResolveFieldMetaMap.forEach((value, key) => {
     resolveFieldMetaMap.set(key, value);
+    const [argMetas, internalArgMetas] = getArgMetas(internalRef, key);
+    setArgMetas(signalRef, key, argMetas, internalArgMetas);
   });
   if (sliceRef) {
     const sliceGqlMetaMap = getGqlMetaMapOnPrototype(sliceRef.prototype);
+    (0, import_common.applyMixins)(signalRef, [sliceRef], /* @__PURE__ */ new Set([...gqlMetaMap.keys()]));
     sliceGqlMetaMap.forEach((value, key) => {
       if (gqlMetaMap.has(key))
         return;
@@ -459,13 +462,6 @@ const mergeSignals = (signalRef, internalRef, sliceRef) => {
   setGqlMetaMapOnPrototype(signalRef.prototype, gqlMetaMap);
   return signalRef;
 };
-function LogSignal(refName, srv, option) {
-  class BaseSignal {
-  }
-  import_signalInfo.signalInfo.setRefNameTemp(BaseSignal, refName);
-  import_signalInfo.signalInfo.setPrefixTemp(BaseSignal, option?.prefix ?? "");
-  return BaseSignal;
-}
 const getSigMeta = (sigRef) => {
   const sigMeta = Reflect.getMetadata("signal", sigRef.prototype);
   if (!sigMeta)

package/cjs/src/signalInfo.js

@@ -23,6 +23,7 @@ module.exports = __toCommonJS(signalInfo_exports);
 var import_base = require("@akanjs/base");
 var import_common = require("@akanjs/common");
 var import_constant = require("@akanjs/constant");
+var import_document = require("@akanjs/document");
 var import_client = require("./client");
 var import_fetchInfo = require("./fetchInfo");
 var import_signalDecorators = require("./signalDecorators");
@@ -124,7 +125,13 @@ const signalInfo = {
     const refName = signalInfo.getRefNameTemp(sigRef);
     const { slices, prefix } = (0, import_signalDecorators.getSigMeta)(sigRef);
     const gqlMetaMap = (0, import_signalDecorators.getGqlMetaMapOnPrototype)(sigRef.prototype);
-    const serializedSignal = { refName, slices, prefix, endpoint: {} };
+    const serializedSignal = {
+      refName,
+      slices,
+      prefix,
+      endpoint: {},
+      filter: import_document.documentInfo.getSerializedFilter(refName)
+    };
     gqlMetaMap.forEach((gqlMeta, key) => {
       if (!["Query", "Mutation", "Pubsub", "Message"].includes(gqlMeta.type))
         return;

package/esm/src/fetchInfo.js

@@ -203,7 +203,8 @@ const databaseFetchOf = (signal, option = {}) => {
     initModel: `init${className}`,
     getModelInit: `get${className}Init`,
     addModelFiles: `add${className}Files`,
-    addFiles: `addFiles`
+    addFiles: `addFiles`,
+    modelSortKeys: `${fieldName}SortKeys`
   };
   const fetch = serviceFetchOf(signal);
   const util = {
@@ -258,7 +259,8 @@ const databaseFetchOf = (signal, option = {}) => {
     [names.getModelEdit]: async (id, option2) => {
       const modelEdit = await global.builtFetch[names.editModel](id, option2);
       return modelEdit[names.modelEdit];
-    }
+    },
+    [names.modelSortKeys]: signal.filter?.sortKeys
   };
   const sliceUtil = Object.fromEntries(
     signal.slices.reduce((acc, { sliceName, argLength, defaultArgs }) => {

package/esm/src/internalApiInfo.js

@@ -48,29 +48,29 @@ class InternalApiInfo {
   };
   applyApiMeta(sigRef, key) {
     if (this.type === "resolveField") {
-      const metadataMap2 = getResolveFieldMetaMapOnPrototype(sigRef.prototype);
-      metadataMap2.set(key, {
+      const metadataMap = getResolveFieldMetaMapOnPrototype(sigRef.prototype);
+      metadataMap.set(key, {
         returns: () => this.returnRef,
         argsOption: this.signalOption,
         key,
         descriptor: { value: this.execFn, writable: true, enumerable: false, configurable: true }
       });
       sigRef.prototype[key] = this.execFn;
-      Reflect.defineMetadata("resolveField", metadataMap2, sigRef.prototype);
-      return;
+      Reflect.defineMetadata("resolveField", metadataMap, sigRef.prototype);
+    } else {
+      const metadataMap = getGqlMetaMapOnPrototype(sigRef.prototype);
+      const internalApiMeta = {
+        returns: () => this.returnRef instanceof Enum ? 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;
+      metadataMap.set(key, internalApiMeta);
+      setGqlMetaMapOnPrototype(sigRef.prototype, metadataMap);
     }
-    const internalApiMeta = {
-      returns: () => this.returnRef instanceof Enum ? 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;
-    const metadataMap = getGqlMetaMapOnPrototype(sigRef.prototype);
-    metadataMap.set(key, internalApiMeta);
-    setGqlMetaMapOnPrototype(sigRef.prototype, metadataMap);
     const argMetas = this.args.map((arg, idx) => ({
       name: arg.name,
       returns: () => arg.argRef,

package/esm/src/signalDecorators.js

@@ -364,7 +364,7 @@ function endpoint(srv, builder, ...libSignals) {
   return sigRef;
 }
 const mergeSignals = (signalRef, internalRef, sliceRef) => {
-  applyMixins(signalRef, [internalRef, ...sliceRef ? [sliceRef] : []]);
+  applyMixins(signalRef, [internalRef]);
   const gqlMetaMap = getGqlMetaMapOnPrototype(signalRef.prototype);
   const resolveFieldMetaMap = getResolveFieldMetaMapOnPrototype(signalRef.prototype);
   setResolveFieldMetaMapOnPrototype(signalRef.prototype, resolveFieldMetaMap);
@@ -377,9 +377,12 @@ const mergeSignals = (signalRef, internalRef, sliceRef) => {
   });
   internalResolveFieldMetaMap.forEach((value, key) => {
     resolveFieldMetaMap.set(key, value);
+    const [argMetas, internalArgMetas] = getArgMetas(internalRef, key);
+    setArgMetas(signalRef, key, argMetas, internalArgMetas);
   });
   if (sliceRef) {
     const sliceGqlMetaMap = getGqlMetaMapOnPrototype(sliceRef.prototype);
+    applyMixins(signalRef, [sliceRef], /* @__PURE__ */ new Set([...gqlMetaMap.keys()]));
     sliceGqlMetaMap.forEach((value, key) => {
       if (gqlMetaMap.has(key))
         return;
@@ -391,13 +394,6 @@ const mergeSignals = (signalRef, internalRef, sliceRef) => {
   setGqlMetaMapOnPrototype(signalRef.prototype, gqlMetaMap);
   return signalRef;
 };
-function LogSignal(refName, srv, option) {
-  class BaseSignal {
-  }
-  signalInfo.setRefNameTemp(BaseSignal, refName);
-  signalInfo.setPrefixTemp(BaseSignal, option?.prefix ?? "");
-  return BaseSignal;
-}
 const getSigMeta = (sigRef) => {
   const sigMeta = Reflect.getMetadata("signal", sigRef.prototype);
   if (!sigMeta)

package/esm/src/signalInfo.js

@@ -1,6 +1,7 @@
 import { baseClientEnv, getNonArrayModel, scalarNameMap } from "@akanjs/base";
 import { lowerlize } from "@akanjs/common";
 import { constantInfo } from "@akanjs/constant";
+import { documentInfo } from "@akanjs/document";
 import { client } from "./client";
 import { databaseFetchOf, serviceFetchOf } from "./fetchInfo";
 import {
@@ -110,7 +111,13 @@ const signalInfo = {
     const refName = signalInfo.getRefNameTemp(sigRef);
     const { slices, prefix } = getSigMeta(sigRef);
     const gqlMetaMap = getGqlMetaMapOnPrototype(sigRef.prototype);
-    const serializedSignal = { refName, slices, prefix, endpoint: {} };
+    const serializedSignal = {
+      refName,
+      slices,
+      prefix,
+      endpoint: {},
+      filter: documentInfo.getSerializedFilter(refName)
+    };
     gqlMetaMap.forEach((gqlMeta, key) => {
       if (!["Query", "Mutation", "Pubsub", "Message"].includes(gqlMeta.type))
         return;

package/package.json

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

package/src/gql.d.ts

@@ -77,6 +77,8 @@ type BasicMethods<T extends string, Input, Full, Light extends {
     [K in `add${_CapitalizedT}Files`]: (fileList: FileList, parentId?: string, option?: FetchPolicy) => Promise<ProtoFile[]>;
 } & {
     [K in `merge${_CapitalizedT}`]: (modelOrId: Full | string, data: Partial<DocumentModel<Input>>, option?: FetchPolicy) => Promise<Full>;
+} & {
+    [K in `${T}SortKeys`]?: string[];
 };
 type ViewEditMethods<T extends string, Full, _CapitalizedT extends string = Capitalize<T>> = {
     [K in `view${_CapitalizedT}`]: (id: string, option?: FetchPolicy) => Promise<ViewReturn<T, Full>>;

package/src/signalInfo.d.ts

@@ -68,6 +68,12 @@ export interface SerializedEndpoint {
     returns: SerializedReturns;
     args: SerializedArg[];
 }
+export interface SerializedFilter {
+    filter: {
+        [key: string]: SerializedArg[];
+    };
+    sortKeys: string[];
+}
 export interface SerializedSignal {
     refName: string;
     slices: SliceMeta[];
@@ -75,4 +81,5 @@ export interface SerializedSignal {
     endpoint: {
         [key: string]: SerializedEndpoint;
     };
+    filter?: SerializedFilter;
 }