@h3ravel/database 11.4.11 → 11.5.0-alpha.10

package/dist/index.cjs

@@ -5,16 +5,18 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
 	}
 	return to;
 };
@@ -31,8 +33,9 @@ let __h3ravel_support = require("@h3ravel/support");
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let __h3ravel_arquebus_migrations = require("@h3ravel/arquebus/migrations");
+let __h3ravel_arquebus_relations = require("@h3ravel/arquebus/relations");
 let __h3ravel_arquebus = require("@h3ravel/arquebus");
-let __h3ravel_core = require("@h3ravel/core");
+let __h3ravel_contracts = require("@h3ravel/contracts");
 
 //#region src/Utils/TableGuesser.ts
 var TableGuesser = class TableGuesser {
@@ -52,11 +55,12 @@ var TableGuesser = class TableGuesser {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/dayjs@1.11.18/node_modules/dayjs/dayjs.min.js
-var require_dayjs_min = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/dayjs@1.11.18/node_modules/dayjs/dayjs.min.js": ((exports, module) => {
+//#region ../../node_modules/.pnpm/dayjs@1.11.19/node_modules/dayjs/dayjs.min.js
+var require_dayjs_min = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	(function(t, e) {
 		"object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
 	})(exports, (function() {
+		"use strict";
 		var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", c = "month", f = "quarter", h = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = {
 			name: "en",
 			weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
@@ -347,7 +351,7 @@ var require_dayjs_min = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/d
 			return O(1e3 * t$1);
 		}, O.en = D[g], O.Ls = D, O.p = {}, O;
 	}));
-}) });
+}));
 
 //#endregion
 //#region src/Commands/MakeCommand.ts
