asterflow 0.0.4 → 0.0.6

package/dist/cjs/index.cjs

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

package/dist/mjs/index.js

@@ -1,21 +1,21 @@
 // core/src/controllers/Asterflow.ts
-import { adapters as m } from "@asterflow/adapter";
-import { AsterResponse as x } from "@asterflow/response";
+import { adapters as f } from "@asterflow/adapter";
+import { AsterResponse as y } from "@asterflow/response";
 import {
-  Method as u,
-  MethodType as f,
-  Router as g
+  Method as l,
+  MethodType as g,
+  Router as x
 } from "@asterflow/router";
-import { Analyze as P, ErrorLog as c, InternalExpression as y } from "@asterflow/url-parser";
+import { Analyze as P, ErrorLog as p, InternalExpression as m } 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, "/");
+function R(c, e) {
+  return `${c}${e}`.replace(/\/{2,}/g, "/");
 }
 // core/src/controllers/Asterflow.ts
-var R = class {
+var h = class {
   driver;
-  reminist = new w({ keys: Object.keys(f) });
+  reminist = new w({ keys: Object.keys(g) });
   middlewares = [];
   plugins = {};
   onRequestPlugins = [];
@@ -23,56 +23,55 @@ var R = class {
   beforeInitializePlugins = [];
   afterInitializePlugins = [];
   constructor(e) {
-    this.driver = e?.driver ?? m.node, this.driver.onRequest = this.handleRequest.bind(this);
+    this.driver = e?.driver ?? f.node, this.driver.onRequest = this.handleRequest.bind(this);
   }
   async handleRequest(e, t) {
-    t = t ?? new x();
-    let s = await this.runHooks("onRequest", e, t);
-    if (s) return s;
-    let n = () => t.notFound({
+    t = t ?? new y();
+    let s = () => t.notFound({
       statusCode: 404,
       code: "NOT_FOUND",
       message: `Unable to find route: ${e.getPathname()}`
-    }), 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));
+    }), n = e.getMethod().toLowerCase();
+    if (!n) return s();
+    let r = this.reminist.find(n, e.url.getPathname());
+    if (!r?.node?.store) return s();
+    let i = r.node.store, a = await this.runHooks("onRequest", this, i, e, t);
+    if (a) return a;
+    (i.url.ast.expressions.has(m.Variable) || i.url.ast.expressions.has(m.Slug)) && (e.url = e.url.withParser(i.url));
     try {
-      return await this.runHandler(i, e, t), await this.runHooks("onResponse", e, t), t;
-    } catch (a) {
-      return console.log(a), t.badRequest({
+      return await this.runHandler(i, e, t), await this.runHooks("onResponse", this, i, e, t), t;
+    } catch (o) {
+      return console.log(o), t.badRequest({
         statusCode: 400,
-        message: a instanceof c ? "AST_ERROR" : "ERROR",
-        error: a instanceof c ? a.message : a
+        message: o instanceof p ? "AST_ERROR" : "ERROR",
+        error: o instanceof p || o instanceof Error ? o.message : o
       });
     }
   }
   middleware(e) {
     for (let t of e.controllers) {
-      let s = l(e.basePath, t.path);
+      let s = R(e.basePath, t.path);
       this.addEntry(t, s);
     }
     return this;
   }
   controller(e) {
-    let t = l("/", e.path);
+    let t = R("/", e.path);
     return this.addEntry(e, t), this;
   }
   use(e, t) {
     let n = e.defineInstance(this)._build(t);
     if (this.plugins[n.name] = n, n.hooks.onRequest && this.onRequestPlugins.push(n), n.hooks.onResponse && this.onResponsePlugins.push(n), n.hooks.beforeInitialize && this.beforeInitializePlugins.push(n), n.hooks.afterInitialize && this.afterInitializePlugins.push(n), n._extensionFn) {
-      let o = n._extensionFn(this, n.context);
-      Object.assign(this, o);
+      let r = n._extensionFn(this, n.context);
+      Object.assign(this, r);
     }
     return this;
   }
   router(e) {
-    return this.controller(new g(e)), this;
+    return this.controller(new x(e)), this;
   }
   method(e) {
-    return this.controller(new u(e)), this;
+    return this.controller(new l(e)), this;
   }
   async resolvePluginContexts() {
     for (let e in this.plugins) {
@@ -85,75 +84,75 @@ var R = class {
     }
   }
   async listen(...e) {
-    await this.resolvePluginContexts(), await this.runHooks("beforeInitialize"), await this.driver.listen(...e), await this.runHooks("afterInitialize");
+    await this.resolvePluginContexts(), await this.runHooks("beforeInitialize", this), await this.driver.listen(...e), await this.runHooks("afterInitialize", this);
   }
   addEntry(e, 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);
+    let s = e instanceof l ? [e.method] : Object.keys(e.methods), n = { path: t, route: e, methods: s, url: new P(t) };
+    for (let r of s)
+      this.reminist.add(r, t, n);
   }
-  async runHooks(e, t, s) {
-    let n = this[`${e}Plugins`];
-    for (let o of n)
+  async runHooks(e, t, s, n, r) {
+    let i = this[`${e}Plugins`];
+    for (let a of i)
       switch (e) {
         case "beforeInitialize":
         case "afterInitialize":
           {
-            let r = o.hooks[e];
-            if (r)
-              for (let i of r)
-                await i(this, o.context);
+            let o = a.hooks[e];
+            if (!o) break;
+            for (let d of o)
+              await d(this, a.context);
           }
           break;
         case "onRequest":
           {
-            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;
-              }
+            let o = a.hooks.onRequest;
+            if (!o) break;
+            if (!n || !r || !s) return;
+            for (let d of o) {
+              let u = await d({ instance: t, router: s, request: n, response: r, plugin: a });
+              if (u && u instanceof y)
+                return u;
+            }
           }
           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 });
+            if (!n || !r || !s) return;
+            let o = a.hooks.onResponse;
+            if (o)
+              for (let d of o)
+                await d({ instance: t, router: s, request: n, response: r, plugin: a });
           }
           break;
       }
   }
   async runHandler({ route: e }, t, s) {
-    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 d = r.safeParse(await t.getBody());
+    let n = t.getMethod().toLowerCase(), r = e instanceof l ? e.handler : e.methods[n], i = e instanceof l ? e.schema : e.schema?.[n];
+    if (!r) return null;
+    if (i) {
+      let d = i.safeParse(await t.getBody());
       if (!d.success)
         return s.validationError({
           statusCode: 422,
           message: "VALIDATION_ERROR",
-          error: d.error
+          error: JSON.parse(d.error)
         });
       s.send(d.data);
     }
-    let i = Object.values(this.plugins).reduce((d, p) => ({ ...d, ...p.context }), {}), a = {
+    let a = Object.values(this.plugins).reduce((d, u) => ({ ...d, ...u.context }), {}), o = {
       instance: this,
       request: t,
       response: s,
       url: t.url,
       schema: await t.getBody(),
       middleware: {},
-      plugins: i
+      plugins: a
     };
-    return o(a);
+    return r(o);
   }
-}, k = R;
+}, k = h;
 export {
   k as AsterFlow,
-  R as AsterFlowInstance
+  h as AsterFlowInstance
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asterflow",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "dist/cjs/index.cjs",
   "module": "dist/mjs/index.js",
   "types": "dist/types/index.d.ts",
@@ -34,10 +34,10 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@asterflow/adapter": "1.0.12",
-    "@asterflow/plugin": "1.0.8",
-    "@asterflow/response": "1.0.9",
-    "@asterflow/router": "1.0.12",
+    "@asterflow/adapter": "1.0.14",
+    "@asterflow/plugin": "1.0.10",
+    "@asterflow/response": "1.0.11",
+    "@asterflow/router": "1.0.14",
     "@asterflow/url-parser": "^2.0.3",
     "reminist": "^1.0.5"
   }