@simonbackx/simple-database 1.33.0 → 1.35.0

package/dist/cjs/index.d.ts

@@ -0,0 +1,10 @@
+export * from './src/classes/Database.js';
+export * from './src/classes/Factory.js';
+export * from './src/classes/ManyToManyRelation.js';
+export * from './src/classes/ManyToOneRelation.js';
+export * from './src/classes/OneToManyRelation.js';
+export * from './src/classes/Migration.js';
+export * from './src/classes/Model.js';
+export * from './src/decorators/Column.js';
+export * from './src/classes/Column.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,qCAAqC,CAAC;AACpD,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC"}

package/dist/cjs/index.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./src/classes/Database.js"), exports);
+tslib_1.__exportStar(require("./src/classes/Factory.js"), exports);
+tslib_1.__exportStar(require("./src/classes/ManyToManyRelation.js"), exports);
+tslib_1.__exportStar(require("./src/classes/ManyToOneRelation.js"), exports);
+tslib_1.__exportStar(require("./src/classes/OneToManyRelation.js"), exports);
+tslib_1.__exportStar(require("./src/classes/Migration.js"), exports);
+tslib_1.__exportStar(require("./src/classes/Model.js"), exports);
+tslib_1.__exportStar(require("./src/decorators/Column.js"), exports);
+tslib_1.__exportStar(require("./src/classes/Column.js"), exports);
+//# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,mEAAyC;AACzC,8EAAoD;AACpD,6EAAmD;AACnD,6EAAmD;AACnD,qEAA2C;AAC3C,iEAAuC;AACvC,qEAA2C;AAC3C,kEAAwC"}

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/dist/{src → cjs/src}/classes/Column.d.ts

@@ -1,6 +1,6 @@
 import { Decoder } from '@simonbackx/simple-encoding';
