@livequery/nestjs 2.0.147 → 2.0.149

package/README.md

@@ -0,0 +1,144 @@
+# @livequery/nestjs
+
+NestJS adapter for the [livequery](https://github.com/livequery) ecosystem — turns plain NestJS controllers into livequery endpoints (filterable/paginated CRUD over HTTP) with optional realtime sync over WebSocket.
+
+```
+HTTP request ──▶ LivequeryInterceptor ──▶ LivequeryDatasourceInterceptors ──▶ datasource.handle(ctx)
+                 (parse + WS subscribe)        (route metadata → engine)        (@livequery/mongodb, ...)
+                                                                                        │
+WS client ◀── WebsocketGateway ◀── watcher (e.g. MongodbRealtime change streams) ◀─────┘
+```
+
+Datasources implement the engine contract from `@livequery/core` (`LivequeryDatasource`: `init` + `handle`). `@livequery/mongodb` is the reference implementation.
+
+## Install
+
+```bash
+bun add @livequery/nestjs @livequery/core
+# peer deps (you likely have them already in a NestJS app):
+bun add reflect-metadata @nestjs/core @nestjs/common @nestjs/platform-ws @nestjs/websockets express
+# the reference datasource:
+bun add @livequery/mongodb mongodb
+```
+
+## Quick start (MongoDB)
+
+**1. Create the decorator + provider pair** with `createDatasourceMapper`:
+
+```ts
+// UseMongodbDatasource.ts
+import { createDatasourceMapper } from '@livequery/nestjs'
+import { MongoDatasource, MongodbRealtime, RouteOptions } from '@livequery/mongodb'
+import type { Provider } from '@nestjs/common'
+
+const [decorator, provider] = createDatasourceMapper({
+    querier: MongoDatasource,          // class, constructed via NestJS DI
+    watcher: MongodbRealtime,          // optional — change streams → realtime
+    config: {
+        connections: { default: mongoClient },
+        databases: ['main'],
+    },
+})
+
+export const MongodbDatasourceProvider: Provider = provider
+export const UseMongodbDatasource = (options: RouteOptions) => decorator(options)
+```
+
+`config` can also be a factory `(...injections) => Config` resolved through DI — pass the inject tokens via `injects: [...]` (e.g. `getConnectionToken()` from `@nestjs/mongoose`).
+
+**2. Decorate controller routes** (paths must start with `livequery/`):
+
+```ts
+@Controller('livequery/tasks')
+export class TaskController {
+    @Get()           @UseMongodbDatasource({ collection: 'tasks', realtime: true }) list() { }
+    @Get(':id')      @UseMongodbDatasource({ collection: 'tasks' })                 get() { }
+    @Post()          @UseMongodbDatasource({ collection: 'tasks' })                 create() { }
+    @Patch(':id')    @UseMongodbDatasource({ collection: 'tasks' })                 update() { }
+    @Delete(':id')   @UseMongodbDatasource({ collection: 'tasks' })                 remove() { }
+}
+```
+
+Handlers can return nothing (the datasource result is returned as-is), a `LivequeryItemMapper` to transform items, or a function `(result) => response` for full control.
+
+**3. Register everything in the module:**
+
+```ts
+import { DiscoveryModule } from '@nestjs/core'
+import { WebsocketGateway } from '@livequery/core'
+
+@Module({
+    imports: [DiscoveryModule],                       // required by route discovery
+    controllers: [TaskController],
+    providers: [
+        MongodbDatasourceProvider,
+        { provide: WebsocketGateway, useValue: gateway },  // new WebsocketGateway(httpServer)
+    ],
+})
+export class AppModule { }
+```
+
+On bootstrap the provider discovers every decorated route, calls `datasource.init(routes)`, and (if a `watcher` was given) pipes `watcher.watch(config, routes, ds)` into the gateway for realtime fan-out.
+
+## Querying
+
+All livequery query grammar flows through automatically:
+
+```
+GET /livequery/tasks?done:eq=false&seq:gte=10&seq:sort=desc&:limit=20&:after=<cursor>
+```
+
+Responses carry `items`/`item` plus paging (`count`, `has`, `cursor`, `page`). Underscore-prefixed fields (`_secret`, …) are stripped from `item`, `items`, and the `{ data }` envelope automatically.
+
+Realtime: a client that sends `x-lcid`/`x-lgid` headers on a GET is subscribed on the gateway; subsequent changes (including out-of-band DB writes when using `MongodbRealtime`) are pushed as `sync` events. Use `@livequery/client` + `@livequery/rest` on the frontend.
+
+## API surface
+
+| Export | Purpose |
+|---|---|
+| `createDatasourceMapper({ querier, watcher?, injects?, config })` | Returns `[decorator, provider]` wiring a datasource class into routes + DI |
+| `LivequeryInterceptor` / `UseLivequeryInterceptor()` | Parses the request into `req.livequery`, registers WS subscriptions, masks private fields |
+| `LivequeryDatasourceInterceptors` | Resolves route metadata and drives `datasource.handle(ctx)` |
+| `LivequeryItemMapper` | Per-item response mapping helper |
+| `@LivequeryRequest()` | Param decorator exposing the parsed `LivequeryRequest` |
+| `ApiGateway`, `ApiServiceLinker`, `listPaths` | Gateway/multi-node utilities |
+| `WebsocketGateway`, `UdpDiscovery`, … | Re-exported from `@livequery/core` |
+| `LivequeryDatasource`, `UpdatedData`, `QueryOption`, `FilterConditions`, `Paging`, … | Type surface re-exported from `@livequery/core` |
+
+## Datasource & watcher contracts
+
+```ts
+// querier: class whose instances satisfy core's engine contract
+type LivequeryDatasourceFactory<Config, RouteOptions> = {
+    new (...args: any[]): LivequeryDatasource<RouteOptions> & { config?: Config }
+}
+// LivequeryDatasource<RouteOptions> (from @livequery/core):
+//   init(routes: Array<RouteOptions & { method: string, path: string }>): Promise<void> | void
+//   handle(ctx: LivequeryContext): any
+
+// watcher: realtime source
+type LivequeryDatasourceWatcher<Config, RouteOptions> = {
+    watch(
+        config: Config,
+        routes: Array<{ path: string, schema: string, method: string, options: RouteOptions }>,
+        ds: LivequeryDatasource<RouteOptions>,
+    ): Observable<UpdatedData<any>>
+}
+```
+
+`config` is assigned onto the instance by the provider after DI construction. Route `path`/`schema` are produced by `@livequery/core`'s `LivequeryRequestParser` from the controller route patterns (the `livequery/` prefix and the document-id segment are stripped — e.g. `livequery/users/:uid/posts/:id` → `users/:uid/posts`); `method` is the HTTP verb string (`'GET'`, `'POST'`, …).
+
+## Notes
+
+- **Transpilers**: the interceptors use explicit `@Inject(...)` tokens, so the package works under bundlers that don't emit `design:paramtypes` (bun, esbuild, vite). Your app still needs `experimentalDecorators` (standard for NestJS); when running TS sources directly with bun, make sure a `tsconfig.json` with `experimentalDecorators` is visible from your working directory, or parameter decorators are silently dropped.
+- **Realtime** with `MongodbRealtime` requires MongoDB change streams (replica set / mongos) and, for full delete payloads, the `collMod` privilege (pre/post images).
+- Errors thrown by datasources are structured `{ status, code, message }` objects — add an exception filter if you want them mapped onto HTTP responses.
+
+## Breaking changes in 2.0.148
+
+- Depends on `@livequery/core ^2.0.148` (peer); `@livequery/types` is no longer used or re-exported. The shared type surface now comes from core.
+- `LivequeryDatasource` exported here is now core's single-generic type (`LivequeryDatasource<RouteOptions>`); the old local two-generic `Subject`-based type was removed. Datasources must implement core's `handle(ctx)` — `@livequery/mongodb` ≥ 2.0.148 and `@livequery/mongoose` already do.
+- The interceptor drives datasources through `handle(ctx)` (engine entry point) instead of calling `query(req, options)` directly; route options are resolved from the datasource's own route table built at `init()`.
+- Watcher route `method` is now the verb string (`'GET'`) instead of NestJS's `RequestMethod` enum number.
+- Client-side types (`Transporter`, `Response`, `QueryStream`, `DocumentResponse`) are no longer re-exported — import them from the client packages if you need them.
+- Removed `LivequeryWebsocketSync` (an empty placeholder class) and `SimpleApiGateway` (a thin `@Injectable` wrapper) — use `ApiGatewayHandler` from `@livequery/core` or `ApiGateway` from this package instead.

package/build/src/LivequeryDatasourceInterceptors.d.ts

@@ -1,22 +1,10 @@
 import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
-import { Subject } from 'rxjs';
 import { DiscoveryService, ModuleRef, Reflector } from '@nestjs/core';
-import { LivequeryBaseEntity, LivequeryRequest, WebsocketSyncPayload } from '@livequery/types';
+import type { LivequeryBaseEntity } from '@livequery/core';
 export declare class LivequeryItemMapper<T extends LivequeryBaseEntity> {
     readonly mapper: (item: T) => T;
     constructor(mapper: (item: T) => T);
 }
-export type LivequeryDatasource<Config, RouteOptions> = Subject<WebsocketSyncPayload<LivequeryBaseEntity>> & {
-    init(config: Config, routes: Array<{
-        path: string;
-        method: number;
-        options: RouteOptions;
-    }>): Promise<void>;
-    query: (query: LivequeryRequest, options: RouteOptions) => Promise<{
-        items: any[];
-        item: any;
-    }>;
-};
 export type DatatasourceRouteMetadata<RouteOptions> = {
     datasource: Symbol;
     options: RouteOptions;
@@ -28,11 +16,12 @@ export declare class LivequeryDatasourceInterceptors implements NestInterceptor
     constructor(reflector: Reflector, discovery: DiscoveryService, moduleRef: ModuleRef);
     getRoutes<Options>(token?: Symbol): {
         path: string;
+        schema: string;
         options: Options;
-        method: any;
+        method: string;
     }[];
     intercept(ctx: ExecutionContext, next: CallHandler): Promise<import("rxjs").Observable<{
-        items: any[];
-        item: any;
+        items?: any[];
+        item?: any;
     }>>;
 }

package/build/src/LivequeryDatasourceInterceptors.js

@@ -1,22 +1,15 @@
 var LivequeryDatasourceInterceptors_1;
-import { __decorate, __metadata } from "tslib";
-import { Injectable } from '@nestjs/common';
+import { __decorate, __metadata, __param } from "tslib";
+import { Inject, Injectable, RequestMethod } from '@nestjs/common';
 import { map, mergeMap } from 'rxjs';
 import { DiscoveryService, ModuleRef, Reflector } from '@nestjs/core';
-import { hidePrivateFields } from '@livequery/core';
+import { hidePrivateFields, LivequeryRequestParser } from '@livequery/core';
 export class LivequeryItemMapper {
     mapper;
     constructor(mapper) {
         this.mapper = mapper;
     }
 }
-function normalizeRouteRef(path) {
-    const pathname = path.split('?')[0].split('~')[0];
-    const segments = pathname.split('/').filter(Boolean);
-    const livequeryIndex = segments.indexOf('livequery');
-    const refSegments = livequeryIndex === -1 ? segments : segments.slice(livequeryIndex + 1);
-    return refSegments.map(segment => segment.startsWith(':') ? segment.slice(1) : segment).join('/');
-}
 let LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors_1 = class LivequeryDatasourceInterceptors {
     reflector;
     discovery;
@@ -44,11 +37,19 @@ let LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors_1 = class
                     const x = (a || '').trim().replace(/^\/+|\/+$/g, '');
                     const y = (b || '').trim().replace(/^\/+|\/+$/g, '');
                     const joined = (x == '' || y == '') ? `${x}${y}` : `${x}/${y}`;
-                    return normalizeRouteRef(joined);
+                    return LivequeryRequestParser.parse({
+                        ref: joined,
+                        path: joined,
+                        params: {},
+                        query: {},
+                        method: 'GET',
+                        headers: new Map(),
+                    })?.schema ?? '';
                 })).flat(2);
