@livequery/nestjs 1.0.29 → 1.0.33

package/build/index.d.ts

@@ -1,4 +1,5 @@
 export * from './src/LivequeryRequest';
 export * from './src/LivequeryInterceptor';
 export * from './src/LivequeryWebsocketSync';
-export * from './src/pathResolver';
+export * from './src/PathHelper';
+export * from './src/UseDatasource';

package/build/index.js

@@ -13,4 +13,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./src/LivequeryRequest"), exports);
 __exportStar(require("./src/LivequeryInterceptor"), exports);
 __exportStar(require("./src/LivequeryWebsocketSync"), exports);
-__exportStar(require("./src/pathResolver"), exports);
+__exportStar(require("./src/PathHelper"), exports);
+__exportStar(require("./src/UseDatasource"), exports);

package/build/src/LivequeryInterceptor.d.ts

@@ -5,8 +5,6 @@ export declare class LivequeryInterceptor implements NestInterceptor {
     constructor(LivequeryWebsocketSync?: LivequeryWebsocketSync);
     intercept(context: ExecutionContext, next: CallHandler): import("rxjs").Observable<{
         data: any;
-    } | {
-        error: any;
     }>;
 }
 export declare const UseLivequeryInterceptor: () => MethodDecorator & ClassDecorator;

package/build/src/LivequeryInterceptor.js

