@h3ravel/arquebus 3.0.0 → 3.0.1

package/README.md

@@ -14,7 +14,7 @@
 
 Arquebus ORM is a Beautiful, expressive framework-agnostic Object-Relational Mapper (ORM) inspired by Laravel's Eloquent, designed for TypeScript applications and for the H3ravel Framework that makes it enjoyable to interact with your database. When using Arquebus, each database table has a corresponding "Model" that is used to interact with that table. In addition to retrieving records from the database table, Arquebus models allow you to insert, update, and delete records from the database as well.
 
-> Arquebus is a Typescript and Modern JS rewrite of [Sutando](https://sutando.org/) and is heavily inspired by Laravel's ORM [Eloquent](https://laravel.com/docs/12.x/eloquent).
+> Arquebus is heavily inspired by Laravel's [Eloquent ORM](https://laravel.com/docs/12.x/eloquent).
 
 ## ✨ Features
 

package/bin/index.cjs

@@ -30,17 +30,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-let _h3ravel_shared = require("@h3ravel/shared");
 let _h3ravel_musket = require("@h3ravel/musket");
-let _h3ravel_support = require("@h3ravel/support");
-let node_fs_promises = require("node:fs/promises");
-node_fs_promises = __toESM(node_fs_promises, 1);
+let _h3ravel_shared = require("@h3ravel/shared");
 let path = require("path");
 path = __toESM(path, 1);
+let resolve_from = require("resolve-from");
+resolve_from = __toESM(resolve_from, 1);
+let node_fs_promises = require("node:fs/promises");
+node_fs_promises = __toESM(node_fs_promises, 1);
 let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
 let node_fs = require("node:fs");
 let node_url = require("node:url");
+let _h3ravel_support = require("@h3ravel/support");
 let dayjs = require("dayjs");
 dayjs = __toESM(dayjs, 1);
 let dayjs_plugin_advancedFormat_js = require("dayjs/plugin/advancedFormat.js");
@@ -51,9 +53,41 @@ knex = __toESM(knex, 1);
 let fs = require("fs");
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize, 1);
-let resolve_from = require("resolve-from");
-resolve_from = __toESM(resolve_from, 1);
 let dotenv = require("dotenv");
