@h3ravel/url 1.1.0-alpha.8 → 1.29.0-alpha.11

package/dist/index.cjs

@@ -1,40 +1,36 @@
-//#region rolldown:runtime
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to$1, 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$1, key) && key !== except) {
-				__defProp(to$1, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
+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
+		});
 	}
-	return to$1;
+	return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
-let __h3ravel_foundation = require("@h3ravel/foundation");
-let __h3ravel_support = require("@h3ravel/support");
+let _h3ravel_foundation = require("@h3ravel/foundation");
+let _h3ravel_support = require("@h3ravel/support");
 let node_path = require("node:path");
-node_path = __toESM(node_path);
-
+node_path = __toESM(node_path, 1);
 //#region src/RequestAwareHelpers.ts
 /**
 * Request-aware URL helper class
 */
 var RequestAwareHelpers = class {
+	app;
 	baseUrl = "";
 	constructor(app) {
 		this.app = app;
@@ -99,7 +95,6 @@ var RequestAwareHelpers = class {
 function createUrlHelper(app) {
 	return () => new RequestAwareHelpers(app);
 }
-
 //#endregion
 //#region src/Url.ts
 /**
@@ -113,39 +108,39 @@ var Url = class Url {
 	_query;
 	_fragment;
 	app;
-	constructor(app, scheme, host, port, path$1 = "/", query = {}, fragment) {
+	constructor(app, scheme, host, port, path = "/", query = {}, fragment) {
 		this.app = app;
 		this._scheme = scheme;
 		this._host = host;
 		this._port = port;
-		this._path = path$1.startsWith("/") ? path$1 : `/${path$1}`;
+		this._path = path.startsWith("/") ? path : `/${path}`;
 		this._query = { ...query };
 		this._fragment = fragment;
 	}
 	/**
 	* Create a URL from a full URL string
 	*/
-	static of(url$1, app) {
+	static of(url, app) {
 		try {
-			const parsed = new URL(url$1);
+			const parsed = new URL(url);
 			const query = {};
 			parsed.searchParams.forEach((value, key) => {
 				query[key] = value;
 			});
 			return new Url(app, parsed.protocol.replace(":", ""), parsed.hostname, parsed.port ? parseInt(parsed.port) : void 0, parsed.pathname || "/", query, parsed.hash ? parsed.hash.substring(1) : void 0);
 		} catch {
-			throw new Error(`Invalid URL: ${url$1}`);
+			throw new Error(`Invalid URL: ${url}`);
 		}
 	}
 	/**
 	* Create a URL from a path relative to the app URL
 	*/
-	static to(path$1, app) {
+	static to(path, app) {
 		let baseUrl = "";
 		try {
 			baseUrl = config("app.url", "http://localhost:3000");
 		} catch {}
-		const fullUrl = new URL(path$1, baseUrl).toString();
+		const fullUrl = new URL(path, baseUrl).toString();
 		return Url.of(fullUrl, app);
 	}
 	/**
@@ -176,11 +171,24 @@ var Url = class Url {
 		if (!app) throw new Error("Application instance required for action URL generation");
 		const [controllerName, methodName = "index"] = typeof controller === "string" ? controller.split("@") : controller;
 		const cname = typeof controllerName === "string" ? controllerName : controllerName.name;
-		const routes = app.make("app.routes");
-		if (!Array.isArray(routes)) throw new Error("Action URL generation requires router integration - not yet implemented");
+		let routes;
+		try {
+			const legacyRoutes = app.make("app.routes");
+			routes = Array.isArray(legacyRoutes) ? legacyRoutes : [];
+		} catch {
+			routes = app.make("router").getRoutes().getRoutes().map((route) => {
+				const action = route.getAction();
+				const controller = action.controller;
+				const signature = typeof controller === "function" ? [controller.name, action.uses?.[1] ?? "index"] : typeof controller === "string" ? controller.replace(/^\\/, "").split("@") : void 0;
+				return {
+					path: route.uri(),
+					signature
+				};
+			});
+		}
 		if (routes.length < 1) throw new Error(`No routes available to resolve action: ${controller}`);
-		const found = routes.find((route$1) => {
-			return route$1.signature?.[0] === cname && (route$1.signature?.[1] || "index") === methodName;
+		const found = routes.find((route) => {
+			return route.signature?.[0] === cname && (route.signature?.[1] || "index") === methodName;
 		});
 		if (!found) throw new Error(`No route found for ${cname}`);
 		const _params = Object.values(params ?? {}).join("/");
@@ -208,8 +216,8 @@ var Url = class Url {
 	/**
 	* Set the path of the URL
 	*/
-	withPath(path$1) {
-		return new Url(this.app, this._scheme, this._host, this._port, path$1, this._query, this._fragment);
+	withPath(path) {
+		return new Url(this.app, this._scheme, this._host, this._port, path, this._query, this._fragment);
 	}
 	/**
 	* Set the query parameters of the URL
@@ -241,11 +249,11 @@ var Url = class Url {
 		try {
 			key = config("app.key");
 		} catch {}
-		if (!key) throw new __h3ravel_foundation.ConfigException("APP_KEY and app.key", "any", this);
-		const url$1 = this.toString();
+		if (!key) throw new _h3ravel_foundation.ConfigException("APP_KEY and app.key", "any", this);
+		const url = this.toString();
 		const queryParams = { ...this._query };
 		if (expiration) queryParams.expires = Math.floor(expiration / 1e3);
-		queryParams.signature = (0, __h3ravel_support.hmac)(expiration ? `${url$1}?expires=${queryParams.expires}` : url$1, key);
+		queryParams.signature = (0, _h3ravel_support.hmac)(expiration ? `${url}?expires=${queryParams.expires}` : url, key);
 		return this.withQuery(queryParams);
 	}
 	/**
@@ -268,20 +276,20 @@ var Url = class Url {
 		try {
 			key = config("app.key", "default-key");
 		} catch {}
-		return signature === (0, __h3ravel_support.hmac)(payload, key);
+		return signature === (0, _h3ravel_support.hmac)(payload, key);
 	}
 	/**
 	* Convert the URL to its string representation
 	*/
 	toString() {
-		let url$1 = "";
+		let url = "";
 		if (this._scheme && this._host) {
-			url$1 += `${this._scheme}://${this._host}`;
-			if (this._port && !(this._scheme === "http" && this._port === 80 || this._scheme === "https" && this._port === 443)) url$1 += `:${this._port}`;
+			url += `${this._scheme}://${this._host}`;
+			if (this._port && !(this._scheme === "http" && this._port === 80 || this._scheme === "https" && this._port === 443)) url += `:${this._port}`;
 		}
 		if (this._path) {
-			if (!this._path.startsWith("/")) url$1 += "/";
-			url$1 += this._path;
+			if (!this._path.startsWith("/")) url += "/";
+			url += this._path;
 		}
 		const queryEntries = Object.entries(this._query);
 		if (queryEntries.length > 0) {
@@ -289,10 +297,10 @@ var Url = class Url {
 				if (Array.isArray(value)) return value.map((v) => `${encodeURIComponent(key)}%5B%5D=${encodeURIComponent(v)}`).join("&");
 				return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
 			}).join("&");
-			url$1 += `?${queryString}`;
+			url += `?${queryString}`;
 		}
-		if (this._fragment) url$1 += `#${this._fragment}`;
-		return url$1;
+		if (this._fragment) url += `#${this._fragment}`;
+		return url;
 	}
 	/**
 	* Get the scheme
@@ -331,7 +339,6 @@ var Url = class Url {
 		return this._fragment;
 	}
 };
-
 //#endregion
 //#region src/Helpers.ts
 /**
@@ -340,8 +347,8 @@ var Url = class Url {
 /**
 * Create a URL from a path relative to the app URL
 */
-function to(path$1, app) {
-	return Url.to(path$1, app);
+function to(path, app) {
+	return Url.to(path, app);
 }
 /**
 * Create a URL from a named route
@@ -379,24 +386,41 @@ function url(app) {
 */
 function createUrlHelpers(app) {
 	return {
-		to: (path$1) => Url.to(path$1, app),
+		/**
+		* Create a URL from a path relative to the app URL
+		*/
+		to: (path) => Url.to(path, app),
+		/**
+		* Create a URL from a named route
+		*/
 		route: (name, params = {}) => Url.route(name, params, app).toString(),
+		/**
+		* Create a signed URL from a named route
+		*/
 		signedRoute: (name, params = {}) => Url.signedRoute(name, params, app),
+		/**
+		* Create a temporary signed URL from a named route
+		*/
 		temporarySignedRoute: (name, params = {}, expiration) => Url.temporarySignedRoute(name, params, expiration, app),
+		/**
+		* Create a URL from a controller action
+		*/
 		action: (controller, params) => Url.action(controller, params, app).toString(),
-		url: (path$1) => {
-			if (path$1) return Url.to(path$1).toString();
+		/**
+		* Get request-aware URL helpers
+		*/
+		url: (path) => {
+			if (path) return Url.to(path).toString();
 			return new RequestAwareHelpers(app);
 		}
 	};
 }
-
 //#endregion
 //#region src/Providers/UrlServiceProvider.ts
 /**
 * Service provider for URL utilities
 */
-var UrlServiceProvider = class extends __h3ravel_support.ServiceProvider {
+var UrlServiceProvider = class extends _h3ravel_support.ServiceProvider {
 	static priority = 897;
 	/**
 	* Register URL services in the container
@@ -421,7 +445,6 @@ var UrlServiceProvider = class extends __h3ravel_support.ServiceProvider {
 		}
 	}
 };
-
 //#endregion
 exports.RequestAwareHelpers = RequestAwareHelpers;
 exports.Url = Url;
@@ -433,4 +456,4 @@ exports.route = route;
 exports.signedRoute = signedRoute;
 exports.temporarySignedRoute = temporarySignedRoute;
 exports.to = to;
-exports.url = url;
+exports.url = url;

package/dist/index.js

@@ -1,12 +1,12 @@
 import { ConfigException } from "@h3ravel/foundation";
 import { ServiceProvider, hmac } from "@h3ravel/support";
 import path from "node:path";
-
 //#region src/RequestAwareHelpers.ts
 /**
 * Request-aware URL helper class
 */
 var RequestAwareHelpers = class {
+	app;
 	baseUrl = "";
 	constructor(app) {
 		this.app = app;
@@ -71,7 +71,6 @@ var RequestAwareHelpers = class {
 function createUrlHelper(app) {
 	return () => new RequestAwareHelpers(app);
 }
-
 //#endregion
 //#region src/Url.ts
 /**
@@ -85,39 +84,39 @@ var Url = class Url {
 	_query;
 	_fragment;
 	app;
-	constructor(app, scheme, host, port, path$1 = "/", query = {}, fragment) {
+	constructor(app, scheme, host, port, path = "/", query = {}, fragment) {
 		this.app = app;
 		this._scheme = scheme;
 		this._host = host;
 		this._port = port;
-		this._path = path$1.startsWith("/") ? path$1 : `/${path$1}`;
+		this._path = path.startsWith("/") ? path : `/${path}`;
 		this._query = { ...query };
 		this._fragment = fragment;
 	}
 	/**
 	* Create a URL from a full URL string
 	*/
-	static of(url$1, app) {
+	static of(url, app) {
 		try {
-			const parsed = new URL(url$1);
+			const parsed = new URL(url);
 			const query = {};
 			parsed.searchParams.forEach((value, key) => {
 				query[key] = value;
 			});
 			return new Url(app, parsed.protocol.replace(":", ""), parsed.hostname, parsed.port ? parseInt(parsed.port) : void 0, parsed.pathname || "/", query, parsed.hash ? parsed.hash.substring(1) : void 0);
 		} catch {
-			throw new Error(`Invalid URL: ${url$1}`);
+			throw new Error(`Invalid URL: ${url}`);
 		}
 	}
 	/**
 	* Create a URL from a path relative to the app URL
 	*/
-	static to(path$1, app) {
+	static to(path, app) {
 		let baseUrl = "";
 		try {
 			baseUrl = config("app.url", "http://localhost:3000");
 		} catch {}
-		const fullUrl = new URL(path$1, baseUrl).toString();
+		const fullUrl = new URL(path, baseUrl).toString();
 		return Url.of(fullUrl, app);
 	}
 	/**
@@ -148,11 +147,24 @@ var Url = class Url {
 		if (!app) throw new Error("Application instance required for action URL generation");
 		const [controllerName, methodName = "index"] = typeof controller === "string" ? controller.split("@") : controller;
 		const cname = typeof controllerName === "string" ? controllerName : controllerName.name;
-		const routes = app.make("app.routes");
-		if (!Array.isArray(routes)) throw new Error("Action URL generation requires router integration - not yet implemented");
+		let routes;
+		try {
+			const legacyRoutes = app.make("app.routes");
+			routes = Array.isArray(legacyRoutes) ? legacyRoutes : [];
+		} catch {
+			routes = app.make("router").getRoutes().getRoutes().map((route) => {
+				const action = route.getAction();
+				const controller = action.controller;
+				const signature = typeof controller === "function" ? [controller.name, action.uses?.[1] ?? "index"] : typeof controller === "string" ? controller.replace(/^\\/, "").split("@") : void 0;
+				return {
+					path: route.uri(),
+					signature
+				};
+			});
+		}
 		if (routes.length < 1) throw new Error(`No routes available to resolve action: ${controller}`);
-		const found = routes.find((route$1) => {
-			return route$1.signature?.[0] === cname && (route$1.signature?.[1] || "index") === methodName;
+		const found = routes.find((route) => {
+			return route.signature?.[0] === cname && (route.signature?.[1] || "index") === methodName;
 		});
 		if (!found) throw new Error(`No route found for ${cname}`);
 		const _params = Object.values(params ?? {}).join("/");
@@ -180,8 +192,8 @@ var Url = class Url {
 	/**
 	* Set the path of the URL
 	*/
-	withPath(path$1) {
-		return new Url(this.app, this._scheme, this._host, this._port, path$1, this._query, this._fragment);
+	withPath(path) {
+		return new Url(this.app, this._scheme, this._host, this._port, path, this._query, this._fragment);
 	}
 	/**
 	* Set the query parameters of the URL
@@ -214,10 +226,10 @@ var Url = class Url {
 			key = config("app.key");
 		} catch {}
 		if (!key) throw new ConfigException("APP_KEY and app.key", "any", this);
-		const url$1 = this.toString();
+		const url = this.toString();
 		const queryParams = { ...this._query };
 		if (expiration) queryParams.expires = Math.floor(expiration / 1e3);
-		queryParams.signature = hmac(expiration ? `${url$1}?expires=${queryParams.expires}` : url$1, key);
+		queryParams.signature = hmac(expiration ? `${url}?expires=${queryParams.expires}` : url, key);
 		return this.withQuery(queryParams);
 	}
 	/**
@@ -246,14 +258,14 @@ var Url = class Url {
 	* Convert the URL to its string representation
 	*/
 	toString() {
-		let url$1 = "";
+		let url = "";
 		if (this._scheme && this._host) {
-			url$1 += `${this._scheme}://${this._host}`;
-			if (this._port && !(this._scheme === "http" && this._port === 80 || this._scheme === "https" && this._port === 443)) url$1 += `:${this._port}`;
+			url += `${this._scheme}://${this._host}`;
+			if (this._port && !(this._scheme === "http" && this._port === 80 || this._scheme === "https" && this._port === 443)) url += `:${this._port}`;
 		}
 		if (this._path) {
-			if (!this._path.startsWith("/")) url$1 += "/";
-			url$1 += this._path;
+			if (!this._path.startsWith("/")) url += "/";
+			url += this._path;
 		}
 		const queryEntries = Object.entries(this._query);
 		if (queryEntries.length > 0) {
@@ -261,10 +273,10 @@ var Url = class Url {
 				if (Array.isArray(value)) return value.map((v) => `${encodeURIComponent(key)}%5B%5D=${encodeURIComponent(v)}`).join("&");
 				return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
 			}).join("&");
-			url$1 += `?${queryString}`;
+			url += `?${queryString}`;
 		}
-		if (this._fragment) url$1 += `#${this._fragment}`;
-		return url$1;
+		if (this._fragment) url += `#${this._fragment}`;
+		return url;
 	}
 	/**
 	* Get the scheme
@@ -303,7 +315,6 @@ var Url = class Url {
 		return this._fragment;
 	}
 };
-
 //#endregion
 //#region src/Helpers.ts
 /**
@@ -312,8 +323,8 @@ var Url = class Url {
 /**
 * Create a URL from a path relative to the app URL
 */
-function to(path$1, app) {
-	return Url.to(path$1, app);
+function to(path, app) {
+	return Url.to(path, app);
 }
 /**
 * Create a URL from a named route
@@ -351,18 +362,35 @@ function url(app) {
 */
 function createUrlHelpers(app) {
 	return {
-		to: (path$1) => Url.to(path$1, app),
+		/**
+		* Create a URL from a path relative to the app URL
+		*/
+		to: (path) => Url.to(path, app),
+		/**
+		* Create a URL from a named route
+		*/
 		route: (name, params = {}) => Url.route(name, params, app).toString(),
+		/**
+		* Create a signed URL from a named route
+		*/
 		signedRoute: (name, params = {}) => Url.signedRoute(name, params, app),
+		/**
+		* Create a temporary signed URL from a named route
+		*/
 		temporarySignedRoute: (name, params = {}, expiration) => Url.temporarySignedRoute(name, params, expiration, app),
+		/**
+		* Create a URL from a controller action
+		*/
 		action: (controller, params) => Url.action(controller, params, app).toString(),
-		url: (path$1) => {
-			if (path$1) return Url.to(path$1).toString();
+		/**
+		* Get request-aware URL helpers
+		*/
+		url: (path) => {
+			if (path) return Url.to(path).toString();
 			return new RequestAwareHelpers(app);
 		}
 	};
 }
-
 //#endregion
 //#region src/Providers/UrlServiceProvider.ts
 /**
@@ -393,6 +421,5 @@ var UrlServiceProvider = class extends ServiceProvider {
 		}
 	}
 };
-
 //#endregion
-export { RequestAwareHelpers, Url, UrlServiceProvider, action, createUrlHelper, createUrlHelpers, route, signedRoute, temporarySignedRoute, to, url };
+export { RequestAwareHelpers, Url, UrlServiceProvider, action, createUrlHelper, createUrlHelpers, route, signedRoute, temporarySignedRoute, to, url };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/url",
-  "version": "1.1.0-alpha.8",
+  "version": "1.29.0-alpha.11",
   "description": "Request-aware URI builder and URL manipulation utilities for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -44,16 +44,16 @@
     "builder"
   ],
   "dependencies": {
-    "@h3ravel/support": "^0.17.0-alpha.8",
-    "@h3ravel/contracts": "^0.29.0-alpha.8",
-    "@h3ravel/foundation": "^0.1.0-alpha.8",
-    "@h3ravel/shared": "^0.29.0-alpha.8"
+    "@h3ravel/support": "^1.29.0-alpha.11",
+    "@h3ravel/contracts": "^1.29.0-alpha.11",
+    "@h3ravel/foundation": "^1.29.0-alpha.11",
+    "@h3ravel/shared": "^1.29.0-alpha.11"
   },
   "devDependencies": {
-    "typescript": "^5.4.0"
+    "typescript": "^6.0.0"
   },
   "scripts": {
-    "build": "tsdown --config-loader unconfig",
+    "build": "tsdown --config-loader unrun",
     "dev": "tsx watch src/index.ts",
     "start": "node dist/index.js",
     "lint": "eslint . --ext .ts",