asterflow 0.0.1 → 0.0.3

package/dist/cjs/index.cjs

@@ -1,36 +1,35 @@
 "use strict";
-var y = Object.defineProperty;
-var f = Object.getOwnPropertyDescriptor;
+var c = Object.defineProperty;
+var g = Object.getOwnPropertyDescriptor;
 var P = Object.getOwnPropertyNames;
 var w = Object.prototype.hasOwnProperty;
-var A = (r, e) => {
+var A = (d, e) => {
   for (var t in e)
-    y(r, t, { get: e[t], enumerable: !0 });
-}, M = (r, e, t, s) => {
+    c(d, t, { get: e[t], enumerable: !0 });
+}, M = (d, e, t, s) => {
   if (e && typeof e == "object" || typeof e == "function")
     for (let n of P(e))
-      !w.call(r, n) && n !== t && y(r, n, { get: () => e[n], enumerable: !(s = f(e, n)) || s.enumerable });
-  return r;
+      !w.call(d, n) && n !== t && c(d, n, { get: () => e[n], enumerable: !(s = g(e, n)) || s.enumerable });
+  return d;
 };
-var I = (r) => M(y({}, "__esModule", { value: !0 }), r);
+var I = (d) => M(c({}, "__esModule", { value: !0 }), d);
 // core/src/index.ts
 var C = {};
 A(C, {
   AsterFlow: () => v,
-  AsterFlowInstance: () => h,
-  joinPaths: () => R
+  AsterFlowInstance: () => h
 });
 module.exports = I(C);
 // core/src/controllers/Asterflow.ts
-var m = require("@asterflow/adapter"), p = require("@asterflow/response"), a = require("@asterflow/router"), l = require("@asterflow/url-parser"), x = require("reminist");
+var p = require("@asterflow/adapter"), m = require("@asterflow/response"), u = require("@asterflow/router"), l = require("@asterflow/url-parser"), x = require("reminist");
 // core/src/utils/parser.ts
-function R(r, e) {
-  return `${r}${e}`.replace(/\/{2,}/g, "/");
+function y(d, e) {
+  return `${d}${e}`.replace(/\/{2,}/g, "/");
 }
 // core/src/controllers/Asterflow.ts
 var h = class {
   driver;
-  reminist = new x.Reminist({ keys: Object.keys(a.MethodType) });
+  reminist = new x.Reminist({ keys: Object.keys(u.MethodType) });
   middlewares = [];
   plugins = {};
   onRequestPlugins = [];
@@ -38,40 +37,41 @@ var h = class {
   beforeInitializePlugins = [];
   afterInitializePlugins = [];
   constructor(e) {
-    this.driver = e?.driver ?? m.adapters.node, this.driver.onRequest = this.handleRequest.bind(this);
+    this.driver = e?.driver ?? p.adapters.node, this.driver.onRequest = this.handleRequest.bind(this);
   }
   async handleRequest(e, t) {
-    t = t ?? new p.AsterResponse(), await this.runHooks("onRequest", e, t);
-    let s = () => t.notFound({
+    t = t ?? new m.AsterResponse();
+    let s = await this.runHooks("onRequest", e, t);
+    if (s) return s;
+    let n = () => t.notFound({
       statusCode: 404,
       code: "NOT_FOUND",
       message: `Unable to find route: ${e.getPathname()}`
-    }), n = e.getMethod().toLowerCase();
-    if (!n) return s();
-    let o = this.reminist.find(n, e.url.getPathname());
-    if (!o?.node?.store) return s();
-    let i = o.node.store;
-    e.url = e.url.withParser(i.url);
+    }), o = e.getMethod().toLowerCase();
+    if (!o) return n();
+    let r = this.reminist.find(o, e.url.getPathname());
+    if (!r?.node?.store) return n();
+    let i = r.node.store;
+    (i.url.ast.expressions.has(l.InternalExpression.Variable) || i.url.ast.expressions.has(l.InternalExpression.Slug)) && (e.url = e.url.withParser(i.url));
     try {
       return await this.runHandler(i, e, t), await this.runHooks("onResponse", e, t), t;
-    } catch (d) {
-      let c = {
+    } catch (a) {
+      return t.badRequest({
         statusCode: 400,
-        message: d instanceof l.ErrorLog ? "AST_ERROR" : "ERROR",
-        error: d instanceof l.ErrorLog ? d.message : d
-      };
-      return t.badRequest(c);
+        message: a instanceof l.ErrorLog ? "AST_ERROR" : "ERROR",
+        error: a instanceof l.ErrorLog ? a.message : a
+      });
     }
   }
   middleware(e) {
     for (let t of e.controllers) {
-      let s = R(e.basePath, t.path);
+      let s = y(e.basePath, t.path);
       this.addEntry(t, s);
     }
     return this;
   }
   controller(e) {
-    let t = R("/", e.path);
+    let t = y("/", e.path);
     return this.addEntry(e, t), this;
   }
   use(e, t) {
@@ -83,10 +83,10 @@ var h = class {
     return this;
   }
   router(e) {
-    return this.controller(new a.Router(e)), this;
+    return this.controller(new u.Router(e)), this;
   }
   method(e) {
-    return this.controller(new a.Method(e)), this;
+    return this.controller(new u.Method(e)), this;
   }
   async resolvePluginContexts() {
     for (let e in this.plugins) {
@@ -102,7 +102,7 @@ var h = class {
     await this.resolvePluginContexts(), await this.runHooks("beforeInitialize"), await this.driver.listen(...e), await this.runHooks("afterInitialize");
   }
   addEntry(e, t) {
-    let s = e instanceof a.Method ? [e.method] : Object.keys(e.methods), n = { path: t, route: e, methods: s, url: new l.Analyze(t) };
+    let s = e instanceof u.Method ? [e.method] : Object.keys(e.methods), n = { path: t, route: e, methods: s, url: new l.Analyze(t) };
     for (let o of s)
       this.reminist.add(o, t, n);
   }
@@ -113,47 +113,61 @@ var h = class {
         case "beforeInitialize":
         case "afterInitialize":
           {
-            let i = o.hooks[e];
-            if (i)
-              for (let d of i)
-                await d(this, o.context);
+            let r = o.hooks[e];
+            if (r)
+              for (let i of r)
+                await i(this, o.context);
           }
           break;
         case "onRequest":
-        case "onResponse": {
-          if (!t || !s) return;
-          for (let i of o.hooks.onRequest)
-            await i({ request: t, response: s, context: o.context });
-        }
+          {
+            if (!t || !s) return;
+            let r = o.hooks.onRequest;
+            if (r)
+              for (let i of r) {
+                let a = await i({ request: t, response: s, context: o.context });
+                if (a && typeof a == "object" && a.constructor?.name === "AsterResponse")
+                  return a;
+              }
+          }
+          break;
+        case "onResponse":
+          {
+            if (!t || !s) return;
+            let r = o.hooks.onResponse;
+            if (r)
+              for (let i of r)
+                await i({ request: t, response: s, context: o.context });
+          }
+          break;
       }
   }
   async runHandler({ route: e }, t, s) {
-    let n = t.getMethod().toLowerCase(), o = e instanceof a.Method ? e.handler : e.methods[n], i = e instanceof a.Method ? e.schema : e.schema?.[n];
+    let n = t.getMethod().toLowerCase(), o = e instanceof u.Method ? e.handler : e.methods[n], r = e instanceof u.Method ? e.schema : e.schema?.[n];
     if (!o) return null;
-    if (i) {
-      let u = i.safeParse(t.getBody());
-      if (!u.success)
+    if (r) {
+      let R = r.safeParse(await t.getBody());
+      if (!R.success)
         return s.validationError({
           statusCode: 422,
           message: "VALIDATION_ERROR",
-          error: u.error
+          error: R.error
         });
-      s.send(u.data);
+      s.send(R.data);
     }
-    let d = Object.values(this.plugins).reduce((u, g) => ({ ...u, ...g.context }), {}), c = {
+    let i = Object.values(this.plugins).reduce((R, f) => ({ ...R, ...f.context }), {}), a = {
       instance: this,
       request: t,
       response: s,
       url: t.url,
       schema: t.getBody(),
       middleware: {},
-      plugins: d
+      plugins: i
     };
-    return o(c);
+    return o(a);
   }
 }, v = h;
 0 && (module.exports = {
   AsterFlow,
-  AsterFlowInstance,
-  joinPaths
+  AsterFlowInstance
 });

package/dist/mjs/index.js

@@ -1,13 +1,13 @@
 // core/src/controllers/Asterflow.ts
 import { adapters as m } from "@asterflow/adapter";
-import { AsterResponse as p } from "@asterflow/response";
+import { AsterResponse as x } from "@asterflow/response";
 import {
-  Method as d,
-  MethodType as x,
+  Method as u,
+  MethodType as f,
   Router as g
 } from "@asterflow/router";
-import { Analyze as f, ErrorLog as c } from "@asterflow/url-parser";
-import { Reminist as P } from "reminist";
+import { Analyze as P, ErrorLog as c, InternalExpression as y } from "@asterflow/url-parser";
+import { Reminist as w } from "reminist";
 // core/src/utils/parser.ts
 function l(h, e) {
   return `${h}${e}`.replace(/\/{2,}/g, "/");
@@ -15,7 +15,7 @@ function l(h, e) {
 // core/src/controllers/Asterflow.ts
 var R = class {
   driver;
-  reminist = new P({ keys: Object.keys(x) });
+  reminist = new w({ keys: Object.keys(f) });
   middlewares = [];
   plugins = {};
   onRequestPlugins = [];
@@ -26,26 +26,27 @@ var R = class {
     this.driver = e?.driver ?? m.node, this.driver.onRequest = this.handleRequest.bind(this);
   }
   async handleRequest(e, t) {
-    t = t ?? new p(), await this.runHooks("onRequest", e, t);
-    let s = () => t.notFound({
+    t = t ?? new x();
+    let s = await this.runHooks("onRequest", e, t);
+    if (s) return s;
+    let n = () => t.notFound({
       statusCode: 404,
       code: "NOT_FOUND",
       message: `Unable to find route: ${e.getPathname()}`
-    }), n = e.getMethod().toLowerCase();
-    if (!n) return s();
-    let o = this.reminist.find(n, e.url.getPathname());
-    if (!o?.node?.store) return s();
-    let r = o.node.store;
-    e.url = e.url.withParser(r.url);
+    }), o = e.getMethod().toLowerCase();
+    if (!o) return n();
+    let r = this.reminist.find(o, e.url.getPathname());
+    if (!r?.node?.store) return n();
+    let i = r.node.store;
+    (i.url.ast.expressions.has(y.Variable) || i.url.ast.expressions.has(y.Slug)) && (e.url = e.url.withParser(i.url));
     try {
-      return await this.runHandler(r, e, t), await this.runHooks("onResponse", e, t), t;
-    } catch (i) {
-      let u = {
+      return await this.runHandler(i, e, t), await this.runHooks("onResponse", e, t), t;
+    } catch (a) {
+      return t.badRequest({
         statusCode: 400,
-        message: i instanceof c ? "AST_ERROR" : "ERROR",
-        error: i instanceof c ? i.message : i
-      };
-      return t.badRequest(u);
+        message: a instanceof c ? "AST_ERROR" : "ERROR",
+        error: a instanceof c ? a.message : a
+      });
     }
   }
   middleware(e) {
@@ -71,7 +72,7 @@ var R = class {
     return this.controller(new g(e)), this;
   }
   method(e) {
-    return this.controller(new d(e)), this;
+    return this.controller(new u(e)), this;
   }
   async resolvePluginContexts() {
     for (let e in this.plugins) {
@@ -87,7 +88,7 @@ var R = class {
     await this.resolvePluginContexts(), await this.runHooks("beforeInitialize"), await this.driver.listen(...e), await this.runHooks("afterInitialize");
   }
   addEntry(e, t) {
-    let s = e instanceof d ? [e.method] : Object.keys(e.methods), n = { path: t, route: e, methods: s, url: new f(t) };
+    let s = e instanceof u ? [e.method] : Object.keys(e.methods), n = { path: t, route: e, methods: s, url: new P(t) };
     for (let o of s)
       this.reminist.add(o, t, n);
   }
@@ -105,27 +106,42 @@ var R = class {
           }
           break;
         case "onRequest":
-        case "onResponse": {
-          if (!t || !s) return;
-          for (let r of o.hooks.onRequest)
-            await r({ request: t, response: s, context: o.context });
-        }
+          {
+            if (!t || !s) return;
+            let r = o.hooks.onRequest;
+            if (r)
+              for (let i of r) {
+                let a = await i({ request: t, response: s, context: o.context });
+                if (a && typeof a == "object" && a.constructor?.name === "AsterResponse")
+                  return a;
+              }
+          }
+          break;
+        case "onResponse":
+          {
+            if (!t || !s) return;
+            let r = o.hooks.onResponse;
+            if (r)
+              for (let i of r)
+                await i({ request: t, response: s, context: o.context });
+          }
+          break;
       }
   }
   async runHandler({ route: e }, t, s) {
-    let n = t.getMethod().toLowerCase(), o = e instanceof d ? e.handler : e.methods[n], r = e instanceof d ? e.schema : e.schema?.[n];
+    let n = t.getMethod().toLowerCase(), o = e instanceof u ? e.handler : e.methods[n], r = e instanceof u ? e.schema : e.schema?.[n];
     if (!o) return null;
     if (r) {
-      let a = r.safeParse(t.getBody());
-      if (!a.success)
+      let d = r.safeParse(await t.getBody());
+      if (!d.success)
         return s.validationError({
           statusCode: 422,
           message: "VALIDATION_ERROR",
-          error: a.error
+          error: d.error
         });
-      s.send(a.data);
+      s.send(d.data);
     }
-    let i = Object.values(this.plugins).reduce((a, y) => ({ ...a, ...y.context }), {}), u = {
+    let i = Object.values(this.plugins).reduce((d, p) => ({ ...d, ...p.context }), {}), a = {
       instance: this,
       request: t,
       response: s,
@@ -134,11 +150,10 @@ var R = class {
       middleware: {},
       plugins: i
     };
-    return o(u);
+    return o(a);
   }
-}, O = R;
+}, k = R;
 export {
-  O as AsterFlow,
-  R as AsterFlowInstance,
-  l as joinPaths
+  k as AsterFlow,
+  R as AsterFlowInstance
 };

package/dist/types/controllers/Asterflow.d.ts

@@ -2,9 +2,10 @@ import { Runtime, type Adapter, type AnyAdapter } from '@asterflow/adapter';
 import type { AnyPlugins, InferConfigArgument, InferPluginExtension, Plugin, ResolvedPlugin } from '@asterflow/plugin';
 import { type Responders } from '@asterflow/response';
 import { Method, Router, type AnyMiddleware, type AnyMiddlewares, type AnyRouter, type AnySchema, type MethodHandler, type MethodKeys, type MethodOptions, type Middleware, type MiddlewareOutput, type RouteHandler, type RouterOptions, type SchemaDynamic } from '@asterflow/router';
+import { type NormalizePath } from '@asterflow/url-parser';
 import { Reminist } from 'reminist';
 import type { AsterFlowOptions } from '../types/asterflow';
-import type { ExtractPaths, InferPath, NormalizePath } from '../types/paths';
+import type { ExtractPaths, InferPath } from '../types/paths';
 import type { AnyReminist, InferReministContext, InferReministPath } from '../types/reminist';
 import type { BuildRouteContext, BuildRoutesContext, RouteEntry } from '../types/routes';
 import type { AnyRecord } from '../types/utils';
@@ -71,6 +72,7 @@ export declare class AsterFlowInstance<const Drive extends AnyAdapter = Adapter<
     private addEntry;
     /**
      * Executes the hook handlers for a specific hook name.
+     * For onRequest hooks, returns the response if any plugin returns one (to stop execution flow).
      */
     private runHooks;
     /**

package/dist/types/index.d.ts

@@ -5,4 +5,3 @@ export * from './types/plugin';
 export * from './types/reminist';
 export * from './types/routes';
 export * from './types/utils';
-export * from './utils/parser';

package/dist/types/types/paths.d.ts

@@ -1,33 +1,5 @@
 import type { AnyRouter, Method, Router } from '@asterflow/router';
-/**
- * Removes the fragment identifier from a URL path.
- * @example
- * // '/page#about' -> '/page'
- */
-type RemoveFragment<Path extends string> = Path extends `${infer CleanPath}#${string}` ? CleanPath : Path;
-/**
- * Removes the query string from a URL path.
- * @example
- * // '/users?data=1' -> '/users'
- */
-type RemoveQueryString<Path extends string> = Path extends `${infer CleanPath}?${string}` ? CleanPath : Path;
-/**
- * Removes type definitions from path segments.
- * Recursively processes the path to clean parts like '=number'.
- * @example
- * // '/users/:id=number' -> '/users/:id'
- */
-type SanitizeSegments<Path extends string> = Path extends `/${infer Rest}` ? `/${SanitizeSegments<Rest>}` : Path extends `${infer Segment}/${infer Rest}` ? `${(Segment extends `${infer Name}=${string}` ? Name : Segment)}/${SanitizeSegments<Rest>}` : Path extends `${infer Name}=${string}` ? Name : Path;
-/**
- * Normalizes a URL path by performing several cleaning operations:
- * 1. Replaces double slashes ('//') with a single slash.
- * 2. Removes the URL fragment (e.g., '#about').
- * 3. Removes the query string (e.g., '?data=1').
- * 4. Removes type definitions from path segments (e.g., ':id=number' -> ':id').
- * @example
- * // '/users//:id=number?data=1#profile' -> '/users/:id'
- */
-export type NormalizePath<Path extends string> = Path extends `${infer Head}//${infer Tail}` ? NormalizePath<`${Head}/${Tail}`> : SanitizeSegments<RemoveQueryString<RemoveFragment<Path>>>;
+import type { NormalizePath } from '@asterflow/url-parser';
 /**
  * Combines a base path with a relative path and normalizes the result.
  */
@@ -43,4 +15,3 @@ export type InferPath<T> = T extends Router<any, infer P, any, any, any, any> ?
 export type ExtractPaths<Base extends string, Routes extends readonly AnyRouter[]> = {
     [K in keyof Routes]: Routes[K] extends infer R extends AnyRouter ? CombinePaths<Base, InferPath<R>> : never;
 };
-export {};

package/dist/types/types/routes.d.ts

@@ -1,7 +1,7 @@
 import type { AnyRouter, MethodKeys } from '@asterflow/router';
-import type { CombinePaths, InferPath, NormalizePath } from './paths';
+import type { CombinePaths, InferPath } from './paths';
 import type { UnionToIntersection } from './utils';
-import type { Analyze } from '@asterflow/url-parser';
+import type { Analyze, NormalizePath } from '@asterflow/url-parser';
 /**
  * Builds the context for a single route, inferring the path and associating the route entry.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asterflow",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "main": "dist/cjs/index.cjs",
   "module": "dist/mjs/index.js",
   "types": "dist/types/index.d.ts",
@@ -27,19 +27,18 @@
     "node": ">=20"
   },
   "scripts": {
-    "dev": "bun run --inspect=ws://localhost:6499 src/index.ts",
-    "exemple": "bun run --inspect-brk=ws://localhost:6499 src/exemple.ts"
+    "dev": "bun run --inspect=ws://localhost:6499 src/index.ts"
   },
   "peerDependencies": {
-    "zod": "^3.25.63",
+    "zod": "^3.25.67",
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@asterflow/adapter": "1.0.9",
-    "@asterflow/plugin": "1.0.5",
-    "@asterflow/response": "1.0.6",
-    "@asterflow/router": "1.0.9",
-    "@asterflow/url-parser": "^2.0.1",
+    "@asterflow/adapter": "1.0.11",
+    "@asterflow/plugin": "1.0.7",
+    "@asterflow/response": "1.0.8",
+    "@asterflow/router": "1.0.11",
+    "@asterflow/url-parser": "^2.0.3",
     "reminist": "^1.0.5"
   }
 }