@eggjs/watcher 4.0.1 → 4.0.2

package/dist/commonjs/lib/boot.d.ts

@@ -1,6 +1,7 @@
-import type { Application, Agent, ILifecycleBoot } from 'egg';
+import type { ILifecycleBoot } from 'egg';
+import { EggWatcherApplicationCore } from './types.js';
 export declare class Boot implements ILifecycleBoot {
     #private;
-    constructor(appOrAgent: Application | Agent);
+    constructor(appOrAgent: EggWatcherApplicationCore);
     didLoad(): Promise<void>;
 }

package/dist/commonjs/lib/boot.js

@@ -9,8 +9,8 @@ class Boot {
         this.#app = appOrAgent;
         this.#watcher = this.#app.watcher = this.#app.cluster(watcher_js_1.Watcher, {})
             .delegate('watch', 'subscribe')
-            .create(appOrAgent.config)
-            .on('info', (msg, ...args) => this.#app.coreLogger.info(msg, ...args))
+            .create(appOrAgent.config);
+        this.#watcher.on('info', (msg, ...args) => this.#app.coreLogger.info(msg, ...args))
             .on('warn', (msg, ...args) => this.#app.coreLogger.warn(msg, ...args))
             .on('error', (msg, ...args) => this.#app.coreLogger.error(msg, ...args));
     }
@@ -20,4 +20,4 @@ class Boot {
     }
 }
 exports.Boot = Boot;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9vdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvYm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSw2Q0FBdUM7QUFFdkMsTUFBYSxJQUFJO0lBQ2YsSUFBSSxDQUFzQjtJQUMxQixRQUFRLENBQVU7SUFFbEIsWUFBWSxVQUErQjtRQUN6QyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztRQUN2QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLG9CQUFPLEVBQUUsRUFBRSxDQUFDO2FBQy9ELFFBQVEsQ0FBQyxPQUFPLEVBQUUsV0FBVyxDQUFDO2FBQzlCLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDO2FBQ3pCLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFXLEVBQUUsR0FBRyxJQUFXLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQzthQUNwRixFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7YUFDcEYsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQVcsRUFBRSxHQUFHLElBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDNUYsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzVCLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQywyQ0FBMkMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pGLENBQUM7Q0FDRjtBQWxCRCxvQkFrQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9vdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvYm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSw2Q0FBdUM7QUFFdkMsTUFBYSxJQUFJO0lBQ2YsSUFBSSxDQUE0QjtJQUNoQyxRQUFRLENBQVU7SUFFbEIsWUFBWSxVQUFxQztRQUMvQyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztRQUN2QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLG9CQUFPLEVBQUUsRUFBRSxDQUFDO2FBQy9ELFFBQVEsQ0FBQyxPQUFPLEVBQUUsV0FBVyxDQUFDO2FBQzlCLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7YUFDL0YsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQVcsRUFBRSxHQUFHLElBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO2FBQ3BGLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFXLEVBQUUsR0FBRyxJQUFXLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzVGLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTztRQUNYLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM1QixJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsMkNBQTJDLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6RixDQUFDO0NBQ0Y7QUFsQkQsb0JBa0JDIn0=

package/dist/commonjs/lib/types.d.ts

@@ -1,4 +1,5 @@
 import type { WatchEventType, Stats } from 'node:fs';
+import type { EggApplicationCore, EggAppConfig } from 'egg';
 import type { Watcher } from './watcher.js';
 export interface WatcherConfig {
     watcher: {
@@ -15,19 +16,7 @@ export interface ChangeInfo {
     stat?: Stats;
     path: string;
 }
-declare module 'egg' {
-    interface EggWatcherAgent {
-        watcher: Watcher;
-    }
-    interface Agent extends EggWatcherAgent {
-    }
-    interface EggWatcherApplication {
-        watcher: Watcher;
-    }
-    interface Application extends EggWatcherApplication {
-    }
-    interface EggWatcherAppConfig extends WatcherConfig {
-    }
-    interface EggAppConfig extends EggWatcherAppConfig {
-    }
+export interface EggWatcherApplicationCore extends EggApplicationCore {
+    watcher: Watcher;
 }
+export type EggWatcherAppConfig = EggAppConfig & WatcherConfig;

package/dist/esm/lib/boot.d.ts

@@ -1,6 +1,7 @@
-import type { Application, Agent, ILifecycleBoot } from 'egg';
+import type { ILifecycleBoot } from 'egg';
+import { EggWatcherApplicationCore } from './types.js';
 export declare class Boot implements ILifecycleBoot {
     #private;
-    constructor(appOrAgent: Application | Agent);
+    constructor(appOrAgent: EggWatcherApplicationCore);
     didLoad(): Promise<void>;
 }

package/dist/esm/lib/boot.js

@@ -6,8 +6,8 @@ export class Boot {
         this.#app = appOrAgent;
         this.#watcher = this.#app.watcher = this.#app.cluster(Watcher, {})
             .delegate('watch', 'subscribe')
-            .create(appOrAgent.config)
-            .on('info', (msg, ...args) => this.#app.coreLogger.info(msg, ...args))
+            .create(appOrAgent.config);
+        this.#watcher.on('info', (msg, ...args) => this.#app.coreLogger.info(msg, ...args))
             .on('warn', (msg, ...args) => this.#app.coreLogger.warn(msg, ...args))
             .on('error', (msg, ...args) => this.#app.coreLogger.error(msg, ...args));
     }
@@ -16,4 +16,4 @@ export class Boot {
         this.#app.coreLogger.info('[@eggjs/watcher:%s] watcher start success', this.#app.type);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9vdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvYm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXZDLE1BQU0sT0FBTyxJQUFJO0lBQ2YsSUFBSSxDQUFzQjtJQUMxQixRQUFRLENBQVU7SUFFbEIsWUFBWSxVQUErQjtRQUN6QyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztRQUN2QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7YUFDL0QsUUFBUSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUM7YUFDOUIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUM7YUFDekIsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQVcsRUFBRSxHQUFHLElBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO2FBQ3BGLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFXLEVBQUUsR0FBRyxJQUFXLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQzthQUNwRixFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM1RixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDNUIsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLDJDQUEyQyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekYsQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9vdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvYm9vdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXZDLE1BQU0sT0FBTyxJQUFJO0lBQ2YsSUFBSSxDQUE0QjtJQUNoQyxRQUFRLENBQVU7SUFFbEIsWUFBWSxVQUFxQztRQUMvQyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztRQUN2QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7YUFDL0QsUUFBUSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUM7YUFDOUIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3QixJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFXLEVBQUUsR0FBRyxJQUFXLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQzthQUMvRixFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7YUFDcEYsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQVcsRUFBRSxHQUFHLElBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDNUYsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzVCLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQywyQ0FBMkMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pGLENBQUM7Q0FDRiJ9

package/dist/esm/lib/types.d.ts

@@ -1,4 +1,5 @@
 import type { WatchEventType, Stats } from 'node:fs';
+import type { EggApplicationCore, EggAppConfig } from 'egg';
 import type { Watcher } from './watcher.js';
 export interface WatcherConfig {
     watcher: {
@@ -15,19 +16,7 @@ export interface ChangeInfo {
     stat?: Stats;
     path: string;
 }
-declare module 'egg' {
-    interface EggWatcherAgent {
-        watcher: Watcher;
-    }
-    interface Agent extends EggWatcherAgent {
-    }
-    interface EggWatcherApplication {
-        watcher: Watcher;
-    }
-    interface Application extends EggWatcherApplication {
-    }
-    interface EggWatcherAppConfig extends WatcherConfig {
-    }
-    interface EggAppConfig extends EggWatcherAppConfig {
-    }
+export interface EggWatcherApplicationCore extends EggApplicationCore {
+    watcher: Watcher;
 }
+export type EggWatcherAppConfig = EggAppConfig & WatcherConfig;

package/dist/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@eggjs/watcher",
-  "version": "4.0.1"
+  "version": "4.0.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/watcher",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "publishConfig": {
     "access": "public"
   },

package/src/lib/boot.ts

@@ -1,16 +1,17 @@
-import type { Application, Agent, ILifecycleBoot } from 'egg';
+import type { ILifecycleBoot } from 'egg';
+import { EggWatcherApplicationCore } from './types.js';
 import { Watcher } from './watcher.js';
 
 export class Boot implements ILifecycleBoot {
-  #app: Application | Agent;
+  #app: EggWatcherApplicationCore;
   #watcher: Watcher;
 
-  constructor(appOrAgent: Application | Agent) {
+  constructor(appOrAgent: EggWatcherApplicationCore) {
     this.#app = appOrAgent;
     this.#watcher = this.#app.watcher = this.#app.cluster(Watcher, {})
       .delegate('watch', 'subscribe')
-      .create(appOrAgent.config)
-      .on('info', (msg: string, ...args: any[]) => this.#app.coreLogger.info(msg, ...args))
+      .create(appOrAgent.config);
+    this.#watcher.on('info', (msg: string, ...args: any[]) => this.#app.coreLogger.info(msg, ...args))
       .on('warn', (msg: string, ...args: any[]) => this.#app.coreLogger.warn(msg, ...args))
       .on('error', (msg: string, ...args: any[]) => this.#app.coreLogger.error(msg, ...args));
   }

package/src/lib/types.ts

@@ -1,4 +1,5 @@
 import type { WatchEventType, Stats } from 'node:fs';
+import type { EggApplicationCore, EggAppConfig } from 'egg';
 import type { Watcher } from './watcher.js';
 
 export interface WatcherConfig {
@@ -18,18 +19,8 @@ export interface ChangeInfo {
   path: string;
 }
 
-declare module 'egg' {
-  export interface EggWatcherAgent {
-    watcher: Watcher;
-  }
-  export interface Agent extends EggWatcherAgent {}
-
-  export interface EggWatcherApplication {
-    watcher: Watcher;
-  }
-  export interface Application extends EggWatcherApplication {}
-
-  export interface EggWatcherAppConfig extends WatcherConfig {}
-
-  export interface EggAppConfig extends EggWatcherAppConfig {}
+export interface EggWatcherApplicationCore extends EggApplicationCore {
+  watcher: Watcher;
 }
+
+export type EggWatcherAppConfig = EggAppConfig & WatcherConfig;