@livequery/mongoose 2.0.4 → 2.0.5

package/build/src/MongoQuery.d.ts

@@ -1,28 +1,3 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose/types/inferrawdoctype.js" />
 import { LivequeryBaseEntity, LivequeryRequest } from "@livequery/types";
 import { Model } from "mongoose";
 export declare class MongoQuery {

package/build/src/MongooseDatasource.d.ts

@@ -1,28 +1,3 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose/types/inferrawdoctype.js" />
 import { RouteOptions } from "./RouteOptions.js";
 import { LivequeryRequest, LivequeryBaseEntity, WebsocketSyncPayload, DatabaseEvent } from '@livequery/types';
 import { Observable } from "rxjs";
@@ -43,7 +18,7 @@ export declare class MongooseDatasource implements LivequeryDatasource<RouteOpti
         [name: string]: Connection;
     }): Promise<void>;
     query(query: LivequeryRequest): Promise<import("mongodb").DeleteResult | import("mongoose").UpdateWriteOpResult | {
-        items: LivequeryBaseEntity[];
+        items: any[];
         summary: any;
         has: {
             next: boolean;

package/build/src/MongooseDatasource.js

@@ -3,34 +3,26 @@ import { map, mergeAll } from "rxjs";
 import { MongoQuery } from "./MongoQuery.js";
 import { ObjectId } from 'bson';
 export class MongooseDatasource {
-    #refs_map = new Map();
-    #repositories_map = new Map();
-    #entities_map = new Map();
-    #realtime_repositories = new Map();
+    #refs = new Map();
+    #routes = new Map();
+    #realtime_collections = new Map();
+    #conections = {};
     async init(routes, connections) {
-        for (const { connection_name = 'default', schema, refs, realtime = false, } of routes) {
+        this.#conections = { ...connections };
+        for (const { refs, ...options } of routes) {
             for (const ref of refs) {
-                const connection = Object.keys(connections).length == 1 ? connections[Object.keys(connections)[0]] : connections[connection_name];
-                if (!connection)
-                    throw new Error(`Can not find [${connection_name}] datasource`);
-                if (!schema.options.collection) {
-                    console.error(`Missing schema collection name at refs`, refs);
-                    throw new Error(`Missing collection name of some schema, please carefully check`);
-                }
-                const model = this.#entities_map.get(schema) ?? connection.model(schema.options.collection, schema);
-                this.#entities_map.set(schema, model);
                 const schema_ref = ref.replaceAll(':', '');
-                this.#repositories_map.set(model, new Set([
-                    ...(this.#repositories_map.get(model) || []),
-                    schema_ref
+                this.#routes.set(schema_ref, options);
+                this.#refs.set(options.schema, new Set([
+                    ...this.#refs.get(options.schema) || [],
+                    ref
                 ]));
-                this.#refs_map.set(schema_ref, { model: model });
-                if (realtime) {
-                    const table_name = model.collection.collectionName;
+                if (options.realtime) {
+                    const table_name = options.schema.options.collection.name;
                     const $ = schema_ref.split('/');
                     const is_collection_ref = $.length % 2 == 1;
-                    this.#realtime_repositories.set(table_name, new Set([
-                        ...this.#realtime_repositories.get(table_name) || [],
+                    this.#realtime_collections.set(table_name, new Set([
+                        ...this.#realtime_collections.get(table_name) || [],
                         is_collection_ref ? schema_ref : $.slice(0, -1).join('/')
                     ]));
                 }
@@ -38,22 +30,27 @@ export class MongooseDatasource {
         }
     }
     async query(query) {
-        const config = this.#refs_map.get(query.schema_ref);
+        const config = this.#routes.get(query.schema_ref);
         if (!config)
             throw { status: 500, code: 'REF_NOT_FOUND', message: 'Missing ref config in livequery system' };
+        const db = await config.db?.(query) || process.env.DB_NAME;
+        const connection = config.connection ? this.#conections[await config.connection(query)] : Object.values(this.#conections)[0];
+        const schema = config.schema;
+        const collection_name = schema.options.collection.name;
+        const model = connection.useDb(db).model(collection_name, schema, collection_name, schema.options);
         if (query.method == 'get')
-            return await this.#get(query, config);
+            return await this.#get(query, model);
         if (query.method == 'post')
-            return this.#post(query, config);
+            return this.#post(query, model);
         if (query.method == 'put')
-            return this.#put(query, config);
+            return this.#put(query, model);
         if (query.method == 'patch')
-            return this.#patch(query, config);
+            return this.#patch(query, model);
         if (query.method == 'delete')
-            return this.#del(query, config);
+            return this.#del(query, model);
         throw { status: 500, code: 'INVAILD_METHOD', message: 'Invaild method' };
     }
-    async #get(req, { model }) {
+    async #get(req, model) {
         const { limit, items, count, has, summary } = await MongoQuery.query(req, model);
         const current = items.length;
         const total = current + count.next + count.prev;
@@ -102,7 +99,7 @@ export class MongooseDatasource {
             item,
         };
     }
-    async #post(req, { model }) {
+    async #post(req, model) {
         const merged = {
             ...req.keys,
             ...req.body
@@ -110,39 +107,54 @@ export class MongooseDatasource {
         const [data] = await model.insertMany([merged]);
         return {
             item: {
-                ...data,
+                ...data['_doc'],
                 _id: undefined,
                 id: data._id.toString()
             }
         };
     }
-    async #put(req, { model }) {
-        const keys = {
-            ...req.keys,
-            id: undefined,
-            ...req.keys.id ? { _id: ObjectId.createFromHexString(req.keys.id) } : {}
-        };
+    async #put(req, model) {
+        const keys = Object.entries(req.keys).reduce((p, [k, c]) => {
+            return {
+                ...p,
+                ...k == 'id' ? {
+                    _id: ObjectId.createFromHexString(req.keys.id)
+                } : {
+                    [k]: c
+                }
+            };
+        }, {});
         return await model.updateOne(keys, req.body);
     }
-    async #patch(req, { model }) {
-        const keys = {
-            ...req.keys,
-            id: undefined,
-            ...req.keys.id ? { _id: ObjectId.createFromHexString(req.keys.id) } : {}
-        };
+    async #patch(req, model) {
+        const keys = Object.entries(req.keys).reduce((p, [k, c]) => {
+            return {
+                ...p,
+                ...k == 'id' ? {
+                    _id: ObjectId.createFromHexString(req.keys.id)
+                } : {
+                    [k]: c
+                }
+            };
+        }, {});
         return await model.updateOne(keys, req.body);
     }
-    async #del(req, { model }) {
-        const keys = {
-            ...req.keys,
-            id: undefined,
-            ...req.keys.id ? { _id: ObjectId.createFromHexString(req.keys.id) } : {}
-        };
+    async #del(req, model) {
+        const keys = Object.entries(req.keys).reduce((p, [k, c]) => {
+            return {
+                ...p,
+                ...k == 'id' ? {
+                    _id: ObjectId.createFromHexString(req.keys.id)
+                } : {
+                    [k]: c
+                }
+            };
+        }, {});
         return await model.deleteOne(keys);
     }
     enable_realtime(d) {
         return d.pipe(map((event) => {
-            const refs = this.#realtime_repositories.get(event.table);
+            const refs = this.#realtime_collections.get(event.table);
             if (!refs)
                 return [];
             const data = {

package/build/src/RouteOptions.d.ts

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

package/build/tsconfig.tsbuildinfo

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

package/package.json

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