@livequery/mongoose 2.0.5 → 2.0.11

package/build/src/MongooseDatasource.d.ts

@@ -41,5 +41,12 @@ export declare class MongooseDatasource implements LivequeryDatasource<RouteOpti
     } | {
         item: any;
     }>;
-    enable_realtime<T extends LivequeryBaseEntity = LivequeryBaseEntity>(d: Observable<DatabaseEvent>): Observable<WebsocketSyncPayload<T>>;
+    enable_realtime<T extends LivequeryBaseEntity = LivequeryBaseEntity>(d: Observable<DatabaseEvent>): Observable<{
+        new_data: LivequeryBaseEntity;
+        old_data: LivequeryBaseEntity;
+        table: string;
+        type: "added" | "removed" | "modified";
+        old_ref: string;
+        new_ref: string;
+    }>;
 }

package/build/src/MongooseDatasource.js

@@ -18,12 +18,13 @@ export class MongooseDatasource {
                     ref
                 ]));
                 if (options.realtime) {
-                    const table_name = options.schema.options.collection.name;
+                    const table_name = options.schema.options.collection;
                     const $ = schema_ref.split('/');
                     const is_collection_ref = $.length % 2 == 1;
                     this.#realtime_collections.set(table_name, new Set([
                         ...this.#realtime_collections.get(table_name) || [],
-                        is_collection_ref ? schema_ref : $.slice(0, -1).join('/')
+                        is_collection_ref ? schema_ref : $.slice(0, -1).join('/'),
+                        schema_ref
                     ]));
                 }
             }
@@ -36,7 +37,7 @@ export class MongooseDatasource {
         const db = await config.db?.(query) || process.env.DB_NAME;
         const connection = config.connection ? this.#conections[await config.connection(query)] : Object.values(this.#conections)[0];
         const schema = config.schema;
-        const collection_name = schema.options.collection.name;
+        const collection_name = schema.options.collection;
         const model = connection.useDb(db).model(collection_name, schema, collection_name, schema.options);
         if (query.method == 'get')
             return await this.#get(query, model);
@@ -153,26 +154,63 @@ export class MongooseDatasource {
         return await model.deleteOne(keys);
     }
     enable_realtime(d) {
+        function parse_refs(ref, o, n) {
+            const keys = ref.split('/').map((k, i) => {
+                if (i % 2 == 0)
+                    return { v: { old_ref: k, new_ref: k } };
+                if (Array.isArray(o[k]) || Array.isArray(n[k])) {
+                    return [
+                        ...Array.isArray(o[k]) ? o[k] : [],
+                        ...Array.isArray(n[k]) ? n[k] : []
+                    ].reduce((p, c) => {
+                        p.set(c, {
+                            old_ref: Array.isArray(o[k]) && o[k].includes(c) ? c : null,
+                            new_ref: Array.isArray(n[k]) && n[k].includes(c) ? c : null,
+                        });
+                        return p;
+                    }, new Map());
+                }
+                return {
+                    v: {
+                        old_ref: o[k],
+                        new_ref: n[k]
+                    }
+                };
+            });
+            function parse(arr) {
+                const v = arr[0];
+                const x = v instanceof Map ? [...v] : Object.entries(v);
+                return x.map(([k, w]) => {
+                    const { old_ref, new_ref } = w;
+                    const next = arr.slice(1);
+                    if (next.length == 0)
+                        return { old_ref, new_ref };
+                    const n = parse(next);
+                    return n.map(nn => {
+                        return {
+                            old_ref: `${old_ref}/${nn.old_ref}`,
+                            new_ref: `${new_ref}/${nn.new_ref}`
+                        };
+                    });
+                }).flat(2);
+            }
+            return parse(keys);
+        }
         return d.pipe(map((event) => {
             const refs = this.#realtime_collections.get(event.table);
             if (!refs)
                 return [];
-            const data = {
-                ...event.old_data || {},
-                ...event.new_data || {}
-            };
             return [...refs].map(ref => {
-                const old_ref = event.old_data ? ref.split('/').map((k, i) => i % 2 == 0 ? k : event.old_data[k]).join('/') : null;
-                const new_ref = event.new_data ? ref.split('/').map((k, i) => i % 2 == 0 ? k : data[k]).join('/') : null;
-                return {
-                    type: event.type,
+                const refs_list = parse_refs(ref, event.old_data, event.new_data);
+                return refs_list.map(({ new_ref, old_ref }) => ({
+                    new_data: event.new_data,
+                    old_data: event.old_data,
                     table: event.table,
+                    type: event.type,
                     old_ref,
-                    new_ref,
-                    old_data: event.old_data,
-                    new_data: event.new_data
-                };
+                    new_ref
+                }));
             });
-        }), mergeAll());
+        }), mergeAll(), mergeAll());
     }
 }

package/package.json

@@ -6,7 +6,7 @@
     "repository": {
         "url": "git@github.com:livequery/mongoose.git"
     },
-    "version": "2.0.5",
+    "version": "2.0.11",
     "description": "Mongoose datasource mapping for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",