@webda/core 3.6.0 → 3.8.0

package/lib/stores/modelmapper.d.ts

@@ -0,0 +1,61 @@
+import { CoreModel, CoreModelDefinition } from "../models/coremodel.js";
+import { Service } from "../services/service.js";
+export interface Mapper {
+    modelAttribute: string;
+    model: CoreModelDefinition<CoreModel>;
+    attributes: string[];
+    attribute: string;
+}
+interface ModelMapperInfo {
+    modelAttribute: string;
+    model: CoreModelDefinition<CoreModel>;
+    attributes: string[];
+    attribute: string;
+    type: "LINK" | "LINKS_MAP" | "LINKS_ARRAY" | "LINKS_SIMPLE_ARRAY";
+}
+/**
+ * Mapper service
+ *
+ * Ensure each ModelMapped properties is in-sync with their respective model
+ */
+export declare class ModelMapper extends Service {
+    mappers: {
+        [key: string]: ModelMapperInfo[];
+    };
+    resolve(): this;
+    /**
+     * Get uuids from a ModelLinker
+     * @param object
+     * @param mapper
+     * @returns
+     */
+    getUuidsFromMapper(object: CoreModel, mapper: ModelMapperInfo): any[];
+    /**
+     * Handle event
+     * @param modelName
+     * @param evt
+     * @param type
+     * @returns
+     */
+    handleEvent(modelName: string, evt: any, type: "Store.Saved" | "Store.Deleted" | "Store.Updated" | "Store.PatchUpdated" | "Store.PartialUpdated"): Promise<any[]>;
+    /**
+     * Handle partial event to update a mapper
+     *
+     * @param modelName
+     * @param evt
+     * @param type
+     * @returns
+     */
+    handlePartialEvent(modelName: string, evt: any, type: "Store.Saved" | "Store.Deleted" | "Store.Updated" | "Store.PatchUpdated" | "Store.PartialUpdated"): Promise<any[]>;
+    /**
+     * Get a mapped object based on Mapper
+     *
+     * Copy attributes that are supposed to be copied
+     *
+     * @param model
+     * @param mapper
+     * @returns
+     */
+    getMapped(model: any, mapper: Mapper): any;
+}
+export {};

package/lib/stores/modelmapper.js

