@h3ravel/arquebus 0.7.2 → 0.7.3

package/dist/index.cjs

@@ -29,6 +29,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
+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);
@@ -38,19 +44,118 @@ 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);
-let node_fs_promises = require("node:fs/promises");
-node_fs_promises = __toESM(node_fs_promises);
 let resolve_from = require("resolve-from");
 resolve_from = __toESM(resolve_from);
-let node_path = require("node:path");
-let node_url = require("node:url");
 
+//#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.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/seeders/seeder-creator.ts
+var SeederCreator = class {
+	constructor(customStubPath) {
+		this.customStubPath = customStubPath;
+	}
+	async create(dir, name, type = "js") {
+		await (0, node_fs_promises.mkdir)(dir, { recursive: true });
+		let stub = await (0, node_fs_promises.readFile)(this.getStubPath(type), "utf-8");
+		stub = stub.replace(/{{ name }}/g, name);
+		const filePath = path.default.join(dir, `${name}.${type}`);
+		await (0, node_fs_promises.writeFile)(filePath, stub);
+		return filePath;
+	}
+	getStubPath(type) {
+		if (this.customStubPath) return path.default.join(this.customStubPath, `seeder-${type}.stub`);
+		const __dirname$1 = this.getDirname({});
+		return path.default.join(__dirname$1, "stubs", `seeder-${type}.stub`);
+	}
+	getDirname(meta) {
+		if (typeof __dirname !== "undefined") return __dirname;
+		if (meta && meta.url) return (0, node_path.dirname)((0, node_url.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 {
 	get;
@@ -4974,7 +5079,7 @@ var SchemaInspector = class {
 
 //#endregion
 //#region src/migrations/migrator.ts
-async function glob$1(folderPath) {
+async function glob(folderPath) {
 	const files = await node_fs_promises.default.readdir(folderPath);
 	const allFiles = [];
 	for (const file of files) {
@@ -4982,7 +5087,7 @@ async function glob$1(folderPath) {
 		const stats = await node_fs_promises.default.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);
 		}
 	}
@@ -5125,7 +5230,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;
@@ -5352,111 +5457,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.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(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 (0, node_fs_promises.mkdir)(dir, { recursive: true });
-		let stub = await (0, node_fs_promises.readFile)(this.getStubPath(type), "utf-8");
-		stub = stub.replace(/{{ name }}/g, name);
-		const filePath = path.default.join(dir, `${name}.${type}`);
-		await (0, node_fs_promises.writeFile)(filePath, stub);
-		return filePath;
-	}
-	getStubPath(type) {
-		if (this.customStubPath) return path.default.join(this.customStubPath, `seeder-${type}.stub`);
-		const __dirname$1 = this.getDirname({});
-		return path.default.join(__dirname$1, "stubs", `seeder-${type}.stub`);
-	}
-	getDirname(meta) {
-		if (typeof __dirname !== "undefined") return __dirname;
-		if (meta && meta.url) return (0, node_path.dirname)((0, node_url.fileURLToPath)(meta.url));
-		throw new Error("Unable to determine dirname");
-	}
-};
-var seeder_creator_default = SeederCreator;
-
 //#endregion
 //#region src/pivot.ts
 var pivot_default = Pivot;
@@ -5628,11 +5628,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 ((0, radashi.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
 exports.Attribute = attribute_default;

package/dist/index.d.ts

@@ -667,6 +667,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;
@@ -1939,7 +1940,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;
@@ -4647,16 +4651,16 @@ declare class Collection$2<I$1 extends Model$2> extends Collection$1<I$1> {
   append(attributes: any): this;
   only(keys: any[]): any;
   getDictionary(items?: ICollection<any> | any[]): TGeneric;
-  toData(): (I$1 | {
+  toData(): ({
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
-  })[];
-  toJSON(): (I$1 | {
+  } | I$1)[];
+  toJSON(): ({
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
-  })[];
+  } | I$1)[];
   toJson(...args: any[]): string;
   [Symbol.iterator]: () => Iterator<I$1>;
 }
@@ -4734,6 +4738,38 @@ declare class Pivot$1 extends Model$2 {
   hasTimestampAttributes(this: any, attributes?: TGeneric | null): boolean;
 }
 //#endregion
+//#region src/seeders/seeder.d.ts
+declare abstract class Seeder {
+  /**
+   * Run the database seeds
+   */
+  abstract run(connection: QueryBuilder): Promise<void>;
+}
+//#endregion
+//#region src/seeders/runner.d.ts
+declare class SeederRunner {
+  resolver: typeof arquebus;
+  connection: TBaseConfig['client'];
+  paths: string[];
+  constructor(resolver: typeof arquebus);
+  path(p: string): void;
+  getPaths(): string[];
+  resolveConnection(connection?: TBaseConfig['client']): QueryBuilder;
+  setConnection(connection: TBaseConfig['client']): this;
+  getSeederFiles(paths: string[]): Promise<string[]>;
+  resolvePath(filePath: string): Promise<Seeder | null>;
+  run(paths: string[], connection?: TBaseConfig['client']): Promise<void>;
+}
+//#endregion
+//#region src/seeders/seeder-creator.d.ts
+declare class SeederCreator {
+  private customStubPath?;
+  constructor(customStubPath?: string | undefined);
+  create(dir: string, name: string, type?: 'js' | 'ts'): Promise<string>;
+  getStubPath(type: 'js' | 'ts'): string;
+  getDirname(meta: ImportMeta | null): string;
+}
+//#endregion
 //#region src/casts/attribute.d.ts
 interface IAttribute {
   get?: null | (<A extends TGeneric>(value: string, attr: A) => string);
@@ -4961,38 +4997,6 @@ declare class Migrate {
   }>;
 }
 //#endregion
-//#region src/seeders/seeder.d.ts
-declare abstract class Seeder {
-  /**
-   * Run the database seeds
-   */
-  abstract run(connection: QueryBuilder): Promise<void>;
-}
-//#endregion
-//#region src/seeders/runner.d.ts
-declare class SeederRunner {
-  resolver: typeof arquebus;
-  connection: TBaseConfig['client'];
-  paths: string[];
-  constructor(resolver: typeof arquebus);
-  path(p: string): void;
-  getPaths(): string[];
-  resolveConnection(connection?: TBaseConfig['client']): QueryBuilder;
-  setConnection(connection: TBaseConfig['client']): this;
-  getSeederFiles(paths: string[]): Promise<string[]>;
-  resolvePath(filePath: string): Promise<Seeder | null>;
-  run(paths: string[], connection?: TBaseConfig['client']): Promise<void>;
-}
-//#endregion
-//#region src/seeders/seeder-creator.d.ts
-declare class SeederCreator {
-  private customStubPath?;
-  constructor(customStubPath?: string | undefined);
-  create(dir: string, name: string, type?: 'js' | 'ts'): Promise<string>;
-  getStubPath(type: 'js' | 'ts'): string;
-  getDirname(meta: ImportMeta | null): string;
-}
-//#endregion
 //#region src/soft-deletes.d.ts
 declare const softDeletes: <TBase extends MixinConstructor>(Model: TBase) => {
   new (...args: any[]): {
@@ -5120,10 +5124,15 @@ declare const snakeCase: (str: string) => string;
 declare const defineConfig: (config: TConfig) => XGeneric<TConfig>;
 //#endregion
 //#region src/index.d.ts
-declare const make: <M extends Model$1 | typeof Model$1>(model: M, data: TGeneric, options?: {
-  paginated: IPaginatorParams | boolean;
-}) => any;
-declare const makeCollection: <M extends Model$1 | typeof Model$1>(model: M, data: TGeneric) => Collection<Model$1 | Model$2>;
-declare const makePaginator: <M extends Model$1 | typeof Model$1>(model: M, data: TGeneric, _: any) => Paginator<Model$1, IPaginatorParams>;
+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 | Model$2>;
+declare const makePaginator: <T$1 extends Model$1>(model: T$1, data: TGeneric) => Paginator<T$1, IPaginatorParams>;
 //#endregion
 export { Attribute, Builder, CastsAttributes, Collection, HasUniqueIds, InvalidArgumentError, Migrate, Migration, Model$1 as Model, ModelNotFoundError, Paginator, Pivot, QueryBuilder, RelationNotFoundError, Scope, Seeder, SeederCreator, SeederRunner, softDeletes as SoftDeletes, arquebus, compose, defineConfig, flatten, flattenDeep, getAttrMethod, getAttrName, getGetterMethod, getRelationMethod, getRelationName, getScopeMethod, getScopeName, getSetterMethod, kebabCase, make, makeCollection, makePaginator, now, snakeCase, tap };