@livequery/mongoose 2.0.50 → 2.0.52

package/build/src/MongooseDatasource.d.ts

@@ -1,14 +1,29 @@
-import { RouteOptions } from "./RouteOptions.js";
-import { LivequeryRequest, WebsocketSyncPayload } from '@livequery/types';
-import mongoose, { Connection } from 'mongoose';
+import { LivequeryRequest, LivequeryBaseEntity, WebsocketSyncPayload } from '@livequery/types';
+import mongoose, { Connection, Schema } from 'mongoose';
 import { Subject } from 'rxjs/internal/Subject';
-export type LivequeryDatasource<T> = {
-    query(query: LivequeryRequest, options: T, connection: any): any;
+import { Observable } from 'rxjs';
+export type LivequeryDatasource<Config, RouteOptions> = Observable<WebsocketSyncPayload<LivequeryBaseEntity>> & {
+    init?: (config: Config, options: Array<{
+        path: string;
+        options: RouteOptions;
+    }>) => Promise<void>;
+    query?: (query: LivequeryRequest, config: Config, options: RouteOptions) => any;
 };
-export declare class MongooseDatasource extends Subject<WebsocketSyncPayload<any>> implements LivequeryDatasource<RouteOptions> {
+export type MongooseDatasourceConfig = {
+    connections: {
+        [key: string]: Connection;
+    };
+    databases: string[];
+};
+export type RouteOptions<T = any> = {
+    realtime?: boolean;
+    schema: Schema<T>;
+    db?: string | ((req: LivequeryRequest) => Promise<string> | string);
+};
+export declare class MongooseDatasource extends Subject<WebsocketSyncPayload<any>> implements LivequeryDatasource<MongooseDatasourceConfig, RouteOptions> {
     #private;
     readonly refs: Map<string, Set<string>>;
-    query(_: LivequeryRequest, config: RouteOptions, connection: Connection): Promise<mongoose.mongo.DeleteResult | mongoose.UpdateWriteOpResult | {
+    query(req: LivequeryRequest, config: MongooseDatasourceConfig, options: RouteOptions): Promise<mongoose.mongo.DeleteResult | mongoose.UpdateWriteOpResult | {
         items: any[];
         summary: any;
         has: {

package/build/src/MongooseDatasource.js

@@ -1,6 +1,5 @@
 import { Cursor } from './Cursor.js';
 import { MongoQuery } from "./MongoQuery.js";
-import mongoose from 'mongoose';
 import { ObjectId } from 'bson';
 import { SmartCache } from './SmartCache.js';
 import { Subject } from 'rxjs/internal/Subject';
@@ -8,18 +7,16 @@ export class MongooseDatasource extends Subject {
     #schemas = new SmartCache();
     #models = new SmartCache();
     refs = new Map();
-    async query(_, config, connection) {
-        const db = typeof config.db == 'function' ? await config.db(_) : config.db || process.env.DB_NAME || 'main';
-        const schema = config.schema;
+    async query(req, config, options) {
+        const db = typeof options.db == 'function' ? await options.db(req) : options.db || process.env.DB_NAME || 'main';
+        const schema = options.schema;
         const collection_name = schema.options.collection;
         const model = await this.#models.get(`${db}|${collection_name}`, async () => {
-            return connection.model(collection_name, schema, collection_name);
+            return config.connections[db].model(collection_name, schema, collection_name);
         });
-        const query = await this.normalizeRef(_, schema);
-        if (query.method == 'get') {
-            config.realtime && this.#log(query, model);
+        const query = await this.normalizeRef(req, schema);
+        if (query.method == 'get')
             return await this.#get(query, model);
-        }
         if (query.method == 'post')
             return this.#post(query, model);
         if (query.method == 'put')
@@ -30,12 +27,6 @@ export class MongooseDatasource extends Subject {
             return this.#del(query, model);
         throw { status: 500, code: 'INVAILD_METHOD', message: 'Invaild method' };
     }
-    #log(req, model) {
-        const _ = this.refs.get(model.collection.name);
-        const set = _ || new Set();
-        set.add(req.collection_ref);
-        !_ && this.refs.set(model.collection.name, set);
-    }
     async #get(req, model) {
         const { limit, items, count, has, summary } = await MongoQuery.query(req, model);
         const current = items.length;
@@ -142,10 +133,10 @@ export class MongooseDatasource extends Subject {
         return {
             ...obj,
             ...[...fields].reduce((p, c) => {
-                if (obj[c] && typeof obj[c] == 'string' && mongoose.Types.ObjectId.isValid(obj[c])) {
+                if (obj[c] && typeof obj[c] == 'string' && ObjectId.isValid(obj[c])) {
                     return {
                         ...p,
-                        [c]: new mongoose.Types.ObjectId(obj[c])
+                        [c]: ObjectId.createFromHexString(obj[c])
                     };
                 }
                 return p;
@@ -155,8 +146,8 @@ export class MongooseDatasource extends Subject {
     async normalizeRef(req, schema) {
         const fields = await this.#schemas.get(schema, async () => {
             return new Set(Object.entries(schema.paths).filter(([k, v]) => {
-                return (v.instance == 'Array' ? v.getEmbeddedSchemaType().instance : v.instance) == 'ObjectID';
-            }).map(([k, v]) => k));
+                return (v.instance == 'Array' ? v.getEmbeddedSchemaType().instance : v.instance) == 'ObjectId';
+            }).map(([k]) => k));
         });
         if (fields.size == 0)
             return req;

package/build/src/index.d.ts

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

package/build/src/index.js

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

package/build/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/cursor.ts","../src/datachangepayload.ts","../src/mongoquery.ts","../src/mongoosedatasource.ts","../src/routeoptions.ts","../src/smartcache.ts","../src/index.ts"],"version":"5.9.3"}
+{"root":["../src/cursor.ts","../src/datachangepayload.ts","../src/mongoquery.ts","../src/mongoosedatasource.ts","../src/smartcache.ts","../src/index.ts"],"version":"5.9.3"}

package/package.json

@@ -6,7 +6,7 @@
     "repository": {
         "url": "git@github.com:livequery/mongoose.git"
     },
-    "version": "2.0.50",
+    "version": "2.0.52",
     "description": "Mongoose datasource mapping for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",
@@ -32,7 +32,7 @@
         "build": "rm -rf build; tsc -b .",
         "deploy": "rm -rf build && yarn build; git add .; git commit -m \"Update\"; git push origin master; npm publish --access public"
     },
-    "dependencies": {
+    "peerDependencies": {
         "bson": "*",
         "mongoose": "^8.6.2"
     }

package/build/src/RouteOptions.d.ts

@@ -1,7 +0,0 @@
-import { LivequeryRequest } from "@livequery/types";
-import { Schema } from "mongoose";
-export type RouteOptions<T = any> = {
-    realtime?: boolean;
-    schema: Schema<T>;
-    db?: string | ((req: LivequeryRequest) => Promise<string> | string);
-};

package/build/src/RouteOptions.js

@@ -1 +0,0 @@
-export {};