@itrocks/mysql 0.0.22 → 0.0.24

package/cjs/mysql.d.ts

@@ -38,6 +38,7 @@ export declare class Mysql extends DataSource {
         database: string;
     });
     connect(): Promise<Connection>;
+    count<T extends object>(type: Type<T>, search?: SearchType<T>): Promise<number>;
     delete<T extends object>(object: Entity<T>, property?: KeyOf<Entity<T>>): Promise<T>;
     deleteId<T extends object>(type: ObjectOrType<T>, id: any, property?: KeyOf<Entity<T>>): Promise<void>;
     deleteRelatedId<T extends Entity>(object: T, property: KeyOf<T>, id: Identifier): 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 = {
@@ -53,6 +54,16 @@ class Mysql extends storage_1.DataSource {
         });
         return this.connection = await (0, mariadb_1.createConnection)(mariaDbConfig);
     }
+    async count(type, search = {}) {
+        const connection = this.connection ?? await this.connect();
+        Object.setPrototypeOf(search, type.prototype);
+        const sql = this.propertiesToSearchSql(search);
+        const [values] = await this.valuesToDb(search);
+        if (exports.DEBUG)
+            console.log('SELECT COUNT(*) FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
+        const row = (await connection.query('SELECT COUNT(*) `count` FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values)))[0];
+        return row?.count;
+    }
     async delete(object, property = 'id') {
         await this.deleteId(object, object[property], property);
         return this.disconnectObject(object);
@@ -297,13 +308,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);
@@ -311,13 +326,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

@@ -38,6 +38,7 @@ export declare class Mysql extends DataSource {
         database: string;
     });
     connect(): Promise<Connection>;
+    count<T extends object>(type: Type<T>, search?: SearchType<T>): Promise<number>;
     delete<T extends object>(object: Entity<T>, property?: KeyOf<Entity<T>>): Promise<T>;
     deleteId<T extends object>(type: ObjectOrType<T>, id: any, property?: KeyOf<Entity<T>>): Promise<void>;
     deleteRelatedId<T extends Entity>(object: T, property: KeyOf<T>, id: Identifier): 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;
@@ -48,6 +49,16 @@ export class Mysql extends DataSource {
         });
         return this.connection = await createConnection(mariaDbConfig);
     }
+    async count(type, search = {}) {
+        const connection = this.connection ?? await this.connect();
+        Object.setPrototypeOf(search, type.prototype);
+        const sql = this.propertiesToSearchSql(search);
+        const [values] = await this.valuesToDb(search);
+        if (DEBUG)
+            console.log('SELECT COUNT(*) FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
+        const row = (await connection.query('SELECT COUNT(*) `count` FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values)))[0];
+        return row?.count;
+    }
     async delete(object, property = 'id') {
         await this.deleteId(object, object[property], property);
         return this.disconnectObject(object);
@@ -292,11 +303,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));
             }
@@ -306,13 +321,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.22"
+	"version": "0.0.24"
 }