+//#region src/cli/utils.ts
+const join = path.default.join;
+var Utils = class {
+	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)];
+	}
+};
+var TableGuesser = class TableGuesser {
+	static CREATE_PATTERNS = [/^create_(\w+)_table$/, /^create_(\w+)$/];
+	static CHANGE_PATTERNS = [/.+_(to|from|in)_(\w+)_table$/, /.+_(to|from|in)_(\w+)$/];
+	static guess(migration) {
+		for (const pattern of TableGuesser.CREATE_PATTERNS) {
+			const matches = migration.match(pattern);
+			if (matches) return [matches[1], true];
+		}
+		for (const pattern of TableGuesser.CHANGE_PATTERNS) {
+			const matches = migration.match(pattern);
+			if (matches) return [matches[2], false];
+		}
+		return [];
+	}
+};
+//#endregion
 //#region src/cli/commands.ts
 var ArquebusCommand = class extends _h3ravel_musket.Command {
 	pathOption(signature) {
@@ -5315,40 +5349,6 @@ var Migrator = class {
 	}
 };
 //#endregion
-//#region src/cli/utils.ts
-const join = path.default.join;
-var Utils = class {
-	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)];
-	}
-};
-var TableGuesser = class TableGuesser {
-	static CREATE_PATTERNS = [/^create_(\w+)_table$/, /^create_(\w+)$/];
-	static CHANGE_PATTERNS = [/.+_(to|from|in)_(\w+)_table$/, /.+_(to|from|in)_(\w+)$/];
-	static guess(migration) {
-		for (const pattern of TableGuesser.CREATE_PATTERNS) {
-			const matches = migration.match(pattern);
-			if (matches) return [matches[1], true];
-		}
-		for (const pattern of TableGuesser.CHANGE_PATTERNS) {
-			const matches = migration.match(pattern);
-			if (matches) return [matches[2], false];
-		}
-		return [];
-	}
-};
-//#endregion
 //#region src/migrate.ts
 var Migrate = class {
 	basePath;
@@ -5589,10 +5589,10 @@ var MigrationCreator = class {
 };
 //#endregion
 //#region package.json
-var version = "3.0.0";
+var version = "3.0.1";
 //#endregion
 //#region src/cli/index.ts
-(class Cli {
+(class Cli extends _h3ravel_musket.Application {
 	cwd;
 	output = _h3ravel_shared.Logger;
 	config = {};
@@ -5601,6 +5601,7 @@ var version = "3.0.0";
 	configPath;
 	modulePackage = { version: "N/A" };
 	constructor(basePath) {
+		super();
 		this.basePath = basePath ?? (process.env.TEST === "true" ? "test/cli" : "");
 	}
 	static async init() {
@@ -5610,6 +5611,11 @@ var version = "3.0.0";
 		await instance.loadConfig();
 		await instance.run();
 	}
+	registerMusketListeners(musket) {
+		musket.afterHandle.once(async () => {
+			process.exit(0);
+		});
+	}
 	terminateNotFound() {
 		const cmd = _h3ravel_shared.Logger.log([["arquebus init", [
 			"italic",
@@ -5659,22 +5665,21 @@ var version = "3.0.0";
 		return this;
 	}
 	async run() {
-		const kernel = new _h3ravel_musket.Kernel(this).setCwd(this.cwd).setConfig({
+		return await new _h3ravel_musket.Kernel(this).setCwd(this.cwd).setConfig({
 			baseCommands: ArquebusCommands,
 			name: "arquebus",
 			hideMusketInfo: true,
 			versionSeparator: "\n"
-		}).bootstrap();
-		kernel.modules = [{
+		}).setPackages([{
 			name: "@h3ravel/arquebus",
-			label: "Arquebus CLI version",
-			version
+			label: "Arquebus CLI",
+			version,
+			base: true
 		}, {
 			name: "@h3ravel/arquebus",
-			label: "Arquebus Local version",
+			label: "Arquebus ORM",
 			version: this.modulePackage.version || "N/A"
-		}];
-		return await kernel.run();
+		}]).bootstrap().run();
 	}
 	async initialize(type = "js") {
 		if (!this.modulePath) this.output.error(["ERROR: No local arquebus install found", " Try running: pnpm add @h3ravel/arquebus"]);

package/bin/index.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
+import { Application, Command, Kernel } from "@h3ravel/musket";
 import { FileSystem, Logger, TaskManager, importFile } from "@h3ravel/shared";
-import { Command, Kernel } from "@h3ravel/musket";
-import { Arr, Obj, Str, data_get, data_set } from "@h3ravel/support";
-import fs, { access, copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import path from "path";
+import resolveFrom from "resolve-from";
+import fs, { access, copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import path$1, { dirname } from "node:path";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { Arr, Obj, Str, data_get, data_set } from "@h3ravel/support";
 import * as dayjsModule from "dayjs";
 import * as advancedFormatModule from "dayjs/plugin/advancedFormat.js";
 import { Collection, collect } from "@h3ravel/collect.js";
 import Knex from "knex";
 import { existsSync as existsSync$1 } from "fs";
 import pluralize from "pluralize";
-import resolveFrom from "resolve-from";
 import { config } from "dotenv";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -27,6 +27,40 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 //#endregion
+//#region src/cli/utils.ts
+const join = path.join;
+var Utils = class {
+	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.join(packageName, "package.json");
+		const resolved = resolveFrom.silent(cwd ?? process.cwd(), packageJson);
+		if (!resolved) return;
+		return path.join(path.dirname(resolved), parts.join("/"));
+	}
+	static async getMigrationPaths(cwd, migrator, defaultPath, path) {
+		if (path) return [join(cwd, path)];
+		return [...migrator.getPaths(), join(cwd, defaultPath)];
+	}
+};
+var TableGuesser = class TableGuesser {
+	static CREATE_PATTERNS = [/^create_(\w+)_table$/, /^create_(\w+)$/];
+	static CHANGE_PATTERNS = [/.+_(to|from|in)_(\w+)_table$/, /.+_(to|from|in)_(\w+)$/];
+	static guess(migration) {
+		for (const pattern of TableGuesser.CREATE_PATTERNS) {
+			const matches = migration.match(pattern);
+			if (matches) return [matches[1], true];
+		}
+		for (const pattern of TableGuesser.CHANGE_PATTERNS) {
+			const matches = migration.match(pattern);
+			if (matches) return [matches[2], false];
+		}
+		return [];
+	}
+};
+//#endregion
 //#region src/cli/commands.ts
 var ArquebusCommand = class extends Command {
 	pathOption(signature) {
@@ -5288,40 +5322,6 @@ var Migrator = class {
 	}
 };
 //#endregion
-//#region src/cli/utils.ts
-const join = path.join;
-var Utils = class {
-	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.join(packageName, "package.json");
-		const resolved = resolveFrom.silent(cwd ?? process.cwd(), packageJson);
-		if (!resolved) return;
-		return path.join(path.dirname(resolved), parts.join("/"));
-	}
-	static async getMigrationPaths(cwd, migrator, defaultPath, path) {
-		if (path) return [join(cwd, path)];
-		return [...migrator.getPaths(), join(cwd, defaultPath)];
-	}
-};
-var TableGuesser = class TableGuesser {
-	static CREATE_PATTERNS = [/^create_(\w+)_table$/, /^create_(\w+)$/];
-	static CHANGE_PATTERNS = [/.+_(to|from|in)_(\w+)_table$/, /.+_(to|from|in)_(\w+)$/];
-	static guess(migration) {
-		for (const pattern of TableGuesser.CREATE_PATTERNS) {
-			const matches = migration.match(pattern);
-			if (matches) return [matches[1], true];
-		}
-		for (const pattern of TableGuesser.CHANGE_PATTERNS) {
-			const matches = migration.match(pattern);
-			if (matches) return [matches[2], false];
-		}
-		return [];
-	}
-};
-//#endregion
 //#region src/migrate.ts
 var Migrate = class {
 	basePath;
@@ -5562,10 +5562,10 @@ var MigrationCreator = class {
 };
 //#endregion
 //#region package.json
-var version = "3.0.0";
+var version = "3.0.1";
 //#endregion
 //#region src/cli/index.ts
-(class Cli {
+(class Cli extends Application {
 	cwd;
 	output = Logger;
 	config = {};
@@ -5574,6 +5574,7 @@ var version = "3.0.0";
 	configPath;
 	modulePackage = { version: "N/A" };
 	constructor(basePath) {
+		super();
 		this.basePath = basePath ?? (process.env.TEST === "true" ? "test/cli" : "");
 	}
 	static async init() {
@@ -5583,6 +5584,11 @@ var version = "3.0.0";
 		await instance.loadConfig();
 		await instance.run();
 	}
+	registerMusketListeners(musket) {
+		musket.afterHandle.once(async () => {
+			process.exit(0);
+		});
+	}
 	terminateNotFound() {
 		const cmd = Logger.log([["arquebus init", [
 			"italic",
@@ -5632,22 +5638,21 @@ var version = "3.0.0";
 		return this;
 	}
 	async run() {
-		const kernel = new Kernel(this).setCwd(this.cwd).setConfig({
+		return await new Kernel(this).setCwd(this.cwd).setConfig({
 			baseCommands: ArquebusCommands,
 			name: "arquebus",
 			hideMusketInfo: true,
 			versionSeparator: "\n"
-		}).bootstrap();
-		kernel.modules = [{
+		}).setPackages([{
 			name: "@h3ravel/arquebus",
-			label: "Arquebus CLI version",
-			version
+			label: "Arquebus CLI",
+			version,
+			base: true
 		}, {
 			name: "@h3ravel/arquebus",
-			label: "Arquebus Local version",
+			label: "Arquebus ORM",
 			version: this.modulePackage.version || "N/A"
-		}];
-		return await kernel.run();
+		}]).bootstrap().run();
 	}
 	async initialize(type = "js") {
 		if (!this.modulePath) this.output.error(["ERROR: No local arquebus install found", " Try running: pnpm add @h3ravel/arquebus"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/arquebus",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "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": {
@@ -155,9 +155,9 @@
   },
   "dependencies": {
     "@h3ravel/collect.js": "^5.4.0",
-    "@h3ravel/musket": "^2.2.7",
-    "@h3ravel/shared": "^2.2.5",
-    "@h3ravel/support": "^2.2.5",
+    "@h3ravel/musket": "^2.2.12",
+    "@h3ravel/shared": "^2.2.6",
+    "@h3ravel/support": "^2.2.6",
     "barrelize": "^1.8.2",
     "chalk": "^5.6.2",
     "chokidar": "^5.0.0",

package/types/cli.ts

@@ -0,0 +1,20 @@
+export type FileType = 'js' | 'ts'
+
+export interface PathOptions {
+    path?: string
+}
+
+export interface MigrationOptions extends PathOptions {
+    step?: number | string
+}
+
+export interface MakeMigrationOptions extends PathOptions {
+    type?: FileType
+    table?: string
+    create?: string | boolean
+}
+
+export interface MakeFileOptions extends PathOptions {
+    type?: FileType
+    force?: boolean
+}

package/types/index.ts

@@ -1,4 +1,5 @@
 export * from './builder'
+export * from './cli'
 export * from './container'
 export * from './database'
 export * from './generics'