akanjs 2.3.9-rc.0 → 2.3.9-rc.2

package/constant/fieldInfo.ts

@@ -26,7 +26,8 @@ export type ParamFieldType =
     })
   | EnumInstance<string, any>;
 
-export type ConstantFieldType = typeof PrimitiveScalar | Cls | MapConstructor | EnumInstance<string, number>;
+type ConstantFieldEnumType = EnumInstance<string, any>;
+export type ConstantFieldType = typeof PrimitiveScalar | ConstantModelRef | MapConstructor | ConstantFieldEnumType;
 export type ConstantFieldTypeInput =
   | ConstantFieldType
   | ConstantFieldType[]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.9-rc.0",
+  "version": "2.3.9-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/signal/endpointInfo.ts

@@ -344,10 +344,22 @@ export type BuildEndpoint<SrvModule extends ServiceModel = ServiceModel> = {
 };
 
 export const buildEndpoint = {
-  query: (returnRef: Cls, signalOption?: SignalOption<Cls>) => new EndpointInfo("query", returnRef, signalOption),
-  mutation: (returnRef: Cls, signalOption?: SignalOption<Cls>) => new EndpointInfo("mutation", returnRef, signalOption),
-  pubsub: (returnRef: Cls, signalOption?: SignalOption<Cls>) => new EndpointInfo("pubsub", returnRef, signalOption),
-  message: (returnRef: Cls, signalOption?: SignalOption<Cls>) => new EndpointInfo("message", returnRef, signalOption),
+  query: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(
+    returnRef: Returns,
+    signalOption?: SignalOption<Returns, Nullable>,
+  ) => new EndpointInfo("query", returnRef, signalOption),
+  mutation: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(
+    returnRef: Returns,
+    signalOption?: SignalOption<Returns, Nullable>,
+  ) => new EndpointInfo("mutation", returnRef, signalOption),
+  pubsub: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(
+    returnRef: Returns,
+    signalOption?: SignalOption<Returns, Nullable>,
+  ) => new EndpointInfo("pubsub", returnRef, signalOption),
+  message: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(
+    returnRef: Returns,
+    signalOption?: SignalOption<Returns, Nullable>,
+  ) => new EndpointInfo("message", returnRef, signalOption),
 } as unknown as BuildEndpoint<any>;
 
 export type EndpointBuilder<SrvModule extends ServiceModel = ServiceModel> = (builder: BuildEndpoint<SrvModule>) => {

package/signal/internalInfo.ts

@@ -1,4 +1,4 @@
-import { Any, type Cls, type FIELD_META, type PromiseOrObject } from "akanjs/base";
+import { Any, type FIELD_META, type PromiseOrObject } from "akanjs/base";
 import type {
   ConstantCls,
   ConstantField,
@@ -209,7 +209,10 @@ export type InternalBuilder<
       } & { [key: string]: InternalInfo<InternalType> };
 
 export const buildInternal = {
-  resolveField: (returnRef: Cls, signalOption?: SignalOption) =>
+  resolveField: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(
+    returnRef: Returns,
+    signalOption?: Pick<SignalOption<Returns, Nullable>, "nullable">,
+  ) =>
     new InternalInfo("resolveField", returnRef, signalOption),
   interval: (scheduleTime: number, signalOption?: SignalOption) =>
     new InternalInfo("interval", Any, {
@@ -248,7 +251,10 @@ export const buildInternal = {
       scheduleType: "destroy",
       ...signalOption,
     }),
-  process: (returnRef: Cls, signalOption?: SignalOption) =>
+  process: <Returns extends ConstantFieldTypeInput, Nullable extends boolean = false>(
+    returnRef: Returns,
+    signalOption?: SignalOption<Returns, Nullable>,
+  ) =>
     new InternalInfo("process", returnRef, {
       serverMode: "all",
       ...signalOption,

package/types/constant/fieldInfo.d.ts

@@ -4,7 +4,8 @@ import type { ConstantModelRef } from "./via.d.ts";
 export type ParamFieldType = (typeof PrimitiveScalar & {
     [CLIENT_VALUE]: string | number | boolean | Dayjs;
 }) | EnumInstance<string, any>;
-export type ConstantFieldType = typeof PrimitiveScalar | Cls | MapConstructor | EnumInstance<string, number>;
+type ConstantFieldEnumType = EnumInstance<string, any>;
+export type ConstantFieldType = typeof PrimitiveScalar | ConstantModelRef | MapConstructor | ConstantFieldEnumType;
 export type ConstantFieldTypeInput = ConstantFieldType | ConstantFieldType[] | ConstantFieldType[][] | ConstantFieldType[][][];
 export type FieldToValue<Field, MapValue = any> = Field extends null ? FieldToValue<Exclude<Field, null>> | null : Field extends MapConstructor ? Map<string, FieldToValue<MapValue>> : Field extends (infer F)[] ? FieldToValue<F>[] : Field extends typeof PrimitiveScalar | StringConstructor | BooleanConstructor | DateConstructor ? Field[typeof SERVER_VALUE] : Field extends ConstantModelRef ? UnCls<Field> : Field extends {
     [SERVER_VALUE]: infer V;