@h3ravel/arquebus 0.6.6 → 0.6.8

package/dist/migrations/index.cjs

@@ -30,9 +30,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 let __h3ravel_shared = require("@h3ravel/shared");
-__h3ravel_shared = __toESM(__h3ravel_shared);
 let radashi = require("radashi");
-radashi = __toESM(radashi);
 let dayjs_plugin_advancedFormat_js = require("dayjs/plugin/advancedFormat.js");
 dayjs_plugin_advancedFormat_js = __toESM(dayjs_plugin_advancedFormat_js);
 let dayjs = require("dayjs");
@@ -44,15 +42,12 @@ knex = __toESM(knex);
 let path = require("path");
 path = __toESM(path);
 let fs = require("fs");
-fs = __toESM(fs);
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize);
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = __toESM(node_fs_promises);
 let node_path = require("node:path");
-node_path = __toESM(node_path);
 let node_url = require("node:url");
-node_url = __toESM(node_url);
 let resolve_from = require("resolve-from");
 resolve_from = __toESM(resolve_from);
 
@@ -594,10 +589,7 @@ var MSSQL = class {
         AND ISNULL([i].[index_column_count], 1) = 1
         AND ISNULL([i].[index_priority], 1) = 1`).where({ "s.name": this.schema });
 		if (table) query.andWhere({ "o.name": table });
-		if (column) {
-			const rawColumn = await query.andWhere({ "c.name": column }).first();
-			return rawColumnToColumn$2(rawColumn);
-		}
+		if (column) return rawColumnToColumn$2(await query.andWhere({ "c.name": column }).first());
 		return (await query).map(rawColumnToColumn$2);
 	}
 	/**
@@ -748,10 +740,7 @@ var MySQL = class {
 			this.on("rc.TABLE_NAME", "=", "fk.TABLE_NAME").andOn("rc.CONSTRAINT_NAME", "=", "fk.CONSTRAINT_NAME").andOn("rc.CONSTRAINT_SCHEMA", "=", "fk.CONSTRAINT_SCHEMA");
 		}).where({ "c.TABLE_SCHEMA": this.knex.client.database() });
 		if (table) query.andWhere({ "c.TABLE_NAME": table });
-		if (column) {
-			const rawColumn = await query.andWhere({ "c.column_name": column }).first();
-			return rawColumnToColumn$1(rawColumn);
-		}
+		if (column) return rawColumnToColumn$1(await query.andWhere({ "c.column_name": column }).first());
 		return (await query).map(rawColumnToColumn$1).sort((column$1) => +!column$1.foreign_key_column).filter((column$1, index, records) => {
 			return records.findIndex((_column) => {
 				return column$1.name === _column.name && column$1.table === _column.table;
@@ -937,10 +926,7 @@ var oracleDB = class {
             ON "ct"."R_CONSTRAINT_NAME" = "fk"."CONSTRAINT_NAME"
         `)).where({ "c.HIDDEN_COLUMN": "NO" });
 		if (table) query.andWhere({ "c.TABLE_NAME": table });
