From a8b7c9fbc1f0e1dff18b36fa7644154e779eec6b Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Thu, 5 Apr 2018 17:34:06 +0800 Subject: [PATCH 01/11] chore(typings): add class EggLoader --- index.d.ts | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/index.d.ts b/index.d.ts index b831cd12e2..0596696822 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1064,4 +1064,35 @@ declare module 'egg' { */ sendToApp(action: string, data: any): void; } + + export interface EggLoaderOptions { + baseDir: string; + typescript?: boolean; + app: Application; + logger: Logger; + plugins?: any; + } + + class EggLoader { + options: EggLoaderOptions; + + constructor(options: EggLoaderOptions); + + private getServerEnv(): EggAppInfo['env']; + + private getServerScope(): EggAppInfo['scope']; + + private getAppname(): EggAppInfo['name']; + + getHomedir(): EggAppInfo['HOME'] + + getAppInfo(): EggAppInfo; + + /** + * @return {Array} framework directories + */ + private getEggPaths(): string[]; + + } + } From 830bc28296b16534d49d835742773776cbe1584c Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Thu, 5 Apr 2018 17:39:44 +0800 Subject: [PATCH 02/11] chore(typings): add class AppWorkerLoader --- index.d.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 0596696822..271560ed3f 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1092,7 +1092,17 @@ declare module 'egg' { * @return {Array} framework directories */ private getEggPaths(): string[]; - } + /** + * App worker process Loader, will load plugins + * @see https://github.com/eggjs/egg-loader + */ + class AppWorkerLoader extends EggLoader { + constructor(options: EggLoaderOptions); + + loadConfig(): void; + + load(): void; + } } From afeb38c3c59aff20765ef3fcdf8e48a0fb1ce72f Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Thu, 5 Apr 2018 17:41:50 +0800 Subject: [PATCH 03/11] chore(typings): add class AgentWorkerLoader --- index.d.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/index.d.ts b/index.d.ts index 271560ed3f..a85cf975ad 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1105,4 +1105,16 @@ declare module 'egg' { load(): void; } + + /** + * Agent worker process loader + * @see https://github.com/eggjs/egg-loader + */ + class AgentWorkerLoader extends EggLoader { + constructor(options: EggLoaderOptions); + + loadConfig(): void; + + load(): void; + } } From 68d78924894571d2b9a57c34db9233a1b29f2f2f Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Thu, 5 Apr 2018 17:46:12 +0800 Subject: [PATCH 04/11] chore(typings): add class Subscription --- index.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.d.ts b/index.d.ts index a85cf975ad..42d01277eb 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1117,4 +1117,6 @@ declare module 'egg' { load(): void; } + + class Subscription extends BaseContextClass { } } From a06d98d4c3fb0003646174f1a503a78e388faab6 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Thu, 5 Apr 2018 19:48:04 +0800 Subject: [PATCH 05/11] fix(typings): Property 'scope' does not exist on type 'EggAppInfo'. --- index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 42d01277eb..5112af2b69 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1073,12 +1073,13 @@ declare module 'egg' { plugins?: any; } + // egg-core class EggLoader { options: EggLoaderOptions; constructor(options: EggLoaderOptions); - private getServerEnv(): EggAppInfo['env']; + private getServerEnv(): string; // not exists EggAppInfo['env'] private getServerScope(): EggAppInfo['scope']; From 08cb99ea5797703f3f0dbba6226615385181f8f7 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Thu, 5 Apr 2018 21:11:27 +0800 Subject: [PATCH 06/11] chore(typings): change elements of EggAppConfig['view'] optional root, cache, defaultExtension --- index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.d.ts b/index.d.ts index 5112af2b69..c0474b5ac6 100644 --- a/index.d.ts +++ b/index.d.ts @@ -420,9 +420,9 @@ declare module 'egg' { } & PlainObject; view: { - root: string; - cache: boolean; - defaultExtension: string; + root?: string; + cache?: boolean; // default true + defaultExtension?: string; defaultViewEngine: string; mapping: PlainObject; }; From 0eb73c4d3250137529aade344511ec3cd0c517fd Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Fri, 6 Apr 2018 17:43:08 +0800 Subject: [PATCH 07/11] chore(typings): revert to 6c32d1098fcc1 PowerPartial support by TypeScript v2.8.0+ --- index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.d.ts b/index.d.ts index c0474b5ac6..5112af2b69 100644 --- a/index.d.ts +++ b/index.d.ts @@ -420,9 +420,9 @@ declare module 'egg' { } & PlainObject; view: { - root?: string; - cache?: boolean; // default true - defaultExtension?: string; + root: string; + cache: boolean; + defaultExtension: string; defaultViewEngine: string; mapping: PlainObject; }; From 1d40935985977a81c4fca9f9279d33cf9c25cb75 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Mon, 9 Apr 2018 11:03:07 +0800 Subject: [PATCH 08/11] chore(typings): comment private method of EggLoader out --- index.d.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.d.ts b/index.d.ts index 5112af2b69..06bac8e279 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1079,12 +1079,6 @@ declare module 'egg' { constructor(options: EggLoaderOptions); - private getServerEnv(): string; // not exists EggAppInfo['env'] - - private getServerScope(): EggAppInfo['scope']; - - private getAppname(): EggAppInfo['name']; - getHomedir(): EggAppInfo['HOME'] getAppInfo(): EggAppInfo; @@ -1092,7 +1086,13 @@ declare module 'egg' { /** * @return {Array} framework directories */ - private getEggPaths(): string[]; + // private getEggPaths(): string[]; + + // private getServerEnv(): string; // not exists EggAppInfo['env'] + + // private getServerScope(): EggAppInfo['scope']; + + // private getAppname(): EggAppInfo['name']; } /** From 71424c8c5a249b743c891945d72a6dcb613adc35 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Tue, 10 Apr 2018 19:36:26 +0800 Subject: [PATCH 09/11] chore(typings): remove private method --- index.d.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/index.d.ts b/index.d.ts index 06bac8e279..ba5bc60d7f 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1082,17 +1082,6 @@ declare module 'egg' { getHomedir(): EggAppInfo['HOME'] getAppInfo(): EggAppInfo; - - /** - * @return {Array} framework directories - */ - // private getEggPaths(): string[]; - - // private getServerEnv(): string; // not exists EggAppInfo['env'] - - // private getServerScope(): EggAppInfo['scope']; - - // private getAppname(): EggAppInfo['name']; } /** From 8bc69a1449c080724bb1ce997c847e219c0e3cc9 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Tue, 10 Apr 2018 19:57:01 +0800 Subject: [PATCH 10/11] chore(typings): export types --- index.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.d.ts b/index.d.ts index ba5bc60d7f..490e4d098e 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1074,7 +1074,7 @@ declare module 'egg' { } // egg-core - class EggLoader { + export class EggLoader { options: EggLoaderOptions; constructor(options: EggLoaderOptions); @@ -1086,9 +1086,9 @@ declare module 'egg' { /** * App worker process Loader, will load plugins - * @see https://github.com/eggjs/egg-loader + * @see https://github.com/eggjs/egg-core */ - class AppWorkerLoader extends EggLoader { + export class AppWorkerLoader extends EggLoader { constructor(options: EggLoaderOptions); loadConfig(): void; @@ -1100,7 +1100,7 @@ declare module 'egg' { * Agent worker process loader * @see https://github.com/eggjs/egg-loader */ - class AgentWorkerLoader extends EggLoader { + export class AgentWorkerLoader extends EggLoader { constructor(options: EggLoaderOptions); loadConfig(): void; @@ -1108,5 +1108,5 @@ declare module 'egg' { load(): void; } - class Subscription extends BaseContextClass { } + export class Subscription extends BaseContextClass { } } From 73cd07177a84a21d35240bdb3af90d5651aa3e77 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Wed, 13 Jun 2018 17:11:42 +0800 Subject: [PATCH 11/11] chore: prune --- index.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 490e4d098e..b6854f6a56 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1108,5 +1108,4 @@ declare module 'egg' { load(): void; } - export class Subscription extends BaseContextClass { } }