@livequery/mongoose 2.0.53 → 2.0.55

package/build/src/MongooseDatasource.d.ts

@@ -1,13 +1,13 @@
 import { LivequeryRequest, LivequeryBaseEntity, WebsocketSyncPayload } from '@livequery/types';
 import mongoose, { Connection, Schema } from 'mongoose';
-import { Subject } from 'rxjs/internal/Subject';
-import { Observable } from 'rxjs';
-export type LivequeryDatasource<RouteOptions> = Observable<WebsocketSyncPayload<LivequeryBaseEntity>> & {
-    init: (routes: Array<{
+import { Subject } from 'rxjs';
+export type LivequeryDatasource<Config, RouteOptions> = Subject<WebsocketSyncPayload<LivequeryBaseEntity>> & {
+    init(config: Config, routes: Array<{
         path: string;
+        method: number;
         options: RouteOptions;
-    }>) => any;
-    query?: (query: LivequeryRequest, options: RouteOptions) => any;
+    }>): Promise<void>;
+    query: (query: LivequeryRequest, options: RouteOptions) => Promise<any>;
 };
 export type MongooseDatasourceConfig = {
     connections: {
@@ -21,16 +21,17 @@ export type RouteOptions<T = any> = {
     db?: string | ((req: LivequeryRequest) => Promise<string> | string);
     connection?: string | ((req: LivequeryRequest) => Promise<string> | string);
 };
-export declare class MongooseDatasource extends Subject<WebsocketSyncPayload<any>> implements LivequeryDatasource<RouteOptions> {
+export declare class MongooseDatasource extends Subject<WebsocketSyncPayload<LivequeryBaseEntity>> implements LivequeryDatasource<MongooseDatasourceConfig, RouteOptions> {
     #private;
-    private config;
     readonly refs: Map<string, Set<string>>;
-    constructor(config: MongooseDatasourceConfig);
-    init(routes: {
+    config: MongooseDatasourceConfig;
+    routes: Map<string, RouteOptions<any>>;
+    init(config: MongooseDatasourceConfig, routes: Array<{
         path: string;
-        options: RouteOptions<any>;
-    }[]): Promise<void>;
-    query(req: LivequeryRequest, options: RouteOptions): Promise<mongoose.UpdateWriteOpResult | mongoose.mongo.DeleteResult | {
+        method: number;
+        options: RouteOptions;
+    }>): Promise<void>;
+    query(req: LivequeryRequest, options: RouteOptions): Promise<mongoose.mongo.DeleteResult | mongoose.UpdateWriteOpResult | {
         items: any[];
         summary: any;
         has: {
@@ -54,8 +55,4 @@ export declare class MongooseDatasource extends Subject<WebsocketSyncPayload<any
     } | {
         item: any;
     }>;
-    link(watcher: (routes: Array<{
-        path: string;
-        options: RouteOptions;
-    }>, config: MongooseDatasourceConfig) => Observable<WebsocketSyncPayload>): import("rxjs").Subscription;
 }

package/build/src/MongooseDatasource.js

@@ -2,20 +2,22 @@ import { Cursor } from './Cursor.js';
 import { MongoQuery } from "./MongoQuery.js";
 import { ObjectId } from 'bson';
 import { SmartCache } from './SmartCache.js';
-import { Subject } from 'rxjs/internal/Subject';
-import { BehaviorSubject, switchMap } from 'rxjs';
+import { Subject } from 'rxjs';
 export class MongooseDatasource extends Subject {
-    config;
     #schemas = new SmartCache();
     #models = new SmartCache();
     refs = new Map();
-    constructor(config) {
-        super();
+    config;
+    routes;
+    async init(config, routes) {
         this.config = config;
-    }
-    #routes$ = new BehaviorSubject([]);
-    async init(routes) {
-        this.#routes$.next(routes);
+        this.routes = routes.reduce((p, c) => {
+            const set = p.get(c.path);
+            if (set && set.schema != c.options.schema)
+                throw new Error('Schema mismatch for route path "' + c.path + '"');
+            p.set(c.path, c.options);
+            return p;
+        }, new Map());
     }
     async query(req, options) {
         const connection_name = typeof options.connection == 'function' ? await options.connection(req) : (options.connection || Object.keys(this.config.connections)[0] || 'default');
@@ -171,7 +173,4 @@ export class MongooseDatasource extends Subject {
             ...req.body ? { body: this.#convert(req.body, fields) } : {}
         };
     }
-    link(watcher) {
-        return this.#routes$.pipe(switchMap(routes => watcher(routes, this.config))).subscribe();
-    }
 }

package/build/src/index.d.ts

@@ -1,2 +1,2 @@
-export { MongooseDatasource, LivequeryDatasource, MongooseDatasourceConfig, RouteOptions } from './MongooseDatasource.js';
+export * from './MongooseDatasource.js';
 export * from './DataChangePayload.js';

package/build/src/index.js

@@ -1,2 +1,2 @@
-export { MongooseDatasource } from './MongooseDatasource.js';
+export * from './MongooseDatasource.js';
 export * from './DataChangePayload.js';

package/package.json

@@ -6,7 +6,7 @@
     "repository": {
         "url": "git@github.com:livequery/mongoose.git"
     },
-    "version": "2.0.53",
+    "version": "2.0.55",
     "description": "Mongoose datasource mapping for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",