Subscribe detail type

core/ArSyncModel.d.ts

@@ -8,8 +8,13 @@ interface Change {
 declare type ChangeCallback = (change: Change) => void;
 declare type LoadCallback = () => void;
 declare type ConnectionCallback = (status: boolean) => void;
-declare type SubscriptionType = 'load' | 'change' | 'connection' | 'destroy';
-declare type SubscriptionCallback = ChangeCallback | LoadCallback | ConnectionCallback;
+declare type SubscriptionCallbackMap = {
+    load: LoadCallback;
+    change: ChangeCallback;
+    connection: ConnectionCallback;
+    destroy: LoadCallback;
+};
+declare type SubscriptionType = keyof SubscriptionCallbackMap;
 declare type ArSyncModelRef = {
     key: string;
     count: number;
@@ -44,12 +49,12 @@ export default class ArSyncModel<T> {
         immutable: boolean;
     });
     onload(callback: LoadCallback): void;
-    subscribeOnce(event: SubscriptionType, callback: SubscriptionCallback): {
+    subscribeOnce<T extends SubscriptionType>(event: T, callback: SubscriptionCallbackMap[T]): {
         unsubscribe: () => void;
     };
     dig<P extends Path>(path: P): DigResult<T, P> | null;
     static digData<Data, P extends Path>(data: Data, path: P): DigResult<Data, P>;
-    subscribe(event: SubscriptionType, callback: SubscriptionCallback): {
+    subscribe<T extends SubscriptionType>(event: T, callback: SubscriptionCallbackMap[T]): {
         unsubscribe: () => void;
     };
     release(): void;

core/ArSyncModel.js

@@ -29,8 +29,8 @@ var ArSyncModel = /** @class */ (function () {
         this.subscribeOnce('load', callback);
     };
     ArSyncModel.prototype.subscribeOnce = function (event, callback) {
-        var subscription = this.subscribe(event, function (arg) {
-            callback(arg);
+        var subscription = this.subscribe(event, function (e) {
+            callback(e);
             subscription.unsubscribe();
         });
         return subscription;

core/ArSyncStore.d.ts

@@ -2,8 +2,9 @@ export declare type Request = {
     api: string;
     query: any;
     params?: any;
-    id?: any;
+    id?: IDType;
 };
+declare type IDType = number | string;
 export declare class ArSyncStore {
     immutable: boolean;
     markedForFreezeObjects: any[];
@@ -34,3 +35,4 @@ export declare class ArSyncStore {
     freezeMarked(): void;
     release(): void;
 }
+export {};

src/core/ArSyncModel.ts

@@ -7,8 +7,13 @@ interface Change { path: Path; value: any }
 type ChangeCallback = (change: Change) => void
 type LoadCallback = () => void
 type ConnectionCallback = (status: boolean) => void
-type SubscriptionType = 'load' | 'change' | 'connection' | 'destroy'
-type SubscriptionCallback = ChangeCallback | LoadCallback | ConnectionCallback
+type SubscriptionCallbackMap = {
+  load: LoadCallback
+  change: ChangeCallback
+  connection: ConnectionCallback
+  destroy: LoadCallback
+}
+type SubscriptionType = keyof SubscriptionCallbackMap
 type ArSyncModelRef = { key: string; count: number; timer: number | null; model: ArSyncStore }
 
 type PathFirst<P extends Readonly<any[]>> = ((...args: P) => void) extends (first: infer First, ...other: any) => void ? First : never
@@ -62,9 +67,9 @@ export default class ArSyncModel<T> {
   onload(callback: LoadCallback) {
     this.subscribeOnce('load', callback)
   }
-  subscribeOnce(event: SubscriptionType, callback: SubscriptionCallback) {
-    const subscription = this.subscribe(event, (arg) => {
-      (callback as (arg: any) => void)(arg)
+  subscribeOnce<T extends SubscriptionType>(event: T, callback: SubscriptionCallbackMap[T]) {
+    const subscription = this.subscribe(event, (e?: any) => {
+      callback(e)
       subscription.unsubscribe()
     })
     return subscription
@@ -86,7 +91,7 @@ export default class ArSyncModel<T> {
     }
     return dig(data, path)
   }
-  subscribe(event: SubscriptionType, callback: SubscriptionCallback): { unsubscribe: () => void } {
+  subscribe<T extends SubscriptionType>(event: T, callback: SubscriptionCallbackMap[T]): { unsubscribe: () => void } {
     const id = this._listenerSerial++
     const subscription = this._ref.model.subscribe(event, callback)
     let unsubscribed = false