fix: rename

Koatty · Nov 10, 2023 · 738185d · 738185d
1 parent 45f747b
commit 738185d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 12 deletions.
diff --git a/src/component/BaseController.ts b/src/component/BaseController.ts
@@ -6,7 +6,7 @@
  */
 import { Koatty, KoattyContext } from 'koatty_core';
 import { formatApiData } from '../util/Helper';
-import { ApiInput, ApiOutput, IController } from './Component';
+import { ApiInput, ApiOutput, IController } from './Components';
 
 /**
  * Base controller
@@ -33,10 +33,9 @@ export class BaseController implements IController {
   /**
    * init
    *
-   * @protected
    * @memberof BaseController
    */
-  protected init(...arg: any[]): void {
+  init(...arg: any[]): void {
 
   }
 
@@ -52,7 +51,7 @@ export class BaseController implements IController {
    */
   public ok(msg: string | ApiInput, data?: any, code = 0) {
     const obj: ApiOutput = formatApiData(msg, data, code);
-    return Promise.resolve(obj);
+    return obj;
   }
 
   /**

diff --git a/src/component/BaseService.ts b/src/component/BaseService.ts
@@ -1,14 +1,21 @@
+/*
+ * @Description: 
+ * @Usage: 
+ * @Author: richen
+ * @Date: 2023-11-08 15:25:22
+ * @LastEditTime: 2023-11-10 09:16:35
+ */
 /**
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
  * @ license: BSD (3-Clause)
  * @ version: 2020-05-18 11:24:49
  */
 import { Koatty } from 'koatty_core';
-import { IService } from './Component';
+import { IService } from './Components';
 
 /**
- * Base class
+ * Base service
  *
  * @export
  * @class Base
@@ -32,7 +39,7 @@ export class BaseService implements IService {
    * @protected
    * @memberof BaseController
    */
-  protected init(...arg: any[]): void {
+  init(...arg: any[]): void {
 
   }
 

diff --git a/src/component/Component.ts → src/component/Components.ts b/src/component/Component.ts → src/component/Components.ts
@@ -64,6 +64,11 @@ export function Controller(path = ""): ClassDecorator {
 export interface IController {
   readonly app: Koatty;
   readonly ctx: KoattyContext;
+
+  init(...arg: any[]): void;
+
+  ok(msg: string | ApiInput, data?: any, code?: number): ApiOutput;
+  fail(msg: Error | string | ApiInput, data?: any, code?: number): void;
 }
 
 /**
@@ -111,6 +116,8 @@ export function Service(identifier?: string): ClassDecorator {
  */
 export interface IService {
   readonly app: Koatty;
+
+  init(...arg: any[]): void;
 }
 
 /**

diff --git a/src/core/Loader.ts b/src/core/Loader.ts
@@ -10,7 +10,7 @@ import { AppEvent, AppEventArr, EventHookFunc, Koatty } from 'koatty_core';
 import { LoadConfigs as loadConf } from "koatty_config";
 import { Logger, LogLevelType, SetLogger } from "../util/Logger";
 import { prevent } from "koatty_exception";
-import { IMiddleware, IPlugin } from '../component/Component';
+import { IMiddleware, IPlugin } from '../component/Components';
 import { checkClass, Helper } from "../util/Helper";
 import { IOCContainer, TAGGED_CLS } from "koatty_container";
 import { COMPONENT_SCAN, CONFIGURATION_SCAN } from './Constants';

diff --git a/src/index.ts b/src/index.ts
@@ -5,7 +5,7 @@
  * @ version: 2020-05-18 10:43:05
  */
 export * from "./core/Bootstrap";
-export * from "./component/Component";
+export * from "./component/Components";
 export * from "./component/BaseService";
 export * from "./component/BaseController";
 export * from "koatty_core";

diff --git a/src/middleware/PayloadMiddleware.ts b/src/middleware/PayloadMiddleware.ts
@@ -4,7 +4,7 @@
  * @ license: BSD (3-Clause)
  * @ version: 2020-05-18 11:16:22
  */
-import { IMiddleware } from "../component/Component";
+import { IMiddleware } from "../component/Components";
 import { Koatty } from 'koatty_core';
 import { Payload } from "koatty_payload";
 

diff --git a/src/middleware/TraceMiddleware.ts b/src/middleware/TraceMiddleware.ts
@@ -4,7 +4,7 @@
  * @ license: BSD (3-Clause)
  * @ version: 2020-05-18 11:16:22
  */
-import { IMiddleware } from "../component/Component";
+import { IMiddleware } from "../component/Components";
 import { Koatty } from 'koatty_core';
 import { Trace } from "koatty_trace";
 

diff --git a/src/util/Helper.ts b/src/util/Helper.ts
@@ -5,7 +5,7 @@
  * @ version: 2020-05-10 11:49:15
  */
 import { Helper } from "koatty_lib";
-import { ApiOutput } from "../component/Component";
+import { ApiOutput } from "../component/Components";
 const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 const ARGUMENT_NAMES = /([^\s,]+)/g;
 // export Helper