@@ -0,0 +1,199 @@
+import { Service } from "../services/service.js";
+/**
+ * Mapper service
+ *
+ * Ensure each ModelMapped properties is in-sync with their respective model
+ */
+export class ModelMapper extends Service {
+    constructor() {
+        super(...arguments);
+        this.mappers = {};
+    }
+    resolve() {
+        var _a, _b;
+        super.resolve();
+        const app = this.getWebda().getApplication();
+        const graph = app.getGraph();
+        for (let i in graph) {
+            if (!graph[i].maps)
+                continue;
+            this.log("INFO", i, graph[i].maps);
+            const targetModel = app.getModel(i);
+            for (let j in graph[i].maps) {
+                const mapper = graph[i].maps[j];
+                (_a = this.mappers)[_b = mapper.model] ?? (_a[_b] = []);
+                // Search for links
+                this.mappers[mapper.model].push({
+                    attribute: mapper.targetLink,
+                    attributes: mapper.targetAttributes,
+                    model: targetModel,
+                    modelAttribute: mapper.attribute,
+                    type: graph[mapper.model].links?.find(p => p.attribute === mapper.targetLink)?.type || "LINK"
+                });
+            }
+        }
+        this.log("INFO", "Add listeners for", this.mappers);
+        for (let modelName in this.mappers) {
+            const model = app.getModel(modelName);
+            model.on("Store.Deleted", async (evt) => {
+                return this.handleEvent(modelName, evt, "Store.Deleted");
+            });
+            model.on("Store.Saved", async (evt) => {
+                return this.handleEvent(modelName, evt, "Store.Saved");
+            });
+            model.on("Store.Updated", async (evt) => {
+                return this.handleEvent(modelName, evt, "Store.Updated");
+            });
+            model.on("Store.PatchUpdated", async (evt) => {
+                return this.handlePartialEvent(modelName, evt, "Store.PatchUpdated");
+            });
+            model.on("Store.PartialUpdated", async (evt) => {
+                return this.handlePartialEvent(modelName, evt, "Store.PartialUpdated");
+            });
+        }
+        return this;
+    }
+    /**
+     * Get uuids from a ModelLinker
+     * @param object
+     * @param mapper
+     * @returns
+     */
+    getUuidsFromMapper(object, mapper) {
+        const targetUuids = [];
+        if (mapper.type === "LINK") {
+            targetUuids.push(object[mapper.attribute]?.getUuid());
+        }
+        else if (mapper.type === "LINKS_MAP") {
+            targetUuids.push(...Object.values(object[mapper.attribute]).map((p) => p.getUuid()));
+        }
+        else {
+            targetUuids.push(...object[mapper.attribute].map(p => (typeof p === "string" ? p : p.getUuid())));
+        }
+        return targetUuids.filter(p => p);
+    }
+    /**
+     * Handle event
+     * @param modelName
+     * @param evt
+     * @param type
+     * @returns
+     */
+    async handleEvent(modelName, evt, type) {
+        let p = [];
+        for (let mapper of this.mappers[modelName]) {
+            // For each mapper we identify uuid to add mapper to, uuid to remove mapper from and uuid to update
+            const toAdds = [];
+            const toRemoves = [];
+            const toUpdates = [];
+            if (type === "Store.Saved") {
+                toAdds.push(...this.getUuidsFromMapper(evt.object, mapper));
+            }
+            else if (type === "Store.Deleted") {
+                toRemoves.push(...this.getUuidsFromMapper(evt.object, mapper));
+            }
+            else if (type === "Store.Updated") {
+                const oldUuids = this.getUuidsFromMapper(evt.previous, mapper);
+                const newUuids = this.getUuidsFromMapper(evt.object, mapper);
+                oldUuids.forEach(u => {
+                    if (newUuids.includes(u)) {
+                        toUpdates.push(u);
+                    }
+                    else {
+                        toRemoves.push(u);
+                    }
+                });
+                newUuids.forEach(u => {
+                    if (!oldUuids.includes(u)) {
+                        toAdds.push(u);
+                    }
+                });
+            }
+            const mapped = this.getMapped(evt.object, mapper);
+            // Add all promise
+            toAdds.forEach(u => {
+                p.push(mapper.model.ref(u).upsertItemToCollection(mapper.modelAttribute, mapped));
+            });
+            // Remove all promise
+            toRemoves.forEach(u => {
+                p.push((async () => {
+                    const targetModel = await mapper.model.ref(u).get();
+                    if (!targetModel)
+                        return;
+                    const ind = targetModel[mapper.modelAttribute].findIndex(p => p.uuid === evt.object.getUuid());
+                    if (ind >= 0) {
+                        await mapper.model.ref(u).deleteItemFromCollection(mapper.modelAttribute, ind, evt.object.getUuid());
+                    }
+                })());
+            });
+            // Update all promise
+            toUpdates.forEach(u => {
+                p.push((async () => {
+                    const targetModel = await mapper.model.ref(u).get();
+                    if (!targetModel)
+                        return;
+                    const ind = targetModel[mapper.modelAttribute].findIndex(p => p.uuid === evt.object.getUuid());
+                    if (ind >= 0) {
+                        await mapper.model
+                            .ref(u)
+                            .upsertItemToCollection(mapper.modelAttribute, mapped, ind, evt.object.getUuid());
+                    }
+                })());
+            });
+        }
+        return Promise.all(p);
+    }
+    /**
+     * Handle partial event to update a mapper
+     *
+     * @param modelName
+     * @param evt
+     * @param type
+     * @returns
+     */
+    async handlePartialEvent(modelName, evt, type) {
+        let uuid = evt.object?.getUuid();
+        // Only use in Store.PartialUpdated
+        const attributes = [];
+        if (type === "Store.PartialUpdated") {
+            const partial = evt;
+            if (partial.partial_update.increments) {
+                attributes.push(...partial.partial_update.increments.map(p => p.property));
+            }
+            if (partial.partial_update.deleteAttribute) {
+                attributes.push(partial.partial_update.deleteAttribute);
+            }
+            uuid = partial.object_id;
+        }
+        else if (type === "Store.PatchUpdated") {
+            attributes.push(...Object.keys(evt.object));
+        }
+        for (let mapper of this.mappers[modelName]) {
+            this.log("TRACE", "Should update a mapper based on Store.PartialUpdated", evt);
+            const partial = evt;
+            // Search if one property is mapped then redirect to Store.Updated
+            if (mapper.attributes.find(p => attributes.find(i => i === p))) {
+                const object = await partial.store.get(uuid);
+                return await this.handleEvent(modelName, { object, previous: object }, "Store.Updated");
+            }
+        }
+    }
+    /**
+     * Get a mapped object based on Mapper
+     *
+     * Copy attributes that are supposed to be copied
+     *
+     * @param model
+     * @param mapper
+     * @returns
+     */
+    getMapped(model, mapper) {
+        let obj = {};
+        for (let attr of mapper.attributes) {
+            obj[attr] = model[attr];
+        }
+        obj["uuid"] = model.getUuid();
+        return obj;
+    }
+}
+//# sourceMappingURL=modelmapper.js.map

package/lib/stores/modelmapper.js.map

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

package/lib/stores/store.d.ts

@@ -1,6 +1,6 @@
 import { Counter, EventWithContext, Histogram } from "../core.js";
 import { ConfigurationProvider, WebdaError } from "../index.js";
-import { Constructor, CoreModel, CoreModelDefinition, FilterKeys } from "../models/coremodel.js";
+import { Constructor, CoreModel, CoreModelDefinition, FilterAttributes } from "../models/coremodel.js";
 import { Service, ServiceParameters } from "../services/service.js";
 import { OperationContext, WebContext } from "../utils/context.js";
 import { HttpMethodType } from "../utils/httpcontext.js";
