@eggjs/schedule 6.0.0-beta.15 → 6.0.0-beta.18

package/dist/agent.d.ts

@@ -1,10 +1,10 @@
-import Agent$1 from "./app/extend/agent.js";
+import ScheduleAgent from "./app/extend/agent.js";
 import { ILifecycleBoot } from "egg";
 
 //#region src/agent.d.ts
 declare class Boot implements ILifecycleBoot {
   #private;
-  constructor(agent: Agent$1);
+  constructor(agent: ScheduleAgent);
   configDidLoad(): Promise<void>;
   serverDidReady(): Promise<void>;
   beforeClose(): Promise<void>;

package/dist/app/extend/agent.d.ts

@@ -1,10 +1,10 @@
 import { BaseStrategy } from "../../lib/strategy/base.js";
 import { TimerStrategy } from "../../lib/strategy/timer.js";
 import { Schedule } from "../../lib/schedule.js";
-import { Agent as Agent$1 } from "egg";
+import { Agent } from "egg";
 
 //#region src/app/extend/agent.d.ts
-declare class Agent extends Agent$1 {
+declare class ScheduleAgent extends Agent {
   /**
    * @member agent#ScheduleStrategy
    */
@@ -19,4 +19,4 @@ declare class Agent extends Agent$1 {
   get schedule(): Schedule;
 }
 //#endregion
-export { Agent as default };
+export { ScheduleAgent as default };

package/dist/app/extend/agent.js

@@ -1,11 +1,11 @@
 import { BaseStrategy } from "../../lib/strategy/base.js";
 import { TimerStrategy } from "../../lib/strategy/timer.js";
 import { Schedule } from "../../lib/schedule.js";
-import { Agent as Agent$1 } from "egg";
+import { Agent } from "egg";
 
 //#region src/app/extend/agent.ts
 const SCHEDULE = Symbol("agent schedule");
-var Agent = class extends Agent$1 {
+var ScheduleAgent = class extends Agent {
 	/**
 	* @member agent#ScheduleStrategy
 	*/
@@ -29,4 +29,4 @@ var Agent = class extends Agent$1 {
 };
 
 //#endregion
-export { Agent as default };
+export { ScheduleAgent as default };

package/dist/app/extend/application.d.ts

@@ -1,16 +1,12 @@
 import { ScheduleWorker } from "../../lib/schedule_worker.js";
-import { Application as Application$1 } from "egg";
+import { Application } from "egg";
 
 //#region src/app/extend/application.d.ts
-declare class Application extends Application$1 {
+declare class ScheduleApplication extends Application {
   /**
    * @member app#schedule
    */
   get scheduleWorker(): ScheduleWorker;
-  /**
-   * For unittest only - run a specific schedule task
-   */
-  runSchedule?(schedulePath: string, ...args: any[]): Promise<any>;
 }
 //#endregion
-export { Application as default };
+export { ScheduleApplication as default };

package/dist/app/extend/application.js

@@ -1,9 +1,9 @@
 import { ScheduleWorker } from "../../lib/schedule_worker.js";
-import { Application as Application$1 } from "egg";
+import { Application } from "egg";
 
 //#region src/app/extend/application.ts
 const SCHEDULE_WORKER = Symbol("application scheduleWorker");
-var Application = class extends Application$1 {
+var ScheduleApplication = class extends Application {
 	/**
 	* @member app#schedule
 	*/
@@ -15,4 +15,4 @@ var Application = class extends Application$1 {
 };
 
 //#endregion
-export { Application as default };
+export { ScheduleApplication as default };

package/dist/app/extend/application.unittest.d.ts

@@ -1,13 +1,8 @@
-import Application from "./application.js";
+import ScheduleApplication from "./application.js";
 
 //#region src/app/extend/application.unittest.d.ts
-declare class ApplicationUnittest extends Application {
+declare class ScheduleApplicationUnittest extends ScheduleApplication {
   runSchedule(schedulePath: string, ...args: any[]): Promise<void>;
 }
-declare module '@eggjs/mock' {
-  interface MockApplication {
-    runSchedule(schedulePath: string, ...args: any[]): Promise<any>;
-  }
-}
 //#endregion
-export { ApplicationUnittest as default };
+export { ScheduleApplicationUnittest as default };

package/dist/app/extend/application.unittest.js

@@ -1,11 +1,11 @@
-import Application from "./application.js";
+import ScheduleApplication from "./application.js";
 import { debuglog } from "node:util";
 import path from "node:path";
 import { importResolve } from "@eggjs/utils";
 
 //#region src/app/extend/application.unittest.ts
 const debug = debuglog("egg/schedule/app");
-var ApplicationUnittest = class extends Application {
+var ScheduleApplicationUnittest = class extends ScheduleApplication {
 	async runSchedule(schedulePath, ...args) {
 		debug("[runSchedule] start schedulePath: %o, args: %o", schedulePath, args);
 		const config = this.config;
@@ -43,4 +43,4 @@ var ApplicationUnittest = class extends Application {
 };
 
 //#endregion
-export { ApplicationUnittest as default };
+export { ScheduleApplicationUnittest as default };

package/dist/app.d.ts

@@ -1,10 +1,10 @@
-import Application$1 from "./app/extend/application.js";
+import ScheduleApplication from "./app/extend/application.js";
 import { ILifecycleBoot } from "egg";
 
 //#region src/app.d.ts
 declare class Boot implements ILifecycleBoot {
   #private;
-  constructor(app: Application$1);
+  constructor(app: ScheduleApplication);
   configDidLoad(): Promise<void>;
 }
 //#endregion

package/dist/config/config.default.d.ts

@@ -1,6 +1,20 @@
+import { ParserOptions } from "cron-parser";
 import { PartialEggConfig } from "egg";
 
 //#region src/config/config.default.d.ts
+interface EggScheduleConfig {
+  type?: 'worker' | 'all';
+  interval?: string | number;
+  cron?: string;
+  cronOptions?: ParserOptions;
+  immediate?: boolean;
+  disable?: boolean;
+  env?: string[];
+  /**
+   * custom additional directory, full path
+   */
+  directory: string[];
+}
 declare const _default: PartialEggConfig;
 //#endregion
-export { _default as default };
+export { EggScheduleConfig, _default as default };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { EggScheduleConfig, EggScheduleItem, EggScheduleJobInfo, EggScheduleTask } from "./lib/types.js";
+import { EggScheduleItem, EggScheduleJobInfo, EggScheduleTask } from "./lib/types.js";
 import { Schedule } from "./lib/schedule.js";
-import Agent from "./app/extend/agent.js";
+import ScheduleAgent from "./app/extend/agent.js";
 import { ScheduleWorker } from "./lib/schedule_worker.js";
-import Application from "./app/extend/application.js";
-import ApplicationUnittest from "./app/extend/application.unittest.js";
-export { Agent, Application, ApplicationUnittest, EggScheduleConfig, EggScheduleItem, EggScheduleJobInfo, EggScheduleTask, Schedule, ScheduleWorker };
+import ScheduleApplication from "./app/extend/application.js";
+import ScheduleApplicationUnittest from "./app/extend/application.unittest.js";
+export { ScheduleAgent as Agent, ScheduleApplication as Application, ScheduleApplicationUnittest as ApplicationUnittest, EggScheduleItem, EggScheduleJobInfo, EggScheduleTask, Schedule, ScheduleWorker };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { Schedule } from "./lib/schedule.js";
-import Agent from "./app/extend/agent.js";
+import ScheduleAgent from "./app/extend/agent.js";
 import { ScheduleWorker } from "./lib/schedule_worker.js";
-import Application from "./app/extend/application.js";
-import ApplicationUnittest from "./app/extend/application.unittest.js";
+import ScheduleApplication from "./app/extend/application.js";
+import ScheduleApplicationUnittest from "./app/extend/application.unittest.js";
 
-export { Agent, Application, ApplicationUnittest, Schedule, ScheduleWorker };
+export { ScheduleAgent as Agent, ScheduleApplication as Application, ScheduleApplicationUnittest as ApplicationUnittest, Schedule, ScheduleWorker };

package/dist/lib/schedule.d.ts

@@ -1,12 +1,12 @@
 import { EggScheduleItem, EggScheduleJobInfo } from "./types.js";
 import { BaseStrategy } from "./strategy/base.js";
-import Agent from "../app/extend/agent.js";
+import ScheduleAgent from "../app/extend/agent.js";
 
 //#region src/lib/schedule.d.ts
 declare class Schedule {
   #private;
   closed: boolean;
-  constructor(agent: Agent);
+  constructor(agent: ScheduleAgent);
   /**
    * register a custom Schedule Strategy
    * @param {String} type - strategy type

package/dist/lib/schedule_worker.d.ts

@@ -1,11 +1,11 @@
 import { EggScheduleItem } from "./types.js";
-import Application from "../app/extend/application.js";
+import ScheduleApplication from "../app/extend/application.js";
 
 //#region src/lib/schedule_worker.d.ts
 declare class ScheduleWorker {
   #private;
   scheduleItems: Record<string, EggScheduleItem>;
-  constructor(app: Application);
+  constructor(app: ScheduleApplication);
   init(): Promise<void>;
   registerSchedule(scheduleItem: EggScheduleItem): void;
   unregisterSchedule(key: string): void;

package/dist/lib/strategy/base.d.ts

@@ -1,16 +1,17 @@
-import { EggScheduleConfig, EggScheduleJobInfo } from "../types.js";
-import Agent$1 from "../../app/extend/agent.js";
+import { EggScheduleConfig } from "../../config/config.default.js";
+import { EggScheduleJobInfo } from "../types.js";
+import ScheduleAgent from "../../app/extend/agent.js";
 import { EggLogger } from "egg";
 
 //#region src/lib/strategy/base.d.ts
 declare class BaseStrategy {
-  protected agent: Agent$1;
+  protected agent: ScheduleAgent;
   protected scheduleConfig: EggScheduleConfig;
   protected key: string;
   protected logger: EggLogger;
   protected closed: boolean;
   count: number;
-  constructor(scheduleConfig: EggScheduleConfig, agent: Agent$1, key: string);
+  constructor(scheduleConfig: EggScheduleConfig, agent: ScheduleAgent, key: string);
   /** keep compatibility */
   get schedule(): EggScheduleConfig;
   start(): Promise<void>;

package/dist/lib/strategy/timer.d.ts

@@ -1,6 +1,6 @@
-import { EggScheduleConfig } from "../types.js";
+import { EggScheduleConfig } from "../../config/config.default.js";
 import { BaseStrategy } from "./base.js";
-import Agent from "../../app/extend/agent.js";
+import ScheduleAgent from "../../app/extend/agent.js";
 import { CronExpression } from "cron-parser";
 import safeTimers from "safe-timers";
 
@@ -8,7 +8,7 @@ import safeTimers from "safe-timers";
 declare abstract class TimerStrategy extends BaseStrategy {
   #private;
   protected cronInstance?: CronExpression;
-  constructor(scheduleConfig: EggScheduleConfig, agent: Agent, key: string);
+  constructor(scheduleConfig: EggScheduleConfig, agent: ScheduleAgent, key: string);
   protected handler(): void;
   start(): Promise<void>;
   onJobStart(): void;

package/dist/lib/types.d.ts

@@ -1,24 +1,6 @@
-import { ParserOptions } from "cron-parser";
+import { EggScheduleConfig } from "../config/config.default.js";
 
 //#region src/lib/types.d.ts
-
-/**
- * Schedule Config
- * @see https://www.eggjs.org/zh-CN/basics/schedule
- */
-interface EggScheduleConfig {
-  type?: 'worker' | 'all';
-  interval?: string | number;
-  cron?: string;
-  cronOptions?: ParserOptions;
-  immediate?: boolean;
-  disable?: boolean;
-  env?: string[];
-  /**
-   * custom additional directory, full path
-   */
-  directory: string[];
-}
 type EggScheduleTask = (ctx: any, ...args: any[]) => Promise<void>;
 interface EggScheduleItem {
   schedule: EggScheduleConfig;
@@ -35,10 +17,5 @@ interface EggScheduleJobInfo {
   message?: string;
   rt?: number;
 }
-declare module 'egg' {
-  interface EggAppConfig {
-    schedule: EggScheduleConfig;
-  }
-}
 //#endregion
-export { EggScheduleConfig, EggScheduleItem, EggScheduleJobInfo, EggScheduleTask };
+export { EggScheduleItem, EggScheduleJobInfo, EggScheduleTask };

package/dist/types.d.ts

@@ -0,0 +1,17 @@
+import { EggScheduleConfig } from "./config/config.default.js";
+
+//#region src/types.d.ts
+declare module 'egg' {
+  interface EggAppConfig {
+    /**
+     * Schedule Config
+     * @see https://www.eggjs.org/zh-CN/basics/schedule
+     */
+    schedule: EggScheduleConfig;
+  }
+}
+declare module '@eggjs/mock' {
+  interface MockApplication {
+    runSchedule(schedulePath: string, ...args: any[]): Promise<any>;
+  }
+}

package/dist/types.js

@@ -0,0 +1 @@
+export {  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/schedule",
-  "version": "6.0.0-beta.15",
+  "version": "6.0.0-beta.18",
   "publishConfig": {
     "access": "public"
   },
@@ -33,21 +33,20 @@
     "is-type-of": "^2.2.0",
     "safe-timers": "^1.1.0",
     "utility": "^2.5.0",
-    "@eggjs/utils": "5.0.0-beta.15"
+    "@eggjs/utils": "5.0.0-beta.18"
   },
   "peerDependencies": {
-    "egg": "4.1.0-beta.15"
+    "egg": "4.1.0-beta.18"
   },
   "devDependencies": {
     "@types/safe-timers": "^1.1.2",
-    "egg-tracer": "^2.1.0",
-    "oxlint": "^1.18.0",
+    "oxlint": "^1.19.0",
     "tsdown": "^0.15.4",
     "typescript": "5.9.2",
     "vitest": "4.0.0-beta.13",
-    "@eggjs/bin": "8.0.0-beta.15",
-    "@eggjs/tsconfig": "3.1.0-beta.15",
-    "@eggjs/mock": "7.0.0-beta.15"
+    "@eggjs/bin": "8.0.0-beta.18",
+    "@eggjs/mock": "7.0.0-beta.18",
+    "@eggjs/tsconfig": "3.1.0-beta.18"
   },
   "author": "dead_horse",
   "license": "MIT",
@@ -68,6 +67,7 @@
     "./lib/strategy/timer": "./dist/lib/strategy/timer.js",
     "./lib/strategy/worker": "./dist/lib/strategy/worker.js",
     "./lib/types": "./dist/lib/types.js",
+    "./types": "./dist/types.js",
     "./package.json": "./package.json"
   },
   "files": [