@@ -803,16 +807,87 @@ const arquebusConfig = (config$1) => {
 
 //#endregion
 //#region src/Model.ts
-var Model = class extends __h3ravel_arquebus.Model {
+var Model = class Model extends (0, __h3ravel_shared.mix)(__h3ravel_contracts.UrlRoutable, __h3ravel_arquebus.Model) {
 	/**
 	* Retrieve the model for a bound value.
 	* 
-	* @param {any}  value 
-	* @param {String|null} field 
-	* @returns 
+	* @param  value 
+	* @param  field 
+	*/
+	resolveRouteBinding(value, field) {
+		return this.resolveRouteBindingQuery(this.newQuery(), value, field).first();
+	}
+	/**
+	* Retrieve the model for a bound value.
+	*
+	* @param  query
+	* @param  value
+	* @param  field
+	*/
+	resolveRouteBindingQuery(query, value, field = null) {
+		return query.where(field ?? this.getRouteKeyName(), value);
+	}
+	/**
+	* Retrieve the model for a bound value.
+	*
+	* @param  value
+	* @param  field
+	*/
+	resolveSoftDeletableRouteBinding(value, field) {
+		return this.resolveRouteBindingQuery(this.newQuery(), value, field).withTrashed().first();
+	}
+	/**
+	* Retrieve the child model for a bound value.
+	*
+	* @param  childType
+	* @param  value
+	* @param  field 
+	*/
+	resolveChildRouteBinding(childType, value, field) {
+		return this.resolveChildRouteBindingQuery(childType, value, field).first();
+	}
+	/**
+	* Retrieve the child model for a bound value.
+	*
+	* @param  childType
+	* @param  value
+	* @param  field 
+	*/
+	resolveSoftDeletableChildRouteBinding(childType, value, field) {
+		return this.resolveChildRouteBindingQuery(childType, value, field).withTrashed().first();
+	}
+	/**
+	* Retrieve the child model query for a bound value.
+	*
+	* @param  childType
+	* @param  value
+	* @param  field
+	*/
+	resolveChildRouteBindingQuery(childType, value, field) {
+		const relationship = this[this.childRouteBindingRelationshipName(childType)]();
+		field = field || relationship.getRelated().getRouteKeyName();
+		if (relationship instanceof __h3ravel_arquebus_relations.HasManyThrough || relationship instanceof __h3ravel_arquebus_relations.BelongsToMany) field = relationship.getRelated().qualifyColumn(field);
+		return relationship instanceof Model ? relationship.resolveRouteBindingQuery(relationship.newQuery(), value, field) : relationship.getRelated().resolveRouteBindingQuery(relationship, value, field);
+	}
+	/**
+	* Retrieve the child route model binding relationship name for the given child type.
+	*
+	* @param  childType
+	*/
+	childRouteBindingRelationshipName(childType) {
+		return __h3ravel_support.Str.plural(__h3ravel_support.Str.camel(childType));
+	}
+	/**
+	* Get the value of the model's route key.
+	*/
+	getRouteKey() {
+		return this.getAttribute(this.getRouteKeyName());
+	}
+	/**
+	* Get the route key for the model.
 	*/
-	resolveRouteBinding(value, field = null) {
-		return this.newQuery().where(field ?? "ids", value).firstOrFail();
+	getRouteKeyName() {
+		return this.getKeyName();
 	}
 };
 
@@ -826,12 +901,13 @@ var Model = class extends __h3ravel_arquebus.Model {
 * Register migration and seeder commands.
 * 
 */
-var DatabaseServiceProvider = class extends __h3ravel_core.ServiceProvider {
+var DatabaseServiceProvider = class extends __h3ravel_support.ServiceProvider {
 	static priority = 994;
 	register() {
 		const config$1 = this.app.make("config");
 		const connection = Object.entries(arquebusConfig(config$1.get("database"))).find(([client]) => client === config$1.get("database.default"))?.at(1);
 		if (connection) __h3ravel_arquebus.arquebus.addConnection(connection);
+		this.app.singleton("db", () => __h3ravel_arquebus.arquebus.fire());
 		/** Register Musket Commands */
 		this.registerCommands([
 			MigrateCommand,

package/dist/index.d.ts

@@ -4,8 +4,10 @@ import * as _h3ravel_arquebus0 from "@h3ravel/arquebus";
 import { Model as Model$1, QueryBuilder, Seeder as Seeder$1 } from "@h3ravel/arquebus";
 import * as knex0 from "knex";
 import { Knex } from "knex";
-import { Application, ServiceProvider } from "@h3ravel/core";
-import { IQueryBuilder } from "@h3ravel/arquebus/types";
+import { IBuilder, IQueryBuilder, Relation } from "@h3ravel/arquebus/types";
+import { UrlRoutable } from "@h3ravel/contracts";
+import { ServiceProvider } from "@h3ravel/support";
+import { Application } from "@h3ravel/core";
 
 //#region src/Commands/MakeCommand.d.ts
 declare class MakeCommand extends Command {
@@ -207,15 +209,68 @@ type TConfig = TBaseConfig & ({
 declare const arquebusConfig: (config: any) => TBaseConfig;
 //#endregion
 //#region src/Model.d.ts
-declare class Model<M extends Model$1 = any> extends Model$1 {
+declare const Model_base: typeof UrlRoutable & typeof Model$1 & (new (...args: any[]) => Model$1 & UrlRoutable);
+declare class Model<M extends Model$1 = any> extends Model_base {
   /**
    * Retrieve the model for a bound value.
    *
-   * @param {any}  value
-   * @param {String|null} field
-   * @returns
+   * @param  value
+   * @param  field
+   */
+  resolveRouteBinding(value: any, field?: string): Promise<M>;
+  /**
+   * Retrieve the model for a bound value.
+   *
+   * @param  query
+   * @param  value
+   * @param  field
+   */
+  resolveRouteBindingQuery(query: IBuilder<M>, value: any, field?: undefined | string | null): IBuilder<M>;
+  /**
+   * Retrieve the model for a bound value.
+   *
+   * @param  value
+   * @param  field
+   */
+  resolveSoftDeletableRouteBinding(value: any, field?: string): Promise<M | null | undefined>;
+  /**
+   * Retrieve the child model for a bound value.
+   *
+   * @param  childType
+   * @param  value
+   * @param  field
+   */
+  resolveChildRouteBinding(childType: string, value: any, field: string): Promise<M | null | undefined>;
+  /**
+   * Retrieve the child model for a bound value.
+   *
+   * @param  childType
+   * @param  value
+   * @param  field
+   */
+  resolveSoftDeletableChildRouteBinding(childType: string, value: any, field: string): Promise<M | null | undefined>;
+  /**
+   * Retrieve the child model query for a bound value.
+   *
+   * @param  childType
+   * @param  value
+   * @param  field
+   */
+  protected resolveChildRouteBindingQuery(childType: string, value: any, field: string): Relation<Model<M>>;
+  /**
+   * Retrieve the child route model binding relationship name for the given child type.
+   *
+   * @param  childType
+   */
+  protected childRouteBindingRelationshipName(childType: string): keyof typeof this;
+  /**
+   * Get the value of the model's route key.
+   */
+  getRouteKey(): any;
+  /**
+   * Get the route key for the model.
    */
-  resolveRouteBinding(value: any, field?: undefined | string | null): Promise<M>;
+  getRouteKeyName(): string;
 }
 //#endregion
 //#region src/Providers/DatabaseServiceProvider.d.ts
@@ -247,7 +302,7 @@ declare class DB {
   /**
    * Builder transaction instance
    */
-  static transaction<C>(callback: (...args: C[]) => any): Promise<knex0.Knex.Transaction<any, any[]>> | undefined;
+  static transaction<C>(callback: (...args: C[]) => any): Promise<knex0.Knex.Transaction<any, any[]>> | null | undefined;
   private builder;
 }
 //#endregion

package/dist/index.js

@@ -1,12 +1,13 @@
 import "node:module";
-import { FileSystem, Logger, Resolver, TaskManager } from "@h3ravel/shared";
+import { FileSystem, Logger, Resolver, TaskManager, mix } from "@h3ravel/shared";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { Command } from "@h3ravel/musket";
-import { Arr, Str } from "@h3ravel/support";
+import { Arr, ServiceProvider, Str } from "@h3ravel/support";
 import npath from "node:path";
 import { Migrate, MigrationCreator } from "@h3ravel/arquebus/migrations";
+import { BelongsToMany, HasManyThrough } from "@h3ravel/arquebus/relations";
 import { Model as Model$1, Seeder as Seeder$1, arquebus } from "@h3ravel/arquebus";
-import { ServiceProvider } from "@h3ravel/core";
+import { UrlRoutable } from "@h3ravel/contracts";
 
 //#region rolldown:runtime
 var __create = Object.create;
@@ -15,16 +16,18 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
 	}
 	return to;
 };
@@ -52,11 +55,12 @@ var TableGuesser = class TableGuesser {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/dayjs@1.11.18/node_modules/dayjs/dayjs.min.js
-var require_dayjs_min = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/dayjs@1.11.18/node_modules/dayjs/dayjs.min.js": ((exports, module) => {
+//#region ../../node_modules/.pnpm/dayjs@1.11.19/node_modules/dayjs/dayjs.min.js
+var require_dayjs_min = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	(function(t, e) {
 		"object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
 	})(exports, (function() {
+		"use strict";
 		var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", c = "month", f = "quarter", h = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = {
 			name: "en",
 			weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
@@ -347,7 +351,7 @@ var require_dayjs_min = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/d
 			return O(1e3 * t$1);
 		}, O.en = D[g], O.Ls = D, O.p = {}, O;
 	}));
-}) });
+}));
 
 //#endregion
 //#region src/Commands/MakeCommand.ts
@@ -803,16 +807,87 @@ const arquebusConfig = (config$1) => {
 
 //#endregion
 //#region src/Model.ts
-var Model = class extends Model$1 {
+var Model = class Model extends mix(UrlRoutable, Model$1) {
 	/**
 	* Retrieve the model for a bound value.
 	* 
-	* @param {any}  value 
-	* @param {String|null} field 
-	* @returns 
+	* @param  value 
+	* @param  field 
+	*/
+	resolveRouteBinding(value, field) {
+		return this.resolveRouteBindingQuery(this.newQuery(), value, field).first();
+	}
+	/**
+	* Retrieve the model for a bound value.
+	*
+	* @param  query
+	* @param  value
+	* @param  field
+	*/
+	resolveRouteBindingQuery(query, value, field = null) {
+		return query.where(field ?? this.getRouteKeyName(), value);
+	}
+	/**
+	* Retrieve the model for a bound value.
+	*
+	* @param  value
+	* @param  field
+	*/
+	resolveSoftDeletableRouteBinding(value, field) {
+		return this.resolveRouteBindingQuery(this.newQuery(), value, field).withTrashed().first();
+	}
+	/**
+	* Retrieve the child model for a bound value.
+	*
+	* @param  childType
+	* @param  value
+	* @param  field 
+	*/
+	resolveChildRouteBinding(childType, value, field) {
+		return this.resolveChildRouteBindingQuery(childType, value, field).first();
+	}
+	/**
+	* Retrieve the child model for a bound value.
+	*
+	* @param  childType
+	* @param  value
+	* @param  field 
+	*/
+	resolveSoftDeletableChildRouteBinding(childType, value, field) {
+		return this.resolveChildRouteBindingQuery(childType, value, field).withTrashed().first();
+	}
+	/**
+	* Retrieve the child model query for a bound value.
+	*
+	* @param  childType
+	* @param  value
+	* @param  field
+	*/
+	resolveChildRouteBindingQuery(childType, value, field) {
+		const relationship = this[this.childRouteBindingRelationshipName(childType)]();
+		field = field || relationship.getRelated().getRouteKeyName();
+		if (relationship instanceof HasManyThrough || relationship instanceof BelongsToMany) field = relationship.getRelated().qualifyColumn(field);
+		return relationship instanceof Model ? relationship.resolveRouteBindingQuery(relationship.newQuery(), value, field) : relationship.getRelated().resolveRouteBindingQuery(relationship, value, field);
+	}
+	/**
+	* Retrieve the child route model binding relationship name for the given child type.
+	*
+	* @param  childType
+	*/
+	childRouteBindingRelationshipName(childType) {
+		return Str.plural(Str.camel(childType));
+	}
+	/**
+	* Get the value of the model's route key.
+	*/
+	getRouteKey() {
+		return this.getAttribute(this.getRouteKeyName());
+	}
+	/**
+	* Get the route key for the model.
 	*/
-	resolveRouteBinding(value, field = null) {
-		return this.newQuery().where(field ?? "ids", value).firstOrFail();
+	getRouteKeyName() {
+		return this.getKeyName();
 	}
 };
 
@@ -832,6 +907,7 @@ var DatabaseServiceProvider = class extends ServiceProvider {
 		const config$1 = this.app.make("config");
 		const connection = Object.entries(arquebusConfig(config$1.get("database"))).find(([client]) => client === config$1.get("database.default"))?.at(1);
 		if (connection) arquebus.addConnection(connection);
+		this.app.singleton("db", () => arquebus.fire());
 		/** Register Musket Commands */
 		this.registerCommands([
 			MigrateCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/database",
-  "version": "11.4.11",
+  "version": "11.5.0-alpha.10",
   "description": "Modeling data and migration system for H3ravel.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -41,21 +41,20 @@
     "laravel"
   ],
   "dependencies": {
-    "@h3ravel/arquebus": "^0.6.14",
-    "@h3ravel/musket": "^0.3.10",
+    "@h3ravel/arquebus": "^0.8.0-alpha.6",
+    "@h3ravel/musket": "^0.8.0-alpha.6",
     "sqlite3": "5.1.7"
   },
   "peerDependencies": {
-    "@h3ravel/core": "^1.21.6",
-    "@h3ravel/shared": "^0.27.7",
-    "@h3ravel/support": "^0.15.6",
-    "@h3ravel/filesystem": "^0.4.13"
+    "@h3ravel/core": "^1.22.0-alpha.10",
+    "@h3ravel/shared": "^0.29.0-alpha.10",
+    "@h3ravel/filesystem": "^0.4.15-alpha.10",
+    "@h3ravel/support": "^0.17.0-alpha.10"
   },
   "devDependencies": {
     "typescript": "^5.9.2"
   },
   "scripts": {
-    "barrel": "barrelsby --directory src --delete --singleQuotes",
     "build": "tsdown --config-loader unconfig",
     "dev": "tsx watch src/index.ts",
     "start": "node dist/index.js",