@@ -83,7 +83,7 @@ export interface EventStoreActioned extends EventStoreAction {
 /**
  * Event called before update of an object
  */
-export interface EventStoreUpdate extends EventStoreUpdated {
+export interface EventStoreUpdate extends EventStore {
     /**
      * Update content
      */
@@ -92,7 +92,11 @@ export interface EventStoreUpdate extends EventStoreUpdated {
 /**
  * Event called after update of an object
  */
-export interface EventStoreUpdated extends EventStore {
+export interface EventStoreUpdated extends EventStoreUpdate {
+    /**
+     * Object before update
+     */
+    previous: any;
 }
 /**
  * Event called before patch update of an object
@@ -358,6 +362,14 @@ export declare class StoreParameters extends ServiceParameters {
      * @default "Webda/CoreModel"
      */
     model?: string;
+    /**
+     * Additional models
+     *
+     * Allow this store to manage other models
+     *
+     * @default []
+     */
+    additionalModels?: string[];
     /**
      * async delete
      */
@@ -594,10 +606,10 @@ declare abstract class Store<T extends CoreModel = CoreModel, K extends StorePar
      * @param info
      * @returns
      */
-    incrementAttributes<FK extends FilterKeys<T, number>>(uid: string, info: {
+    incrementAttributes<FK extends FilterAttributes<T, number>>(uid: string, info: {
         property: FK;
         value: number;
-    }[]): Promise<any[]>;
+    }[]): Promise<Date>;
     /**
      * Helper function that call incrementAttributes
      * @param uid
@@ -605,7 +617,7 @@ declare abstract class Store<T extends CoreModel = CoreModel, K extends StorePar
      * @param value
      * @returns
      */
-    incrementAttribute<FK extends FilterKeys<T, number>>(uid: string, prop: FK, value: number): Promise<any[]>;
+    incrementAttribute<FK extends FilterAttributes<T, number>>(uid: string, prop: FK, value: number): Promise<Date>;
     /**
      * Add or update an item to an array in the model
      *
@@ -616,7 +628,7 @@ declare abstract class Store<T extends CoreModel = CoreModel, K extends StorePar
      * @param itemWriteCondition value of the condition to test (in case of update)
      * @param itemWriteConditionField field to read the condition from (in case of update)
      */
-    upsertItemToCollection<FK extends FilterKeys<T, Array<any>>>(uid: string, prop: FK, item: any, index?: number, itemWriteCondition?: any, itemWriteConditionField?: string): Promise<void>;
+    upsertItemToCollection<FK extends FilterAttributes<T, Array<any>>>(uid: string, prop: FK, item: any, index?: number, itemWriteCondition?: any, itemWriteConditionField?: string): Promise<Date>;
     /**
      * Remove an item from an array in the model
      *
@@ -626,15 +638,25 @@ declare abstract class Store<T extends CoreModel = CoreModel, K extends StorePar
      * @param itemWriteCondition value of the condition
      * @param itemWriteConditionField field to read the condition from
      */
-    deleteItemFromCollection<FK extends FilterKeys<T, Array<any>>>(uid: string, prop: FK, index: number, itemWriteCondition: any, itemWriteConditionField?: string): Promise<void>;
+    deleteItemFromCollection<FK extends FilterAttributes<T, Array<any>>>(uid: string, prop: FK, index: number, itemWriteCondition: any, itemWriteConditionField?: string): Promise<Date>;
     /**
-     * Get all results without pagination
+     * Iterate through the results
      *
      * This can be resource consuming
      *
      * @param query
      * @param context
      */
+    iterate(query?: string, context?: OperationContext): AsyncGenerator<T>;
+    /**
+     * Query all the results
+     *
+     *
+     * @param query
+     * @param context
+     * @returns
+     * @deprecated use iterate instead
+     */
     queryAll(query: string, context?: OperationContext): Promise<T[]>;
     /**
      * Check that __type Comparison is only used with = and CONTAINS
@@ -695,7 +717,7 @@ declare abstract class Store<T extends CoreModel = CoreModel, K extends StorePar
      * @param condition
      * @param uid
      */
-    checkCollectionUpdateCondition<FK extends FilterKeys<T, Array<any>>, CK extends keyof T>(model: T, collection: FK, conditionField?: CK, condition?: any, index?: number): void;
+    checkCollectionUpdateCondition<FK extends FilterAttributes<T, Array<any>>, CK extends keyof T>(model: T, collection: FK, conditionField?: CK, condition?: any, index?: number): void;
     /**
      * Update conditionally
      * @param uuid
@@ -714,7 +736,7 @@ declare abstract class Store<T extends CoreModel = CoreModel, K extends StorePar
      * @param itemWriteConditionField
      * @param updateDate
      */
-    simulateUpsertItemToCollection<FK extends FilterKeys<T, Array<any>>>(model: T, prop: FK, item: any, updateDate: Date, index?: number, itemWriteCondition?: any, itemWriteConditionField?: string): Promise<void>;
+    simulateUpsertItemToCollection<FK extends FilterAttributes<T, Array<any>>>(model: T, prop: FK, item: any, updateDate: Date, index?: number, itemWriteCondition?: any, itemWriteConditionField?: string): Promise<void>;
     /**
      * Update an object
      *