@h3ravel/url 1.0.15 → 1.1.0-alpha.2

package/dist/app.globals.d.ts

@@ -1,25 +1,13 @@
-import { ExtractControllerMethods } from '@h3ravel/shared'
-import { RequestAwareHelpers, Url } from '.'
+import { ExtractClassMethods } from '@h3ravel/shared'
 
 export { }
 
 declare global {
-    /**
-     * Create a URL from a named route
-     */
-    function route (name: string, params?: Record<string, any>): string;
-
     /**
      * Create a URL from a controller action
      */
     function action<C extends new (...args: any) => any> (
-        controller: string | [C, methodName: ExtractControllerMethods<InstanceType<C>>],
+        controller: string | [C, methodName: ExtractClassMethods<InstanceType<C>>],
         params?: Record<string, any>
     ): string;
-
-    /**
-     * Get request-aware URL helpers
-     */
-    function url (): RequestAwareHelpers;
-    function url (path: string): string;
 }

package/dist/index.cjs

@@ -6,12 +6,16 @@ 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
-		});
+	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
+				});
+			}
+		}
 	}
 	return to$1;
 };
@@ -21,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-let __h3ravel_core = require("@h3ravel/core");
+let __h3ravel_foundation = require("@h3ravel/foundation");
 let __h3ravel_support = require("@h3ravel/support");
 let node_path = require("node:path");
 node_path = __toESM(node_path);
@@ -86,7 +90,7 @@ var RequestAwareHelpers = class {
 	* Get the current query parameters
 	*/
 	query() {
-		return this.getCurrentRequest().query || {};
+		return this.getCurrentRequest()._query || {};
 	}
 };
 /**
@@ -149,10 +153,7 @@ var Url = class Url {
 	*/
 	static route(name, params = {}, app) {
 		if (!app) throw new Error("Application instance required for route generation");
-		const router = app.make("router");
-		if (!router || typeof router.route !== "function") throw new Error("Router not available or does not support route generation");
-		if (typeof router.route !== "function") throw new Error("Router does not support route generation");
-		const routeUrl = router.route(name, params);
+		const routeUrl = app.make("url").route(name, params);
 		if (!routeUrl) throw new Error(`Route "${name}" not found`);
 		return Url.to(routeUrl, app);
 	}
