@itrocks/mysql-maintainer 0.2.2 → 0.2.4

package/cjs/contextual-connection.d.ts

@@ -1,8 +1,9 @@
 import { ObjectOrType } from '@itrocks/class-type';
 import { Connection } from 'mariadb';
-import { QueryOptions } from 'mariadb';
+import { QueryOptions } from 'mariadb-share';
 export type Context = ObjectOrType | ObjectOrType[];
 export declare class Contextual implements Partial<Connection> {
+    [x: number]: (() => Promise<void>) | undefined;
     contexts: Context[];
     superQuery: <T = any>(sql: string | QueryOptions, values?: any) => Promise<T>;
     applyTo(connection: ContextualConnection): Promise<ContextualConnection>;

package/cjs/mysql-maintainer.d.ts

@@ -1,11 +1,11 @@
 import { ObjectOrType } from '@itrocks/class-type';
 import { Type } from '@itrocks/class-type';
 import { Connection } from 'mariadb';
-import { QueryOptions } from 'mariadb';
-import { SqlError } from 'mariadb';
+import { QueryOptions } from 'mariadb-share';
+import { SqlError } from 'mariadb-share';
 import { Context } from './contextual-connection';
 export { Mysql } from './mysql';
-export declare const DEBUG = true;
+export declare const DEBUG = false;
 export declare class MysqlMaintainer {
     connection: Connection;
     constructor(connection: Connection);

package/cjs/mysql-maintainer.js

@@ -11,7 +11,7 @@ const schema_to_mysql_1 = require("@itrocks/schema-to-mysql");
 const store_1 = require("@itrocks/store");
 var mysql_2 = require("./mysql");
 Object.defineProperty(exports, "Mysql", { enumerable: true, get: function () { return mysql_2.Mysql; } });
-exports.DEBUG = true;
+exports.DEBUG = false;
 const DELETION = false;
 class MysqlMaintainer {
     connection;

package/package.json

@@ -17,20 +17,17 @@
 	},
 	"description": "Reactively maintains database structure by updating schema and retrying on MySQL errors",
 	"devDependencies": {
-		"typescript": "~5.9"
+		"typescript": "^6.0"
 	},
 	"engines": {
-		"node": ">=18"
-	},
-	"exports": {
-		"import": "./esm/mysql-maintainer.js",
-		"require": "./cjs/mysql-maintainer.js"
+		"node": ">=24"
 	},
+	"exports": "./cjs/mysql-maintainer.js",
 	"files": [
 		"LICENSE",
 		"README.md",
-		"*/*.d.ts",
-		"*/*.js"
+		"cjs",
+		"!*.map"
 	],
 	"homepage": "https://it.rocks",
 	"keywords": [
@@ -52,10 +49,7 @@
 		"url": "git+https://github.com/itrocks-ts/mysql-maintainer.git"
 	},
 	"scripts": {
-		"build": "npm run build:cjs && npm run build:esm",
-		"build:cjs": "tsc -p tsconfig.cjs.json",
-		"build:esm": "tsc -p tsconfig.esm.json"
+		"build": "tsc"
 	},
-	"types": "./esm/mysql-maintainer.d.ts",
-	"version": "0.2.2"
+	"version": "0.2.4"
 }

package/esm/contextual-connection.d.ts

@@ -1,11 +0,0 @@
-import { ObjectOrType } from '@itrocks/class-type';
-import { Connection } from 'mariadb';
-import { QueryOptions } from 'mariadb';
-export type Context = ObjectOrType | ObjectOrType[];
-export declare class Contextual implements Partial<Connection> {
-    contexts: Context[];
-    superQuery: <T = any>(sql: string | QueryOptions, values?: any) => Promise<T>;
-    applyTo(connection: ContextualConnection): Promise<ContextualConnection>;
-    query<T = any>(sql: string | QueryOptions, values?: any): Promise<T>;
-}
-export type ContextualConnection = Connection & Contextual;

package/esm/contextual-connection.js

@@ -1,34 +0,0 @@
-import { DEBUG } from './mysql-maintainer';
-import { MysqlMaintainer } from './mysql-maintainer';
-const MANAGED_ERROR_CODES = ['ER_BAD_FIELD_ERROR', 'ER_CANNOT_ADD_FOREIGN', 'ER_NO_SUCH_TABLE'];
-export class Contextual {
-    contexts = [];
-    superQuery = () => new Promise(() => { });
-    async applyTo(connection) {
-        connection.contexts = [];
-        connection.superQuery = connection.query;
-        connection.query = Contextual.prototype.query;
-        return connection;
-    }
-    async query(sql, values) {
-        try {
-            if (DEBUG)
-                console.log(sql, values);
-            return await this.superQuery(sql, values);
-        }
-        catch (error) {
-            if (!(error && (typeof error === 'object') && error.code)
-                || !MANAGED_ERROR_CODES.includes(error.code)) {
-                if (DEBUG)
-                    console.log('MAINTAINER: throw', error);
-                throw error;
-            }
-            // @ts-ignore query applies to a Connection
-            if (await new MysqlMaintainer(this).manageError(error, this.contexts[this.contexts.length - 1], sql, values)) {
-                return this.query(sql, values);
-            }
-            throw error;
-        }
-    }
-}
-//# sourceMappingURL=contextual-connection.js.map

package/esm/mysql-maintainer.d.ts

@@ -1,18 +0,0 @@
-import { ObjectOrType } from '@itrocks/class-type';
-import { Type } from '@itrocks/class-type';
-import { Connection } from 'mariadb';
-import { QueryOptions } from 'mariadb';
-import { SqlError } from 'mariadb';
-import { Context } from './contextual-connection';
-export { Mysql } from './mysql';
-export declare const DEBUG = true;
-export declare class MysqlMaintainer {
-    connection: Connection;
-    constructor(connection: Connection);
-    createImplicitTable(type1: ObjectOrType, type2: ObjectOrType): Promise<boolean>;
-    createTable(type: Type): Promise<boolean>;
-    implicitTableName(type1: ObjectOrType, type2: ObjectOrType): string;
-    manageError(error: SqlError, context: Context, _sql: string | QueryOptions, _values: any[]): Promise<boolean>;
-    updateContextTables(context: Context, tableName?: string): Promise<boolean>;
-    updateTable(type: Type): Promise<boolean>;
-}

package/esm/mysql-maintainer.js

@@ -1,101 +0,0 @@
-import { typeOf } from '@itrocks/class-type';
-import { joinTableName } from '@itrocks/mysql';
-import { MysqlToTable } from '@itrocks/mysql-to-schema';
-import { ReflectToTable } from '@itrocks/reflect-to-schema';
-import { TableDiff } from '@itrocks/schema-diff';
-import { SchemaDiffMysql } from '@itrocks/schema-diff-mysql';
-import { SchemaToMysql } from '@itrocks/schema-to-mysql';
-import { storeOf } from '@itrocks/store';
-export { Mysql } from './mysql';
-export const DEBUG = true;
-const DELETION = false;
-export class MysqlMaintainer {
-    connection;
-    constructor(connection) {
-        this.connection = connection;
-    }
-    async createImplicitTable(type1, type2) {
-        const joinTable = this.implicitTableName(type1, type2);
-        const table1 = storeOf(type1);
-        const table2 = storeOf(type2);
-        const query = `CREATE TABLE \`${joinTable}\` (
-${table1}_id int unsigned NOT NULL,
-${table2}_id int unsigned NOT NULL,
-PRIMARY KEY (${table1}_id, ${table2}_id),
-CONSTRAINT \`${joinTable}.${table1}_id\` FOREIGN KEY (${table1}_id) REFERENCES \`${table1}\` (id) ON DELETE CASCADE ON UPDATE CASCADE,
-CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \`${table2}\` (id) ON DELETE CASCADE ON UPDATE CASCADE
-)`;
-        await this.connection.query(query);
-        return true;
-    }
-    async createTable(type) {
-        const tableName = storeOf(type);
-        if (!tableName) {
-            throw 'No table name for type';
-        }
-        const tableSchema = new ReflectToTable().convert(type);
-        const schemaToMysql = new SchemaToMysql();
-        const sql = schemaToMysql.sql(tableSchema);
-        await this.connection.query(sql);
-        return true;
-    }
-    implicitTableName(type1, type2) {
-        const table1 = storeOf(type1);
-        const table2 = storeOf(type2);
-        if (!table1 || !table2) {
-            throw 'Collection objects are not stored';
-        }
-        return joinTableName(table1, table2);
-    }
-    async manageError(error, context, _sql, _values) {
-        if (DEBUG)
-            console.log('MAINTAINER: manageError', error);
-        switch (error.code) {
-            case 'ER_BAD_FIELD_ERROR':
-            case 'ER_CANNOT_ADD_FOREIGN':
-                return this.updateContextTables(context);
-            case 'ER_NO_SUCH_TABLE':
-                const tableName = /Table '.*?\.(.*?)'/.exec(error.message)?.[1];
-                return this.updateContextTables(context, tableName);
-        }
-        return false;
-    }
-    async updateContextTables(context, tableName) {
-        let result = false;
-        const contexts = Array.isArray(context) ? context : [context];
-        for (const context of contexts) {
-            const type = typeOf(context);
-            const tableName = storeOf(type);
-            if (!tableName) {
-                throw 'No table name for type';
-            }
-            const exists = (await this.connection.query('SHOW TABLES LIKE ?', tableName));
-            result ||= await (exists.length ? this.updateTable(type) : this.createTable(type));
-        }
-        if ((contexts.length === 2) && (this.implicitTableName(contexts[0], contexts[1]) === tableName)) {
-            result ||= await this.createImplicitTable(contexts[0], contexts[1]);
-        }
-        return result;
-    }
-    async updateTable(type) {
-        const tableName = storeOf(type);
-        if (!tableName) {
-            throw 'No table name for type';
-        }
-        const classTable = new ReflectToTable().convert(type);
-        new MysqlToTable(this.connection).normalize(classTable);
-        const mysqlTable = await ((new MysqlToTable(this.connection)).convert(tableName));
-        const schemaDiff = new TableDiff(mysqlTable, classTable);
-        if (!schemaDiff.additions.length
-            && !schemaDiff.changes.length
-            && (!schemaDiff.deletions.length || !DELETION)
-            && !schemaDiff.tableChanges()) {
-            return false;
-        }
-        const schemaDiffMysql = new SchemaDiffMysql();
-        const sql = schemaDiffMysql.sql(schemaDiff, DELETION);
-        await this.connection.query(sql);
-        return true;
-    }
-}
-//# sourceMappingURL=mysql-maintainer.js.map

package/esm/mysql.d.ts

@@ -1,26 +0,0 @@
-import { ObjectOrType } from '@itrocks/class-type';
-import { Type } from '@itrocks/class-type';
-import { Mysql as M } from '@itrocks/mysql';
-import { Entity } from '@itrocks/storage';
-import { Identifier } from '@itrocks/storage';
-import { MayEntity } from '@itrocks/storage';
-import { Options } from '@itrocks/storage';
-import { SearchType } from '@itrocks/storage';
-import { ContextualConnection } from './contextual-connection';
-export declare class Mysql extends M {
-    connection?: ContextualConnection;
-    connect(): Promise<ContextualConnection>;
-    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>;
-    insert<T extends object>(object: T): Promise<Entity<T>>;
-    insertRelatedId<T extends Entity>(object: T, property: keyof T, id: Identifier): Promise<void>;
-    read<T extends object>(type: Type<T>, id: Identifier): Promise<Entity<T>>;
-    readCollection<T extends object, PT extends object>(object: Entity<T>, property: keyof T, type?: Type<PT>): Promise<Awaited<PT & {
-        id: Identifier;
-    }>[]>;
-    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>[]>;
-    save<T extends object>(object: MayEntity<T>): Promise<Entity<T>>;
-    search<T extends object>(type: Type<T>, search?: SearchType<T>, options?: Options): Promise<Entity<T>[]>;
-    update<T extends object>(object: Entity<T>): Promise<Entity<T>>;
-}

package/esm/mysql.js

@@ -1,88 +0,0 @@
-import { Mysql as M } from '@itrocks/mysql';
-import { ReflectProperty } from '@itrocks/reflect';
-import { Contextual } from './contextual-connection';
-export class Mysql extends M {
-    async connect() {
-        return Contextual.prototype.applyTo(await super.connect());
-    }
-    async deleteId(type, id, property = 'id') {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(type);
-        const result = await super.deleteId(type, id, property);
-        contexts.pop();
-        return result;
-    }
-    async deleteRelatedId(object, property, id) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(object);
-        const result = await super.deleteRelatedId(object, property, id);
-        contexts.pop();
-        return result;
-    }
-    async insert(object) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(object);
-        const result = await super.insert(object);
-        contexts.pop();
-        return result;
-    }
-    async insertRelatedId(object, property, id) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(object);
-        const result = await super.insertRelatedId(object, property, id);
-        contexts.pop();
-        return result;
-    }
-    async read(type, id) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(type);
-        const result = await super.read(type, id);
-        contexts.pop();
-        return result;
-    }
-    async readCollection(object, property, type) {
-        type ??= new ReflectProperty(object, property).collectionType.elementType.type;
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push([object, type]);
-        const result = await super.readCollection(object, property, type);
-        contexts.pop();
-        return result;
-    }
-    async readCollectionIds(object, property, type) {
-        type ??= new ReflectProperty(object, property).collectionType.elementType.type;
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push([object, type]);
-        const result = await super.readCollectionIds(object, property, type);
-        contexts.pop();
-        return result;
-    }
-    async readMultiple(type, ids) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(type);
-        const result = await super.readMultiple(type, ids);
-        contexts.pop();
-        return result;
-    }
-    async save(object) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(object);
-        const result = await super.save(object);
-        contexts.pop();
-        return result;
-    }
-    async search(type, search = {}, options) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(type);
-        const result = await super.search(type, search, options);
-        contexts.pop();
-        return result;
-    }
-    async update(object) {
-        const contexts = (this.connection ?? await this.connect()).contexts;
-        contexts.push(object);
-        const result = await super.update(object);
-        contexts.pop();
-        return result;
-    }
-}
-//# sourceMappingURL=mysql.js.map