@h3ravel/arquebus 0.7.2 → 0.7.3

package/dist/index.js

@@ -1,17 +1,17 @@
 import "node:module";
+import fs, { access, mkdir, readFile, writeFile } from "node:fs/promises";
+import path from "path";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import { assign, camel, dash, diff, flat, get, isArray, isEmpty, isEqual, isNullish, isString, omit, pick, set, snake, trim } from "radashi";
 import advancedFormat from "dayjs/plugin/advancedFormat.js";
 import dayjs from "dayjs";
 import collect$1, { Collection, collect } from "collect.js";
 import Knex$1 from "knex";
-import path from "path";
 import { existsSync } from "fs";
 import { FileSystem, Logger, TaskManager } from "@h3ravel/shared";
 import pluralize from "pluralize";
-import fs, { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import resolveFrom from "resolve-from";
-import { dirname } from "node:path";
-import { fileURLToPath } from "node:url";
 
 //#region rolldown:runtime
 var __defProp = Object.defineProperty;
@@ -24,6 +24,111 @@ var __export = (all) => {
 	return target;
 };
 
+//#endregion
+//#region src/seeders/seeder.ts
+var Seeder = class {};
+var seeder_default = Seeder;
+
+//#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/seeders/seeder-creator.ts
+var SeederCreator = class {
+	constructor(customStubPath) {
+		this.customStubPath = customStubPath;
+	}
+	async create(dir, name, type = "js") {
+		await mkdir(dir, { recursive: true });
+		let stub = await readFile(this.getStubPath(type), "utf-8");
+		stub = stub.replace(/{{ name }}/g, name);
+		const filePath = path.join(dir, `${name}.${type}`);
+		await writeFile(filePath, stub);
+		return filePath;
+	}
+	getStubPath(type) {
+		if (this.customStubPath) return path.join(this.customStubPath, `seeder-${type}.stub`);
+		const __dirname$1 = this.getDirname(import.meta);
+		return path.join(__dirname$1, "stubs", `seeder-${type}.stub`);
+	}
+	getDirname(meta) {
+		if (typeof __dirname !== "undefined") return __dirname;
+		if (meta && meta.url) return dirname(fileURLToPath(meta.url));
+		throw new Error("Unable to determine dirname");
+	}
+};
+var seeder_creator_default = SeederCreator;
+
 //#endregion
 //#region src/casts/attribute.ts
 var Attribute = class Attribute {
@@ -4948,7 +5053,7 @@ var SchemaInspector = class {
 
 //#endregion
 //#region src/migrations/migrator.ts
-async function glob$1(folderPath) {
+async function glob(folderPath) {
 	const files = await fs.readdir(folderPath);
 	const allFiles = [];
 	for (const file of files) {
@@ -4956,7 +5061,7 @@ async function glob$1(folderPath) {
 		const stats = await fs.stat(filePath);
 		if (stats.isFile()) allFiles.push(filePath);
 		else if (stats.isDirectory()) {
-			const subFiles = await glob$1(filePath);
+			const subFiles = await glob(filePath);
 			allFiles.push(...subFiles);
 		}
 	}
@@ -5099,7 +5204,7 @@ var Migrator = class {
 				files.push(p);
 				continue;
 			}
-			files.push(...await glob$1(p));
+			files.push(...await glob(p));
 		}
 		return files.filter(Boolean).reduce((result, file) => {
 			result[this.getMigrationName(file)] = file;
@@ -5326,111 +5431,6 @@ var Migration = class extends Inference {
 };
 var migration_default = Migration;
 
-//#endregion
-//#region src/seeders/seeder.ts
-var Seeder = class {};
-var seeder_default = Seeder;
-
-//#endregion
-//#region src/seeders/runner.ts
-async function glob(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(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/seeders/seeder-creator.ts
-var SeederCreator = class {
-	constructor(customStubPath) {
-		this.customStubPath = customStubPath;
-	}
-	async create(dir, name, type = "js") {
-		await mkdir(dir, { recursive: true });
-		let stub = await readFile(this.getStubPath(type), "utf-8");
-		stub = stub.replace(/{{ name }}/g, name);
-		const filePath = path.join(dir, `${name}.${type}`);
-		await writeFile(filePath, stub);
-		return filePath;
-	}
-	getStubPath(type) {
-		if (this.customStubPath) return path.join(this.customStubPath, `seeder-${type}.stub`);
-		const __dirname$1 = this.getDirname(import.meta);
-		return path.join(__dirname$1, "stubs", `seeder-${type}.stub`);
-	}
-	getDirname(meta) {
-		if (typeof __dirname !== "undefined") return __dirname;
-		if (meta && meta.url) return dirname(fileURLToPath(meta.url));
-		throw new Error("Unable to determine dirname");
-	}
-};
-var seeder_creator_default = SeederCreator;
-
 //#endregion
 //#region src/pivot.ts
 var pivot_default = Pivot;
@@ -5602,11 +5602,11 @@ var soft_deletes_default = softDeletes;
 const make = (model, data, options = {}) => {
 	const { paginated } = options;
 	if (paginated) return new paginator_default(data.data.map((item) => model.make(item)), data.total, data.per_page, data.current_page);
-	if (Array.isArray(data)) return new collection_default(data.map((item) => model.make(item)));
+	if (isArray(data)) return new collection_default(data.map((item) => model.make(item)));
 	return model.make(data);
 };
 const makeCollection = (model, data) => new collection_default(data.map((item) => model.make(item)));
-const makePaginator = (model, data, _) => new paginator_default(data.data.map((item) => model.make(item)), data.total, data.per_page, data.current_page);
+const makePaginator = (model, data) => new paginator_default(data.data.map((item) => model.make(item)), data.total, data.per_page, data.current_page);
 
 //#endregion
 export { attribute_default as Attribute, builder_default as Builder, casts_attributes_default as CastsAttributes, collection_default as Collection, has_unique_ids_default as HasUniqueIds, InvalidArgumentError, Migrate, migration_default as Migration, model_default as Model, ModelNotFoundError, paginator_default as Paginator, pivot_default as Pivot, query_builder_default as QueryBuilder, RelationNotFoundError, scope_default as Scope, seeder_default as Seeder, seeder_creator_default as SeederCreator, runner_default as SeederRunner, soft_deletes_default as SoftDeletes, arquebus_default as arquebus, compose, defineConfig, flatten, flattenDeep, getAttrMethod, getAttrName, getGetterMethod, getRelationMethod, getRelationName, getScopeMethod, getScopeName, getSetterMethod, kebabCase, make, makeCollection, makePaginator, now, snakeCase, tap };

package/dist/inspector/index.cjs

@@ -29,6 +29,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
+require("node:fs/promises");
+let path = require("path");
+path = __toESM(path);
+require("node:path");
+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);
@@ -38,16 +43,11 @@ let collect_js = require("collect.js");
 collect_js = __toESM(collect_js);
 let knex = require("knex");
 knex = __toESM(knex);
-let path = require("path");
-path = __toESM(path);
 let fs = require("fs");
 let __h3ravel_shared = require("@h3ravel/shared");
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize);
-require("node:fs/promises");
 require("resolve-from");
-require("node:path");
-require("node:url");
 
 //#region src/inspector/utils/strip-quotes.ts
 /**

package/dist/inspector/index.js

@@ -1,17 +1,17 @@
 import "node:module";
+import "node:fs/promises";
+import path from "path";
+import "node:path";
+import "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";
 import collect$1, { Collection, collect } from "collect.js";
 import Knex$1 from "knex";
-import path from "path";
 import { existsSync } from "fs";
 import { FileSystem } from "@h3ravel/shared";
 import pluralize from "pluralize";
-import "node:fs/promises";
 import "resolve-from";
-import "node:path";
-import "node:url";
 
 //#region rolldown:runtime
 var __defProp = Object.defineProperty;

package/dist/migrations/index.cjs

@@ -30,6 +30,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 let __h3ravel_shared = require("@h3ravel/shared");
+let node_fs_promises = require("node:fs/promises");
+node_fs_promises = __toESM(node_fs_promises);
+let path = require("path");
+path = __toESM(path);
+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);
@@ -39,15 +45,9 @@ let collect_js = require("collect.js");
 collect_js = __toESM(collect_js);
 let knex = require("knex");
 knex = __toESM(knex);
-let path = require("path");
-path = __toESM(path);
 let fs = require("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");
-let node_url = require("node:url");
 let resolve_from = require("resolve-from");
 resolve_from = __toESM(resolve_from);
 

package/dist/migrations/index.d.ts

@@ -471,6 +471,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;
@@ -1394,7 +1395,10 @@ declare const BaseModel$1: (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;

package/dist/migrations/index.js

@@ -1,16 +1,16 @@
 import { t as __export } from "./chunk-Bop6jNiL.js";
 import { FileSystem, Logger, TaskManager } from "@h3ravel/shared";
+import fs, { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import path from "path";
+import path$1, { 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";
 import collect, { Collection, collect as collect$1 } from "collect.js";
 import Knex$1 from "knex";
-import path from "path";
 import { existsSync } from "fs";
 import pluralize from "pluralize";
-import fs, { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import path$1, { dirname } from "node:path";
-import { fileURLToPath } from "node:url";
 import resolveFrom from "resolve-from";
 
 //#region src/migrations/migration-repository.ts
@@ -1320,6 +1320,12 @@ function extractType(type) {
 	return type.replace(/[^a-zA-Z]/g, "").toLowerCase();
 }
 
+//#endregion
+//#region node_modules/.pnpm/tsdown@0.16.0_typescript@5.9.3/node_modules/tsdown/esm-shims.js
+const getFilename = () => fileURLToPath(import.meta.url);
+const getDirname = () => path$1.dirname(getFilename());
+const __dirname = /* @__PURE__ */ getDirname();
+
 //#endregion
 //#region src/casts/attribute.ts
 var Attribute = class Attribute {
@@ -4754,12 +4760,6 @@ var Migration = class extends Inference {
 };
 var migration_default = Migration;
 
-//#endregion
-//#region node_modules/.pnpm/tsdown@0.16.0_typescript@5.9.3/node_modules/tsdown/esm-shims.js
-const getFilename = () => fileURLToPath(import.meta.url);
-const getDirname = () => path$1.dirname(getFilename());
-const __dirname = /* @__PURE__ */ getDirname();
-
 //#endregion
 //#region src/inspector/dialects/sqlite.ts
 function parseDefaultValue(value) {

package/dist/relations/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;

package/dist/seeders/index.d.ts

@@ -468,6 +468,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;
@@ -1391,7 +1392,10 @@ declare const BaseModel$1: (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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/arquebus",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Arquebus ORM is a Beautiful, expressive ORM inspired by Laravel's Eloquent, designed for TypeScript applications and for the H3ravel Framework.",
   "homepage": "https://h3ravel.toneflix.net/arquebus",
   "bin": {