@itrocks/mysql 0.0.20 → 0.0.22

package/cjs/mysql.d.ts

@@ -30,6 +30,7 @@ export declare class Mysql extends DataSource {
         database: string;
     };
     connection?: Connection;
+    saveQueue: WeakMap<object, Promise<void | Entity<object>>>;
     constructor(config: {
         host: string;
         user: string;
@@ -51,6 +52,7 @@ export declare class Mysql extends DataSource {
     }>[]>;
     readCollectionIds<T extends object, PT extends object>(object: Entity<T>, property: KeyOf<T>, type?: Type<PT>): Promise<Identifier[]>;
     readMultiple<T extends object>(type: Type<T>, ids: Identifier[]): Promise<Entity<T>[]>;
+    runSerialized<T extends object>(object: MayEntity<T>, task: () => Promise<Entity<T>>): Promise<Entity<T>>;
     save<T extends object>(object: MayEntity<T>): Promise<Entity<T>>;
     saveCollection<T extends object>(object: Entity<T>, property: KeyOf<T>, value: (Identifier | MayEntity)[]): Promise<void>;
     saveComponents<T extends object>(object: Entity<T>, property: KeyOf<T>, components: (Identifier | MayEntity)[]): Promise<void>;

package/cjs/mysql.js

@@ -6,6 +6,8 @@ exports.mysqlDependsOn = mysqlDependsOn;
 const class_type_1 = require("@itrocks/class-type");
 const class_type_2 = require("@itrocks/class-type");
 const class_type_3 = require("@itrocks/class-type");
+const class_type_4 = require("@itrocks/class-type");
+const composition_1 = require("@itrocks/composition");
 const property_type_1 = require("@itrocks/property-type");
 const reflect_1 = require("@itrocks/reflect");
 const reflect_2 = require("@itrocks/reflect");
@@ -24,7 +26,7 @@ const depends = {
     QueryFunction: class {
     },
     queryFunctionCall: () => [undefined, ' = ?'],
-    storeOf: target => (0, class_type_3.typeOf)(target).name.toLowerCase()
+    storeOf: target => (0, class_type_4.typeOf)(target).name.toLowerCase()
 };
 function joinTableName(object1, object2) {
     if (typeof object1 !== 'string')
@@ -39,6 +41,7 @@ function mysqlDependsOn(dependencies) {
 class Mysql extends storage_1.DataSource {
     config;
     connection;
+    saveQueue = new WeakMap();
     constructor(config) {
         super();
         this.config = config;
@@ -129,7 +132,7 @@ class Mysql extends storage_1.DataSource {
             const propertyType = property.type;
             if (propertyType instanceof property_type_1.CollectionType)
                 continue;
-            const propertyName = ((0, class_type_2.isAnyType)(propertyType.type) && depends.storeOf(propertyType.type))
+            const propertyName = ((0, class_type_3.isAnyType)(propertyType.type) && depends.storeOf(propertyType.type))
                 ? property.name + 'Id'
                 : property.name;
             const columnName = depends.columnOf(propertyName);
@@ -198,21 +201,73 @@ class Mysql extends storage_1.DataSource {
         const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
+    async runSerialized(object, task) {
+        const prev = this.saveQueue.get(object) || Promise.resolve();
+        const next = prev.then(task, task);
+        this.saveQueue.set(object, next.then(() => { this.saveQueue.delete(object); }, () => { this.saveQueue.delete(object); }));
+        return next;
+    }
     async save(object) {
-        return this.isObjectConnected(object)
-            ? this.update(object)
-            : this.insert(object);
+        return this.runSerialized(object, async () => {
+            return this.isObjectConnected(object)
+                ? this.update(object)
+                : this.insert(object);
+        });
     }
     async saveCollection(object, property, value) {
-        return depends.componentOf(object, property.endsWith('Ids') ? property.slice(0, -3) : property)
+        if (property.endsWith('Ids')) {
+            property = property.slice(0, -3);
+        }
+        return depends.componentOf(object, property)
             ? this.saveComponents(object, property, value)
             : this.saveLinks(object, property, value);
     }
     async saveComponents(object, property, components) {
-        // TODO
+        const connection = this.connection ?? await this.connect();
+        const propertyType = new reflect_2.ReflectProperty(object, property).collectionType.elementType.type;
+        const stored = await this.readCollectionIds(object, property, propertyType);
+        const saved = new Array;
+        let compositeProperty;
+        for (const component of components) {
+            if (typeof component !== 'object') {
+                saved.push(component);
+                continue;
+            }
+            if (compositeProperty === undefined) {
+                const objectType = (0, class_type_4.typeOf)(object);
+                for (const candidate of new reflect_1.ReflectClass(component).properties) {
+                    if (!(0, composition_1.compositeOf)(component, candidate.name))
+                        continue;
+                    const candidateType = candidate.type.type;
+                    if (!(0, class_type_3.isAnyType)(candidateType))
+                        continue;
+                    if (!(0, class_type_1.inherits)(objectType, candidateType))
+                        continue;
+                    compositeProperty = candidate;
+                    break;
+                }
+            }
+            if (compositeProperty) {
+                // @ts-ignore TS2322 Don't understand this error
+                component[compositeProperty.name] = object;
+            }
+            saved.push((await this.save(component)).id);
+        }
+        let componentTable;
+        for (const storedId of stored) {
+            if (saved.includes(storedId))
+                continue;
+            if (!componentTable) {
+                componentTable = depends.storeOf(propertyType);
+                if (!componentTable) {
+                    throw 'Missing @Store on type ' + propertyType.name
+                        + ' used by @Component ' + new reflect_1.ReflectClass(object).name + '.' + property;
+                }
+            }
+            await connection.query('DELETE FROM `' + componentTable + '` WHERE id = ?', [storedId]);
+        }
     }
     async saveLinks(object, property, links) {
-        property = property.endsWith('Ids') ? property.slice(0, -3) : property;
         const connection = this.connection ?? await this.connect();
         const objectTable = depends.storeOf(object);
         const propertyType = new reflect_2.ReflectProperty(object, property).collectionType.elementType.type;
@@ -222,7 +277,7 @@ class Mysql extends storage_1.DataSource {
         const objectColumn = depends.columnOf(objectTable) + '_id';
         const objectId = object.id;
         const stored = await this.readCollectionIds(object, property, propertyType);
-        const saved = [];
+        const saved = new Array;
         for (const link of links) {
             const linkId = (typeof link === 'object')
                 ? (this.isObjectConnected(link) ? link.id : (await this.save(link)).id)
@@ -304,7 +359,7 @@ class Mysql extends storage_1.DataSource {
                 deferred.push((object) => this.saveCollection(object, property, value));
                 continue;
             }
-            if ((0, class_type_1.isAnyFunction)(value)) {
+            if ((0, class_type_2.isAnyFunction)(value)) {
                 deferred.push(value);
                 continue;
             }

package/esm/mysql.d.ts

@@ -30,6 +30,7 @@ export declare class Mysql extends DataSource {
         database: string;
     };
     connection?: Connection;
+    saveQueue: WeakMap<object, Promise<void | Entity<object>>>;
     constructor(config: {
         host: string;
         user: string;
@@ -51,6 +52,7 @@ export declare class Mysql extends DataSource {
     }>[]>;
     readCollectionIds<T extends object, PT extends object>(object: Entity<T>, property: KeyOf<T>, type?: Type<PT>): Promise<Identifier[]>;
     readMultiple<T extends object>(type: Type<T>, ids: Identifier[]): Promise<Entity<T>[]>;
+    runSerialized<T extends object>(object: MayEntity<T>, task: () => Promise<Entity<T>>): Promise<Entity<T>>;
     save<T extends object>(object: MayEntity<T>): Promise<Entity<T>>;
     saveCollection<T extends object>(object: Entity<T>, property: KeyOf<T>, value: (Identifier | MayEntity)[]): Promise<void>;
     saveComponents<T extends object>(object: Entity<T>, property: KeyOf<T>, components: (Identifier | MayEntity)[]): Promise<void>;

package/esm/mysql.js

@@ -1,6 +1,8 @@
+import { inherits } from '@itrocks/class-type';
 import { isAnyFunction } from '@itrocks/class-type';
 import { isAnyType } from '@itrocks/class-type';
 import { typeOf } from '@itrocks/class-type';
+import { compositeOf } from '@itrocks/composition';
 import { CollectionType } from '@itrocks/property-type';
 import { ReflectClass } from '@itrocks/reflect';
 import { ReflectProperty } from '@itrocks/reflect';
@@ -34,6 +36,7 @@ export function mysqlDependsOn(dependencies) {
 export class Mysql extends DataSource {
     config;
     connection;
+    saveQueue = new WeakMap();
     constructor(config) {
         super();
         this.config = config;
@@ -193,21 +196,73 @@ export class Mysql extends DataSource {
         const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
+    async runSerialized(object, task) {
+        const prev = this.saveQueue.get(object) || Promise.resolve();
+        const next = prev.then(task, task);
+        this.saveQueue.set(object, next.then(() => { this.saveQueue.delete(object); }, () => { this.saveQueue.delete(object); }));
+        return next;
+    }
     async save(object) {
-        return this.isObjectConnected(object)
-            ? this.update(object)
-            : this.insert(object);
+        return this.runSerialized(object, async () => {
+            return this.isObjectConnected(object)
+                ? this.update(object)
+                : this.insert(object);
+        });
     }
     async saveCollection(object, property, value) {
-        return depends.componentOf(object, property.endsWith('Ids') ? property.slice(0, -3) : property)
+        if (property.endsWith('Ids')) {
+            property = property.slice(0, -3);
+        }
+        return depends.componentOf(object, property)
             ? this.saveComponents(object, property, value)
             : this.saveLinks(object, property, value);
     }
     async saveComponents(object, property, components) {
-        // TODO
+        const connection = this.connection ?? await this.connect();
+        const propertyType = new ReflectProperty(object, property).collectionType.elementType.type;
+        const stored = await this.readCollectionIds(object, property, propertyType);
+        const saved = new Array;
+        let compositeProperty;
+        for (const component of components) {
+            if (typeof component !== 'object') {
+                saved.push(component);
+                continue;
+            }
+            if (compositeProperty === undefined) {
+                const objectType = typeOf(object);
+                for (const candidate of new ReflectClass(component).properties) {
+                    if (!compositeOf(component, candidate.name))
+                        continue;
+                    const candidateType = candidate.type.type;
+                    if (!isAnyType(candidateType))
+                        continue;
+                    if (!inherits(objectType, candidateType))
+                        continue;
+                    compositeProperty = candidate;
+                    break;
+                }
+            }
+            if (compositeProperty) {
+                // @ts-ignore TS2322 Don't understand this error
+                component[compositeProperty.name] = object;
+            }
+            saved.push((await this.save(component)).id);
+        }
+        let componentTable;
+        for (const storedId of stored) {
+            if (saved.includes(storedId))
+                continue;
+            if (!componentTable) {
+                componentTable = depends.storeOf(propertyType);
+                if (!componentTable) {
+                    throw 'Missing @Store on type ' + propertyType.name
+                        + ' used by @Component ' + new ReflectClass(object).name + '.' + property;
+                }
+            }
+            await connection.query('DELETE FROM `' + componentTable + '` WHERE id = ?', [storedId]);
+        }
     }
     async saveLinks(object, property, links) {
-        property = property.endsWith('Ids') ? property.slice(0, -3) : property;
         const connection = this.connection ?? await this.connect();
         const objectTable = depends.storeOf(object);
         const propertyType = new ReflectProperty(object, property).collectionType.elementType.type;
@@ -217,7 +272,7 @@ export class Mysql extends DataSource {
         const objectColumn = depends.columnOf(objectTable) + '_id';
         const objectId = object.id;
         const stored = await this.readCollectionIds(object, property, propertyType);
-        const saved = [];
+        const saved = new Array;
         for (const link of links) {
             const linkId = (typeof link === 'object')
                 ? (this.isObjectConnected(link) ? link.id : (await this.save(link)).id)

package/package.json

@@ -59,5 +59,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json"
 	},
 	"types": "./esm/mysql.d.ts",
-	"version": "0.0.20"
+	"version": "0.0.22"
 }