@h3ravel/arquebus 0.4.1 → 0.5.0

package/bin/index.cjs

@@ -58,8 +58,6 @@ let fs = require("fs");
 fs = __toESM(fs);
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize);
-let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let node_url = require("node:url");
@@ -2459,8 +2457,8 @@ var HasManyThrough = class extends relation_default {
 		const results = await this.take(1).get(columns);
 		return results.count() > 0 ? results.first() : null;
 	}
-	async firstOrFail(columns = ["*"]) {
-		const model = await this.first(columns);
+	async firstOrFail(...columns) {
+		const model = await this.first(...columns);
 		if (model) return model;
 		throw new ModelNotFoundError().setModel(this.related.constructor);
 	}
@@ -2499,7 +2497,7 @@ var HasManyThrough = class extends relation_default {
 	}
 	async paginate(perPage = null, columns = ["*"], pageName = "page", page = null) {
 		this.query.addSelect(this.shouldSelect(columns));
-		return await this.query.paginate(perPage, columns, pageName, page);
+		return await this.query.paginate(perPage ?? 15, columns, pageName, page);
 	}
 	shouldSelect(columns = ["*"]) {
 		if ((columns === null || columns === void 0 ? void 0 : columns.at(0)) == "*") columns = [this.related.getTable() + ".*"];
@@ -2777,9 +2775,6 @@ const UniqueIds = (Model$1) => {
 		uniqueIds() {
 			return [];
 		}
-		newUniqueId() {
-			return null;
-		}
 		setUniqueIds() {
 			const uniqueIds = this.uniqueIds();
 			for (const column of uniqueIds) if (this[column] === null || this[column] === void 0) this[column] = this.newUniqueId();
@@ -2801,6 +2796,7 @@ var Paginator = class {
 	options = {};
 	static setFormatter(formatter) {
 		if (typeof formatter !== "function" && formatter !== null && formatter !== void 0) throw new Error("Paginator formatter must be a function or null");
+		if (!formatter) return;
 		this.formatter = formatter;
 	}
 	constructor(items, total, perPage, currentPage = 1, options = {}) {
@@ -2889,8 +2885,10 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 	asProxy() {
 		return new Proxy(this, {
 			get: function(target, prop) {
+				var _target$connector$cli;
 				if (typeof target[prop] !== "undefined") return target[prop];
 				if (["destroy", "schema"].includes(prop)) return target.connector.schema;
+				const skipReturning = !!((_target$connector$cli = target.connector.client.config) === null || _target$connector$cli === void 0 || (_target$connector$cli = _target$connector$cli.client) === null || _target$connector$cli === void 0 ? void 0 : _target$connector$cli.includes("mysql")) && prop === "returning";
 				if ([
 					"select",
 					"from",
@@ -2953,7 +2951,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 					"clearWhere",
 					"clearHaving",
 					"clearGroup"
-				].includes(prop)) return (...args) => {
+				].includes(prop) && !skipReturning) return (...args) => {
 					target.connector[prop](...args);
 					return target.asProxy();
 				};
@@ -3010,7 +3008,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 		} while (countResults === count);
 		return true;
 	}
-	async paginate(page = 1, perPage = 15) {
+	async paginate(page = 1, perPage = 15, _pageName, _page) {
 		const total = await this.clone().clearOrder().count("*");
 		let results;
 		if (total > 0) {
@@ -3249,14 +3247,15 @@ var arquebus_default = arquebus;
 
 //#endregion
 //#region src/model.ts
-const BaseModel = compose(class {}, has_attributes_default, hides_attributes_default, has_relations_default, has_timestamps_default, has_hooks_default, has_global_scopes_default, unique_ids_default);
+const ModelClass = class {};
+const BaseModel = compose(ModelClass, has_attributes_default, hides_attributes_default, has_relations_default, has_timestamps_default, has_hooks_default, has_global_scopes_default, unique_ids_default);
 var Model = class Model extends BaseModel {
-	primaryKey = "id";
 	builder = null;
 	table = null;
 	keyType = "int";
 	incrementing = true;
 	withCount = [];
+	primaryKey = "id";
 	perPage = 15;
 	static globalScopes = {};
 	static pluginInitializers = {};
@@ -3266,6 +3265,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -4037,8 +4037,8 @@ var BelongsToMany = class extends compose(relation_default, interacts_with_pivot
 		const results = await this.take(1).get(columns);
 		return results.count() > 0 ? results.first() : null;
 	}
-	async firstOrFail(columns = ["*"]) {
-		const model = await this.first(columns);
+	async firstOrFail(...columns) {
+		const model = await this.first(...columns);
 		if (model !== null) return model;
 		throw new ModelNotFoundError().setModel(this.related.constructor);
 	}
@@ -4214,7 +4214,9 @@ var Builder = class Builder extends Inference {
 	}
 	asProxy() {
 		return new Proxy(this, { get(target, prop) {
+			var _target$query$connect;
 			if (typeof target[prop] !== "undefined") return target[prop];
+			const skipReturning = !!((_target$query$connect = target.query.connector) === null || _target$query$connect === void 0 || (_target$query$connect = _target$query$connect.client.config) === null || _target$query$connect === void 0 || (_target$query$connect = _target$query$connect.client) === null || _target$query$connect === void 0 ? void 0 : _target$query$connect.includes("mysql")) && prop === "returning";
 			if ([
 				"select",
 				"from",
@@ -4277,7 +4279,7 @@ var Builder = class Builder extends Inference {
 				"clearWhere",
 				"clearHaving",
 				"clearGroup"
-			].includes(prop)) return (...args) => {
+			].includes(prop) && !skipReturning) return (...args) => {
 				target.query[prop](...args);
 				return target.asProxy();
 			};
@@ -5402,10 +5404,10 @@ var MigrationCreator = class {
 	* @returns 
 	*/
 	async create(name$1, dir, table, create = false) {
-		const stub = this.getStub(table, create);
+		const stub = await this.getStub(table, create);
 		const filePath = this.getPath(name$1, dir);
 		await this.ensureDirectoryExists(path.default.dirname(filePath));
-		await node_fs_promises.default.writeFile(filePath, this.populateStub(stub, table));
+		await (0, node_fs_promises.writeFile)(filePath, this.populateStub(stub, table));
 		await this.firePostCreateHooks(table, filePath);
 		return filePath;
 	}
@@ -5416,29 +5418,29 @@ var MigrationCreator = class {
 	* @param callback 
 	*/
 	async publish(dir, callback) {
-		const migrationFiles = await node_fs_promises.default.readdir(this.customStubPath ?? "");
+		const migrationFiles = await (0, node_fs_promises.readdir)(this.customStubPath ?? "");
 		await this.ensureDirectoryExists(dir);
 		for (const migrationFile of migrationFiles) {
 			const sourceFilePath = path.default.join(this.customStubPath ?? "", migrationFile);
 			const destinationFilePath = path.default.join(dir, migrationFile);
-			await node_fs_promises.default.copyFile(sourceFilePath, destinationFilePath);
+			await (0, node_fs_promises.copyFile)(sourceFilePath, destinationFilePath);
 			if (callback) callback(migrationFile, sourceFilePath, destinationFilePath);
 		}
 	}
-	getStub(table, create = false) {
+	async getStub(table, create = false) {
 		let stub;
 		if (!table) {
 			const customPath = path.default.join(this.customStubPath ?? "", `migration-${this.type}.stub`);
 			console.log("\n", customPath, "---");
-			stub = (0, node_fs.existsSync)(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
+			stub = await __h3ravel_shared.FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
 		} else if (create) {
 			const customPath = path.default.join(this.customStubPath ?? "", `migration.create-${this.type}.stub`);
-			stub = (0, node_fs.existsSync)(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
+			stub = await __h3ravel_shared.FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
 		} else {
 			const customPath = path.default.join(this.customStubPath ?? "", `migration.update-${this.type}.stub`);
-			stub = (0, node_fs.existsSync)(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
+			stub = await __h3ravel_shared.FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
 		}
-		return (0, node_fs.readFileSync)(stub, "utf-8");
+		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);
@@ -5458,7 +5460,7 @@ var MigrationCreator = class {
 		this.postCreate.push(callback);
 	}
 	async ensureDirectoryExists(dir) {
-		await node_fs_promises.default.mkdir(dir, { recursive: true });
+		await (0, node_fs_promises.mkdir)(dir, { recursive: true });
 	}
 	stubPath(stub = "") {
 		const __dirname$1 = this.getDirname({});
@@ -5474,7 +5476,7 @@ var MigrationCreator = class {
 //#endregion
 //#region package.json
 var name = "@h3ravel/arquebus";
-var version = "0.4.0";
+var version = "0.5.0";
 var packageManager = "pnpm@10.14.0";
 var description = "Arquebus ORM is a Beautiful, expressive ORM inspired by Laravel's Eloquent, designed for TypeScript applications and for the H3ravel Framework.";
 var homepage = "https://h3ravel.toneflix.net/arquebus";
@@ -5592,12 +5594,12 @@ var scripts = {
 	"test:postgres": "cross-env DB=postgres vitest --project node",
 	"test:sqlite": "cross-env DB=sqlite vitest --project node",
 	"test:browser": "vitest --project browser",
-	"release:patch": "pnpm build && git add . && git commit -m \"version: bump version and publish\" && pnpm version patch && pnpm publish --tag latest"
+	"release:patch": "pnpm build && git add . && git commit -m \"version: bump version\" && pnpm version patch && pnpm publish --tag latest"
 };
 var husky = { "hooks": { "pre-commit": "lint-staged" } };
 var lint_staged = { "*.{js,json}": ["prettier --write", "git add"] };
 var dependencies = {
-	"@h3ravel/shared": "^0.18.1",
+	"@h3ravel/shared": "^0.20.1",
 	"chalk": "^5.6.2",
 	"collect.js": "^4.36.1",
 	"commander": "^14.0.1",

package/bin/index.js

@@ -5,8 +5,8 @@ import { access } from "fs/promises";
 import escalade from "escalade/sync";
 import path from "path";
 import resolveFrom from "resolve-from";
-import fs, { mkdir, readFile, writeFile } from "node:fs/promises";
-import { Logger, TaskManager } from "@h3ravel/shared";
+import fs, { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import { FileSystem, Logger, TaskManager } from "@h3ravel/shared";
 import { assign, camel, diff, flat, get, isArray, isEmpty, isEqual, isString, omit, pick, set, snake, trim } from "radashi";
 import advancedFormat from "dayjs/plugin/advancedFormat.js";
 import dayjs from "dayjs";
@@ -14,7 +14,6 @@ import collect, { Collection, collect as collect$1 } from "collect.js";
 import Knex from "knex";
 import { existsSync } from "fs";
 import pluralize from "pluralize";
-import { existsSync as existsSync$1, readFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import chalk from "chalk";
@@ -2422,8 +2421,8 @@ var HasManyThrough = class extends relation_default {
 		const results = await this.take(1).get(columns);
 		return results.count() > 0 ? results.first() : null;
 	}
-	async firstOrFail(columns = ["*"]) {
-		const model = await this.first(columns);
+	async firstOrFail(...columns) {
+		const model = await this.first(...columns);
 		if (model) return model;
 		throw new ModelNotFoundError().setModel(this.related.constructor);
 	}
@@ -2462,7 +2461,7 @@ var HasManyThrough = class extends relation_default {
 	}
 	async paginate(perPage = null, columns = ["*"], pageName = "page", page = null) {
 		this.query.addSelect(this.shouldSelect(columns));
-		return await this.query.paginate(perPage, columns, pageName, page);
+		return await this.query.paginate(perPage ?? 15, columns, pageName, page);
 	}
 	shouldSelect(columns = ["*"]) {
 		if ((columns === null || columns === void 0 ? void 0 : columns.at(0)) == "*") columns = [this.related.getTable() + ".*"];
@@ -2740,9 +2739,6 @@ const UniqueIds = (Model$1) => {
 		uniqueIds() {
 			return [];
 		}
-		newUniqueId() {
-			return null;
-		}
 		setUniqueIds() {
 			const uniqueIds = this.uniqueIds();
 			for (const column of uniqueIds) if (this[column] === null || this[column] === void 0) this[column] = this.newUniqueId();
@@ -2764,6 +2760,7 @@ var Paginator = class {
 	options = {};
 	static setFormatter(formatter) {
 		if (typeof formatter !== "function" && formatter !== null && formatter !== void 0) throw new Error("Paginator formatter must be a function or null");
+		if (!formatter) return;
 		this.formatter = formatter;
 	}
 	constructor(items, total, perPage, currentPage = 1, options = {}) {
@@ -2852,8 +2849,10 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 	asProxy() {
 		return new Proxy(this, {
 			get: function(target, prop) {
+				var _target$connector$cli;
 				if (typeof target[prop] !== "undefined") return target[prop];
 				if (["destroy", "schema"].includes(prop)) return target.connector.schema;
+				const skipReturning = !!((_target$connector$cli = target.connector.client.config) === null || _target$connector$cli === void 0 || (_target$connector$cli = _target$connector$cli.client) === null || _target$connector$cli === void 0 ? void 0 : _target$connector$cli.includes("mysql")) && prop === "returning";
 				if ([
 					"select",
 					"from",
@@ -2916,7 +2915,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 					"clearWhere",
 					"clearHaving",
 					"clearGroup"
-				].includes(prop)) return (...args) => {
+				].includes(prop) && !skipReturning) return (...args) => {
 					target.connector[prop](...args);
 					return target.asProxy();
 				};
@@ -2973,7 +2972,7 @@ var QueryBuilder = class QueryBuilder extends Inference$1 {
 		} while (countResults === count);
 		return true;
 	}
-	async paginate(page = 1, perPage = 15) {
+	async paginate(page = 1, perPage = 15, _pageName, _page) {
 		const total = await this.clone().clearOrder().count("*");
 		let results;
 		if (total > 0) {
@@ -3212,14 +3211,15 @@ var arquebus_default = arquebus;
 
 //#endregion
 //#region src/model.ts
-const BaseModel = compose(class {}, has_attributes_default, hides_attributes_default, has_relations_default, has_timestamps_default, has_hooks_default, has_global_scopes_default, unique_ids_default);
+const ModelClass = class {};
+const BaseModel = compose(ModelClass, has_attributes_default, hides_attributes_default, has_relations_default, has_timestamps_default, has_hooks_default, has_global_scopes_default, unique_ids_default);
 var Model = class Model extends BaseModel {
-	primaryKey = "id";
 	builder = null;
 	table = null;
 	keyType = "int";
 	incrementing = true;
 	withCount = [];
+	primaryKey = "id";
 	perPage = 15;
 	static globalScopes = {};
 	static pluginInitializers = {};
@@ -3229,6 +3229,7 @@ var Model = class Model extends BaseModel {
 	eagerLoad = {};
 	exists = false;
 	with = [];
+	name;
 	trx = null;
 	constructor(attributes = {}) {
 		super();
@@ -4000,8 +4001,8 @@ var BelongsToMany = class extends compose(relation_default, interacts_with_pivot
 		const results = await this.take(1).get(columns);
 		return results.count() > 0 ? results.first() : null;
 	}
-	async firstOrFail(columns = ["*"]) {
-		const model = await this.first(columns);
+	async firstOrFail(...columns) {
+		const model = await this.first(...columns);
 		if (model !== null) return model;
 		throw new ModelNotFoundError().setModel(this.related.constructor);
 	}
@@ -4177,7 +4178,9 @@ var Builder = class Builder extends Inference {
 	}
 	asProxy() {
 		return new Proxy(this, { get(target, prop) {
+			var _target$query$connect;
 			if (typeof target[prop] !== "undefined") return target[prop];
+			const skipReturning = !!((_target$query$connect = target.query.connector) === null || _target$query$connect === void 0 || (_target$query$connect = _target$query$connect.client.config) === null || _target$query$connect === void 0 || (_target$query$connect = _target$query$connect.client) === null || _target$query$connect === void 0 ? void 0 : _target$query$connect.includes("mysql")) && prop === "returning";
 			if ([
 				"select",
 				"from",
@@ -4240,7 +4243,7 @@ var Builder = class Builder extends Inference {
 				"clearWhere",
 				"clearHaving",
 				"clearGroup"
-			].includes(prop)) return (...args) => {
+			].includes(prop) && !skipReturning) return (...args) => {
 				target.query[prop](...args);
 				return target.asProxy();
 			};
@@ -5365,10 +5368,10 @@ var MigrationCreator = class {
 	* @returns 
 	*/
 	async create(name$1, dir, table, create = false) {
-		const stub = this.getStub(table, create);
+		const stub = await this.getStub(table, create);
 		const filePath = this.getPath(name$1, dir);
 		await this.ensureDirectoryExists(path.dirname(filePath));
-		await fs.writeFile(filePath, this.populateStub(stub, table));
+		await writeFile(filePath, this.populateStub(stub, table));
 		await this.firePostCreateHooks(table, filePath);
 		return filePath;
 	}
@@ -5379,29 +5382,29 @@ var MigrationCreator = class {
 	* @param callback 
 	*/
 	async publish(dir, callback) {
-		const migrationFiles = await fs.readdir(this.customStubPath ?? "");
+		const migrationFiles = await readdir(this.customStubPath ?? "");
 		await this.ensureDirectoryExists(dir);
 		for (const migrationFile of migrationFiles) {
 			const sourceFilePath = path.join(this.customStubPath ?? "", migrationFile);
 			const destinationFilePath = path.join(dir, migrationFile);
-			await fs.copyFile(sourceFilePath, destinationFilePath);
+			await copyFile(sourceFilePath, destinationFilePath);
 			if (callback) callback(migrationFile, sourceFilePath, destinationFilePath);
 		}
 	}
-	getStub(table, create = false) {
+	async getStub(table, create = false) {
 		let stub;
 		if (!table) {
 			const customPath = path.join(this.customStubPath ?? "", `migration-${this.type}.stub`);
 			console.log("\n", customPath, "---");
-			stub = existsSync$1(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
+			stub = await FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration-${this.type}.stub`);
 		} else if (create) {
 			const customPath = path.join(this.customStubPath ?? "", `migration.create-${this.type}.stub`);
-			stub = existsSync$1(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
+			stub = await FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.create-${this.type}.stub`);
 		} else {
 			const customPath = path.join(this.customStubPath ?? "", `migration.update-${this.type}.stub`);
-			stub = existsSync$1(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
+			stub = await FileSystem.fileExists(customPath) ? customPath : this.stubPath(`/migration.update-${this.type}.stub`);
 		}
-		return readFileSync(stub, "utf-8");
+		return await readFile(stub, "utf-8");
 	}
 	populateStub(stub, table) {
 		if (table !== null) stub = stub.replace(/DummyTable|{{\s*table\s*}}/g, table);
@@ -5421,7 +5424,7 @@ var MigrationCreator = class {
 		this.postCreate.push(callback);
 	}
 	async ensureDirectoryExists(dir) {
-		await fs.mkdir(dir, { recursive: true });
+		await mkdir(dir, { recursive: true });
 	}
 	stubPath(stub = "") {
 		const __dirname$1 = this.getDirname(import.meta);
@@ -5437,7 +5440,7 @@ var MigrationCreator = class {
 //#endregion
 //#region package.json
 var name = "@h3ravel/arquebus";
-var version = "0.4.0";
+var version = "0.5.0";
 var packageManager = "pnpm@10.14.0";
 var description = "Arquebus ORM is a Beautiful, expressive ORM inspired by Laravel's Eloquent, designed for TypeScript applications and for the H3ravel Framework.";
 var homepage = "https://h3ravel.toneflix.net/arquebus";
@@ -5555,12 +5558,12 @@ var scripts = {
 	"test:postgres": "cross-env DB=postgres vitest --project node",
 	"test:sqlite": "cross-env DB=sqlite vitest --project node",
 	"test:browser": "vitest --project browser",
-	"release:patch": "pnpm build && git add . && git commit -m \"version: bump version and publish\" && pnpm version patch && pnpm publish --tag latest"
+	"release:patch": "pnpm build && git add . && git commit -m \"version: bump version\" && pnpm version patch && pnpm publish --tag latest"
 };
 var husky = { "hooks": { "pre-commit": "lint-staged" } };
 var lint_staged = { "*.{js,json}": ["prettier --write", "git add"] };
 var dependencies = {
-	"@h3ravel/shared": "^0.18.1",
+	"@h3ravel/shared": "^0.20.1",
 	"chalk": "^5.6.2",
 	"collect.js": "^4.36.1",
 	"commander": "^14.0.1",