@livequery/nestjs 1.0.39 → 1.0.40

package/build/index.d.ts

@@ -1,5 +1,6 @@
-export * from './src/LivequeryRequest';
+export { LivequeryRequest } from './src/LivequeryRequest';
 export * from './src/LivequeryResponse';
 export * from './src/LivequeryInterceptor';
 export * from './src/LivequeryWebsocketSync';
-export * from './src/PathHelper';
+export * from './src/createDatasourceMapper';
+export { LivequeryDatasourceInterceptors } from './src/LivequeryDatasourceInterceptors';

package/build/index.js

@@ -14,8 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./src/LivequeryRequest"), exports);
+exports.LivequeryDatasourceInterceptors = exports.LivequeryRequest = void 0;
+var LivequeryRequest_1 = require("./src/LivequeryRequest");
+Object.defineProperty(exports, "LivequeryRequest", { enumerable: true, get: function () { return LivequeryRequest_1.LivequeryRequest; } });
 __exportStar(require("./src/LivequeryResponse"), exports);
 __exportStar(require("./src/LivequeryInterceptor"), exports);
 __exportStar(require("./src/LivequeryWebsocketSync"), exports);
-__exportStar(require("./src/PathHelper"), exports);
+__exportStar(require("./src/createDatasourceMapper"), exports);
+var LivequeryDatasourceInterceptors_1 = require("./src/LivequeryDatasourceInterceptors");
+Object.defineProperty(exports, "LivequeryDatasourceInterceptors", { enumerable: true, get: function () { return LivequeryDatasourceInterceptors_1.LivequeryDatasourceInterceptors; } });

package/build/src/LivequeryDatasourceInterceptors.d.ts

@@ -0,0 +1,16 @@
+import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { LivequeryRequest } from '@livequery/types';
+import { ModuleRef } from '@nestjs/core';
+export declare type DatasourceOptions<T> = Array<T & {
+    refs: string[];
+}>;
+export declare type Datasource<T = any> = {
+    query(query: LivequeryRequest): any;
+};
+export declare const DatasourceList: Map<new (...args: any[]) => Datasource, Datasource<any>>;
+export declare const $__datasource_factory_token: unique symbol;
+export declare class LivequeryDatasourceInterceptors implements NestInterceptor {
+    private moduleRef;
+    constructor(moduleRef: ModuleRef);
+    intercept(ctx: ExecutionContext, next: CallHandler): Promise<import("rxjs").Observable<any>>;
+}

package/build/src/LivequeryDatasourceInterceptors.js

@@ -0,0 +1,35 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LivequeryDatasourceInterceptors = exports.$__datasource_factory_token = exports.DatasourceList = void 0;
+const common_1 = require("@nestjs/common");
+const rxjs_1 = require("rxjs");
+const core_1 = require("@nestjs/core");
+exports.DatasourceList = new Map();
+exports.$__datasource_factory_token = Symbol();
+let LivequeryDatasourceInterceptors = class LivequeryDatasourceInterceptors {
+    moduleRef;
+    constructor(moduleRef) {
+        this.moduleRef = moduleRef;
+    }
+    async intercept(ctx, next) {
+        const token = Reflect.getMetadata(exports.$__datasource_factory_token, ctx.getHandler());
+        const datasource = exports.DatasourceList.has(token) ? exports.DatasourceList.get(token) : this.moduleRef.get(token);
+        const req = ctx.switchToHttp().getRequest();
+        req.livequery_response = await datasource.query(req.livequery);
+        return next.handle().pipe((0, rxjs_1.map)(rs => rs ?? req.livequery_response));
+    }
+};
+LivequeryDatasourceInterceptors = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [core_1.ModuleRef])
+], LivequeryDatasourceInterceptors);
+exports.LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors;

package/build/src/LivequeryInterceptor.js

@@ -36,8 +36,8 @@ let LivequeryInterceptor = class LivequeryInterceptor {
                 return [name, expression || 'eq', rest[key]];
             }
         });