-		if (column) {
-			const rawColumn = await query.andWhere({ "c.COLUMN_NAME": column }).first();
-			return rawColumnToColumn(rawColumn);
-		}
+		if (column) return rawColumnToColumn(await query.andWhere({ "c.COLUMN_NAME": column }).first());
 		return (await query).map(rawColumnToColumn);
 	}
 	/**
@@ -1827,9 +1813,7 @@ const HasAttributes = (Model$1) => {
 		}
 		originalIsEquivalent(key) {
 			if (this.original[key] === void 0) return false;
-			const attribute = this.attributes[key];
-			const original = this.original[key];
-			if (attribute === original) return true;
+			if (this.attributes[key] === this.original[key]) return true;
 			else return false;
 		}
 		setAttributes(attributes) {
@@ -2011,8 +1995,7 @@ const HasAttributes = (Model$1) => {
 			return new Date(value);
 		}
 		asDate(value) {
-			const date = this.asDateTime(value);
-			return (0, dayjs.default)(date).startOf("day").toDate();
+			return (0, dayjs.default)(this.asDateTime(value)).startOf("day").toDate();
 		}
 	};
 };
@@ -2526,10 +2509,7 @@ const HasRelations = (Model$1) => {
 			return this.relations[relation] !== void 0;
 		}
 		related(relation) {
-			if (typeof this[getRelationMethod(relation)] !== "function") {
-				const message = `Model [${this.constructor.name}]'s relation [${relation}] doesn't exist.`;
-				throw new RelationNotFoundError(message);
-			}
+			if (typeof this[getRelationMethod(relation)] !== "function") throw new RelationNotFoundError(`Model [${this.constructor.name}]'s relation [${relation}] doesn't exist.`);
 			return this[getRelationMethod(relation)]();
 		}
 		async getRelated(relation) {
@@ -4030,8 +4010,7 @@ var BelongsToMany = class extends compose(relation_default, interacts_with_pivot
 		return columns.concat(this.aliasedPivotColumns());
 	}
 	aliasedPivotColumns() {
-		const defaults = [this.foreignPivotKey, this.relatedPivotKey];
-		return (0, collect_js.collect)(defaults.concat(this.pivotColumns)).map((column) => {
+		return (0, collect_js.collect)([this.foreignPivotKey, this.relatedPivotKey].concat(this.pivotColumns)).map((column) => {
 			return this.qualifyPivotColumn(column) + " as pivot_" + column;
 		}).unique().all();
 	}
@@ -4324,8 +4303,7 @@ var Builder = class Builder extends Inference$1 {
 	}
 	addUpdatedAtColumn(values) {
 		if (!this.model.usesTimestamps() || this.model.getUpdatedAtColumn() === null) return values;
-		const column = this.model.getUpdatedAtColumn();
-		values = (0, radashi.assign)({ [column]: this.model.freshTimestampString() }, values);
+		values = (0, radashi.assign)({ [this.model.getUpdatedAtColumn()]: this.model.freshTimestampString() }, values);
 		return values;
 	}
 	delete() {
@@ -4640,10 +4618,7 @@ var Builder = class Builder extends Inference$1 {
 		}];
 	}
 	related(relation) {
-		if (typeof this.model[getRelationMethod(relation)] !== "function") {
-			const message = `Model [${this.model.constructor.name}]'s relation [${relation}] doesn't exist.`;
-			throw new RelationNotFoundError(message);
-		}
+		if (typeof this.model[getRelationMethod(relation)] !== "function") throw new RelationNotFoundError(`Model [${this.model.constructor.name}]'s relation [${relation}] doesn't exist.`);
 		return this.model[getRelationMethod(relation)]();
 	}
 	take(...args) {
@@ -4716,8 +4691,7 @@ var Builder = class Builder extends Inference$1 {
 		return await this.whereIn(this.model.getKeyName(), ids).get(columns);
 	}
 	async pluck(column) {
-		const data = await this.query.pluck(column);
-		return new collection_default(data);
+		return new collection_default(await this.query.pluck(column));
 	}
 	async destroy(ids) {
 		if (ids instanceof collection_default) ids = ids.modelKeys();
@@ -4762,10 +4736,7 @@ var Builder = class Builder extends Inference$1 {
 		return this.hydrate(await this.query.get()).all();
 	}
 	getRelation(name) {
-		if (typeof this.model[getRelationMethod(name)] !== "function") {
-			const message = `Model [${this.model.constructor.name}]'s relation [${name}] doesn't exist.`;
-			throw new RelationNotFoundError(message);
-		}
+		if (typeof this.model[getRelationMethod(name)] !== "function") throw new RelationNotFoundError(`Model [${this.model.constructor.name}]'s relation [${name}] doesn't exist.`);
 		const relation = relation_default.noConstraints(() => this.model.newInstance(this.model.attributes)[getRelationMethod(name)]());
 		const nested = this.relationsNestedUnder(name);
 		if (Object.keys(nested).length > 0) relation.query.with(nested);
@@ -4866,8 +4837,7 @@ var SQLite = class {
 			column: column.name
 		}));
 		const tables = await this.tables();
-		const columnsPerTable = await Promise.all(tables.map(async (table$1) => await this.columns(table$1)));
-		return flatten(columnsPerTable);
+		return flatten(await Promise.all(tables.map(async (table$1) => await this.columns(table$1))));
 	}
 	async columnInfo(table, column) {
 		const getColumnsForTable = async (table$1) => {
@@ -4902,8 +4872,7 @@ var SQLite = class {
 		};
 		if (!table) {
 			const tables = await this.tables();
-			const columnsPerTable = await Promise.all(tables.map(async (table$1) => await getColumnsForTable(table$1)));
-			return flatten(columnsPerTable);
+			return flatten(await Promise.all(tables.map(async (table$1) => await getColumnsForTable(table$1))));
 		}
 		if (table && !column) return await getColumnsForTable(table);
 		return (await getColumnsForTable(table)).find((columnInfo) => columnInfo.name === column);
@@ -4934,8 +4903,7 @@ var SQLite = class {
 			constraint_name: null
 		}));
 		const tables = await this.tables();
-		const keysPerTable = await Promise.all(tables.map(async (table$1) => await this.foreignKeys(table$1)));
-		return flatten(keysPerTable);
+		return flatten(await Promise.all(tables.map(async (table$1) => await this.foreignKeys(table$1))));
 	}
 	async uniqueConstraints(table) {
 		if (table) {
@@ -4951,8 +4919,7 @@ var SQLite = class {
 			});
 		}
 		const tables = await this.tables();
-		const constraintsPerTable = await Promise.all(tables.map(async (table$1) => await this.uniqueConstraints(table$1)));
-		return flatten(constraintsPerTable);
+		return flatten(await Promise.all(tables.map(async (table$1) => await this.uniqueConstraints(table$1))));
 	}
 };
 
@@ -5323,21 +5290,19 @@ var Migrate = class {
 		const getAllMigrationFiles = async () => {
 			return await migrator.getMigrationFiles(await Utils.getMigrationPaths(this.basePath ?? process.cwd(), migrator, config.migrations.path, options.path));
 		};
-		async function getStatusFor(ran$1, batches$1) {
+		async function getStatusFor(ran, batches) {
 			const files = await getAllMigrationFiles();
 			return Object.values(files).map((migration) => {
 				const migrationName = migrator.getMigrationName(migration);
 				return {
 					name: migrationName,
-					ran: ran$1.includes(migrationName),
-					batch: ran$1.includes(migrationName) ? batches$1[migrationName] : null
+					ran: ran.includes(migrationName),
+					batch: ran.includes(migrationName) ? batches[migrationName] : null
 				};
 			});
 		}
 		if (!await migrator.repositoryExists()) this.callback("ERROR: Migration table does not exist.", "error");
-		const ran = await migrator.repository.getRan();
-		const batches = await migrator.getRepository().getMigrationBatches();
-		const migrations = await getStatusFor(ran, batches);
+		const migrations = await getStatusFor(await migrator.repository.getRan(), await migrator.getRepository().getMigrationBatches());
 		if (destroyAll) await arquebus$1.destroyAll();
 		return migrations;
 	}
@@ -5356,11 +5321,9 @@ var Migrate = class {
 				arquebus_default.addConnection(connection, name);
 			});
 		}
-		const repository = new MigrationRepository(arquebus_default, table);
-		const migrator = new migrator_default(repository, arquebus_default);
 		return {
 			arquebus: arquebus_default,
-			migrator
+			migrator: new migrator_default(new MigrationRepository(arquebus_default, table), arquebus_default)
 		};
 	}
 };