-                const method = Reflect.getMetadata('method', metatype.prototype[name]);
+                const method = RequestMethod[Reflect.getMetadata('method', metatype.prototype[name]) ?? RequestMethod.GET] ?? 'GET';
                 return paths.map(path => ({
                     path,
+                    schema: path,
                     options: metadata.options,
                     method
                 }));
@@ -58,9 +59,21 @@ let LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors_1 = class
     async intercept(ctx, next) {
         return next.handle().pipe(mergeMap(async (rs) => {
             const req = ctx.switchToHttp().getRequest();
-            const { options, datasource } = await this.reflector.get(LivequeryDatasourceInterceptors_1, ctx.getHandler());
-            const ds = await this.moduleRef.get(datasource);
-            const lrs = await ds.query(req.livequery, options);
+            const { datasource } = this.reflector.get(LivequeryDatasourceInterceptors_1, ctx.getHandler());
+            const ds = this.moduleRef.get(datasource);
+            const context = {
+                request: {
+                    path: req.originalUrl ?? req.url ?? '',
+                    ref: req.livequery?.schema ?? req.route?.path ?? req.path ?? '',
+                    params: req.params ?? {},
+                    query: req.query ?? {},
+                    body: req.body,
+                    method: req.method,
+                    headers: new Headers(req.headers),
+                },
+                livequery: req.livequery,
+            };
+            const lrs = await ds.handle(context);
             if (rs instanceof LivequeryItemMapper) {
                 if (lrs.item) {
                     return {
@@ -84,7 +97,7 @@ let LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors_1 = class
             if (data.items) {
                 return {
                     ...data,
-                    items: data.items.map(item => hidePrivateFields(item))
+                    items: data.items.map((item) => hidePrivateFields(item))
                 };
             }
             return data;
@@ -93,6 +106,9 @@ let LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors_1 = class
 };
 LivequeryDatasourceInterceptors = LivequeryDatasourceInterceptors_1 = __decorate([
     Injectable(),
+    __param(0, Inject(Reflector)),
+    __param(1, Inject(DiscoveryService)),
+    __param(2, Inject(ModuleRef)),
     __metadata("design:paramtypes", [Reflector,
         DiscoveryService,
         ModuleRef])

package/build/src/LivequeryDatasourceInterceptors.js.map

@@ -1 +1 @@
-{"version":3,"file":"LivequeryDatasourceInterceptors.js","sourceRoot":"","sources":["../../src/LivequeryDatasourceInterceptors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LivequeryDatasourceInterceptors.js","sourceRoot":"","sources":["../../src/LivequeryDatasourceInterceptors.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAiC,MAAM,EAAE,UAAU,EAAmB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnH,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAErE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAG5E,MAAM,OAAO,mBAAmB;IACA;IAA5B,YAA4B,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAI,CAAC;CAC1D;AAQM,IAAM,+BAA+B,uCAArC,MAAM,+BAA+B;IAOT;IACgB;IAChB;IAH/B,YAC+B,SAAoB,EACJ,SAA2B,EAC3C,SAAoB;QAFpB,cAAS,GAAT,SAAS,CAAW;QACJ,cAAS,GAAT,SAAS,CAAkB;QAC3C,cAAS,GAAT,SAAS,CAAW;IAC/C,CAAC;IAGL,SAAS,CAAU,KAAc;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAA;QACnD,OAAO,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAChC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;YACpC,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,CAAA;YACxB,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;YAClE,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACpB,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,iCAA+B,EAAE,EAAE,CAAuC,CAAA;gBAC9G,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,IAAI,KAAK,CAAC;oBAAE,OAAO,EAAE,CAAA;gBACnE,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAC9D,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACxD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBACzC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;oBACpD,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;oBACpD,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAA;oBAC9D,OAAO,sBAAsB,CAAC,KAAK,CAAC;wBAChC,GAAG,EAAE,MAAM;wBACX,IAAI,EAAE,MAAM;wBACZ,MAAM,EAAE,EAAE;wBACV,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,KAAK;wBACb,OAAO,EAAE,IAAI,GAAG,EAAE;qBACrB,CAAC,EAAE,MAAM,IAAI,EAAE,CAAA;gBACpB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAGX,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,KAAK,CAAA;gBACnH,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACtB,IAAI;oBACJ,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,MAAM;iBACT,CAAC,CAAC,CAAA;YACP,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACd,CAAC;IAGD,KAAK,CAAC,SAAS,CAAC,GAAqB,EAAE,IAAiB;QACpD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACrB,QAAQ,CAAC,KAAK,EAAE,EAA4C,EAAE,EAAE;YAC5D,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;YAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,iCAA+B,EAAE,GAAG,CAAC,UAAU,EAAE,CAE1F,CAAA;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAiB,CAA6B,CAAA;YAO5E,MAAM,OAAO,GAAqB;gBAC9B,OAAO,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE;oBACtC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE;oBAC/D,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE;oBACxB,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE;oBACtB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,OAAsB,CAAmC;iBACrF;gBACD,SAAS,EAAE,GAAG,CAAC,SAAS;aAC3B,CAAA;YACD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAkC,CAAA;YAErE,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,CAAkC,CAAA;YACzD,CAAC;YACD,OAAO,EAAE,IAAI,GAAG,CAAA;QACpB,CAAC,CAAC,EACF,GAAG,CAAC,IAAI,CAAC,EAAE;YACP,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,OAAO;oBACH,GAAG,IAAI;oBACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;iBAChE,CAAA;YACL,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC,CAAC,CACL,CAAA;IAEL,CAAC;CACJ,CAAA;AAlHY,+BAA+B;IAD3C,UAAU,EAAE;IAQJ,WAAA,MAAM,CAAC,SAAS,CAAC,CAAA;IACjB,WAAA,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACxB,WAAA,MAAM,CAAC,SAAS,CAAC,CAAA;qCAFoB,SAAS;QACO,gBAAgB;QAChC,SAAS;GAT1C,+BAA+B,CAkH3C"}

package/build/src/LivequeryInterceptor.js

@@ -37,15 +37,7 @@ let LivequeryInterceptor = class LivequeryInterceptor {
         if (parsed && req.method === 'GET' && !cursor) {
             this.WebsocketGateway?.handle(ctx);
         }
-        return next.handle().pipe(map(response => {
-            if (response.item) {
-                return {
-                    ...response,
-                    item: hidePrivateFields(response.item.toJSON ? response.item.toJSON() : response.item),
-                };
-            }
-            return response;
-        }));
+        return next.handle().pipe(map(response => maskLivequeryResponse(response)));
     }
 };
 LivequeryInterceptor = __decorate([
@@ -55,5 +47,23 @@ LivequeryInterceptor = __decorate([
     __metadata("design:paramtypes", [WebsocketGateway])
 ], LivequeryInterceptor);
 export { LivequeryInterceptor };
+function toPlain(item) {
+    return item && typeof item.toJSON === 'function' ? item.toJSON() : item;
+}
+function maskLivequeryResponse(response) {
+    if (!response || typeof response !== 'object')
+        return response;
+    let masked = response;
+    if (masked.item) {
+        masked = { ...masked, item: hidePrivateFields(toPlain(masked.item)) };
+    }
+    if (Array.isArray(masked.items)) {
+        masked = { ...masked, items: masked.items.map((item) => hidePrivateFields(toPlain(item))) };
+    }
+    if (masked.data && typeof masked.data === 'object') {
+        masked = { ...masked, data: maskLivequeryResponse(masked.data) };
+    }
+    return masked;
+}
 export const UseLivequeryInterceptor = () => UseInterceptors(LivequeryInterceptor);
 //# sourceMappingURL=LivequeryInterceptor.js.map

package/build/src/LivequeryInterceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"LivequeryInterceptor.js","sourceRoot":"","sources":["../../src/LivequeryInterceptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LivequeryInterceptor.js","sourceRoot":"","sources":["../../src/LivequeryInterceptor.ts"],"names":[],"mappings":"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"}

package/build/src/LivequeryRequest.d.ts

@@ -1,3 +1,3 @@
-import { LivequeryRequest as LQR } from '@livequery/types';
+import type { LivequeryRequest as LQR } from '@livequery/core';
 export declare const LivequeryRequest: (...dataOrPipes: unknown[]) => ParameterDecorator;
 export type LivequeryRequest = LQR;

package/build/src/helpers/createDatasourceMapper.d.ts

@@ -1,22 +1,25 @@
-import { LivequeryDatasource } from "../LivequeryDatasourceInterceptors.js";
 import { RouterOptions } from "express";
 import { Observable } from 'rxjs';
 import { ModuleRef } from "@nestjs/core";
-import { UpdatedData } from "@livequery/types";
+import type { LivequeryDatasource, UpdatedData } from "@livequery/core";
 import { WebsocketGateway } from "@livequery/core";
 export type ResolverRoutes = Array<{
     path: string;
     options: RouterOptions;
 }>;
 export type LivequeryDatasourceFactory<Config, RouteOptions> = {
-    new (...args: any[]): LivequeryDatasource<Config, RouteOptions>;
+    new (...args: any[]): LivequeryDatasource<RouteOptions> & {
+        config?: Config;
+    };
+};
+export type LivequeryDatasourceWatcherRoute<RouteOptions> = {
+    path: string;
+    schema: string;
+    method: string;
+    options: RouteOptions;
 };
 export type LivequeryDatasourceWatcher<Config, RouteOptions> = {
-    watch(config: Config, routes: Array<{
-        path: string;
-        method: number;
-        options: RouteOptions;
-    }>, ds: LivequeryDatasource<Config, RouteOptions>): Observable<UpdatedData<any>>;
+    watch(config: Config, routes: Array<LivequeryDatasourceWatcherRoute<RouteOptions>>, ds: LivequeryDatasource<RouteOptions>): Observable<UpdatedData<any>>;
 };
 export type LivequeryDatasourceWatcherFactory<Config, RouteOptions> = {
     new (...args: any[]): LivequeryDatasourceWatcher<Config, RouteOptions>;
@@ -30,5 +33,9 @@ export type CreateDatasourceOptions<Config, RouteOptions> = {
 export declare const createDatasourceMapper: <Config, RouteOptions>({ querier, injects, config: configResolver, watcher }: CreateDatasourceOptions<Config, RouteOptions>) => [(options: RouteOptions) => <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void, {
     provide: LivequeryDatasourceFactory<Config, RouteOptions>;
     inject: any[];
-    useFactory: (moduleRef: ModuleRef, ws: WebsocketGateway, ...injections: any[]) => Promise<LivequeryDatasource<Config, RouteOptions>>;
+    useFactory: (moduleRef: ModuleRef, ws: WebsocketGateway, ...injections: any[]) => Promise<import("@livequery/core").LivequeryHandler & {
+        init(routes: import("@livequery/core").LivequeryDatasourceInitConfig<RouteOptions>[]): Promise<void> | void;
+    } & {
+        config?: Config;
+    }>;
 }];

package/build/src/helpers/createDatasourceMapper.js

@@ -19,7 +19,8 @@ export const createDatasourceMapper = ({ querier, injects = [], config: configRe
             const interceptor = await moduleRef.create(LivequeryDatasourceInterceptors);
             const routes = interceptor.getRoutes(querier);
             const config = configResolver instanceof Function ? await configResolver(...injections) : configResolver;
-            await ds.init(config, routes);
+            ds.config = config;
+            await ds.init(routes.map(r => ({ path: r.path, method: r.method, ...r.options })));
             if (watcher) {
                 const w = await moduleRef.create(watcher);
                 w.watch(config, routes, ds).subscribe({

package/build/src/helpers/createDatasourceMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDatasourceMapper.js","sourceRoot":"","sources":["../../../src/helpers/createDatasourceMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAkD,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACxI,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAGrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AA+BnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAuB,EACzD,OAAO,EACP,OAAO,GAAG,EAAE,EACZ,MAAM,EAAE,cAAc,EACtB,OAAO,EACqC,EAAE,EAAE;IAGhD,MAAM,SAAS,GAAG,CAAC,OAAqB,EAAE,EAAE;QACxC,MAAM,QAAQ,GAA4C;YACtD,OAAO;YACP,UAAU,EAAE,OAA4B;SAC3C,CAAA;QACD,OAAO,eAAe,CAClB,uBAAuB,EAAE,EACzB,eAAe,CAAC,+BAA+B,CAAC,EAChD,WAAW,CAAC,+BAA+B,EAAE,QAAQ,CAAC,CACzD,CAAA;IACL,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG;QACb,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QACjD,UAAU,EAAE,KAAK,EAAE,SAAoB,EAAE,EAAoB,EAAE,GAAG,UAAiB,EAAE,EAAE;YACnF,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,MAAM,CAA4C,OAAO,CAAC,CAAA;YACrF,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,MAAM,CAAkC,+BAA+B,CAAC,CAAA;YAC5G,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAe,OAA4B,CAAC,CAAA;YAChF,MAAM,MAAM,GAAG,cAAc,YAAY,QAAQ,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAA;YACxG,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YAC7B,IAAI,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,MAAM,CAAmD,OAAO,CAAC,CAAA;gBAC3F,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC;oBAClC,IAAI,CAAC,KAAK;wBACN,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBAClB,CAAC;iBACJ,CAAC,CAAA;YACN,CAAC;YACD,OAAO,EAAE,CAAA;QACb,CAAC;KACJ,CAAA;IAGD,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAwC,CAAA;AACvE,CAAC,CAAA"}
+{"version":3,"file":"createDatasourceMapper.js","sourceRoot":"","sources":["../../../src/helpers/createDatasourceMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAA6B,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACnH,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAGrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAwCnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAuB,EACzD,OAAO,EACP,OAAO,GAAG,EAAE,EACZ,MAAM,EAAE,cAAc,EACtB,OAAO,EACqC,EAAE,EAAE;IAGhD,MAAM,SAAS,GAAG,CAAC,OAAqB,EAAE,EAAE;QACxC,MAAM,QAAQ,GAA4C;YACtD,OAAO;YACP,UAAU,EAAE,OAA4B;SAC3C,CAAA;QACD,OAAO,eAAe,CAClB,uBAAuB,EAAE,EACzB,eAAe,CAAC,+BAA+B,CAAC,EAChD,WAAW,CAAC,+BAA+B,EAAE,QAAQ,CAAC,CACzD,CAAA;IACL,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG;QACb,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QACjD,UAAU,EAAE,KAAK,EAAE,SAAoB,EAAE,EAAoB,EAAE,GAAG,UAAiB,EAAE,EAAE;YACnF,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAC1C,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAA;YAC3E,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAe,OAA4B,CAAC,CAAA;YAChF,MAAM,MAAM,GAAG,cAAc,YAAY,QAAQ,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAA;YACxG,EAAE,CAAC,MAAM,GAAG,MAAM,CAAA;YAClB,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;YAClF,IAAI,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBACzC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC;oBAClC,IAAI,CAAC,KAAK;wBACN,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBAClB,CAAC;iBACJ,CAAC,CAAA;YACN,CAAC;YACD,OAAO,EAAE,CAAA;QACb,CAAC;KACJ,CAAA;IAGD,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAwC,CAAA;AACvE,CAAC,CAAA"}

package/build/src/index.d.ts

@@ -6,6 +6,4 @@ export { LivequeryInterceptor, UseLivequeryInterceptor } from './LivequeryInterc
 export * from './helpers/createDatasourceMapper.js';
 export * from './LivequeryDatasourceInterceptors.js';
 export { ApiGateway, ApiGateway as ApiGatewayLinker } from './ApiGatewayLinker.js';
-export { SimpleApiGateway } from './SimpleApiGateway.js';
-export { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
-export * from '@livequery/types';
+export type { LivequeryDatasource, LivequeryDatasourceInitConfig, LivequeryBaseEntity, UpdatedData, UpdatedDataType, WebsocketSyncPayload, DatabaseEvent, Paging, QueryOption, BasicOptions, SummaryQuery, SummaryOperator, GroupByOperator, FilterConditions, ConditionTypeBuilder, FlatObjectKeys, ChainObjectKeys, RequestMethod, Eq, Neq, NumberNotEqual, Lt, Eqn, Lte, Gt, Gte, Visible, InArray, NotInArray, Like, OrderBy, } from '@livequery/core';

package/build/src/index.js

@@ -6,7 +6,4 @@ export { LivequeryInterceptor, UseLivequeryInterceptor } from './LivequeryInterc
 export * from './helpers/createDatasourceMapper.js';
 export * from './LivequeryDatasourceInterceptors.js';
 export { ApiGateway, ApiGateway as ApiGatewayLinker } from './ApiGatewayLinker.js';
-export { SimpleApiGateway } from './SimpleApiGateway.js';
-export { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
-export * from '@livequery/types';
 //# sourceMappingURL=index.js.map

package/build/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAqG,gBAAgB,EAA6B,MAAM,iBAAiB,CAAA;AAC9L,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACzF,cAAc,qCAAqC,CAAA;AACnD,cAAc,sCAAsC,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAqG,gBAAgB,EAA6B,MAAM,iBAAiB,CAAA;AAC9L,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACzF,cAAc,qCAAqC,CAAA;AACnD,cAAc,sCAAsC,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAA"}

package/build/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/apigatewaylinker.ts","../src/apiservicelinker.ts","../src/livequerydatasourceinterceptors.ts","../src/livequeryinterceptor.ts","../src/livequeryrequest.ts","../src/livequerywebsocketsync.ts","../src/simpleapigateway.ts","../src/index.ts","../src/helpers/createdatasourcemapper.ts","../src/helpers/listpaths.ts"],"version":"5.9.3"}
+{"root":["../src/apigatewaylinker.ts","../src/apiservicelinker.ts","../src/livequerydatasourceinterceptors.ts","../src/livequeryinterceptor.ts","../src/livequeryrequest.ts","../src/index.ts","../src/helpers/createdatasourcemapper.ts","../src/helpers/listpaths.ts"],"version":"5.9.3"}

package/package.json

@@ -5,7 +5,7 @@
     "repository": {
         "url": "git@github.com:livequery/nestjs.git"
     },
-    "version": "2.0.147",
+    "version": "2.0.149",
     "description": "Nestjs decorators for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",
@@ -27,7 +27,7 @@
     },
     "type": "module",
     "devDependencies": {
-        "@livequery/types": "2.0.7",
+        "@livequery/core": "file:../core",
         "@nestjs/platform-express": "^11.1.19",
         "@types/express": "x",
         "@types/node": "x",
@@ -38,6 +38,7 @@
     },
     "peerDependencies": {
         "reflect-metadata": "x",
+        "@livequery/core": "^2.0.149",
         "@nestjs/core": "*",
         "@nestjs/common": "*",
         "@nestjs/platform-ws": "^11.0.10",
@@ -45,7 +46,6 @@
         "express": "^4.21.2"
     },
     "dependencies": {
-        "@livequery/core": "file:../core",
         "msgpackr": "^1.11.9"
     }
 }

package/build/src/ApiGateway.d.ts

@@ -1,54 +0,0 @@
-import { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
-import { NodeMetadata } from './RxjsUdp.js';
-export type Routing = {
-    [ref: string]: {
-        dpaths: string[];
-        children?: Routing;
-        methods?: {
-            [METHOD: string]: {
-                hosts: Array<{
-                    uri: string;
-                    instance_id: string;
-                }>;
-                last_requested_index: number;
-            };
-        };
-    };
-};
-export type ServiceApiMetadata = NodeMetadata<{
-    role: 'service' | 'gateway';
-    name: string;
-    port: number;
-    paths: Array<{
-        method: string;
-        path: string;
-    }>;
-    websocket?: string;
-    wsauth?: string;
-    linked: string[];
-    target?: string;
-}>;
-export type ServiceApiStatus = {
-    id: string;
-    online: boolean;
-    metadata?: ServiceApiMetadata;
-} | {
-    id: string;
-    online: false;
-};
-export type ApiGatewayClientOptions = {
-    id: string;
-    name: string;
-    controllers: any[];
-    port: number;
-};
-export declare class ApiGateway {
-    #private;
-    private lws;
-    constructor(lws: LivequeryWebsocketSync);
-    private get;
-    private post;
-    private patch;
-    private put;
-    private del;
-}