@livequery/nestjs 1.0.33 → 1.0.36

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/LivequeryWebsocketSync.js

@@ -15,23 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LivequeryWebsocketSync = void 0;
 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.changes.pipe((0, operators_1.mergeMap)(change => {
-            const map = new Map();
-            if (!map.has(change.ref))
-                map.set(change.ref, []);
-            map.get(change.ref).push(change);
-            return [...map.entries()].map(([ref, changes]) => ({ ref, changes }));
-        })).subscribe(({ ref, changes }) => {
-            const connections = this.refs.get(ref);
+        this.changes.subscribe(({ ref, data, type }) => {
+            const refs = ref.split('/');
+            const collection_ref = refs.length % 2 == 1 ? ref : refs.slice(0, refs.length - 1).join('/');
+            const connections = new Set([
+                ...this.refs.get(collection_ref) || [],
+                ...this.refs.get(`${collection_ref}/${data.id}`) || []
+            ]);
             if (!connections)
                 return;
-            const payload = JSON.stringify({ event: 'sync', data: { changes } });
+            const payload = JSON.stringify({ event: 'sync', data: { changes: [{ ref, data, type }] } });
             for (const cid of connections) {
                 const connection = this.connections.get(cid);
                 connection && connection.socket.OPEN && connection.socket.send(payload);

package/package.json

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