@livequery/nestjs 1.0.31 → 1.0.34

package/build/index.d.ts

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

package/build/index.js

@@ -11,7 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./src/LivequeryRequest"), exports);
+__exportStar(require("./src/LivequeryResponse"), exports);
 __exportStar(require("./src/LivequeryInterceptor"), exports);
 __exportStar(require("./src/LivequeryWebsocketSync"), exports);
 __exportStar(require("./src/PathHelper"), exports);
-__exportStar(require("./src/UseDatasource"), exports);

package/build/src/LivequeryInterceptor.d.ts

@@ -5,6 +5,8 @@ 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

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UseLivequeryInterceptor = exports.LivequeryInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const LivequeryWebsocketSync_1 = require("./LivequeryWebsocketSync");
+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;
@@ -39,7 +39,7 @@ let LivequeryInterceptor = class LivequeryInterceptor {
         });
         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] = {
+        req.livequery = {
             ref,
             collection_ref,
             schema_collection_ref,
@@ -59,7 +59,7 @@ let LivequeryInterceptor = class LivequeryInterceptor {
         };
         const socket_id = req.headers.socket_id;
         socket_id && this.LivequeryWebsocketSync?.listen(socket_id, collection_ref, doc_id);
-        return next.handle().pipe((0, operators_1.map)(data => ({ data })));
+        return next.handle().pipe((0, operators_1.map)(data => ({ data })), (0, operators_1.catchError)(error => (0, rxjs_1.of)({ error })));
     }
 };
 LivequeryInterceptor = __decorate([

package/build/src/LivequeryRequest.d.ts

@@ -1,2 +1 @@
-export declare const LivequeryRequestKey: unique symbol;
 export declare const LivequeryRequest: (...dataOrPipes: unknown[]) => ParameterDecorator;

package/build/src/LivequeryRequest.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LivequeryRequest = exports.LivequeryRequestKey = void 0;
+exports.LivequeryRequest = void 0;
 const common_1 = require("@nestjs/common");
-exports.LivequeryRequestKey = Symbol();
 exports.LivequeryRequest = (0, common_1.createParamDecorator)((data, ctx) => {
     const request = ctx.switchToHttp().getRequest();
-    return request[exports.LivequeryRequestKey];
+    return request.livequery;
 });

package/build/src/LivequeryResponse.d.ts

@@ -1,3 +1,7 @@
-import { QueryData } from '@livequery/types';
+export declare type LivequeryResponse<T = any> = {
+    items: T[];
+    page_info?: {
+        has_more: boolean;
+    };
+};
 export declare const LivequeryResponse: (...dataOrPipes: unknown[]) => ParameterDecorator;
-export declare const createLivequeryResponse: <T>(items: T[]) => QueryData<T>;

package/build/src/LivequeryResponse.js

@@ -1,17 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLivequeryResponse = exports.LivequeryResponse = void 0;
+exports.LivequeryResponse = void 0;
 const common_1 = require("@nestjs/common");
-exports.LivequeryResponse = common_1.createParamDecorator((data, ctx) => {
-    const request = ctx.switchToHttp().getRequest();
-    return request.__livequery_response;
-});
-const createLivequeryResponse = (items) => {
-    return {
-        data: {
-            items
-        },
-        error: null
-    };
-};
-exports.createLivequeryResponse = createLivequeryResponse;
+exports.LivequeryResponse = (0, common_1.createParamDecorator)((data, ctx) => ctx.switchToHttp().getRequest().livequery_response);

package/build/src/PathHelper.js

@@ -16,7 +16,7 @@ class PathHelper {
         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 ? refs[refs.length - 1] : null;
+        const doc_id = is_collection ? null : refs[refs.length - 1];
         return { ref, schema_ref, is_collection, doc_id, collection_ref };
     }
     static nestjsPathResolver(target, method) {

package/build/src/UseDatasource.d.ts

@@ -7,12 +7,13 @@ declare type Datasource = {
 export declare class UseDatasource {
     private moduleRef;
     private reflector;
-    static readonly UseDatasourceMetadata: unique symbol;
     private static ControllerList;
     constructor(moduleRef: ModuleRef, reflector: Reflector);
-    static createDatasourceMapper<T>(factory: {
+    static createDatasourceMapper<T = {}>(factory: {
         new (): Datasource;
-    }): [(options: T) => <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void, () => {
+    }): [(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;

package/build/src/UseDatasource.js

@@ -20,14 +20,16 @@ const rxjs_1 = require("rxjs");
 let UseDatasource = UseDatasource_1 = class UseDatasource {
     moduleRef;
     reflector;
-    static UseDatasourceMetadata = Symbol();
     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), (0, common_1.UseInterceptors)(this), (0, common_1.SetMetadata)(this.UseDatasourceMetadata, { options, factory }), (target, method) => this.ControllerList.push({
+        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
@@ -43,7 +45,7 @@ let UseDatasource = UseDatasource_1 = class UseDatasource {
     async intercept(context, next) {
         const request = context.switchToHttp().getRequest();
         const livequery = request[LivequeryRequest_1.LivequeryRequestKey];
-        const { factory } = this.reflector.get(UseDatasource_1.UseDatasourceMetadata, context.getHandler());
+        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));

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "1.0.31",
+    "version": "1.0.34",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",