@@ -240,7 +241,7 @@ var Url = class Url {
 		try {
 			key = config("app.key");
 		} catch {}
-		if (!key) throw new __h3ravel_core.ConfigException("APP_KEY and app.key", "any", this);
+		if (!key) throw new __h3ravel_foundation.ConfigException("APP_KEY and app.key", "any", this);
 		const url$1 = this.toString();
 		const queryParams = { ...this._query };
 		if (expiration) queryParams.expires = Math.floor(expiration / 1e3);
@@ -395,12 +396,14 @@ function createUrlHelpers(app) {
 /**
 * Service provider for URL utilities
 */
-var UrlServiceProvider = class extends __h3ravel_core.ServiceProvider {
+var UrlServiceProvider = class extends __h3ravel_support.ServiceProvider {
 	static priority = 897;
 	/**
 	* Register URL services in the container
 	*/
-	register() {}
+	register() {
+		this.app.setUriResolver(() => Url);
+	}
 	/**
 	* Boot URL services
 	*/

package/dist/index.d.ts

@@ -1,16 +1,15 @@
 /// <reference path="./app.globals.d.ts" />
-import { ExtractControllerMethods } from "@h3ravel/shared";
-import { Application, ServiceProvider } from "@h3ravel/core";
+import { ExtractClassMethods, IApplication, IUrlHelpers, RouteParams } from "@h3ravel/contracts";
+import { ServiceProvider } from "@h3ravel/support";
 
 //#region src/RequestAwareHelpers.d.ts
-
 /**
  * Request-aware URL helper class
  */
 declare class RequestAwareHelpers {
   private app;
   private readonly baseUrl;
-  constructor(app: Application);
+  constructor(app: IApplication);
   /**
    * Get the current request instance
    */
@@ -39,7 +38,7 @@ declare class RequestAwareHelpers {
 /**
  * Global helper function factory
  */
-declare function createUrlHelper(app: Application): () => RequestAwareHelpers;
+declare function createUrlHelper(app: IApplication): () => RequestAwareHelpers;
 //#endregion
 //#region src/Url.d.ts
 /**
@@ -57,27 +56,27 @@ declare class Url {
   /**
    * Create a URL from a full URL string
    */
-  static of(url: string, app?: Application): Url;
+  static of(url: string, app?: IApplication): Url;
   /**
    * Create a URL from a path relative to the app URL
    */
-  static to(path: string, app?: Application): Url;
+  static to(path: string, app?: IApplication): Url;
   /**
    * Create a URL from a named route
    */
-  static route<TName extends string = string, TParams extends RouteParams = RouteParams>(name: TName, params?: TParams, app?: Application): Url;
+  static route<TName extends string = string, TParams extends RouteParams = RouteParams>(name: TName, params?: TParams, app?: IApplication): Url;
   /**
    * Create a signed URL from a named route
    */
-  static signedRoute<TName extends string = string, TParams extends RouteParams = RouteParams>(name: TName, params?: TParams, app?: Application): Url;
+  static signedRoute<TName extends string = string, TParams extends RouteParams = RouteParams>(name: TName, params?: TParams, app?: IApplication): Url;
   /**
    * Create a temporary signed URL from a named route
    */
-  static temporarySignedRoute<TName extends string = string, TParams extends RouteParams = RouteParams>(name: TName, params: TParams | undefined, expiration: number, app?: Application): Url;
+  static temporarySignedRoute<TName extends string = string, TParams extends RouteParams = RouteParams>(name: TName, params: TParams | undefined, expiration: number, app?: IApplication): Url;
   /**
    * Create a URL from a controller action
    */
-  static action<C extends new (...args: any) => any>(controller: string | [C, methodName: ExtractControllerMethods<InstanceType<C>>], params?: Record<string, any>, app?: Application): Url;
+  static action<C extends new (...args: any) => any>(controller: string | [C, methodName: ExtractClassMethods<InstanceType<C>>], params?: Record<string, any>, app?: IApplication): Url;
   /**
    * Set the scheme (protocol) of the URL
    */
@@ -109,11 +108,11 @@ declare class Url {
   /**
    * Add a signature to the URL for security
    */
-  withSignature(app?: Application, expiration?: number): Url;
+  withSignature(app?: IApplication, expiration?: number): Url;
   /**
    * Verify if a URL signature is valid
    */
-  hasValidSignature(app?: Application): boolean;
+  hasValidSignature(app?: IApplication): boolean;
   /**
    * Convert the URL to its string representation
    */
@@ -144,108 +143,6 @@ declare class Url {
   getFragment(): string | undefined;
 }
 //#endregion
-//#region src/Contracts/UrlContract.d.ts
-type RouteParams<N = any> = Record<string, N>;
-/**
- * Contract for URL manipulation and generation
- */
-interface UrlContract {
-  /**
-   * Set the scheme (protocol) of the URL
-   */
-  withScheme(scheme: string): this;
-  /**
-   * Set the host of the URL
-   */
-  withHost(host: string): this;
-  /**
-   * Set the port of the URL
-   */
-  withPort(port: number): this;
-  /**
-   * Set the path of the URL
-   */
-  withPath(path: string): this;
-  /**
-   * Set the query parameters of the URL
-   */
-  withQuery(query: Record<string, any>): this;
-  /**
-   * Set the fragment (hash) of the URL
-   */
-  withFragment(fragment: string): this;
-  /**
-   * Convert the URL to its string representation
-   */
-  toString(): string;
-}
-/**
- * Contract for request-aware URL helpers
- */
-interface RequestAwareUrlContract {
-  /**
-   * Get the current request URL
-   */
-  current(): string;
-  /**
-   * Get the full current URL with query string
-   */
-  full(): string;
-  /**
-   * Get the previous request URL
-   */
-  previous(): string;
-  /**
-   * Get the previous request path (without query string)
-   */
-  previousPath(): string;
-  /**
-   * Get the current query parameters
-   */
-  query(): Record<string, any>;
-}
-/**
- * The Url Helper Contract
- */
-interface HelpersContract {
-  /**
-   * Create a URL from a path relative to the app URL
-   */
-  to: (path: string) => Url;
-  /**
-   * Create a URL from a named route
-   */
-  route: (name: string, params?: Record<string, any>) => string;
-  /**
-   * Create a signed URL from a named route
-   *
-   * @param name
-   * @param params
-   * @returns
-   */
-  signedRoute: (name: string, params?: Record<string, any>) => Url;
-  /**
-   * Create a temporary signed URL from a named route
-   *
-   * @param name
-   * @param params
-   * @param expiration
-   * @returns
-   */
-  temporarySignedRoute: (name: string, params: Record<string, any> | undefined, expiration: number) => Url;
-  /**
-   * Create a URL from a controller action
-   */
-  action: <C extends new (...args: any) => any>(controller: string | [C, methodName: ExtractControllerMethods<InstanceType<C>>], params?: Record<string, any>) => string;
-  /**
-   * Get request-aware URL helpers
-   */
-  url: {
-    (): RequestAwareHelpers;
-    (path: string): string;
-  };
-}
-//#endregion
 //#region src/Helpers.d.ts
 /**
  * Global helper functions for URL manipulation
@@ -253,31 +150,31 @@ interface HelpersContract {
 /**
  * Create a URL from a path relative to the app URL
  */
-declare function to(path: string, app?: Application): Url;
+declare function to(path: string, app?: IApplication): Url;
 /**
  * Create a URL from a named route
  */
-declare function route<TName extends string, TParams extends Record<string, string> = Record<string, string>>(name: TName, params?: TParams, app?: Application): Url;
+declare function route<TName extends string, TParams extends Record<string, string> = Record<string, string>>(name: TName, params?: TParams, app?: IApplication): Url;
 /**
  * Create a signed URL from a named route
  */
-declare function signedRoute<TName extends string, TParams extends Record<string, string> = Record<string, string>>(name: TName, params?: TParams, app?: Application): Url;
+declare function signedRoute<TName extends string, TParams extends Record<string, string> = Record<string, string>>(name: TName, params?: TParams, app?: IApplication): Url;
 /**
  * Create a temporary signed URL from a named route
  */
-declare function temporarySignedRoute(name: string, params: Record<string, string> | undefined, expiration: number, app?: Application): Url;
+declare function temporarySignedRoute(name: string, params: Record<string, string> | undefined, expiration: number, app?: IApplication): Url;
 /**
  * Create a URL from a controller action
  */
-declare function action(controller: string, app?: Application): Url;
+declare function action(controller: string, app?: IApplication): Url;
 /**
  * Get request-aware URL helpers
  */
-declare function url(app?: Application): RequestAwareHelpers;
+declare function url(app?: IApplication): RequestAwareHelpers;
 /**
  * Create URL helpers that are bound to an application instance
  */
-declare function createUrlHelpers(app: Application): HelpersContract;
+declare function createUrlHelpers(app: IApplication): IUrlHelpers;
 //#endregion
 //#region src/Providers/UrlServiceProvider.d.ts
 /**
@@ -295,4 +192,4 @@ declare class UrlServiceProvider extends ServiceProvider {
   boot(): void;
 }
 //#endregion
-export { HelpersContract, RequestAwareHelpers, RequestAwareUrlContract, RouteParams, Url, UrlContract, UrlServiceProvider, action, createUrlHelper, createUrlHelpers, route, signedRoute, temporarySignedRoute, to, url };
+export { RequestAwareHelpers, Url, UrlServiceProvider, action, createUrlHelper, createUrlHelpers, route, signedRoute, temporarySignedRoute, to, url };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { ConfigException, ServiceProvider } from "@h3ravel/core";
-import { hmac } from "@h3ravel/support";
+import { ConfigException } from "@h3ravel/foundation";
+import { ServiceProvider, hmac } from "@h3ravel/support";
 import path from "node:path";
 
 //#region src/RequestAwareHelpers.ts
@@ -62,7 +62,7 @@ var RequestAwareHelpers = class {
 	* Get the current query parameters
 	*/
 	query() {
-		return this.getCurrentRequest().query || {};
+		return this.getCurrentRequest()._query || {};
 	}
 };
 /**
@@ -125,10 +125,7 @@ var Url = class Url {
 	*/
 	static route(name, params = {}, app) {
 		if (!app) throw new Error("Application instance required for route generation");
-		const router = app.make("router");
-		if (!router || typeof router.route !== "function") throw new Error("Router not available or does not support route generation");
-		if (typeof router.route !== "function") throw new Error("Router does not support route generation");
-		const routeUrl = router.route(name, params);
+		const routeUrl = app.make("url").route(name, params);
 		if (!routeUrl) throw new Error(`Route "${name}" not found`);
 		return Url.to(routeUrl, app);
 	}
@@ -376,7 +373,9 @@ var UrlServiceProvider = class extends ServiceProvider {
 	/**
 	* Register URL services in the container
 	*/
-	register() {}
+	register() {
+		this.app.setUriResolver(() => Url);
+	}
 	/**
 	* Boot URL services
 	*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/url",
-  "version": "1.0.15",
+  "version": "1.1.0-alpha.2",
   "description": "Request-aware URI builder and URL manipulation utilities for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -44,23 +44,15 @@
     "builder"
   ],
   "dependencies": {
-    "@h3ravel/support": "^0.15.6",
-    "@h3ravel/shared": "^0.27.7"
-  },
-  "peerDependencies": {
-    "@h3ravel/core": "^1.21.6",
-    "@h3ravel/config": "^1.4.18"
+    "@h3ravel/support": "^0.1.0-alpha.2",
+    "@h3ravel/contracts": "^0.1.0-alpha.2",
+    "@h3ravel/foundation": "^0.1.0-alpha.2",
+    "@h3ravel/shared": "^0.1.0-alpha.2"
   },
   "devDependencies": {
     "typescript": "^5.4.0"
   },
-  "peerDependenciesMeta": {
-    "@h3ravel/config": {
-      "optional": true
-    }
-  },
   "scripts": {
-    "barrel": "barrelsby --directory src --delete --singleQuotes",
     "build": "tsdown --config-loader unconfig",
     "dev": "tsx watch src/index.ts",
     "start": "node dist/index.js",