-        const { ref, is_collection, collection_ref, doc_id, } = PathHelper_1.PathHelper.livequeryPathExtractor(req._parsedUrl.pathname);
-        const { collection_ref: schema_collection_ref, ref: schema_ref } = PathHelper_1.PathHelper.livequeryPathExtractor(req.route.path);
+        const { ref, is_collection, collection_ref, doc_id, } = PathHelper_1.PathHelper.parseHttpRequestPath(req._parsedUrl.pathname);
+        const { collection_ref: schema_collection_ref, ref: schema_ref } = PathHelper_1.PathHelper.parseHttpRequestPath(req.route.path);
         req.livequery = {
             ref,
             schema_ref,

package/build/src/PathHelper.d.ts

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

package/build/src/PathHelper.js

@@ -3,9 +3,21 @@ 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) {
+    static trimLivequeryHotkey(path) {
+        const ref = path
+            ?.split('~')[0]
+            ?.replaceAll(':', '')
+            ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
+            ?.split('/')
+            ?.filter(s => s.length > 0)
+            ?.join('/');
+        if (!ref)
+            throw 'LIVEQUERY_MAGIC_KEY_NOT_FOUND';
+        return ref;
+    }
+    static parseHttpRequestPath(path) {
         const refs = path
+            ?.split('~')[0]
             ?.replaceAll(':', '')
             ?.split(const_1.LIVEQUERY_MAGIC_KEY)?.[1]
             ?.split('/')
@@ -19,10 +31,14 @@ class PathHelper {
         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);
+    static join(a, b) {
+        return [a || '']
+            .flat(2)
+            .map(r1 => [b || ''].flat(2).map(r2 => `${r1}/${r2}`))
+            .flat(2)
+            .map(r => r.split('/')
+            .filter(r => r != '')
+            .join('/'));
     }
 }
 exports.PathHelper = PathHelper;

package/build/src/createDatasourceMapper.d.ts

@@ -0,0 +1,6 @@
+import { Provider } from "@nestjs/common";
+import { Datasource, DatasourceOptions } from "./LivequeryDatasourceInterceptors";
+export declare const createDatasourceMapper: <T extends {}>(datasource_factory: new (...args: any[]) => Datasource) => [({ useFactory, inject }: {
+    useFactory: (options: DatasourceOptions<T>, ...injects: any[]) => Datasource<T> | Promise<Datasource<T>>;
+    inject?: any[];
+}) => Provider<any>, (options: T) => <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void];

package/build/src/createDatasourceMapper.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDatasourceMapper = void 0;
+const common_1 = require("@nestjs/common");
+const LivequeryDatasourceInterceptors_1 = require("./LivequeryDatasourceInterceptors");
+const LivequeryInterceptor_1 = require("./LivequeryInterceptor");
+const PathHelper_1 = require("./PathHelper");
+const createDatasourceMapper = (datasource_factory) => {
+    const RouteConfigList = [];
+    const decorator = (options) => (0, common_1.applyDecorators)((target, method) => RouteConfigList.push({ target, method, options }), (0, LivequeryInterceptor_1.UseLivequeryInterceptor)(), (0, common_1.UseInterceptors)(LivequeryDatasourceInterceptors_1.LivequeryDatasourceInterceptors), (target, method, descriptor) => {
+        Reflect.defineMetadata(LivequeryDatasourceInterceptors_1.$__datasource_factory_token, datasource_factory, descriptor.value);
+    });
+    const UseDatasource = ({ useFactory, inject }) => {
+        return {
+            provide: datasource_factory,
+            inject,
+            useFactory: async (...injects) => {
+                const options = RouteConfigList.map(config => {
+                    return {
+                        ...(config.options || {}),
+                        refs: PathHelper_1.PathHelper.join(Reflect.getMetadata('path', config.target.constructor), Reflect.getMetadata('path', config.target[config.method])).map(PathHelper_1.PathHelper.trimLivequeryHotkey)
+                    };
+                });
+                const datasource = await useFactory(options, ...injects);
+                LivequeryDatasourceInterceptors_1.DatasourceList.set(datasource_factory, datasource);
+                return datasource;
+            }
+        };
+    };
+    return [UseDatasource, decorator];
+};
+exports.createDatasourceMapper = createDatasourceMapper;

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "1.0.39",
+    "version": "1.0.40",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -11,14 +11,14 @@
         "build/**/*"
     ],
     "devDependencies": {
-        "@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",
-        "reflect-metadata": "^0.1.13",
-        "rxjs": "^7.4.0"
+        "@livequery/types": "1.x",
+        "@nestjs/common": "8.x",
+        "@nestjs/core": "8.x",
+        "@nestjs/websockets": "8.x",
+        "@types/express": "4.x",
+        "@types/node": "14.x",
+        "reflect-metadata": "0.x",
+        "rxjs": "^.x"
     },
     "peerDependencies": {
         "@nestjs/common": "^7.6.17",
@@ -34,4 +34,4 @@
     },
     "author": "",
     "license": "ISC"
-}
+}