@livequery/nestjs 2.0.7 → 2.0.10

package/build/src/LivequeryDatasourceInterceptors.d.ts

@@ -1,10 +1,16 @@
 import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { Observable } from 'rxjs';
 import { ModuleRef } from '@nestjs/core';
 import { LivequeryDatasource } from './helpers/createDatasourceMapper.js';
+import { LivequeryBaseEntity } from '@livequery/types';
 export declare const LivequeryDatasourceList: Map<new (...args: any[]) => LivequeryDatasource, LivequeryDatasource>;
 export declare const $__datasource_factory_token: unique symbol;
+export declare class LivequeryItemMapper<T extends LivequeryBaseEntity> {
+    readonly mapper: (item: T) => T;
+    constructor(mapper: (item: T) => T);
+}
 export declare class LivequeryDatasourceInterceptors implements NestInterceptor {
     private moduleRef;
     constructor(moduleRef: ModuleRef);
-    intercept(ctx: ExecutionContext, next: CallHandler): Promise<import("rxjs").Observable<any>>;
+    intercept(ctx: ExecutionContext, next: CallHandler): Promise<Observable<any>>;
 }

package/build/src/LivequeryDatasourceInterceptors.js

@@ -1,9 +1,15 @@
 import { __decorate, __metadata } from "tslib";
 import { Injectable } from '@nestjs/common';
-import { map } from 'rxjs';
+import { mergeMap } from 'rxjs';
 import { ModuleRef } from '@nestjs/core';
 export const LivequeryDatasourceList = new Map();
 export const $__datasource_factory_token = Symbol();