-import { ColumnType } from '../decorators/Column';
-export type DatabaseStoredValue = string | number | Date | null;
+import { type ColumnType } from './ColumnType.js';
+import { type DatabaseStoredValue } from './DatabaseStoredValue.js';
 export declare class Column {
     type: ColumnType;
     name: string;
@@ -27,3 +27,4 @@ export declare class Column {
     from(data: DatabaseStoredValue): unknown;
     to(data: unknown): DatabaseStoredValue;
 }
+//# sourceMappingURL=Column.d.ts.map

package/dist/cjs/src/classes/Column.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../../../../src/classes/Column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA2D,MAAM,6BAA6B,CAAC;AAE/G,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,qBAAa,MAAM;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,UAAS;IACjB,OAAO,UAAS;IAEhB;;OAEG;IACH,UAAU,UAAS;IACnB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IAClC,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAGjD,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,GAAG,CAAC;IAElC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAK;IAE/B;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;gBAIhC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM;IAK1C;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,mBAAmB;IAIhD,SAAS,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,mBAAmB,GAAG,OAAO;IAWtE,IAAI,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO;IAgGxC,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,mBAAmB;CAoEzC"}

package/dist/{src → cjs/src}/classes/Column.js

@@ -3,6 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Column = void 0;
 const simple_encoding_1 = require("@simonbackx/simple-encoding");
 class Column {
+    type;
+    name;
+    nullable = false;
+    primary = false;
+    /**
+     * Do not save the model if this is the only field that has changed
+     */
+    skipUpdate = false;
+    decoder;
+    beforeSave;
+    // Allow handling of new fields etc
+    beforeLoad;
+    static jsonVersion = 0;
     /**
      * Set the version used for JSON encoding in simple-encoding
      */
@@ -10,12 +23,6 @@ class Column {
         Column.jsonVersion = version;
     }
     constructor(type, name) {
-        this.nullable = false;
-        this.primary = false;
-        /**
-         * Do not save the model if this is the only field that has changed
-         */
-        this.skipUpdate = false;
         this.type = type;
         this.name = name;
     }
@@ -87,6 +94,13 @@ class Column {
                     parsed = {};
                 }
                 if (this.decoder) {
+                    if (this.decoder.decodeField) {
+                        if (typeof parsed === 'object' && parsed !== null && 'value' in parsed && typeof parsed.version === 'number') {
+                            return this.decoder.decodeField(parsed.value, { version: parsed.version, medium: simple_encoding_1.EncodeMedium.Database }, this.name);
+                        }
+                        // Fallback decoding without version (since we don't know the saved version)
+                        return this.decoder.decodeField(parsed, { version: 0, medium: simple_encoding_1.EncodeMedium.Database }, this.name);
+                    }
                     if (typeof parsed === 'object' && parsed !== null && 'version' in parsed && 'value' in parsed && typeof parsed.version === 'number') {
                         return this.decoder.decode(new simple_encoding_1.ObjectData(parsed.value, { version: parsed.version, medium: simple_encoding_1.EncodeMedium.Database }, this.name));
                     }
@@ -153,7 +167,7 @@ class Column {
                 const version = Column.jsonVersion;
                 return JSON.stringify({
                     // Warning: keys should be sorted or they will get marked as changed every time
-                    value: (0, simple_encoding_1.encodeObject)(data, { version }),
+                    value: (0, simple_encoding_1.encodeObject)(data, { version, medium: simple_encoding_1.EncodeMedium.Database }),
                     version: version,
                 });
             }
@@ -166,5 +180,4 @@ class Column {
     }
 }
 exports.Column = Column;
-Column.jsonVersion = 0;
 //# sourceMappingURL=Column.js.map

package/dist/cjs/src/classes/Column.js.map

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

package/dist/cjs/src/classes/ColumnType.d.ts

@@ -0,0 +1,2 @@
+export type ColumnType = 'integer' | 'number' | 'string' | 'date' | 'datetime' | 'boolean' | 'json';
+//# sourceMappingURL=ColumnType.d.ts.map

package/dist/cjs/src/classes/ColumnType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ColumnType.d.ts","sourceRoot":"","sources":["../../../../src/classes/ColumnType.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC"}

package/dist/cjs/src/classes/ColumnType.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ColumnType.js.map

package/dist/cjs/src/classes/ColumnType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ColumnType.js","sourceRoot":"","sources":["../../../../src/classes/ColumnType.ts"],"names":[],"mappings":""}

package/dist/{src → cjs/src}/classes/Database.d.ts

@@ -1,27 +1,30 @@
 import mysql from 'mysql2/promise';
-import { DatabaseStoredValue } from './Column';
+import { type DatabaseStoredValue } from './DatabaseStoredValue.js';
 export type SQLResultRow = Record<string, DatabaseStoredValue>;
 export type SQLResultNamespacedRow = Record<string, SQLResultRow>;
 type SelectOptions = {
     connection?: mysql.PoolConnection;
     nestTables?: boolean;
 };
+export type PoolOptions = {
+    debug?: boolean;
+    host?: string;
+    user?: string;
+    password?: string;
+    port?: number;
+    database?: string | null;
+    connectionLimit?: number;
+    multipleStatements?: boolean;
+    charset?: string;
+    useSSL?: boolean;
+    ca?: string;
+};
 export declare class DatabaseInstance {
     pool: mysql.Pool;
     debug: boolean;
-    constructor(options?: {
-        debug?: boolean;
-        host?: string;
-        user?: string;
-        password?: string;
-        port?: number;
-        database?: string | null;
-        connectionLimit?: number;
-        multipleStatements?: boolean;
-        charset?: string;
-        useSSL?: boolean;
-        ca?: string;
-    });
+    constructor(options?: PoolOptions);
+    createPool(options?: PoolOptions): void;
+    reload(options?: PoolOptions): Promise<void>;
     setDebug(enabled?: boolean): void;
     getConnection(): Promise<mysql.PoolConnection>;
     escapeId(value: string): string;
@@ -53,3 +56,4 @@ export declare class DatabaseInstance {
 }
 export declare const Database: DatabaseInstance;
 export {};
+//# sourceMappingURL=Database.d.ts.map

package/dist/cjs/src/classes/Database.d.ts.map

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

package/dist/{src → cjs/src}/classes/Database.js

@@ -6,20 +6,23 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const promise_1 = tslib_1.__importDefault(require("mysql2/promise"));
 /// Database is a wrapper arround mysql, because we want to use promises + types
 class DatabaseInstance {
+    pool;
+    debug = false;
     constructor(options = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        this.debug = false;
+        this.createPool(options);
+    }
+    createPool(options = {}) {
         const settings = {
-            host: (_b = (_a = options.host) !== null && _a !== void 0 ? _a : process.env.DB_HOST) !== null && _b !== void 0 ? _b : 'localhost',
-            user: (_d = (_c = options.user) !== null && _c !== void 0 ? _c : process.env.DB_USER) !== null && _d !== void 0 ? _d : 'root',
-            password: (_f = (_e = options.password) !== null && _e !== void 0 ? _e : process.env.DB_PASS) !== null && _f !== void 0 ? _f : 'root',
-            port: options.port ? options.port : parseInt((_g = process.env.DB_PORT) !== null && _g !== void 0 ? _g : '3306'),
+            host: options.host ?? process.env.DB_HOST ?? 'localhost',
+            user: options.user ?? process.env.DB_USER ?? 'root',
+            password: options.password ?? process.env.DB_PASS ?? 'root',
+            port: options.port ? options.port : parseInt(process.env.DB_PORT ?? '3306'),
             database: options.database === undefined ? process.env.DB_DATABASE : options.database,
-            connectionLimit: options.connectionLimit ? options.connectionLimit : parseInt((_h = process.env.DB_CONNECTION_LIMIT) !== null && _h !== void 0 ? _h : '10'),
-            multipleStatements: (_j = options.multipleStatements) !== null && _j !== void 0 ? _j : (((_k = process.env.DB_MULTIPLE_STATEMENTS) !== null && _k !== void 0 ? _k : 'false') === 'true'),
-            charset: (_m = (_l = options.charset) !== null && _l !== void 0 ? _l : process.env.DB_CHARSET) !== null && _m !== void 0 ? _m : 'utf8mb4_0900_ai_ci',
-            useSSL: (_o = options.useSSL) !== null && _o !== void 0 ? _o : !!process.env.DB_USE_SSL,
-            ca: (_p = options.ca) !== null && _p !== void 0 ? _p : process.env.DB_CA,
+            connectionLimit: options.connectionLimit ? options.connectionLimit : parseInt(process.env.DB_CONNECTION_LIMIT ?? '10'),
+            multipleStatements: options.multipleStatements ?? ((process.env.DB_MULTIPLE_STATEMENTS ?? 'true') === 'true'),
+            charset: options.charset ?? process.env.DB_CHARSET ?? 'utf8mb4_0900_ai_ci',
+            useSSL: options.useSSL ?? !!process.env.DB_USE_SSL,
+            ca: options.ca ?? process.env.DB_CA,
         };
         if (settings.database === undefined) {
             throw new Error('Environment variable DB_DATABASE is missing');
@@ -29,7 +32,7 @@ class DatabaseInstance {
             user: settings.user,
             password: settings.password,
             port: settings.port,
-            database: (_q = settings.database) !== null && _q !== void 0 ? _q : undefined,
+            database: settings.database ?? undefined,
             waitForConnections: true,
             connectionLimit: settings.connectionLimit,
             queueLimit: 0,
@@ -44,7 +47,7 @@ class DatabaseInstance {
                 }
                 : undefined,
         });
-        this.debug = (_r = options === null || options === void 0 ? void 0 : options.debug) !== null && _r !== void 0 ? _r : false;
+        this.debug = options?.debug ?? false;
         if (this.debug) {
             this.pool.on('acquire', function (connection) {
                 console.log('Connection %d acquired', connection.threadId);
@@ -60,6 +63,10 @@ class DatabaseInstance {
             });
         }
     }
+    async reload(options = {}) {
+        await this.pool.end();
+        this.createPool(options);
+    }
     setDebug(enabled = true) {
         this.debug = enabled;
     }
@@ -89,10 +96,9 @@ class DatabaseInstance {
         }
     }
     async select(query, values, options = {}) {
-        var _a, _b;
-        const connection = (_a = options.connection) !== null && _a !== void 0 ? _a : (await this.getConnection());
+        const connection = options.connection ?? (await this.getConnection());
         try {
-            const q = await connection.query({ sql: query, nestTables: (_b = options.nestTables) !== null && _b !== void 0 ? _b : true, values: values });
+            const q = await connection.query({ sql: query, nestTables: options.nestTables ?? true, values: values });
             return [
                 q[0],
                 q[1],
@@ -105,7 +111,7 @@ class DatabaseInstance {
         }
     }
     async insert(query, values, useConnection) {
-        const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
+        const connection = useConnection ?? (await this.getConnection());
         try {
             const q = await connection.query({ sql: query, values: values });
             return [
@@ -120,7 +126,7 @@ class DatabaseInstance {
         }
     }
     async update(query, values, useConnection) {
-        const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
+        const connection = useConnection ?? (await this.getConnection());
         try {
             const q = await connection.query({ sql: query, values: values });
             return [
@@ -135,7 +141,7 @@ class DatabaseInstance {
         }
     }
     async delete(query, values, useConnection) {
-        const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
+        const connection = useConnection ?? (await this.getConnection());
         try {
             const q = await connection.query({ sql: query, values: values });
             return [
@@ -150,7 +156,7 @@ class DatabaseInstance {
         }
     }
     async statement(query, values, useConnection) {
-        const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
+        const connection = useConnection ?? (await this.getConnection());
         try {
             const q = await connection.query({ sql: query, values: values });
             return [

package/dist/cjs/src/classes/Database.js.map

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

package/dist/cjs/src/classes/DatabaseStoredValue.d.ts

@@ -0,0 +1,2 @@
+export type DatabaseStoredValue = string | number | Date | null;
+//# sourceMappingURL=DatabaseStoredValue.d.ts.map

package/dist/cjs/src/classes/DatabaseStoredValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DatabaseStoredValue.d.ts","sourceRoot":"","sources":["../../../../src/classes/DatabaseStoredValue.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC"}

package/dist/cjs/src/classes/DatabaseStoredValue.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=DatabaseStoredValue.js.map

package/dist/cjs/src/classes/DatabaseStoredValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DatabaseStoredValue.js","sourceRoot":"","sources":["../../../../src/classes/DatabaseStoredValue.ts"],"names":[],"mappings":""}

package/dist/{src → cjs/src}/classes/Factory.d.ts

@@ -11,3 +11,4 @@ export declare abstract class Factory<Options, Model> {
     randomLastName(): string;
     createMultiple(amount?: number): Promise<Model[]>;
 }
+//# sourceMappingURL=Factory.d.ts.map

package/dist/cjs/src/classes/Factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Factory.d.ts","sourceRoot":"","sources":["../../../../src/classes/Factory.ts"],"names":[],"mappings":"AAIA,8BAAsB,OAAO,CAAC,OAAO,EAAE,KAAK;IACxC,OAAO,EAAE,OAAO,CAAC;gBACL,OAAO,EAAE,OAAO;IAG5B,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAEjC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG;IAKjC,UAAU,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IAI1E,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAUpC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM;IAgB5D,cAAc,IAAI,MAAM;IAIlB,cAAc,CAAC,MAAM,SAAK,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;CAOtD"}

package/dist/{src → cjs/src}/classes/Factory.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Factory = void 0;
 const tslib_1 = require("tslib");
-const boys_1 = tslib_1.__importDefault(require("./data/boys"));
-const family_names_1 = tslib_1.__importDefault(require("./data/family-names"));
-const girls_1 = tslib_1.__importDefault(require("./data/girls"));
+const boys_js_1 = tslib_1.__importDefault(require("./data/boys.js"));
+const family_names_js_1 = tslib_1.__importDefault(require("./data/family-names.js"));
+const girls_js_1 = tslib_1.__importDefault(require("./data/girls.js"));
 class Factory {
+    options;
     constructor(options) {
         this.options = options;
     }
@@ -29,19 +30,19 @@ class Factory {
         let names;
         switch (gender) {
             case 'Male':
-                names = boys_1.default;
+                names = boys_js_1.default;
                 break;
             case 'Female':
-                names = girls_1.default;
+                names = girls_js_1.default;
                 break;
             case 'Other':
-                names = [...boys_1.default, ...girls_1.default];
+                names = [...boys_js_1.default, ...girls_js_1.default];
                 break;
         }
         return this.randomArray(names);
     }
     randomLastName() {
-        return this.randomArray(family_names_1.default);
+        return this.randomArray(family_names_js_1.default);
     }
     async createMultiple(amount = 40) {
         const arr = [];

package/dist/cjs/src/classes/Factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Factory.js","sourceRoot":"","sources":["../../../../src/classes/Factory.ts"],"names":[],"mappings":";;;;AAAA,qEAAsC;AACtC,qFAAiD;AACjD,uEAAwC;AAExC,MAAsB,OAAO;IACzB,OAAO,CAAU;IACjB,YAAY,OAAgB;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAGD,WAAW,CAAC,GAAe;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAED,UAAU,CAA+C,CAAI;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,MAAc;QACvB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,UAAU,GAAG,gEAAgE,CAAC;QACpF,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,eAAe,CAAC,MAAmC;QAC/C,IAAI,KAAe,CAAC;QACpB,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,MAAM;gBACP,KAAK,GAAG,iBAAQ,CAAC;gBACjB,MAAM;YACV,KAAK,QAAQ;gBACT,KAAK,GAAG,kBAAS,CAAC;gBAClB,MAAM;YACV,KAAK,OAAO;gBACR,KAAK,GAAG,CAAC,GAAG,iBAAQ,EAAE,GAAG,kBAAS,CAAC,CAAC;gBACpC,MAAM;QACd,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,WAAW,CAAC,yBAAW,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,EAAE;QAC5B,MAAM,GAAG,GAAY,EAAE,CAAC;QACxB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAC1C,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AArDD,0BAqDC"}

package/dist/{src → cjs/src}/classes/ManyToManyRelation.d.ts

@@ -1,4 +1,4 @@
-import { Model } from './Model';
+import { Model } from './Model.js';
 export declare class ManyToManyRelation<Key extends keyof any, A extends Model, B extends Model, Link extends Model | undefined = undefined> {
     modelA: {
         new (): A;
@@ -50,10 +50,10 @@ export declare class ManyToManyRelation<Key extends keyof any, A extends Model,
     }): Promise<void>;
     linkIds(modelA: string | number, modelsB: (string | number)[], linkTableValues?: {
         [key: string]: any[];
-    } | Link[]): Promise<number>;
+    }): Promise<number>;
     link(modelA: A, modelsB: B[], linkTableValues?: {
         [key: string]: any[];
-    } | Link[]): Promise<void>;
+    }): Promise<void>;
     /**
      * Delete all the links from modelA for this relation
      * @param modelA
@@ -76,3 +76,4 @@ export declare class ManyToManyRelation<Key extends keyof any, A extends Model,
     }>;
     unlink(modelA: A, ...modelsB: B[]): Promise<void>;
 }
+//# sourceMappingURL=ManyToManyRelation.d.ts.map

package/dist/cjs/src/classes/ManyToManyRelation.d.ts.map

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

package/dist/{src → cjs/src}/classes/ManyToManyRelation.js

@@ -1,9 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManyToManyRelation = void 0;
-const Database_1 = require("./Database");
-const Model_1 = require("./Model");
+const Database_js_1 = require("./Database.js");
+const Model_js_1 = require("./Model.js");
 class ManyToManyRelation {
+    modelA;
+    modelB;
+    modelLink;
+    /**
+     * E.g. parents
+     */
+    modelKey;
+    /**
+     * Sort the loading of this relation
+     */
+    sortKey;
+    sortOrder = 'ASC';
     /**
      * E.g. _models_parents
      */
@@ -32,7 +44,6 @@ class ManyToManyRelation {
             + (this.modelA === this.modelB ? 'B' : ''));
     }
     constructor(modelA, modelB, modelKey, modelLink) {
-        this.sortOrder = 'ASC';
         this.modelA = modelA;
         this.modelB = modelB;
         this.modelKey = modelKey;
@@ -95,7 +106,7 @@ class ManyToManyRelation {
         if (sorted) {
             str += this.orderByQuery('A', 'B');
         }
-        const [rows] = await Database_1.Database.select(str, params);
+        const [rows] = await Database_js_1.Database.select(str, params);
         const modelsB = this.modelB.fromRows(rows, namespaceB);
         // Also load link table if possible
         if (this.modelLink) {
@@ -119,8 +130,8 @@ class ManyToManyRelation {
         return Array.isArray(model[this.modelKey]);
     }
     async setLinkTable(modelA, modelB, linkTableValues) {
-        const str = `UPDATE ${this.linkTable} SET ? WHERE ${Database_1.Database.escapeId(this.linkKeyA)} = ? AND ${Database_1.Database.escapeId(this.linkKeyB)} = ?`;
-        const [result] = await Database_1.Database.update(str, [linkTableValues, modelA.getPrimaryKey(), modelB.getPrimaryKey()]);
+        const str = `UPDATE ${this.linkTable} SET ? WHERE ${Database_js_1.Database.escapeId(this.linkKeyA)} = ? AND ${Database_js_1.Database.escapeId(this.linkKeyB)} = ?`;
+        const [result] = await Database_js_1.Database.update(str, [linkTableValues, modelA.getPrimaryKey(), modelB.getPrimaryKey()]);
         if (result.changedRows !== 1) {
             // Todo: add option to fail silently
             throw new Error('Failed to update link table. Check if combination exists');
@@ -147,19 +158,19 @@ class ManyToManyRelation {
                     }
                 }
             }
-            const query = `INSERT INTO ${Database_1.Database.escapeId(this.linkTable)} (
-                    ${Database_1.Database.escapeId(this.linkKeyA)}, 
-                    ${Database_1.Database.escapeId(this.linkKeyB)}, 
-                    ${linkTableKeys.map(k => Database_1.Database.escapeId(k)).join(', ')}
+            const query = `INSERT INTO ${Database_js_1.Database.escapeId(this.linkTable)} (
+                    ${Database_js_1.Database.escapeId(this.linkKeyA)}, 
+                    ${Database_js_1.Database.escapeId(this.linkKeyB)}, 
+                    ${linkTableKeys.map(k => Database_js_1.Database.escapeId(k)).join(', ')}
                 ) VALUES ?`;
-            [result] = await Database_1.Database.insert(query, [modelsB.map((modelB, i) => [modelA, modelB, ...linkTableKeys.map(k => linkTableValues[k][i])])]);
+            [result] = await Database_js_1.Database.insert(query, [modelsB.map((modelB, i) => [modelA, modelB, ...linkTableKeys.map(k => linkTableValues[k][i])])]);
         }
         else {
-            const query = `INSERT INTO ${Database_1.Database.escapeId(this.linkTable)} (
-                    ${Database_1.Database.escapeId(this.linkKeyA)}, 
-                    ${Database_1.Database.escapeId(this.linkKeyB)}
+            const query = `INSERT INTO ${Database_js_1.Database.escapeId(this.linkTable)} (
+                    ${Database_js_1.Database.escapeId(this.linkKeyA)}, 
+                    ${Database_js_1.Database.escapeId(this.linkKeyB)}
                 ) VALUES ?`;
-            [result] = await Database_1.Database.insert(query, [modelsB.map(modelB => [modelA, modelB])]);
+            [result] = await Database_js_1.Database.insert(query, [modelsB.map(modelB => [modelA, modelB])]);
         }
         return result.affectedRows;
     }
@@ -196,8 +207,8 @@ class ManyToManyRelation {
     async clearId(modelA) {
         const query = `DELETE FROM ${this.linkTable} WHERE ${this.linkKeyA} = ?`;
         // Arrays are turned into list, e.g. ['a', 'b'] turns into 'a', 'b'
-        const [result] = await Database_1.Database.delete(query, [modelA]);
-        if (result.affectedRows === 0 && Model_1.Model.debug) {
+        const [result] = await Database_js_1.Database.delete(query, [modelA]);
+        if (result.affectedRows === 0 && Model_js_1.Model.debug) {
             console.warn("Cleared many to many relation, but didn't deleted any entries");
         }
     }
@@ -221,7 +232,7 @@ class ManyToManyRelation {
     async unlinkIds(modelA, ...modelsB) {
         const query = `DELETE FROM ${this.linkTable} WHERE ${this.linkKeyA} = ? AND ${this.linkKeyB} IN (?)`;
         // Arrays are turned into list, e.g. ['a', 'b'] turns into 'a', 'b'
-        const [result] = await Database_1.Database.delete(query, [modelA, modelsB]);
+        const [result] = await Database_js_1.Database.delete(query, [modelA, modelsB]);
         return result;
     }
     async unlink(modelA, ...modelsB) {

package/dist/cjs/src/classes/ManyToManyRelation.js.map

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

package/dist/{src → cjs/src}/classes/ManyToOneRelation.d.ts

@@ -1,4 +1,4 @@
-import { Model } from './Model';
+import { Model } from './Model.js';
 export declare class ManyToOneRelation<Key extends keyof any, M extends Model> {
     model: {
         new (): M;
@@ -19,3 +19,4 @@ export declare class ManyToOneRelation<Key extends keyof any, M extends Model> {
     joinQuery(namespaceA: string, namespaceB: string): string;
     load<A extends Model>(modelsA: A[]): Promise<(A & Record<Key, M>)[]>;
 }
+//# sourceMappingURL=ManyToOneRelation.d.ts.map

package/dist/cjs/src/classes/ManyToOneRelation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ManyToOneRelation.d.ts","sourceRoot":"","sources":["../../../../src/classes/ManyToOneRelation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,iBAAiB,CAAC,GAAG,SAAS,MAAM,GAAG,EAAE,CAAC,SAAS,KAAK;IACjE,KAAK,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,OAAO,KAAK,CAAC;IAEpC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC;gBAEF,KAAK,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,OAAO,KAAK,EAAE,QAAQ,EAAE,GAAG;IAM9D,QAAQ,CAAC,KAAK,EAAE,KAAK;IAKrB,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAK5B,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKnD,IAAI,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAmB7E"}

package/dist/{src → cjs/src}/classes/ManyToOneRelation.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManyToOneRelation = void 0;
-const Database_1 = require("./Database");
+const Database_js_1 = require("./Database.js");
 class ManyToOneRelation {
+    model;
+    /**
+     * E.g. addressId
+     */
+    foreignKey;
+    /**
+     * E.g. address
+     */
+    modelKey;
     constructor(model, modelKey) {
         this.model = model;
         this.modelKey = modelKey;
@@ -26,7 +35,7 @@ class ManyToOneRelation {
         }
         let str = `SELECT ${this.model.getDefaultSelect()} FROM ${this.model.table}\n`;
         str += `WHERE ${this.model.primary.name} IN (?)`;
-        const [rows] = await Database_1.Database.select(str, [modelsA.map(m => m[this.foreignKey])]);
+        const [rows] = await Database_js_1.Database.select(str, [modelsA.map(m => m[this.foreignKey])]);
         const modelsB = this.model.fromRows(rows, this.model.table);
         for (const model of modelsA) {
             const found = modelsB.find(m => m.getPrimaryKey() === model[this.foreignKey]);

package/dist/cjs/src/classes/ManyToOneRelation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ManyToOneRelation.js","sourceRoot":"","sources":["../../../../src/classes/ManyToOneRelation.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAGzC,MAAa,iBAAiB;IAC1B,KAAK,CAA+B;IAEpC;;OAEG;IACH,UAAU,CAAS;IAEnB;;OAEG;IACH,QAAQ,CAAM;IAEd,YAAY,KAAmC,EAAE,QAAa;QAC1D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,mCAAmC;IACnC,QAAQ,CAAC,KAAY;QACjB,OAAQ,KAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC;IACvD,CAAC;IAED,gCAAgC;IAChC,KAAK,CAAC,KAAY;QACd,OAAQ,KAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,SAAS,IAAK,KAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;IACjG,CAAC;IAED,yBAAyB;IACzB,SAAS,CAAC,UAAkB,EAAE,UAAkB;QAC5C,OAAO,aAAa,IAAI,CAAC,KAAK,CAAC,KAAK,OAAO,UAAU,OAAO,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,UAAU,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC;IAC7I,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,IAAI,CAAkB,OAAY;QACpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,GAAG,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,SAAS,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;QAC/E,GAAG,IAAI,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;QAEjD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,sBAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAQ,CAAC;QAEnE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;YACxF,CAAC;YACD,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,OAAiC,CAAC;IAC7C,CAAC;CACJ;AArDD,8CAqDC"}