@asterflow/plugin 1.0.4 → 1.0.5

package/README.md

@@ -113,7 +113,7 @@ const loggerPlugin = Plugin.create({ name: 'logger-plugin' })
 To use the created plugins, you register them with the `AsterFlow` instance.
 
 ```typescript
-import { AsterFlow } from '@asterflow/core'
+import { AsterFlow } from 'asterflow'
 import { adapters } from '@asterflow/adapter'
 import fastify from 'fastify'
 // Import your plugins here
@@ -140,7 +140,7 @@ app.listen(server, { port: 3000 }, (err) => {
 
 ## 🔗 Related Packages
 
--   [@asterflow/core](https://www.npmjs.com/package/@asterflow/core) - The heart of the AsterFlow framework.
+-   [asterflow](https://www.npmjs.com/package/asterflow) - The heart of the AsterFlow framework.
 -   [@asterflow/adapter](https://www.npmjs.com/package/@asterflow/adapter) - HTTP adapters for different runtimes.
 -   [@asterflow/router](https://www.npmjs.com/package/@asterflow/router) - Type-safe routing system.
 -   [@asterflow/request](https://www.npmjs.com/package/@asterflow/request) - Unified HTTP request system.

package/dist/cjs/index.cjs

@@ -1,97 +1,71 @@
 "use strict";
 var r = Object.defineProperty;
-var h = Object.getOwnPropertyDescriptor;
-var d = Object.getOwnPropertyNames;
-var c = Object.prototype.hasOwnProperty;
-var f = (t, e) => {
+var f = Object.getOwnPropertyDescriptor;
+var u = Object.getOwnPropertyNames;
+var d = Object.prototype.hasOwnProperty;
+var g = (o, e) => {
   for (var n in e)
-    r(t, n, { get: e[n], enumerable: !0 });
-}, u = (t, e, n, s) => {
+    r(o, n, { get: e[n], enumerable: !0 });
+}, h = (o, e, n, t) => {
   if (e && typeof e == "object" || typeof e == "function")
-    for (let o of d(e))
-      !c.call(t, o) && o !== n && r(t, o, { get: () => e[o], enumerable: !(s = h(e, o)) || s.enumerable });
-  return t;
+    for (let s of u(e))
+      !d.call(o, s) && s !== n && r(o, s, { get: () => e[s], enumerable: !(t = f(e, s)) || t.enumerable });
+  return o;
 };
-var g = (t) => u(r({}, "__esModule", { value: !0 }), t);
+var x = (o) => h(r({}, "__esModule", { value: !0 }), o);
 // packages/plugin/src/index.ts
-var C = {};
-f(C, {
+var y = {};
+g(y, {
   Plugin: () => a
 });
-module.exports = g(C);
+module.exports = x(y);
 // packages/plugin/src/controllers/Plugin.ts
-var a = class t {
+var a = class o {
   name;
   resolvers;
   defaultConfig;
-  hooks;
+  hooks = {};
   instance;
   _extensionFn;
-  constructor(e, n, s, o, i) {
-    this.name = e, this.resolvers = n, this.hooks = s, this.defaultConfig = o, this._extensionFn = i;
+  constructor(e, n, t, s, i) {
+    this.name = e, this.resolvers = n, this.hooks = t, this.defaultConfig = s, this._extensionFn = i;
   }
   config(e) {
-    return new t(
-      this.name,
-      this.resolvers,
-      this.hooks,
-      e,
-      this._extensionFn
-    );
+    return this.defaultConfig = {
+      ...this.defaultConfig,
+      defaultConfig: e
+    }, this;
   }
   defineInstance(e) {
     return this.instance = e, this;
   }
   decorate(e, n) {
-    let s = async (o, i) => ({
+    let t = async (s, i) => ({
       ...i,
       [e]: n
     });
-    return new t(
-      this.name,
-      [...this.resolvers, s],
-      this.hooks,
-      this.defaultConfig,
-      this._extensionFn
-    );
+    return this.resolvers = [...this.resolvers, t], this;
   }
   derive(e, n) {
-    let s = async (o, i) => {
-      let l = { ...i, ...o }, x = await n(l);
+    let t = async (s, i) => {
+      let c = { ...i, ...s }, l = await n(c);
       return {
         ...i,
-        [e]: x
+        [e]: l
       };
     };
-    return new t(
-      this.name,
-      [...this.resolvers, s],
-      this.hooks,
-      this.defaultConfig,
-      this._extensionFn
-    );
+    return this.resolvers = [...this.resolvers, t], this;
   }
   on(e, n) {
-    let s = this.hooks[e] || [], o = {
+    let t = this.hooks[e] || [];
+    return this.hooks = {
       ...this.hooks,
-      [e]: [...s, n]
-    };
-    return new t(
-      this.name,
-      this.resolvers,
-      o,
-      this.defaultConfig,
-      this._extensionFn
-    );
+      [e]: [...t, n]
+    }, this;
   }
   extends(e) {
-    return new t(
-      this.name,
-      this.resolvers,
-      this.hooks,
-      this.defaultConfig,
-      (n, s) => ({ ...this._extensionFn ? this._extensionFn(n, s) : {}, ...e(n, s) })
-    );
+    let n = this._extensionFn;
+    return this._extensionFn = (t, s) => ({ ...n ? n(t, s) : {}, ...e(t, s) }), this;
   }
   _build(e) {
     let n = { ...this.defaultConfig, ...e };
@@ -104,18 +78,7 @@ var a = class t {
     };
   }
   static create(e) {
-    return new t(e.name, [], {}, {}, void 0);
-  }
-  static instance() {
-    return {
-      create: (e) => new t(
-        e.name,
-        [],
-        {},
-        {},
-        void 0
-      )
-    };
+    return new o(e.name, [], {}, {}, void 0);
   }
 };
 0 && (module.exports = {

package/dist/mjs/index.js

@@ -1,76 +1,50 @@
 // packages/plugin/src/controllers/Plugin.ts
-var r = class s {
+var i = class r {
   name;
   resolvers;
   defaultConfig;
-  hooks;
+  hooks = {};
   instance;
   _extensionFn;
-  constructor(e, n, t, o, i) {
-    this.name = e, this.resolvers = n, this.hooks = t, this.defaultConfig = o, this._extensionFn = i;
+  constructor(e, n, t, s, o) {
+    this.name = e, this.resolvers = n, this.hooks = t, this.defaultConfig = s, this._extensionFn = o;
   }
   config(e) {
-    return new s(
-      this.name,
-      this.resolvers,
-      this.hooks,
-      e,
-      this._extensionFn
-    );
+    return this.defaultConfig = {
+      ...this.defaultConfig,
+      defaultConfig: e
+    }, this;
   }
   defineInstance(e) {
     return this.instance = e, this;
   }
   decorate(e, n) {
-    let t = async (o, i) => ({
-      ...i,
+    let t = async (s, o) => ({
+      ...o,
       [e]: n
     });
-    return new s(
-      this.name,
-      [...this.resolvers, t],
-      this.hooks,
-      this.defaultConfig,
-      this._extensionFn
-    );
+    return this.resolvers = [...this.resolvers, t], this;
   }
   derive(e, n) {
-    let t = async (o, i) => {
-      let a = { ...i, ...o }, l = await n(a);
+    let t = async (s, o) => {
+      let a = { ...o, ...s }, c = await n(a);
       return {
-        ...i,
-        [e]: l
+        ...o,
+        [e]: c
       };
     };
-    return new s(
-      this.name,
-      [...this.resolvers, t],
-      this.hooks,
-      this.defaultConfig,
-      this._extensionFn
-    );
+    return this.resolvers = [...this.resolvers, t], this;
   }
   on(e, n) {
-    let t = this.hooks[e] || [], o = {
+    let t = this.hooks[e] || [];
+    return this.hooks = {
       ...this.hooks,
       [e]: [...t, n]
-    };
-    return new s(
-      this.name,
-      this.resolvers,
-      o,
-      this.defaultConfig,
-      this._extensionFn
-    );
+    }, this;
   }
   extends(e) {
-    return new s(
-      this.name,
-      this.resolvers,
-      this.hooks,
-      this.defaultConfig,
-      (n, t) => ({ ...this._extensionFn ? this._extensionFn(n, t) : {}, ...e(n, t) })
-    );
+    let n = this._extensionFn;
+    return this._extensionFn = (t, s) => ({ ...n ? n(t, s) : {}, ...e(t, s) }), this;
   }
   _build(e) {
     let n = { ...this.defaultConfig, ...e };
@@ -83,20 +57,9 @@ var r = class s {
     };
   }
   static create(e) {
-    return new s(e.name, [], {}, {}, void 0);
-  }
-  static instance() {
-    return {
-      create: (e) => new s(
-        e.name,
-        [],
-        {},
-        {},
-        void 0
-      )
-    };
+    return new r(e.name, [], {}, {}, void 0);
   }
 };
 export {
-  r as Plugin
+  i as Plugin
 };

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

@@ -1,17 +1,20 @@
-import type { AnyAsterflow, ExtendedAsterflow } from '@asterflow/core';
+import type { AnyAsterflow, ExtendedAsterflow } from 'asterflow';
 import type { PluginHooks, Resolver } from '../types/plugin';
-export declare class Plugin<Path extends string, Instance extends AnyAsterflow, Config extends Record<string, any> = {}, Context extends Record<string, any> = {}, Hooks extends PluginHooks<any, Context[], any> = {}, Extension extends Record<string, any> = {}> {
+import type { Prettify, UnionToIntersection } from '../types/utils';
+export declare class Plugin<Path extends string = string, Instance extends AnyAsterflow = AnyAsterflow, Config extends Record<string, any> = {}, Decorate extends Record<string, any> = {}, Derive extends Record<string, any> = {}, Extension extends Record<string, any> = {}> {
     readonly name: Path;
-    private readonly resolvers;
-    readonly defaultConfig: Partial<Config>;
-    readonly hooks: Hooks;
+    resolvers: Resolver[];
+    defaultConfig: Partial<Config>;
+    hooks: PluginHooks<any, Decorate, any>;
     instance: Instance;
-    private readonly _extensionFn?;
+    private _extensionFn?;
     private constructor();
     /**
      * Defines the shape of the configuration and its default values for this plugin.
      */
-    config<C extends Record<string, any>>(defaultConfig: C): Plugin<Path, Instance, C, Context, Hooks, Extension>;
+    config<C extends Record<string, any>>(defaultConfig: C): Plugin<Path, Instance, Prettify<UnionToIntersection<{
+        defaultConfig: C;
+    } | C | Config>>, Decorate, Derive, Extension>;
     /**
      * O `defineInstance` agora é mais simples. Ele não precisa mais re-tipar
      * a classe inteira. Ele só serve para passar o `this` para o `_build`.
@@ -20,12 +23,12 @@ export declare class Plugin<Path extends string, Instance extends AnyAsterflow,
     /**
      * Adds a new static value to the plugin's context (decoration).
      */
-    decorate<Key extends string, Value>(key: Key, value: Value): Plugin<Path, Instance, Config, Context & { [K in Key]: Value; }, Hooks, Extension>;
+    decorate<Key extends string, Value>(key: Key, value: Value): Plugin<Path, Instance, Config, Prettify<UnionToIntersection<Decorate | { [K in Key]: Value; }>>, Derive, Extension>;
     /**
      * Adds a new property to the context that is derived from the configuration and the existing context.
      * The resolver function is executed lazily when the plugin is registered via `app.use()`.
      */
-    derive<Key extends string, Value>(key: Key, resolverFn: (context: Context & Config) => Value | Promise<Value>): Plugin<Path, Instance, Config, Context & { [K in Key]: Awaited<Value>; }, Hooks, Extension>;
+    derive<Key extends string, Value>(key: Key, resolverFn: (context: Derive & Config & Decorate) => Value | Promise<Value>): Plugin<Path, Instance, Config, Decorate, Prettify<UnionToIntersection<Derive | { [K in Key]: Awaited<Value>; }>>, Extension>;
     /**
      * Registers a handler for a specific lifecycle event.
      * Adding a hook makes the plugin "runtime-aware". AsterFlow can optimize by only
@@ -36,21 +39,21 @@ export declare class Plugin<Path extends string, Instance extends AnyAsterflow,
      *   .on('beforeInitialize', (app, context) => { })
      *   .on('beforeInitialize', (app, context) => { });
      */
-    on<Event extends keyof PluginHooks<ExtendedAsterflow<Instance>, Context & Config, Extension>>(event: Event, handler: NonNullable<PluginHooks<ExtendedAsterflow<Instance>, Context & Config, Extension>[Event]>[number]): Plugin<Path, Instance, Config, Context, Omit<Hooks, Event> & { [K in Event]: [...Hooks extends { [k in Event]: any[]; } ? Hooks[K] : []]; }, Extension>;
+    on<Event extends keyof PluginHooks<ExtendedAsterflow<Instance>, Prettify<UnionToIntersection<Derive | Config | Decorate>>, Extension>>(event: Event, handler: NonNullable<PluginHooks<ExtendedAsterflow<Instance>, Prettify<UnionToIntersection<Derive | Config | Decorate>>, Extension>[Event]>[number]): this;
     /**
      * Defines new properties or methods to be added to the AsterFlow instance.
      * A função recebe a instância do app e o contexto do plugin, e deve retornar um objeto
      * com as novas propriedades.
      */
-    extends<E extends Record<string, any>>(extensionFn: (app: ExtendedAsterflow<Instance>, context: Context) => E): Plugin<Path, ExtendedAsterflow<Instance>, Config, Context, Hooks, Extension & E>;
+    extends<E extends Record<string, any>>(extensionFn: (app: Instance, context: Prettify<UnionToIntersection<Config | Derive | Decorate>>) => E): Plugin<Path, Instance, Config, Decorate, Derive, Prettify<UnionToIntersection<Extension & E>>>;
     /**
      * Builds the final context and hooks from the provided configuration.
      */
     _build(config: any): {
         name: Path;
-        context: Config & Context;
-        hooks: Hooks;
-        _extensionFn: ((app: Instance, context: Context) => Extension) | undefined;
+        context: Config & Derive & Decorate;
+        hooks: PluginHooks<any, Decorate, any>;
+        _extensionFn: ((app: Instance, context: Prettify<UnionToIntersection<Config & Decorate & Derive>>) => Extension) | undefined;
         resolvers: Resolver[];
     };
     /**
@@ -58,10 +61,5 @@ export declare class Plugin<Path extends string, Instance extends AnyAsterflow,
      */
     static create<Path extends string, Asterflow extends AnyAsterflow>(options: {
         name: Path;
-    }): Plugin<Path, Asterflow, {}, {}, {}>;
-    static instance<T extends AnyAsterflow>(): {
-        create: <Path extends string>(options: {
-            name: Path;
-        }) => Plugin<Path, T, {}, {}, {}, {}>;
-    };
+    }): Plugin<Path, Asterflow, {}, {}, {}, {}>;
 }

package/dist/types/types/plugin.d.ts

@@ -1,16 +1,18 @@
 import type { Runtime } from '@asterflow/adapter';
-import type { AnyAsterflow, ExtendedAsterflow } from '@asterflow/core';
+import type { AnyAsterflow, ExtendedAsterflow } from 'asterflow';
 import type { Request } from '@asterflow/request';
-import type { AsterResponse } from '@asterflow/response';
+import type { AsterResponse, Prettify } from '@asterflow/response';
 import type { Plugin } from '../controllers/Plugin';
-export type AnyPlugin = Plugin<string, any, any, any, any, any>;
+import type { AnyRecord, UnionToIntersection } from './utils';
+export type AnyPluginHooks = PluginHooks<AnyAsterflow, AnyRecord, AnyRecord>;
+export type AnyPlugin = Plugin<string, AnyAsterflow, AnyRecord, AnyRecord, AnyRecord, AnyRecord>;
 export type AnyPlugins = Record<string, ResolvedPlugin<AnyPlugin>>;
-export type AnyPluginHooks = PluginHooks<any, any, any>;
 export type AnyPluginInstance = ResolvedPlugin<AnyPlugin> & {
     hooks: AnyPluginHooks;
 };
 export type InferPluginExtension<P> = P extends Plugin<any, any, any, any, any, infer Ext> ? Ext : {};
-export type ResolvedPlugin<P extends AnyPlugin> = P extends Plugin<infer Path, any, any, infer Ctx, any, infer Ext> ? {
+export type InferPluginContext<P> = P extends Plugin<any, any, infer Config, infer Decorate, infer Derive, any> ? Prettify<UnionToIntersection<Config | Decorate | Derive>> : {};
+export type ResolvedPlugin<P extends Plugin<any, any, any, any, any, any>> = P extends Plugin<infer Path, any, any, infer Ctx, any, infer Ext> ? {
     name: Path;
     context: Ctx;
     hooks: PluginHooks<any, Ctx, Ext>;
@@ -21,23 +23,23 @@ export type ResolvedPlugin<P extends AnyPlugin> = P extends Plugin<infer Path, a
  * Tipo para extrair o objeto de configuração de um plugin.
  * Ele torna as propriedades com valores padrão opcionais.
  */
-export type InferConfigArgument<P extends AnyPlugin> = P extends Plugin<any, any, infer C, any, any> ? Omit<C, keyof P['defaultConfig']> & Partial<Pick<C, keyof P['defaultConfig'] & keyof C>> : never;
+export type InferConfigArgument<P extends Plugin<any, any, any, any, any, any>> = P extends Plugin<any, any, infer C, any, any, any> ? Omit<C, keyof P['defaultConfig']> & Partial<Pick<C, keyof P['defaultConfig'] & keyof C>> : never;
 /**
  * Defines the available lifecycle hooks a plugin can register.
  */
 export type PluginHooks<Instance extends AnyAsterflow, Context extends Record<string, any>, Extension extends Record<string, any> = {}> = {
-    beforeInitialize?: ((app: ExtendedAsterflow<Instance> & Extension, context: Context) => void | Promise<void>)[];
-    afterInitialize?: ((app: ExtendedAsterflow<Instance> & Extension, context: Context) => void | Promise<void>)[];
+    beforeInitialize?: ((app: ExtendedAsterflow<Instance> & Extension, context: Context) => any | Promise<any>)[];
+    afterInitialize?: ((app: ExtendedAsterflow<Instance> & Extension, context: Context) => any | Promise<any>)[];
     onRequest?: (({ context, request, response }: {
         request: Request<Runtime>;
         response: AsterResponse;
         context: Context;
-    }) => void | Promise<void>)[];
+    }) => any | Promise<any>)[];
     onResponse?: (({ context, request, response }: {
         request: Request<Runtime>;
         response: AsterResponse;
         context: Context;
-    }) => void | Promise<void>)[];
+    }) => any | Promise<any>)[];
 };
 /**
  * Represents a function that resolves a part of the plugin's context.

package/dist/types/types/utils.d.ts

@@ -0,0 +1,5 @@
+export type AnyRecord = Record<string, any>;
+export type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+export type Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asterflow/plugin",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "dist/cjs/index.cjs",
   "module": "dist/mjs/index.js",
   "types": "dist/types/index.d.ts",
@@ -18,9 +18,9 @@
     "node": ">=20"
   },
   "devDependencies": {
-    "@asterflow/core": "1.0.8",
-    "@asterflow/response": "1.0.5",
-    "@asterflow/request": "1.0.8"
+    "asterflow": "0.0.1",
+    "@asterflow/response": "1.0.6",
+    "@asterflow/request": "1.0.9"
   },
   "peerDependencies": {
     "typescript": "^5.8.3"