@akanjs/signal 0.9.57 → 0.9.58-canary.1

package/cjs/src/graphql.js

@@ -38,7 +38,7 @@ const makeArgStr = (args) => {
   return args.length ? `(${args.map((arg) => {
     const argRef = import_constant.constantInfo.getModelRef(arg.refName, arg.modelType);
     const argRefType = (0, import_base.isGqlScalar)(argRef) ? "gqlScalar" : "class";
-    const gqlTypeStr = "[".repeat(arg.arrDepth) + `${(0, import_constant.getGqlTypeStr)(argRef)}${argRefType === "class" ? "Input" : ""}` + "!]".repeat(arg.arrDepth);
+    const gqlTypeStr = "[".repeat(arg.arrDepth) + `${(0, import_constant.getGqlTypeStr)(argRef)}${argRefType === "class" ? import_constant.constantInfo.isObject(argRef) ? "Object" : "Input" : ""}` + "!]".repeat(arg.arrDepth);
     return `$${arg.name}: ` + gqlTypeStr + (arg.argsOption.nullable ? "" : "!");
   }).join(", ")})` : "";
 };
@@ -115,7 +115,7 @@ function graphql(literals, ...args) {
     literals = [literals];
   let result = literals[0];
   args.forEach((arg, i) => {
-    if (arg && arg.kind === "Document")
+    if (arg?.kind === "Document")
       result += arg.loc.source.body;
     else
       result += arg;

package/cjs/src/signalInfo.js

@@ -156,7 +156,7 @@ const signalInfo = {
           const [argRef, arrDepth2] = (0, import_base.getNonArrayModel)(argMeta.returns());
           const isGqlScalar2 = import_base.scalarNameMap.has(argRef);
           const modelType2 = isGqlScalar2 ? "scalar" : import_constant.constantInfo.getModelType(argRef);
-          if (!["input", "insight", "scalar"].includes(modelType2))
+          if (!["input", "object", "insight", "scalar"].includes(modelType2))
             throw new Error(`Invalid model type: ${modelType2}`);
           const refName3 = isGqlScalar2 ? import_base.scalarNameMap.get(argRef) : import_constant.constantInfo.getRefName(argRef);
           return {

package/cjs/src/sliceInfo.js

@@ -140,7 +140,7 @@ class SliceInfo {
       const skipLimitSort = requestArgs.slice(argLength, argLength + 3);
       const [skip = 0, limit = 20, sort = "latest"] = skipLimitSort;
       const internalArgs = requestArgs.slice(argLength + 3);
-      const query = execFn.apply(this, [...args, ...internalArgs]);
+      const query = await execFn.apply(this, [...args, ...internalArgs]);
       return await this[serviceName].__list(query, {
         skip,
         limit,
@@ -167,7 +167,7 @@ class SliceInfo {
     const insightFn = async function(...requestArgs) {
       const args = requestArgs.slice(0, argLength);
       const internalArgs = requestArgs.slice(argLength);
-      const query = execFn.apply(this, [...args, ...internalArgs]);
+      const query = await execFn.apply(this, [...args, ...internalArgs]);
       return await this[serviceName].__insight(
         query
       );

package/esm/src/graphql.js

@@ -14,7 +14,7 @@ const makeArgStr = (args) => {
   return args.length ? `(${args.map((arg) => {
     const argRef = constantInfo.getModelRef(arg.refName, arg.modelType);
     const argRefType = isGqlScalar(argRef) ? "gqlScalar" : "class";
-    const gqlTypeStr = "[".repeat(arg.arrDepth) + `${getGqlTypeStr(argRef)}${argRefType === "class" ? "Input" : ""}` + "!]".repeat(arg.arrDepth);
+    const gqlTypeStr = "[".repeat(arg.arrDepth) + `${getGqlTypeStr(argRef)}${argRefType === "class" ? constantInfo.isObject(argRef) ? "Object" : "Input" : ""}` + "!]".repeat(arg.arrDepth);
     return `$${arg.name}: ` + gqlTypeStr + (arg.argsOption.nullable ? "" : "!");
   }).join(", ")})` : "";
 };
@@ -91,7 +91,7 @@ function graphql(literals, ...args) {
     literals = [literals];
   let result = literals[0];
   args.forEach((arg, i) => {
-    if (arg && arg.kind === "Document")
+    if (arg?.kind === "Document")
       result += arg.loc.source.body;
     else
       result += arg;

package/esm/src/signalInfo.js

@@ -142,7 +142,7 @@ const signalInfo = {
           const [argRef, arrDepth2] = getNonArrayModel(argMeta.returns());
           const isGqlScalar2 = scalarNameMap.has(argRef);
           const modelType2 = isGqlScalar2 ? "scalar" : constantInfo.getModelType(argRef);
-          if (!["input", "insight", "scalar"].includes(modelType2))
+          if (!["input", "object", "insight", "scalar"].includes(modelType2))
             throw new Error(`Invalid model type: ${modelType2}`);
           const refName3 = isGqlScalar2 ? scalarNameMap.get(argRef) : constantInfo.getRefName(argRef);
           return {

package/esm/src/sliceInfo.js

@@ -126,7 +126,7 @@ class SliceInfo {
       const skipLimitSort = requestArgs.slice(argLength, argLength + 3);
       const [skip = 0, limit = 20, sort = "latest"] = skipLimitSort;
       const internalArgs = requestArgs.slice(argLength + 3);
-      const query = execFn.apply(this, [...args, ...internalArgs]);
+      const query = await execFn.apply(this, [...args, ...internalArgs]);
       return await this[serviceName].__list(query, {
         skip,
         limit,
@@ -153,7 +153,7 @@ class SliceInfo {
     const insightFn = async function(...requestArgs) {
       const args = requestArgs.slice(0, argLength);
       const internalArgs = requestArgs.slice(argLength);
-      const query = execFn.apply(this, [...args, ...internalArgs]);
+      const query = await execFn.apply(this, [...args, ...internalArgs]);
       return await this[serviceName].__insight(
         query
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/signal",
-  "version": "0.9.57",
+  "version": "0.9.58-canary.1",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"
@@ -17,7 +17,7 @@
   "dependencies": {
     "@urql/core": "^5.1.0",
     "immer": "^10.1.1",
-    "next": "15.3.2",
+    "next": "16.0.3",
     "reflect-metadata": "^0.2.2",
     "socket.io-client": "^4.8.1"
   },

package/src/gql.d.ts

@@ -1,4 +1,4 @@
-import { DataList, type GetActionObject, type GetStateObject, MergeAll, type MergedValues, type Prettify, type PromiseOrObject, Type } from "@akanjs/base";
+import { BaseObject, DataList, type GetActionObject, type GetStateObject, MergeAll, type MergedValues, type Prettify, type PromiseOrObject, Type } from "@akanjs/base";
 import { FetchPolicy } from "@akanjs/common";
 import { ConstantModel, DefaultOf, DocumentModel, ProtoFile, QueryOf } from "@akanjs/constant";
 import type { ExtractQuery, ExtractSort, FilterInstance } from "@akanjs/document";
@@ -155,11 +155,11 @@ export declare const getGqlOnStorage: (refName: string) => {
     [key: string]: any;
 };
 export declare const setGqlOnStorage: (refName: string, modelGql: any) => void;
-export declare const gqlOf: <T extends string, Input, Full extends {
+export declare const gqlOf: <T extends string, Input, Obj extends BaseObject, Full extends {
     id: string;
 }, Light extends {
     id: string;
-}, Insight, Filter extends FilterInstance, Signal, _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc, _Sort = ExtractSort<Filter>, _SignalAction = GetActionObject<Signal>>(constant: ConstantModel<T, Input, Full, Light, Insight, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc>, filterRef: Type<Filter>, sigRef: Type<Signal>, option?: {
+}, Insight, Filter extends FilterInstance, Signal, _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc, _Sort = ExtractSort<Filter>, _SignalAction = GetActionObject<Signal>>(constant: ConstantModel<T, Input, Obj, Full, Light, Insight, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc>, filterRef: Type<Filter>, sigRef: Type<Signal>, option?: {
     overwrite?: {
         [key: string]: any;
     };

package/src/signalDecorators.d.ts

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 import { Assign, BaseInsight, BaseObject, Dayjs, EnumInstance, Environment, MergeAllTypes, Type, UnType } from "@akanjs/base";
-import { ConstantModel, DocumentModel, GqlReturn, PurifiedModel, QueryOf } from "@akanjs/constant";
+import { DocumentModel, GqlReturn, PurifiedModel, QueryOf } from "@akanjs/constant";
 import type { Doc, ExtractSort, FilterInstance } from "@akanjs/document";
 import type { Guard, InternalParam } from "@akanjs/nest";
 import type { ServiceModule, Sig } from "@akanjs/service";
@@ -125,24 +125,17 @@ type ExtendSlices<T extends string, Full extends BaseObject, Light extends BaseO
 type ExtendEndpoints<Full extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, LibEndpoints extends Type[], _Endpoints = MergeAllTypes<LibEndpoints>> = {
     [K in keyof _Endpoints]: _Endpoints[K] extends ApiInfo<infer ReqType, infer Srvs, infer ArgNames, infer Args, infer InternalArgs, infer ServerArgs, infer Returns, infer ServerReturns, infer Nullable> ? ApiInfo<ReqType, Srvs, ArgNames, Args, InternalArgs, ServerArgs, ExtendedGqlReturn<Returns, Full, Light, Insight>, ServerReturns, Nullable> : never;
 };
-export interface SrvOption<T extends string, Srv extends {
-    [key: string]: Type;
-}, Input = never, Full = never, Light = never, Insight = never> {
-    ref: T;
-    srv: Srv;
-    cnst?: ConstantModel<T, Input, Full, Light, Insight>;
-}
 export declare function internal<Srv extends {
     [key: string]: any;
-}, Full, InternalBuilder extends InternalApiBuilder<Srv, Doc<Full>>, LibInternals extends Type[]>(srv: ServiceModule<string, Srv, any, Full, any, any>, internalBuilder: InternalBuilder, ...libInternals: LibInternals): Type<ReturnType<InternalBuilder> & MergeAllTypes<LibInternals>>;
-export declare function slice<T extends string, Input, Full extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, Srv extends {
+}, Full, InternalBuilder extends InternalApiBuilder<Srv, Doc<Full>>, LibInternals extends Type[]>(srv: ServiceModule<string, Srv, any, any, Full, any, any>, internalBuilder: InternalBuilder, ...libInternals: LibInternals): Type<ReturnType<InternalBuilder> & MergeAllTypes<LibInternals>>;
+export declare function slice<T extends string, Input, Full extends BaseObject, Object extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, Srv extends {
     [key: string]: any;
-}, SliceBuilder extends SliceApiBuilder<T, Full, Light, Insight, Srv>, LibSlices extends Type[], _Query = QueryOf<DocumentModel<Full>>>(srv: ServiceModule<T, Srv, Input, Full, Light, Insight>, option: SliceOption, sliceBuilder: SliceBuilder, ...libSlices: LibSlices): Type<ReturnType<SliceBuilder> & {
+}, SliceBuilder extends SliceApiBuilder<T, Full, Light, Insight, Srv>, LibSlices extends Type[], _Query = QueryOf<DocumentModel<Full>>>(srv: ServiceModule<T, Srv, Input, Object, Full, Light, Insight>, option: SliceOption, sliceBuilder: SliceBuilder, ...libSlices: LibSlices): Type<ReturnType<SliceBuilder> & {
     [""]: SliceInfo<T, Full, Light, Insight, Srv, ["query"], [_Query], [], [_Query]>;
 } & ExtendSlices<T, Full, Light, Insight, LibSlices>>;
-export declare function endpoint<Input, Full extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, Srv extends {
+export declare function endpoint<Input, Object extends BaseObject, Full extends BaseObject, Light extends BaseObject, Insight extends BaseInsight, Srv extends {
     [key: string]: any;
-}, Builder extends ApiBuilder<Srv>, LibEndpoints extends Type[]>(srv: ServiceModule<string, Srv, Input, Full, Light, Insight>, builder: Builder, ...libEndpoints: LibEndpoints): Type<Assign<ReturnType<Builder>, ExtendEndpoints<Full, Light, Insight, LibEndpoints>>>;
+}, Builder extends ApiBuilder<Srv>, LibEndpoints extends Type[]>(srv: ServiceModule<string, Srv, Input, Object, Full, Light, Insight>, builder: Builder, ...libEndpoints: LibEndpoints): Type<Assign<ReturnType<Builder>, ExtendEndpoints<Full, Light, Insight, LibEndpoints>>>;
 export declare const mergeSignals: <Endpoint, Internal, Slice>(endpointRef: Type<Endpoint>, internalRef: Type<Internal>, sliceRef?: Type<Slice>) => Type<BuildApiSignal<Endpoint> & BuildInternalApiSignal<Internal> & BuildSliceSignal<Slice>>;
 export declare const serverSignalOf: <Signal>(sigRef: Type<Signal>) => Type<Sig<Signal>>;
 export type DefaultSignal<T extends string, Input, Full, Light, Insight, Filter extends FilterInstance, _CapitalizedT extends string = Capitalize<T>, _PurifiedInput = PurifiedModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Sort = ExtractSort<Filter>> = {

package/src/signalInfo.d.ts

@@ -18,7 +18,7 @@ export declare const signalInfo: {
     serialize(sigRef: Type): SerializedSignal;
     initialize(): object;
     buildFetch(signals?: SerializedSignal[], cnstInfo?: {
-        database: Map<string, import("@akanjs/constant").ConstantModel<any, any, any, any, any, any, import("@akanjs/constant").DefaultOf<any>, import("@akanjs/constant").DefaultOf<any>, import("@akanjs/base").GetStateObject<any>, import("@akanjs/base").GetStateObject<any>, import("@akanjs/constant").DefaultOf<any>, any, any, any, import("mongoose").FilterQuery<any>>>;
+        database: Map<string, import("@akanjs/constant").ConstantModel<string, any, any, any, any, any, Capitalize<string>, import("@akanjs/constant").DefaultOf<any>, import("@akanjs/constant").DefaultOf<any>, import("@akanjs/base").GetStateObject<any>, import("@akanjs/base").GetStateObject<any>, import("@akanjs/constant").DefaultOf<any>, any, any, any, import("mongoose").FilterQuery<any>>>;
         scalar: Map<string, import("@akanjs/constant").ScalarConstantModel<any, any, any, any, any>>;
         modelRefNameMap: Map<new (...args: any[]) => any, string>;
         getRefName<AllowEmpty extends boolean = false>(modelRef: Type, { allowEmpty }?: {
@@ -34,15 +34,15 @@ export declare const signalInfo: {
         isInsight(modelRef: Type): boolean;
         isFilter(modelRef: Type): boolean;
         isScalar(modelRef: Type): boolean;
-        setDatabase(refName: string, cnst: import("@akanjs/constant").ConstantModel<any, any, any, any, any, any>): void;
+        setDatabase(refName: string, cnst: import("@akanjs/constant").ConstantModel<string, any, any, any, any, any>): void;
         getDatabase<AllowEmpty extends boolean = false>(refName: string, { allowEmpty }?: {
             allowEmpty?: AllowEmpty;
-        }): AllowEmpty extends true ? import("@akanjs/constant").ConstantModel<any, any, any, any, any, any> | undefined : import("@akanjs/constant").ConstantModel<any, any, any, any, any, any>;
-        setScalar(refName: string, cnst: import("@akanjs/constant").ScalarConstantModel<any, any, any, any, any>): void;
+        }): AllowEmpty extends true ? import("@akanjs/constant").ConstantModel<string, any, any, any, any, any> | undefined : import("@akanjs/constant").ConstantModel<string, any, any, any, any, any>;
+        setScalar(refName: string, cnst: import("@akanjs/constant").ScalarConstantModel<string, any, any, any, any>): void;
         getScalar<AllowEmpty extends boolean = false>(refName: string, { allowEmpty }?: {
             allowEmpty?: AllowEmpty;
-        }): AllowEmpty extends true ? import("@akanjs/constant").ScalarConstantModel<any, any, any, any, any> | undefined : import("@akanjs/constant").ScalarConstantModel<any, any, any, any, any>;
-        getModelRef(refName: string, modelType: "input" | "full" | "light" | "insight" | "scalar"): Type | import("@akanjs/base").GqlScalar;
+        }): AllowEmpty extends true ? import("@akanjs/constant").ScalarConstantModel<string, any, any, any, any> | undefined : import("@akanjs/constant").ScalarConstantModel<string, any, any, any, any>;
+        getModelRef(refName: string, modelType: "input" | "object" | "full" | "light" | "insight" | "scalar"): Type | import("@akanjs/base").GqlScalar;
     }): object;
     registerClient: (cnst: any) => Promise<{
         fetch: typeof fetch;
@@ -57,7 +57,7 @@ export interface SerializedReturns {
 export interface SerializedArg {
     type: ArgType;
     refName: Exclude<GqlScalarName, "Map"> | (string & {});
-    modelType: "input" | "insight" | "scalar";
+    modelType: "input" | "object" | "insight" | "scalar";
     name: string;
     argsOption: ArgsOption;
     arrDepth: number;