@h3ravel/arquebus 0.5.0 → 0.6.0

package/dist/migrations/index.cjs

@@ -45,16 +45,16 @@ 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 fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
 let escalade_sync = require("escalade/sync");
 escalade_sync = __toESM(escalade_sync);
 let resolve_from = require("resolve-from");
 resolve_from = __toESM(resolve_from);
+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");
@@ -1449,7 +1449,7 @@ var InvalidArgumentError = class extends BaseError {};
 var mixin_exports = /* @__PURE__ */ __export({ compose: () => compose$1 });
 /**
 * Compose function that merges multiple classes and mixins
-* 
+*
 * @example
 * const SomePlugin = <TBase extends new (...args: any[]) => TGeneric> (Base: TBase) => {
 *     return class extends Base {
@@ -1486,10 +1486,10 @@ var mixin_exports = /* @__PURE__ */ __export({ compose: () => compose$1 });
 * console.log(user.pluginMethod('w')) // "plugin"
 * console.log(user.pluginMethod()) // "plugin"
 * console.log(user.relationPosts()) // "hasMany Posts"
-* 
-* @param Base 
-* @param mixins 
-* @returns 
+*
+* @param Base
+* @param mixins
+* @returns
 */
 function compose$1(Base, ...mixins) {
 	/**
@@ -1543,10 +1543,10 @@ const getSetterMethod = (attr) => {
 };
 /**
 * Tap into a model a collection instance
-* 
-* @param instance 
-* @param callback 
-* @returns 
+*
+* @param instance
+* @param callback
+* @returns
 */
 const tap = (instance, callback) => {
 	const result = callback(instance);
@@ -2997,6 +2997,59 @@ var QueryBuilder = class QueryBuilder extends Inference$2 {
 };
 var query_builder_default = QueryBuilder;
 
+//#endregion
+//#region src/cli/utils.ts
+const join = path.default.join;
+var Utils = class {
+	/**
+	* Wraps text with chalk
+	*
+	* @param txt
+	* @param color
+	* @returns
+	*/
+	static textFormat(txt, color) {
+		return String(txt).split(":").map((e, i, a) => i == 0 && a.length > 1 ? color(" " + e + ": ") : e).join("");
+	}
+	static findModulePkg(moduleId, cwd) {
+		const parts = moduleId.replace(/\\/g, "/").split("/");
+		let packageName = "";
+		if (parts.length > 0 && parts[0][0] === "@") packageName += parts.shift() + "/";
+		packageName += parts.shift();
+		const packageJson = path.default.join(packageName, "package.json");
+		const resolved = resolve_from.default.silent(cwd ?? process.cwd(), packageJson);
+		if (!resolved) return;
+		return path.default.join(path.default.dirname(resolved), parts.join("/"));
+	}
+	static async getMigrationPaths(cwd, migrator, defaultPath, path$7) {
+		if (path$7) return [join(cwd, path$7)];
+		return [...migrator.getPaths(), join(cwd, defaultPath)];
+	}
+	/**
+	* Check if file exists
+	*
+	* @param path
+	* @returns
+	*/
+	static async fileExists(path$7) {
+		try {
+			await (0, fs_promises.access)(path$7);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	static findUpConfig(cwd, name, extensions) {
+		return (0, escalade_sync.default)(cwd, (_dir, names) => {
+			for (const ext of extensions) {
+				const filename = `${name}.${ext}`;
+				if (names.includes(filename)) return filename;
+			}
+			return false;
+		});
+	}
+};
+
 //#endregion
 //#region src/arquebus.ts
 var arquebus = class arquebus {
@@ -3018,22 +3071,22 @@ var arquebus = class arquebus {
 		return this.instance;
 	}
 	/**
-	* Initialize a new database connection 
-	* 
-	* @returns 
+	* Initialize a new database connection
+	*
+	* @returns
 	*/
 	static fire(connection = null) {
 		return this.getInstance().getConnection(connection);
 	}
 	/**
-	* Initialize a new database connection 
-	* 
+	* Initialize a new database connection
+	*
 	* This is an alias of `arquebus.fire()` and will be removed in the future
-	* 
+	*
 	* @deprecated since version 0.3.0
 	* @alias fire
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	static connection(connection = null) {
 		return this.fire(connection);
@@ -3070,11 +3123,12 @@ var arquebus = class arquebus {
 	}
 	getConnection(name = null) {
 		name = name || "default";
-		if (this.manager[name] === void 0) {
-			const queryBuilder = new query_builder_default(this.connections[name], arquebus.getConnectorFactory());
-			this.manager[name] = queryBuilder;
+		const resolvedName = this.connections[name] ? name : "default";
+		if (this.manager[resolvedName] === void 0) {
+			const queryBuilder = new query_builder_default(this.connections[resolvedName], arquebus.getConnectorFactory());
+			this.manager[resolvedName] = queryBuilder;
 		}
-		return this.manager[name];
+		return this.manager[resolvedName];
 	}
 	addConnection(config, name = "default") {
 		this.connections[name] = {
@@ -3091,13 +3145,13 @@ var arquebus = class arquebus {
 	}
 	/**
 	* Autoload the config file
-	* 
-	* @param addConnection 
+	*
+	* @param addConnection
 	* @default true
-	* If set to `false` we will no attempt add the connection, we 
+	* If set to `false` we will no attempt add the connection, we
 	* will just go ahead and return the config
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	static async autoLoad(addConnection = true) {
 		let config;
@@ -3114,6 +3168,23 @@ var arquebus = class arquebus {
 			if (addConnection) instance.addConnection(config, config.client);
 			return config;
 		} else throw new Error("arquebus.config.ts found in production without build step");
+		const candidateDirs = [
+			process.cwd(),
+			path.default.join(process.cwd(), "test", "cli"),
+			path.default.join(process.cwd(), "test")
+		];
+		for (const dir of candidateDirs) {
+			const found = Utils.findUpConfig(dir, "arquebus.config", [
+				"js",
+				"ts",
+				"cjs"
+			]);
+			if (found) if (!found.endsWith(".ts") || process.env.NODE_ENV !== "production") {
+				config = (await import(found)).default;
+				if (addConnection) instance.addConnection(config, config.client);
+				return config;
+			} else throw new Error("arquebus.config.ts found in production without build step");
+		}
 		return {};
 	}
 	beginTransaction(connection = null) {
@@ -5083,9 +5154,9 @@ var Migrator = class {
 	}
 	/**
 	* Drop all tables and re-run all migrations
-	* 
-	* @param paths 
-	* @param options 
+	*
+	* @param paths
+	* @param options
 	*/
 	async fresh(paths, options) {
 		/** Initialise connections */
@@ -5177,59 +5248,6 @@ var Migrator = class {
 };
 var migrator_default = Migrator;
 
-//#endregion
-//#region src/cli/utils.ts
-const join = path.default.join;
-var Utils = class {
-	/**
-	* Wraps text with chalk
-	* 
-	* @param txt 
-	* @param color 
-	* @returns 
-	*/
-	static textFormat(txt, color) {
-		return String(txt).split(":").map((e, i, a) => i == 0 && a.length > 1 ? color(" " + e + ": ") : e).join("");
-	}
-	static findModulePkg(moduleId, cwd) {
-		const parts = moduleId.replace(/\\/g, "/").split("/");
-		let packageName = "";
-		if (parts.length > 0 && parts[0][0] === "@") packageName += parts.shift() + "/";
-		packageName += parts.shift();
-		const packageJson = path.default.join(packageName, "package.json");
-		const resolved = resolve_from.default.silent(cwd ?? process.cwd(), packageJson);
-		if (!resolved) return;
-		return path.default.join(path.default.dirname(resolved), parts.join("/"));
-	}
-	static async getMigrationPaths(cwd, migrator, defaultPath, path$5) {
-		if (path$5) return [join(cwd, path$5)];
-		return [...migrator.getPaths(), join(cwd, defaultPath)];
-	}
-	/**
-	* Check if file exists
-	* 
-	* @param path 
-	* @returns 
-	*/
-	static async fileExists(path$5) {
-		try {
-			await (0, fs_promises.access)(path$5);
-			return true;
-		} catch {
-			return false;
-		}
-	}
-	static findUpConfig(cwd, name, extensions) {
-		return (0, escalade_sync.default)(cwd, (_dir, names) => {
-			for (const ext of extensions) {
-				const filename = `${name}.${ext}`;
-				if (names.includes(filename)) return filename;
-			}
-			return false;
-		});
-	}
-};
-
 //#endregion
 //#region src/migrate.ts
 var Migrate = class {
@@ -5241,10 +5259,10 @@ var Migrate = class {
 	}
 	/**
 	* Runs all pending migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async run(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5258,10 +5276,10 @@ var Migrate = class {
 	}
 	/**
 	* Rollback the last migration
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async rollback(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5275,10 +5293,10 @@ var Migrate = class {
 	}
 	/**
 	* Rollback all database migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async reset(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5293,10 +5311,10 @@ var Migrate = class {
 	}
 	/**
 	* Reset and re-run all migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async refresh(config, options = {}, destroyAll = false) {
 		await this.reset(config, Object.assign({}, options, { quiet: true }), false);
@@ -5305,10 +5323,10 @@ var Migrate = class {
 	}
 	/**
 	* Drop all tables and re-run all migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
 	*/
 	async fresh(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5318,8 +5336,8 @@ var Migrate = class {
 	}
 	/**
 	* Prepares the database for migration
-	* 
-	* @param migrator 
+	*
+	* @param migrator
 	*/
 	async prepareDatabase(migrator) {
 		if (!await migrator.repositoryExists()) {
@@ -5331,11 +5349,11 @@ var Migrate = class {
 	}
 	/**
 	* Check the status of available migrations
-	* 
-	* @param config 
-	* @param options 
-	* @param destroyAll 
-	* @returns 
+	*
+	* @param config
+	* @param options
+	* @param destroyAll
+	* @returns
 	*/
 	async status(config, options = {}, destroyAll = false) {
 		const { arquebus: arquebus$1, migrator } = await this.setupConnection(config);
@@ -5362,9 +5380,9 @@ var Migrate = class {
 	}
 	/**
 	* Setup the database connection
-	* 
-	* @param config 
-	* @returns 
+	*
+	* @param config
+	* @returns
 	*/
 	async setupConnection(config) {
 		var _config$migrations;
@@ -5394,12 +5412,12 @@ var MigrationCreator = class {
 	}
 	/**
 	* Create a new migration file
-	* 
-	* @param name 
-	* @param dir 
-	* @param table 
-	* @param create 
-	* @returns 
+	*
+	* @param name
+	* @param dir
+	* @param table
+	* @param create
+	* @returns
 	*/
 	async create(name, dir, table, create = false) {
 		const stub = await this.getStub(table, create);
@@ -5411,9 +5429,9 @@ var MigrationCreator = class {
 	}
 	/**
 	* Publish migrations from third party vendors
-	* 
-	* @param dir 
-	* @param callback 
+	*
+	* @param dir
+	* @param callback
 	*/
 	async publish(dir, callback) {
 		const migrationFiles = await (0, node_fs_promises.readdir)(this.customStubPath ?? "");
@@ -5441,7 +5459,7 @@ var MigrationCreator = class {
 		return await (0, node_fs_promises.readFile)(stub, "utf-8");
 	}
 	populateStub(stub, table) {
-		if (table !== null) stub = stub.replace(/DummyTable|{{\s*table\s*}}/g, table);
+		if (table) stub = stub.replace(/DummyTable|{{\s*table\s*}}/g, table);
 		return stub;
 	}
 	getClassName(name) {

package/dist/migrations/index.d.cts

@@ -112,7 +112,7 @@ declare class Builder<M extends Model = Model, R = IModel | ICollection<M>> exte
   enforceOrderBy(this: any): void;
   clone(this: any): any;
   forPage(this: any, page: number, perPage?: number): any;
-  insert(...args: Parameters<typeof (void 0).query.insert>): Promise<any>;
+  insert(...args: Parameters<typeof this.query.insert>): Promise<any>;
   update<T extends TGeneric>(values: T): Promise<any>;
   increment(column: string, amount?: number, extra?: {}): Promise<any>;
   decrement(column: string, amount?: number, extra?: {}): Promise<any>;
@@ -219,7 +219,7 @@ declare class Relation$1 {
   getEager(): any;
   get(columns?: string | string[]): Promise<any>;
   first(columns?: string[]): Promise<any>;
-  paginate(...args: any[]): Promise<any>;
+  paginate(...args: unknown[]): Promise<any>;
   count(...args: any[]): Promise<any>;
   toSql(): string;
   addConstraints(): void;
@@ -4081,7 +4081,7 @@ type ReturnTypeOfMethod<T, K extends keyof T> = T[K] extends ((...args: any[]) =
 type SnakeToCamelCase<S extends string> = S extends `${infer T}_${infer U}` ? `${T}${Capitalize<SnakeToCamelCase<U>>}` : S;
 type CamelToSnakeCase<S extends string> = S extends `${infer T}${infer U}` ? U extends Uncapitalize<U> ? `${Uncapitalize<T>}${CamelToSnakeCase<U>}` : `${Uncapitalize<T>}_${CamelToSnakeCase<U>}` : S;
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends ((...args: any[]) => any) ? K : never }[keyof T];
-type RelationNames<T> = FunctionPropertyNames<T> extends infer R ? R extends `relation${infer P}` ? P extends ('sToData' | 'loaded') ? never : CamelToSnakeCase<P> : never : never;
+type RelationNames<T> = FunctionPropertyNames<T> extends infer R ? R extends `relation${infer P}` ? P extends 'sToData' | 'loaded' ? never : CamelToSnakeCase<P> : never : never;
 type MixinConstructor<T = TGeneric> = new (...args: any[]) => T;
 //#endregion
 //#region src/browser/collection.d.ts
@@ -4718,7 +4718,7 @@ declare class QueryBuilder<M extends Model = Model, R = M[] | M> extends Inferen
   chunk(count: number, callback: TFunction): Promise<boolean>;
   paginate<F extends IPaginatorParams>(this: any, page: number | undefined, perPage: number | undefined, _pageName: string, _page: number): Promise<IPaginator<M, F>>;
   forPage(this: any, page?: number, perPage?: number): any;
-  toSQL(...args: Parameters<typeof (void 0).connector.toSQL>): Knex.Sql;
+  toSQL(...args: Parameters<typeof this.connector.toSQL>): Knex.Sql;
   count(column: string): Promise<number>;
   min(column: string): Promise<number>;
   max(column: string): Promise<number>;
@@ -4726,9 +4726,9 @@ declare class QueryBuilder<M extends Model = Model, R = M[] | M> extends Inferen
   avg(column: string): Promise<number>;
   clone(): IQueryBuilder<M, R>;
   delete(): Promise<number | boolean>;
-  insert(...args: Parameters<typeof (void 0).connector.insert>): Promise<unknown>;
-  update(...args: Parameters<typeof (void 0).connector.update>): Promise<number>;
-  destroy(...args: Parameters<typeof (void 0).connector.destroy>): Promise<number>;
+  insert(...args: Parameters<typeof this.connector.insert>): Promise<unknown>;
+  update(...args: Parameters<typeof this.connector.update>): Promise<number>;
+  destroy(...args: Parameters<typeof this.connector.destroy>): Promise<number>;
   get _statements(): IStatement[] & any[];
   get _single(): any;
   get from(): Knex.Table<any, any> & Knex.Table<any, any[]>;
@@ -4943,7 +4943,7 @@ declare class MigrationCreator {
    * @param create
    * @returns
    */
-  create(name: string, dir: string, table: string, create?: boolean): Promise<string>;
+  create(name: string, dir: string, table?: string, create?: boolean): Promise<string>;
   /**
    * Publish migrations from third party vendors
    *
@@ -4952,10 +4952,10 @@ declare class MigrationCreator {
    */
   publish(dir: string, callback?: (name: string, source: string, dest: string) => void): Promise<void>;
   getStub(table?: string, create?: boolean): Promise<string>;
-  populateStub(stub: string, table: string): string;
+  populateStub(stub: string, table?: string): string;
   getClassName(name: string): string;
   getPath(name: string, dir: string): string;
-  firePostCreateHooks(table: string, filePath: string): Promise<void>;
+  firePostCreateHooks(table: string | undefined, filePath: string): Promise<void>;
   afterCreate(callback: TFunction): void;
   ensureDirectoryExists(dir: string): Promise<void>;
   stubPath(stub?: string): string;

package/dist/migrations/index.d.ts

@@ -109,7 +109,7 @@ declare class Builder<M extends Model = Model, R = IModel | ICollection<M>> exte
   enforceOrderBy(this: any): void;
   clone(this: any): any;
   forPage(this: any, page: number, perPage?: number): any;
-  insert(...args: Parameters<typeof (void 0).query.insert>): Promise<any>;
+  insert(...args: Parameters<typeof this.query.insert>): Promise<any>;
   update<T extends TGeneric>(values: T): Promise<any>;
   increment(column: string, amount?: number, extra?: {}): Promise<any>;
   decrement(column: string, amount?: number, extra?: {}): Promise<any>;
@@ -216,7 +216,7 @@ declare class Relation$1 {
   getEager(): any;
   get(columns?: string | string[]): Promise<any>;
   first(columns?: string[]): Promise<any>;
-  paginate(...args: any[]): Promise<any>;
+  paginate(...args: unknown[]): Promise<any>;
   count(...args: any[]): Promise<any>;
   toSql(): string;
   addConstraints(): void;
@@ -4078,7 +4078,7 @@ type ReturnTypeOfMethod<T, K extends keyof T> = T[K] extends ((...args: any[]) =
 type SnakeToCamelCase<S extends string> = S extends `${infer T}_${infer U}` ? `${T}${Capitalize<SnakeToCamelCase<U>>}` : S;
 type CamelToSnakeCase<S extends string> = S extends `${infer T}${infer U}` ? U extends Uncapitalize<U> ? `${Uncapitalize<T>}${CamelToSnakeCase<U>}` : `${Uncapitalize<T>}_${CamelToSnakeCase<U>}` : S;
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends ((...args: any[]) => any) ? K : never }[keyof T];
-type RelationNames<T> = FunctionPropertyNames<T> extends infer R ? R extends `relation${infer P}` ? P extends ('sToData' | 'loaded') ? never : CamelToSnakeCase<P> : never : never;
+type RelationNames<T> = FunctionPropertyNames<T> extends infer R ? R extends `relation${infer P}` ? P extends 'sToData' | 'loaded' ? never : CamelToSnakeCase<P> : never : never;
 type MixinConstructor<T = TGeneric> = new (...args: any[]) => T;
 //#endregion
 //#region src/browser/collection.d.ts
@@ -4715,7 +4715,7 @@ declare class QueryBuilder<M extends Model = Model, R = M[] | M> extends Inferen
   chunk(count: number, callback: TFunction): Promise<boolean>;
   paginate<F extends IPaginatorParams>(this: any, page: number | undefined, perPage: number | undefined, _pageName: string, _page: number): Promise<IPaginator<M, F>>;
   forPage(this: any, page?: number, perPage?: number): any;
-  toSQL(...args: Parameters<typeof (void 0).connector.toSQL>): Knex.Sql;
+  toSQL(...args: Parameters<typeof this.connector.toSQL>): Knex.Sql;
   count(column: string): Promise<number>;
   min(column: string): Promise<number>;
   max(column: string): Promise<number>;
@@ -4723,9 +4723,9 @@ declare class QueryBuilder<M extends Model = Model, R = M[] | M> extends Inferen
   avg(column: string): Promise<number>;
   clone(): IQueryBuilder<M, R>;
   delete(): Promise<number | boolean>;
-  insert(...args: Parameters<typeof (void 0).connector.insert>): Promise<unknown>;
-  update(...args: Parameters<typeof (void 0).connector.update>): Promise<number>;
-  destroy(...args: Parameters<typeof (void 0).connector.destroy>): Promise<number>;
+  insert(...args: Parameters<typeof this.connector.insert>): Promise<unknown>;
+  update(...args: Parameters<typeof this.connector.update>): Promise<number>;
+  destroy(...args: Parameters<typeof this.connector.destroy>): Promise<number>;
   get _statements(): IStatement[] & any[];
   get _single(): any;
   get from(): Knex.Table<any, any> & Knex.Table<any, any[]>;
@@ -4940,7 +4940,7 @@ declare class MigrationCreator {
    * @param create
    * @returns
    */
-  create(name: string, dir: string, table: string, create?: boolean): Promise<string>;
+  create(name: string, dir: string, table?: string, create?: boolean): Promise<string>;
   /**
    * Publish migrations from third party vendors
    *
@@ -4949,10 +4949,10 @@ declare class MigrationCreator {
    */
   publish(dir: string, callback?: (name: string, source: string, dest: string) => void): Promise<void>;
   getStub(table?: string, create?: boolean): Promise<string>;
-  populateStub(stub: string, table: string): string;
+  populateStub(stub: string, table?: string): string;
   getClassName(name: string): string;
   getPath(name: string, dir: string): string;
-  firePostCreateHooks(table: string, filePath: string): Promise<void>;
+  firePostCreateHooks(table: string | undefined, filePath: string): Promise<void>;
   afterCreate(callback: TFunction): void;
   ensureDirectoryExists(dir: string): Promise<void>;
   stubPath(stub?: string): string;