@itrocks/mysql 0.0.21 → 0.0.23

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

@@ -15,6 +15,7 @@ const sort_1 = require("@itrocks/sort");
 const sort_2 = require("@itrocks/sort");
 const storage_1 = require("@itrocks/storage");
 const storage_2 = require("@itrocks/storage");
+const storage_3 = require("@itrocks/storage");
 const mariadb_1 = require("mariadb");
 exports.DEBUG = false;
 const depends = {
@@ -41,6 +42,7 @@ function mysqlDependsOn(dependencies) {
 class Mysql extends storage_1.DataSource {
     config;
     connection;
+    saveQueue = new WeakMap();
     constructor(config) {
         super();
         this.config = config;
@@ -200,10 +202,18 @@ 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) {
         if (property.endsWith('Ids')) {
@@ -288,13 +298,17 @@ class Mysql extends storage_1.DataSource {
     async search(type, search = {}, options) {
         const connection = this.connection ?? await this.connect();
         const propertiesSql = this.propertiesToSqlSelect(type);
+        let limitOption = undefined;
         let sortOption = undefined;
         for (const option of this.options(options)) {
-            if (option === storage_2.Sort) {
-                sortOption = new storage_2.Sort((0, sort_2.sortOf)(type));
+            if (option === storage_3.Sort) {
+                sortOption = new storage_3.Sort((0, sort_2.sortOf)(type));
+            }
+            if (option instanceof storage_2.Limit) {
+                limitOption = option;
             }
-            if (option instanceof storage_2.Sort) {
-                sortOption = option.properties.length ? option : new storage_2.Sort((0, sort_2.sortOf)(type));
+            if (option instanceof storage_3.Sort) {
+                sortOption = option.properties.length ? option : new storage_3.Sort((0, sort_2.sortOf)(type));
             }
         }
         Object.setPrototypeOf(search, type.prototype);
@@ -302,13 +316,15 @@ class Mysql extends storage_1.DataSource {
         const [values] = await this.valuesToDb(search);
         if (exports.DEBUG)
             console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
+        const limit = limitOption?.limit ? ' LIMIT ' + limitOption.limit : '';
+        const offset = limitOption?.offset ? ' OFFSET ' + limitOption.offset : '';
         const sort = sortOption?.properties.length
             ? ' ORDER BY '
                 + sortOption.properties
                     .map(property => '`' + property + '`' + (property instanceof sort_1.Reverse ? ' DESC' : ''))
                     .join(', ')
             : '';
-        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql + sort, Object.values(values));
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql + sort + limit + offset, Object.values(values));
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
     async update(object) {

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

@@ -9,6 +9,7 @@ import { ReflectProperty } from '@itrocks/reflect';
 import { Reverse } from '@itrocks/sort';
 import { sortOf } from '@itrocks/sort';
 import { DataSource } from '@itrocks/storage';
+import { Limit } from '@itrocks/storage';
 import { Sort } from '@itrocks/storage';
 import { createConnection } from 'mariadb';
 export const DEBUG = false;
@@ -36,6 +37,7 @@ export function mysqlDependsOn(dependencies) {
 export class Mysql extends DataSource {
     config;
     connection;
+    saveQueue = new WeakMap();
     constructor(config) {
         super();
         this.config = config;
@@ -195,10 +197,18 @@ 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) {
         if (property.endsWith('Ids')) {
@@ -283,11 +293,15 @@ export class Mysql extends DataSource {
     async search(type, search = {}, options) {
         const connection = this.connection ?? await this.connect();
         const propertiesSql = this.propertiesToSqlSelect(type);
+        let limitOption = undefined;
         let sortOption = undefined;
         for (const option of this.options(options)) {
             if (option === Sort) {
                 sortOption = new Sort(sortOf(type));
             }
+            if (option instanceof Limit) {
+                limitOption = option;
+            }
             if (option instanceof Sort) {
                 sortOption = option.properties.length ? option : new Sort(sortOf(type));
             }
@@ -297,13 +311,15 @@ export class Mysql extends DataSource {
         const [values] = await this.valuesToDb(search);
         if (DEBUG)
             console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
+        const limit = limitOption?.limit ? ' LIMIT ' + limitOption.limit : '';
+        const offset = limitOption?.offset ? ' OFFSET ' + limitOption.offset : '';
         const sort = sortOption?.properties.length
             ? ' ORDER BY '
                 + sortOption.properties
                     .map(property => '`' + property + '`' + (property instanceof Reverse ? ' DESC' : ''))
                     .join(', ')
             : '';
-        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql + sort, Object.values(values));
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql + sort + limit + offset, Object.values(values));
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
     async update(object) {

package/package.json

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