+export class LivequeryItemMapper {
+    mapper;
+    constructor(mapper) {
+        this.mapper = mapper;
+    }
+}
 let LivequeryDatasourceInterceptors = class LivequeryDatasourceInterceptors {
     moduleRef;
     constructor(moduleRef) {
@@ -12,9 +18,29 @@ let LivequeryDatasourceInterceptors = class LivequeryDatasourceInterceptors {
     async intercept(ctx, next) {
         const token = Reflect.getMetadata($__datasource_factory_token, ctx.getHandler());
         const datasource = LivequeryDatasourceList.has(token) ? LivequeryDatasourceList.get(token) : this.moduleRef.get(token);
-        const req = ctx.switchToHttp().getRequest();
-        req.livequery_response = await datasource.query(req.livequery);
-        return next.handle().pipe(map(rs => rs ?? req.livequery_response));
+        return next.handle().pipe(mergeMap(async (rs) => {
+            const req = ctx.switchToHttp().getRequest();
+            const lrs = await datasource.query(req.livequery);
+            if (rs instanceof LivequeryItemMapper) {
+                if (lrs.item) {
+                    return {
+                        ...lrs,
+                        item: rs.mapper(lrs.item)
+                    };
+                }
+                if (lrs.items) {
+                    return {
+                        ...lrs,
+                        items: lrs.items.map(item => rs.mapper(item))
+                    };
+                }
+                return lrs;
+            }
+            if (typeof rs == 'function') {
+                return await rs(lrs);
+            }
+            return rs || lrs;
+        }));
     }
 };
 LivequeryDatasourceInterceptors = __decorate([

package/build/src/LivequeryDatasourceInterceptors.js.map

@@ -1 +1 @@
-{"version":3,"file":"LivequeryDatasourceInterceptors.js","sourceRoot":"","sources":["../../src/LivequeryDatasourceInterceptors.ts"],"names":[],"mappings":";AAAA,OAAO,EAAiC,UAAU,EAAmB,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKxC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAA8D,CAAA;AAC5G,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,EAAE,CAAA;AAK5C,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAEpB;IAApB,YAAoB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAI,CAAC;IAE7C,KAAK,CAAC,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAEpD,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,2BAA2B,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;QAChF,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtH,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;QAC3C,GAAG,CAAC,kBAAkB,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAC9D,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACrB,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAC1C,CAAA;IAEL,CAAC;CACJ,CAAA;AAfY,+BAA+B;IAD3C,UAAU,EAAE;qCAGsB,SAAS;GAF/B,+BAA+B,CAe3C"}
+{"version":3,"file":"LivequeryDatasourceInterceptors.js","sourceRoot":"","sources":["../../src/LivequeryDatasourceInterceptors.ts"],"names":[],"mappings":";AAAA,OAAO,EAAiC,UAAU,EAAmB,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAO,QAAQ,EAAc,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAMxC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAA8D,CAAA;AAC5G,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,EAAE,CAAA;AAEnD,MAAM,OAAO,mBAAmB;IACA;IAA5B,YAA4B,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAI,CAAC;CAC1D;AAGM,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAEpB;IAApB,YAAoB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAI,CAAC;IAE7C,KAAK,CAAC,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAEpD,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,2BAA2B,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;QAChF,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAGtH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACrB,QAAQ,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAChB,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;YAC3C,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAEjD,IAAI,EAAE,YAAY,mBAAmB,EAAE,CAAC;gBACpC,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;oBACX,OAAO;wBACH,GAAG,GAAG;wBACN,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;qBAC5B,CAAA;gBACL,CAAC;gBAED,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACZ,OAAO;wBACH,GAAG,GAAG;wBACN,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBAChD,CAAA;gBACL,CAAC;gBACD,OAAO,GAAG,CAAA;YACd,CAAC;YAED,IAAI,OAAO,EAAE,IAAI,UAAU,EAAE,CAAC;gBAC1B,OAAO,MAAM,EAAE,CAAC,GAAG,CAAC,CAAA;YACxB,CAAC;YACD,OAAO,EAAE,IAAI,GAAG,CAAA;QACpB,CAAC,CAAC,CACL,CAAA;IAEL,CAAC;CACJ,CAAA;AAxCY,+BAA+B;IAD3C,UAAU,EAAE;qCAGsB,SAAS;GAF/B,+BAA+B,CAwC3C"}

package/build/src/LivequeryResponse.d.ts

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

package/build/src/LivequeryResponse.js

@@ -1,3 +1,2 @@
-import { createParamDecorator } from "@nestjs/common";
-export const LivequeryResponse = createParamDecorator((data, ctx) => ctx.switchToHttp().getRequest().livequery_response);
+export {};
 //# sourceMappingURL=LivequeryResponse.js.map

package/build/src/LivequeryResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"LivequeryResponse.js","sourceRoot":"","sources":["../../src/LivequeryResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAoB,MAAM,gBAAgB,CAAC;AASxE,MAAM,CAAC,MAAM,iBAAiB,GAAG,oBAAoB,CACjD,CAAC,IAAa,EAAE,GAAqB,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC,kBAAkB,CAC/F,CAAA"}
+{"version":3,"file":"LivequeryResponse.js","sourceRoot":"","sources":["../../src/LivequeryResponse.ts"],"names":[],"mappings":""}

package/build/src/index.d.ts

@@ -1,10 +1,9 @@
 export { listPaths } from './helpers/listPaths.js';
 export { LivequeryRequest } from './LivequeryRequest.js';
-export { LivequeryResponse } from './LivequeryResponse.js';
 export { LivequeryInterceptor, RealtimeSubscription, UseLivequeryInterceptor } from './LivequeryInterceptor.js';
 export { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
 export { createDatasourceMapper, LivequeryDatasourceOptions, LivequeryDatasource } from './helpers/createDatasourceMapper.js';
-export { LivequeryDatasourceInterceptors } from './LivequeryDatasourceInterceptors.js';
+export { LivequeryDatasourceInterceptors, LivequeryItemMapper } from './LivequeryDatasourceInterceptors.js';
 export { UseWebsocketPublicKey, UseWebsocketPrivateKey } from './UseWebsocketShareKeyPair.js';
 export { ApiGateway } from './ApiGateway.js';
 export { ApiGatewayLinker } from './ApiGatewayLinker.js';

package/build/src/index.js

@@ -1,10 +1,9 @@
 export { listPaths } from './helpers/listPaths.js';
 export { LivequeryRequest } from './LivequeryRequest.js';
-export { LivequeryResponse } from './LivequeryResponse.js';
 export { LivequeryInterceptor, UseLivequeryInterceptor } from './LivequeryInterceptor.js';
 export { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
 export { createDatasourceMapper } from './helpers/createDatasourceMapper.js';
-export { LivequeryDatasourceInterceptors } from './LivequeryDatasourceInterceptors.js';
+export { LivequeryDatasourceInterceptors, LivequeryItemMapper } from './LivequeryDatasourceInterceptors.js';
 export { UseWebsocketPublicKey, UseWebsocketPrivateKey } from './UseWebsocketShareKeyPair.js';
 export { ApiGateway } from './ApiGateway.js';
 export { ApiGatewayLinker } from './ApiGatewayLinker.js';

package/build/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAwB,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAC/G,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,sBAAsB,EAAmD,MAAM,qCAAqC,CAAA;AAC7H,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AACtF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAwB,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAC/G,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,sBAAsB,EAAmD,MAAM,qCAAqC,CAAA;AAC7H,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAC3G,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA"}

package/package.json

@@ -5,7 +5,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "2.0.7",
+    "version": "2.0.10",
     "description": "Nestjs decorators for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",