@h3ravel/arquebus 0.7.2 → 0.7.3

package/bin/index.cjs

@@ -38,6 +38,8 @@ let resolve_from = require("resolve-from");
 resolve_from = __toESM(resolve_from);
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = __toESM(node_fs_promises);
+let node_path = require("node:path");
+let node_url = require("node:url");
 let radashi = require("radashi");
 let dayjs_plugin_advancedFormat_js = require("dayjs/plugin/advancedFormat.js");
 dayjs_plugin_advancedFormat_js = __toESM(dayjs_plugin_advancedFormat_js);
@@ -50,8 +52,6 @@ knex = __toESM(knex);
 let fs = require("fs");
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize);
-let node_path = require("node:path");
-let node_url = require("node:url");
 let __h3ravel_support = require("@h3ravel/support");
 let dotenv = require("dotenv");
 
@@ -1397,6 +1397,79 @@ function extractType(type) {
 	return type.replace(/[^a-zA-Z]/g, "").toLowerCase();
 }
 
+//#endregion
+//#region src/seeders/runner.ts
+async function glob$1(folderPath) {
+	const { default: escalade } = await import("escalade");
+	const entries = [];
+	await escalade(folderPath, async (dir, names) => {
+		await Promise.all(names.map(async (name) => {
+			const p = path.default.join(dir, name);
+			try {
+				await (0, node_fs_promises.access)(p);
+				if (p.endsWith(".js") || p.endsWith(".ts")) entries.push(p);
+			} catch {}
+		}));
+		return "";
+	});
+	return entries;
+}
+var SeederRunner = class {
+	resolver;
+	connection;
+	paths = [];
+	constructor(resolver) {
+		this.resolver = resolver;
+	}
+	path(p) {
+		this.paths = Array.from(new Set([...this.paths, p]));
+	}
+	getPaths() {
+		return this.paths;
+	}
+	resolveConnection(connection) {
+		var _getInstance, _ref, _instance$connections;
+		const name = connection || this.connection || "default";
+		const instance = ((_getInstance = (_ref = this.resolver).getInstance) === null || _getInstance === void 0 ? void 0 : _getInstance.call(_ref)) ?? null;
+		if (!!!(instance === null || instance === void 0 || (_instance$connections = instance.connections) === null || _instance$connections === void 0 ? void 0 : _instance$connections[name])) this.resolver.autoLoad().catch(() => {
+			/** noop */
+		});
+		return this.resolver.fire(name);
+	}
+	setConnection(connection) {
+		this.connection = connection;
+		return this;
+	}
+	async getSeederFiles(paths) {
+		const files = [];
+		for (const p of paths) {
+			if (p.endsWith(".js") || p.endsWith(".ts")) {
+				files.push(p);
+				continue;
+			}
+			files.push(...await glob$1(p));
+		}
+		return files;
+	}
+	async resolvePath(filePath) {
+		try {
+			const mod = await import(filePath);
+			return new (mod.default ?? mod.Seeder)();
+		} catch {
+			return null;
+		}
+	}
+	async run(paths, connection) {
+		const files = await this.getSeederFiles(paths);
+		const conn = this.resolveConnection(connection);
+		for (const file of files) {
+			const seeder = await this.resolvePath(file);
+			if (seeder && typeof seeder.run === "function") await seeder.run(conn);
+		}
+	}
+};
+var runner_default = SeederRunner;
+
 //#endregion
 //#region src/casts/attribute.ts
 var Attribute = class Attribute {
@@ -4815,79 +4888,6 @@ var Builder = class Builder extends Inference {
 };
 var builder_default = Builder;
 
-//#endregion
-//#region src/seeders/runner.ts
-async function glob$1(folderPath) {
-	const { default: escalade } = await import("escalade");
-	const entries = [];
-	await escalade(folderPath, async (dir, names) => {
-		await Promise.all(names.map(async (name) => {
-			const p = path.default.join(dir, name);
-			try {
-				await (0, node_fs_promises.access)(p);
-				if (p.endsWith(".js") || p.endsWith(".ts")) entries.push(p);
-			} catch {}
-		}));
-		return "";
-	});
-	return entries;
-}
-var SeederRunner = class {
-	resolver;
-	connection;
-	paths = [];
-	constructor(resolver) {
-		this.resolver = resolver;
-	}
-	path(p) {
-		this.paths = Array.from(new Set([...this.paths, p]));
-	}
-	getPaths() {
-		return this.paths;
-	}
-	resolveConnection(connection) {
-		var _getInstance, _ref, _instance$connections;
-		const name = connection || this.connection || "default";
-		const instance = ((_getInstance = (_ref = this.resolver).getInstance) === null || _getInstance === void 0 ? void 0 : _getInstance.call(_ref)) ?? null;
-		if (!!!(instance === null || instance === void 0 || (_instance$connections = instance.connections) === null || _instance$connections === void 0 ? void 0 : _instance$connections[name])) this.resolver.autoLoad().catch(() => {
-			/** noop */
-		});
-		return this.resolver.fire(name);
-	}
-	setConnection(connection) {
-		this.connection = connection;
-		return this;
-	}
-	async getSeederFiles(paths) {
-		const files = [];
-		for (const p of paths) {
-			if (p.endsWith(".js") || p.endsWith(".ts")) {
-				files.push(p);
-				continue;
-			}
-			files.push(...await glob$1(p));
-		}
-		return files;
-	}
-	async resolvePath(filePath) {
-		try {
-			const mod = await import(filePath);
-			return new (mod.default ?? mod.Seeder)();
-		} catch {
-			return null;
-		}
-	}
-	async run(paths, connection) {
-		const files = await this.getSeederFiles(paths);
-		const conn = this.resolveConnection(connection);
-		for (const file of files) {
-			const seeder = await this.resolvePath(file);
-			if (seeder && typeof seeder.run === "function") await seeder.run(conn);
-		}
-	}
-};
-var runner_default = SeederRunner;
-
 //#endregion
 //#region src/inspector/dialects/sqlite.ts
 function parseDefaultValue(value) {
@@ -5490,7 +5490,7 @@ var MigrationCreator = class {
 
 //#endregion
 //#region package.json
-var version = "0.7.1";
+var version = "0.7.3";
 
 //#endregion
 //#region src/cli/cli.ts

package/bin/index.js

@@ -5,6 +5,8 @@ import { FileSystem, Logger, TaskManager } from "@h3ravel/shared";
 import path from "path";
 import resolveFrom from "resolve-from";
 import fs, { access, copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 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";
@@ -12,8 +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 { dirname } from "node:path";
-import { fileURLToPath } from "node:url";
 import { Str } from "@h3ravel/support";
 import { config } from "dotenv";
 
@@ -1371,6 +1371,79 @@ function extractType(type) {
 	return type.replace(/[^a-zA-Z]/g, "").toLowerCase();
 }
 
+//#endregion
+//#region src/seeders/runner.ts
+async function glob$1(folderPath) {
+	const { default: escalade } = await import("escalade");
+	const entries = [];
+	await escalade(folderPath, async (dir, names) => {
+		await Promise.all(names.map(async (name) => {
+			const p = path.join(dir, name);
+			try {
+				await access(p);
+				if (p.endsWith(".js") || p.endsWith(".ts")) entries.push(p);
+			} catch {}
+		}));
+		return "";
+	});
+	return entries;
+}
+var SeederRunner = class {
+	resolver;
+	connection;
+	paths = [];
+	constructor(resolver) {
+		this.resolver = resolver;
+	}
+	path(p) {
+		this.paths = Array.from(new Set([...this.paths, p]));
+	}
+	getPaths() {
+		return this.paths;
+	}
+	resolveConnection(connection) {
+		var _getInstance, _ref, _instance$connections;
+		const name = connection || this.connection || "default";
+		const instance = ((_getInstance = (_ref = this.resolver).getInstance) === null || _getInstance === void 0 ? void 0 : _getInstance.call(_ref)) ?? null;
+		if (!!!(instance === null || instance === void 0 || (_instance$connections = instance.connections) === null || _instance$connections === void 0 ? void 0 : _instance$connections[name])) this.resolver.autoLoad().catch(() => {
+			/** noop */
+		});
+		return this.resolver.fire(name);
+	}
+	setConnection(connection) {
+		this.connection = connection;
+		return this;
+	}
+	async getSeederFiles(paths) {
+		const files = [];
+		for (const p of paths) {
+			if (p.endsWith(".js") || p.endsWith(".ts")) {
+				files.push(p);
+				continue;
+			}
+			files.push(...await glob$1(p));
+		}
+		return files;
+	}
+	async resolvePath(filePath) {
+		try {
+			const mod = await import(filePath);
+			return new (mod.default ?? mod.Seeder)();
+		} catch {
+			return null;
+		}
+	}
+	async run(paths, connection) {
+		const files = await this.getSeederFiles(paths);
+		const conn = this.resolveConnection(connection);
+		for (const file of files) {
+			const seeder = await this.resolvePath(file);
+			if (seeder && typeof seeder.run === "function") await seeder.run(conn);
+		}
+	}
+};
+var runner_default = SeederRunner;
+
 //#endregion
 //#region src/casts/attribute.ts
 var Attribute = class Attribute {
@@ -4789,79 +4862,6 @@ var Builder = class Builder extends Inference {
 };
 var builder_default = Builder;
 
-//#endregion
-//#region src/seeders/runner.ts
-async function glob$1(folderPath) {
-	const { default: escalade } = await import("escalade");
-	const entries = [];
-	await escalade(folderPath, async (dir, names) => {
-		await Promise.all(names.map(async (name) => {
-			const p = path.join(dir, name);
-			try {
-				await access(p);
-				if (p.endsWith(".js") || p.endsWith(".ts")) entries.push(p);
-			} catch {}
-		}));
-		return "";
-	});
-	return entries;
-}
-var SeederRunner = class {
-	resolver;
-	connection;
-	paths = [];
-	constructor(resolver) {
-		this.resolver = resolver;
-	}
-	path(p) {
-		this.paths = Array.from(new Set([...this.paths, p]));
-	}
-	getPaths() {
-		return this.paths;
-	}
-	resolveConnection(connection) {
-		var _getInstance, _ref, _instance$connections;
-		const name = connection || this.connection || "default";
-		const instance = ((_getInstance = (_ref = this.resolver).getInstance) === null || _getInstance === void 0 ? void 0 : _getInstance.call(_ref)) ?? null;
-		if (!!!(instance === null || instance === void 0 || (_instance$connections = instance.connections) === null || _instance$connections === void 0 ? void 0 : _instance$connections[name])) this.resolver.autoLoad().catch(() => {
-			/** noop */
-		});
-		return this.resolver.fire(name);
-	}
-	setConnection(connection) {
-		this.connection = connection;
-		return this;
-	}
-	async getSeederFiles(paths) {
-		const files = [];
-		for (const p of paths) {
-			if (p.endsWith(".js") || p.endsWith(".ts")) {
-				files.push(p);
-				continue;
-			}
-			files.push(...await glob$1(p));
-		}
-		return files;
-	}
-	async resolvePath(filePath) {
-		try {
-			const mod = await import(filePath);
-			return new (mod.default ?? mod.Seeder)();
-		} catch {
-			return null;
-		}
-	}
-	async run(paths, connection) {
-		const files = await this.getSeederFiles(paths);
-		const conn = this.resolveConnection(connection);
-		for (const file of files) {
-			const seeder = await this.resolvePath(file);
-			if (seeder && typeof seeder.run === "function") await seeder.run(conn);
-		}
-	}
-};
-var runner_default = SeederRunner;
-
 //#endregion
 //#region src/inspector/dialects/sqlite.ts
 function parseDefaultValue(value) {
@@ -5464,7 +5464,7 @@ var MigrationCreator = class {
 
 //#endregion
 //#region package.json
-var version = "0.7.1";
+var version = "0.7.3";
 
 //#endregion
 //#region src/cli/cli.ts

package/dist/browser/index.cjs

@@ -653,9 +653,20 @@ const HasRelations = (Instance) => {
 			return data;
 		}
 		guessBelongsToRelation() {
-			var _e$stack;
-			const frame = (_e$stack = (/* @__PURE__ */ new Error()).stack) === null || _e$stack === void 0 ? void 0 : _e$stack.split("\n")[2];
-			return getRelationName(frame === null || frame === void 0 ? void 0 : frame.split(" ")[5]);
+			const e = /* @__PURE__ */ new Error();
+			const stack = e.stack || e.stackTrace;
+			if (!stack) return getRelationName("unknown");
+			const frames = stack.split("\n");
+			const frame = frames[2] || frames[1] || frames[0];
+			let functionName = "anonymous";
+			if (frame.includes("@")) functionName = frame.split("@")[0].trim();
+			else if (frame.includes("at ")) {
+				const match = frame.match(/at\s+([^(]+)\s*\(/);
+				functionName = match ? match[1].trim() : "anonymous";
+				if (functionName === null || functionName === void 0 ? void 0 : functionName.includes(".")) functionName = functionName.split(".").pop();
+			}
+			functionName = functionName === null || functionName === void 0 ? void 0 : functionName.replace(/^</, "").replace(/>$/, "").trim();
+			return getRelationName(functionName || "anonymous");
 		}
 		joiningTable(related, instance = null) {
 			return [instance ? instance.joiningTableSegment() : snakeCase(related.name), this.joiningTableSegment()].sort().join("_").toLocaleLowerCase();

package/dist/browser/index.d.ts

@@ -140,6 +140,7 @@ interface IModel {
   setAppends(appends: string[]): this;
   append(key: string | string[]): this;
   getRelation<T$1 extends Model$2>(relation: string): T$1 | ICollection<T$1> | null | undefined;
+  getRelation<T$1 extends Model$2, IsCollection extends boolean = false>(relation: string): IsCollection extends true ? ICollection<T$1> | undefined : T$1 | null | undefined;
   setRelation<T$1 extends Model$2>(relation: string, value: T$1 | ICollection<T$1> | null): this;
   unsetRelation(relation: string): this;
   relationLoaded(relation: string): boolean;
@@ -2176,7 +2177,10 @@ declare const BaseModel: (new (...args: any[]) => any) & {
     uniqueIds(): never[];
     setUniqueIds(): void;
   });
-  getRelation: <T$1 extends Model$2>(relation: string) => T$1 | ICollection<T$1> | null | undefined;
+  getRelation: {
+    <T$1 extends Model$2>(relation: string): T$1 | ICollection<T$1> | null | undefined;
+    <T$1 extends Model$2, IsCollection extends boolean = false>(relation: string): IsCollection extends true ? ICollection<T$1> | undefined : T$1 | null | undefined;
+  };
   setRelation: <T$1 extends Model$2>(relation: string, value: T$1 | ICollection<T$1> | null) => (new () => IModel) & IModel & {
     [x: string]: any;
     timestamps: boolean;
@@ -4900,10 +4904,15 @@ declare class Paginator<T$1 extends Model$1, K$1 extends IPaginatorParams = IPag
 }
 //#endregion
 //#region src/browser/index.d.ts
-declare const make: (model: Model$1, data: TGeneric, options?: {
-  paginated: IPaginatorParams;
-}) => any;
-declare const makeCollection: (model: Model$1, data: TGeneric) => Collection<Model$1>;
+interface IMake {
+  <T$1 extends Model$1>(model: T$1, data: TGeneric): T$1;
+  <T$1 extends Model$1>(model: T$1, data: Array<TGeneric>): Collection<T$1>;
+  <T$1 extends Model$1>(model: T$1, data: TGeneric, options: {
+    paginated?: IPaginatorParams;
+  }): Paginator<T$1>;
+}
+declare const make: IMake;
+declare const makeCollection: <T$1 extends Model$1>(model: T$1, data: TGeneric) => Collection<Model$1>;
 declare const isBrowser = true;
 declare const _default: {
   isBrowser: boolean;
@@ -4922,11 +4931,9 @@ declare const _default: {
       getIncrementing(): any;
     };
   } & TBase;
-  make: (model: Model$1, data: TGeneric, options?: {
-    paginated: IPaginatorParams;
-  }) => any;
-  makeCollection: (model: Model$1, data: TGeneric) => Collection<Model$1>;
-  makePaginator: (model: Model$1, data: TGeneric) => Paginator<Model$1, IPaginatorParams>;
+  make: IMake;
+  makeCollection: <T$1 extends Model$1>(model: T$1, data: TGeneric) => Collection<Model$1>;
+  makePaginator: <T$1 extends Model$1>(model: T$1, data: TGeneric) => Paginator<T$1, IPaginatorParams>;
 };
 //#endregion
 export { Attribute, CastsAttributes, Collection, HasUniqueIds, InvalidArgumentError, Model$1 as Model, ModelNotFoundError, Paginator, Pivot, RelationNotFoundError, compose, _default as default, defineConfig, flatten, flattenDeep, getAttrMethod, getAttrName, getGetterMethod, getRelationMethod, getRelationName, getScopeMethod, getScopeName, getSetterMethod, isBrowser, kebabCase, make, makeCollection, now, snakeCase, tap };

package/dist/browser/index.js

@@ -630,9 +630,20 @@ const HasRelations = (Instance) => {
 			return data;
 		}
 		guessBelongsToRelation() {
-			var _e$stack;
-			const frame = (_e$stack = (/* @__PURE__ */ new Error()).stack) === null || _e$stack === void 0 ? void 0 : _e$stack.split("\n")[2];
-			return getRelationName(frame === null || frame === void 0 ? void 0 : frame.split(" ")[5]);
+			const e = /* @__PURE__ */ new Error();
+			const stack = e.stack || e.stackTrace;
+			if (!stack) return getRelationName("unknown");
+			const frames = stack.split("\n");
+			const frame = frames[2] || frames[1] || frames[0];
+			let functionName = "anonymous";
+			if (frame.includes("@")) functionName = frame.split("@")[0].trim();
+			else if (frame.includes("at ")) {
+				const match = frame.match(/at\s+([^(]+)\s*\(/);
+				functionName = match ? match[1].trim() : "anonymous";
+				if (functionName === null || functionName === void 0 ? void 0 : functionName.includes(".")) functionName = functionName.split(".").pop();
+			}
+			functionName = functionName === null || functionName === void 0 ? void 0 : functionName.replace(/^</, "").replace(/>$/, "").trim();
+			return getRelationName(functionName || "anonymous");
 		}
 		joiningTable(related, instance = null) {
 			return [instance ? instance.joiningTableSegment() : snakeCase(related.name), this.joiningTableSegment()].sort().join("_").toLocaleLowerCase();

package/dist/concerns/index.d.ts

@@ -140,6 +140,7 @@ interface IModel {
   setAppends(appends: string[]): this;
   append(key: string | string[]): this;
   getRelation<T$1 extends Model$1>(relation: string): T$1 | ICollection<T$1> | null | undefined;
+  getRelation<T$1 extends Model$1, IsCollection extends boolean = false>(relation: string): IsCollection extends true ? ICollection<T$1> | undefined : T$1 | null | undefined;
   setRelation<T$1 extends Model$1>(relation: string, value: T$1 | ICollection<T$1> | null): this;
   unsetRelation(relation: string): this;
   relationLoaded(relation: string): boolean;
@@ -2041,7 +2042,10 @@ declare const BaseModel: (new (...args: any[]) => any) & {
     uniqueIds(): never[];
     setUniqueIds(): void;
   });
-  getRelation: <T$1 extends Model$1>(relation: string) => T$1 | ICollection<T$1> | null | undefined;
+  getRelation: {
+    <T$1 extends Model$1>(relation: string): T$1 | ICollection<T$1> | null | undefined;
+    <T$1 extends Model$1, IsCollection extends boolean = false>(relation: string): IsCollection extends true ? ICollection<T$1> | undefined : T$1 | null | undefined;
+  };
   setRelation: <T$1 extends Model$1>(relation: string, value: T$1 | ICollection<T$1> | null) => (new () => IModel) & IModel & {
     [x: string]: any;
     timestamps: boolean;