@@ -11,33 +11,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UseLivequeryInterceptor = exports.LivequeryInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const LivequeryWebsocketSync_1 = require("./LivequeryWebsocketSync");
-const const_1 = require("./const");
-const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const LivequeryRequest_1 = require("./LivequeryRequest");
+const PathHelper_1 = require("./PathHelper");
 let LivequeryInterceptor = class LivequeryInterceptor {
+    LivequeryWebsocketSync;
     constructor(LivequeryWebsocketSync = null) {
         this.LivequeryWebsocketSync = LivequeryWebsocketSync;
     }
     intercept(context, next) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const req = context.switchToHttp().getRequest();
-        const _l = req.query, { _limit = 20, _cursor, _order_by, _sort, _select } = _l, rest = __rest(_l, ["_limit", "_cursor", "_order_by", "_sort", "_select"]);
+        const { _limit = 20, _cursor, _order_by, _sort, _select, ...rest } = req.query;
         const filters = Object
             .keys(rest)
             .map(key => {
@@ -49,16 +37,8 @@ let LivequeryInterceptor = class LivequeryInterceptor {
                 return [name, expression || 'eq', rest[key]];
             }
         });
-        const refs = (_c = (_b = (_a = req._parsedUrl.pathname) === null || _a === void 0 ? void 0 : _a.split(const_1.LIVEQUERY_MAGIC_KEY)) === null || _b === void 0 ? void 0 : _b[1]) === null || _c === void 0 ? void 0 : _c.split('/');
-        if (!refs)
-            throw new common_1.HttpException('CAN_NOT_DETECT_LIVEQUERY_KEY', 400);
-        const ref = refs.join('/');
-        const is_collection = refs.length % 2 == 1;
-        const collection_ref = refs.slice(0, refs.length - (is_collection ? 0 : 1)).join('/');
-        const doc_id = !is_collection && refs[refs.length - 1];
-        const schema_collection_ref = (_j = (_h = (_g = (_f = (_e = (_d = req.route.path) === null || _d === void 0 ? void 0 : _d.split(const_1.LIVEQUERY_MAGIC_KEY)) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.split('/')) === null || _g === void 0 ? void 0 : _g.filter((_, i) => i % 2 == 0)) === null || _h === void 0 ? void 0 : _h.join('/')) === null || _j === void 0 ? void 0 : _j.replaceAll(':', '');
-        if (!schema_collection_ref)
-            throw new common_1.HttpException('CAN_NOT_DETECT_LIVEQUERY_KEY', 400);
+        const { ref, is_collection, collection_ref, doc_id, } = PathHelper_1.PathHelper.livequeryPathExtractor(req._parsedUrl.pathname);
+        const { collection_ref: schema_collection_ref } = PathHelper_1.PathHelper.livequeryPathExtractor(req.route.path);
         req[LivequeryRequest_1.LivequeryRequestKey] = {
             ref,
             collection_ref,
@@ -66,14 +46,20 @@ let LivequeryInterceptor = class LivequeryInterceptor {
             is_collection,
             doc_id,
             filters,
-            options: Object.assign({ _limit: Number(_limit), _cursor,
+            options: {
+                _limit: Number(_limit),
+                _cursor,
                 _order_by,
-                _sort }, _select ? { _select: JSON.parse(_select) } : {}),
-            keys: req.params
+                _sort,
+                ..._select ? { _select: JSON.parse(_select) } : {}
+            },
+            keys: req.params,
+            body: req.body,
+            method: req.method.toLowerCase()
         };
         const socket_id = req.headers.socket_id;
-        socket_id && ((_k = this.LivequeryWebsocketSync) === null || _k === void 0 ? void 0 : _k.listen(socket_id, collection_ref, doc_id));
-        return next.handle().pipe((0, operators_1.map)(data => ({ data })), (0, operators_1.catchError)(error => (0, rxjs_1.of)({ error })));
+        socket_id && this.LivequeryWebsocketSync?.listen(socket_id, collection_ref, doc_id);
+        return next.handle().pipe((0, operators_1.map)(data => ({ data })));
     }
 };
 LivequeryInterceptor = __decorate([

package/build/src/LivequeryWebsocketSync.js

@@ -17,10 +17,10 @@ const websockets_1 = require("@nestjs/websockets");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 let LivequeryWebsocketSync = class LivequeryWebsocketSync {
+    connections = new Map();
+    refs = new Map();
+    changes = new rxjs_1.Subject();
     constructor() {
-        this.connections = new Map();
-        this.refs = new Map();
-        this.changes = new rxjs_1.Subject();
         this.changes.pipe((0, operators_1.mergeMap)(change => {
             const map = new Map();
             if (!map.has(change.ref))
@@ -39,9 +39,8 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         });
     }
     async handleDisconnect(socket) {
-        var _a, _b;
-        for (const ref of ((_a = this.connections.get(socket.id)) === null || _a === void 0 ? void 0 : _a.refs) || []) {
-            (_b = this.refs.get(ref)) === null || _b === void 0 ? void 0 : _b.delete(socket.id);
+        for (const ref of this.connections.get(socket.id)?.refs || []) {
+            this.refs.get(ref)?.delete(socket.id);
         }
         this.connections.delete(socket.id);
     }
@@ -50,12 +49,11 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync {
         socket.id = id;
     }
     unsubscribe({ ref }, socket) {
-        var _a, _b, _c, _d;
         if (!this.connections.has(socket.id))
             return;
-        (_b = (_a = this.connections.get(socket.id)) === null || _a === void 0 ? void 0 : _a.refs) === null || _b === void 0 ? void 0 : _b.delete(ref);
-        (_c = this.refs.get(ref)) === null || _c === void 0 ? void 0 : _c.delete(socket.id);
-        ((_d = this.refs.get(ref)) === null || _d === void 0 ? void 0 : _d.size) == 0 && this.refs.delete(ref);
+        this.connections.get(socket.id)?.refs?.delete(ref);
+        this.refs.get(ref)?.delete(socket.id);
+        this.refs.get(ref)?.size == 0 && this.refs.delete(ref);
     }
     listen(connection_id, collection_ref, doc_id) {
         const cnn = this.connections.get(connection_id);

package/build/src/PathHelper.d.ts

@@ -0,0 +1,11 @@
+export declare class PathHelper {
+    #private;
+    static livequeryPathExtractor(path: string): {
+        ref: string;
+        schema_ref: string;
+        is_collection: boolean;
+        doc_id: string;
+        collection_ref: string;
+    };
+    static nestjsPathResolver(target: Function, method: string): string[];
+}

package/build/src/PathHelper.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PathHelper = void 0;
+const const_1 = require("./const");
+class PathHelper {
+    static #toArray = (a) => typeof a == 'string' ? [a] : a;
+    static livequeryPathExtractor(path) {
+        const refs = path
+            ?.replaceAll(':', '')
+            ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
+            ?.split('/')
+            ?.filter(s => s.length > 0);
+        if (!refs)
+            throw 'LIVEQUERY_MAGIC_KEY_NOT_FOUND';
+        const is_collection = refs.length % 2 == 1;
+        const ref = refs.join('/');
+        const collection_ref = is_collection ? ref : refs.slice(0, refs.length - 1).join('/');
+        const schema_ref = refs.filter((_, i) => i % 2 == 0).join('/');
+        const doc_id = is_collection ? null : refs[refs.length - 1];
+        return { ref, schema_ref, is_collection, doc_id, collection_ref };
+    }
+    static nestjsPathResolver(target, method) {
+        const collection_paths = this.#toArray(Reflect.getMetadata('path', target) || '');
+        const method_paths = this.#toArray(Reflect.getMetadata('path', target.prototype[method]) || '');
+        return collection_paths.map(collection_path => method_paths.map(method_path => `${collection_path}/${method_path}`)).flat(2);
+    }
+}
+exports.PathHelper = PathHelper;

package/build/src/UseDatasource.d.ts

@@ -0,0 +1,28 @@
+import { LivequeryRequest } from "@livequery/types";
+import { CallHandler, ExecutionContext } from "@nestjs/common";
+import { ModuleRef, Reflector } from "@nestjs/core";
+declare type Datasource = {
+    query(req: LivequeryRequest): Promise<any>;
+};
+export declare class UseDatasource {
+    private moduleRef;
+    private reflector;
+    private static ControllerList;
+    constructor(moduleRef: ModuleRef, reflector: Reflector);
+    static createDatasourceMapper<T = {}>(factory: {
+        new (): Datasource;
+    }): [(options: T & {
+        _manual_query?: boolean;
+    }) => <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void, () => {
+        paths: {
+            ref: string;
+            schema_ref: string;
+            is_collection: boolean;
+            doc_id: string;
+            collection_ref: string;
+        }[];
+        options: T;
+    }[]];
+    intercept(context: ExecutionContext, next: CallHandler): Promise<import("rxjs").Observable<any>>;
+}
+export {};

package/build/src/UseDatasource.js

@@ -0,0 +1,59 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var UseDatasource_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UseDatasource = void 0;
+const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
+const LivequeryInterceptor_1 = require("./LivequeryInterceptor");
+const LivequeryRequest_1 = require("./LivequeryRequest");
+const PathHelper_1 = require("./PathHelper");
+const rxjs_1 = require("rxjs");
+let UseDatasource = UseDatasource_1 = class UseDatasource {
+    moduleRef;
+    reflector;
+    static ControllerList = [];
+    constructor(moduleRef, reflector) {
+        this.moduleRef = moduleRef;
+        this.reflector = reflector;
+    }
+    static createDatasourceMapper(factory) {
+        const decorator = (options) => (0, common_1.applyDecorators)((0, common_1.UseInterceptors)(LivequeryInterceptor_1.LivequeryInterceptor), ...options._manual_query == true ? [] : [
+            (0, common_1.SetMetadata)(UseDatasource_1, { options, factory }),
+            (0, common_1.UseInterceptors)(this)
+        ], (target, method) => this.ControllerList.push({
+            target: target.constructor,
+            method,
+            options
+        }));
+        const list = () => this.ControllerList.map(({ method, target, options }) => {
+            const paths = PathHelper_1.PathHelper.nestjsPathResolver(target, method).map(path => {
+                return PathHelper_1.PathHelper.livequeryPathExtractor(path);
+            });
+            return { paths, options: options };
+        }).flat(2);
+        return [decorator, list];
+    }
+    async intercept(context, next) {
+        const request = context.switchToHttp().getRequest();
+        const livequery = request[LivequeryRequest_1.LivequeryRequestKey];
+        const { factory } = this.reflector.get(UseDatasource_1, context.getHandler());
+        const ds = await this.moduleRef.get(factory);
+        const result = await ds.query(livequery);
+        return next.handle().pipe((0, rxjs_1.map)(data => data ?? result));
+    }
+};
+UseDatasource = UseDatasource_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [core_1.ModuleRef,
+        core_1.Reflector])
+], UseDatasource);
+exports.UseDatasource = UseDatasource;

package/build/src/const.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIVEQUERY_MAGIC_KEY = void 0;
-exports.LIVEQUERY_MAGIC_KEY = process.env.LIVEQUERY_MAGIC_KEY || 'livequery';
+exports.LIVEQUERY_MAGIC_KEY = `${process.env.LIVEQUERY_MAGIC_KEY || 'livequery'}/`;

package/build/src/pathResolver.d.ts

@@ -3,6 +3,9 @@ export declare class PathHelper {
     static livequeryPathExtractor(path: string): {
         ref: string;
         schema_ref: string;
+        is_collection: boolean;
+        doc_id: string;
+        collection_ref: string;
     };
     static nestjsPathResolver(target: Function, method: string): string[];
 }

package/build/src/pathResolver.js

@@ -1,29 +1,28 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _a, _PathHelper_toArray;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathHelper = void 0;
 const const_1 = require("./const");
 class PathHelper {
+    static #toArray = (a) => typeof a == 'string' ? [a] : a;
     static livequeryPathExtractor(path) {
-        var _b, _c, _d, _e;
-        const refs = (_e = (_d = (_c = (_b = path === null || path === void 0 ? void 0 : path.replaceAll(':', '')) === null || _b === void 0 ? void 0 : _b.split(const_1.LIVEQUERY_MAGIC_KEY)) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.split('/')) === null || _e === void 0 ? void 0 : _e.filter(s => s.length > 0);
+        const refs = path
+            ?.replaceAll(':', '')
+            ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
+            ?.split('/')
+            ?.filter(s => s.length > 0);
         if (!refs)
-            return null;
+            throw 'LIVEQUERY_MAGIC_KEY_NOT_FOUND';
+        const is_collection = refs.length % 2 == 1;
         const ref = refs.join('/');
+        const collection_ref = is_collection ? ref : refs.slice(0, refs.length - 1).join('/');
         const schema_ref = refs.filter((_, i) => i % 2 == 0).join('/');
-        return { ref, schema_ref };
+        const doc_id = is_collection ? refs[refs.length - 1] : null;
+        return { ref, schema_ref, is_collection, doc_id, collection_ref };
     }
     static nestjsPathResolver(target, method) {
-        const collection_paths = __classPrivateFieldGet(this, _a, "f", _PathHelper_toArray).call(this, Reflect.getMetadata('path', target) || '');
-        const method_paths = __classPrivateFieldGet(this, _a, "f", _PathHelper_toArray).call(this, Reflect.getMetadata('path', target.prototype[method]) || '');
+        const collection_paths = this.#toArray(Reflect.getMetadata('path', target) || '');
+        const method_paths = this.#toArray(Reflect.getMetadata('path', target.prototype[method]) || '');
         return collection_paths.map(collection_path => method_paths.map(method_path => `${collection_path}/${method_path}`)).flat(2);
     }
 }
 exports.PathHelper = PathHelper;
-_a = PathHelper;
-_PathHelper_toArray = { value: (a) => typeof a == 'string' ? [a] : a };

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "1.0.29",
+    "version": "1.0.33",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -11,9 +11,14 @@
         "build/**/*"
     ],
     "devDependencies": {
-        "@livequery/types": "^1.0.29",
+        "@livequery/types": "^1.0.34",
+        "@nestjs/common": "^8.2.3",
+        "@nestjs/core": "^8.2.3",
+        "@nestjs/websockets": "^8.2.3",
         "@types/express": "^4.17.11",
-        "@types/node": "^14.14.20"
+        "@types/node": "^14.14.20",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "^7.4.0"
     },
     "peerDependencies": {
         "@nestjs/common": "^7.6.17",
@@ -29,4 +34,4 @@
     },
     "author": "",
     "license": "ISC"
-}
+}