refactor: format code

.gitignore

@@ -11,9 +11,7 @@ package-lock.json
 /lib/**/*.js
 /test/**/*.js
 /config/**/*.js
-/scripts/**/*.js
 *.d.ts
 *.js.map
 .vscode
-!typings/**/*.d.ts
 .nyc_output

.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: node_js
 node_js:
   - '8'
+  - '10'
 install:
   - npm i npminstall && npminstall
 script:

app/extend/application.ts

@@ -15,5 +15,5 @@ export default {
     return function <T = any>(clsType: any) {
       return getInstance<T>(clsType, this, undefined);
     };
-  }
+  },
 };

app/extend/context.ts

@@ -14,5 +14,5 @@ export default {
     return function <T = any>(clsType: any) {
       return getInstance<T>(clsType, this.app, this);
     };
-  }
+  },
 };

appveyor.yml

@@ -1,6 +1,7 @@
 environment:
   matrix:
     - nodejs_version: '8'
+    - nodejs_version: '10'
 
 install:
   - ps: Install-Product node $env:nodejs_version

config/config.default.ts

@@ -2,5 +2,5 @@ export default {
   aop: {
     useCtxProxyForAppComponent: false,
     autoRegisterToCtx: false,
-  }
+  },
 };

lib/appctx.ts

@@ -3,7 +3,7 @@ export function setCtx(target: any, ctx: any) {
   Object.defineProperty(target, ctxSymbol, {
     enumerable: false,
     writable: false,
-    value: ctx
+    value: ctx,
   });
 }
 export function getCtx(target: any) {
@@ -15,7 +15,7 @@ export function setApp(target: any, app: any) {
   Object.defineProperty(target, appSymbol, {
     enumerable: false,
     writable: false,
-    value: app
+    value: app,
   });
 }
 export function getApp(target: any) {

lib/aspect.ts

@@ -22,18 +22,18 @@ export interface AspectPoint<T = any> {
 }
 
 function run(func: any, context: FunctionContext) {
-  func && func(context);
+  if (func) func(context);
 }
 
-function createContext(inst: any, fn: Function, args: any[]) {
+function createContext(inst: any, fn: (a: any) => void, args: any[]) {
   return {
     functionName: (fn as any).__name || fn.name,
     inst,
     args,
   } as FunctionContext;
 }
 
-export function funcWrapper(point: AspectPoint, fn: Function) {
+export function funcWrapper(point: AspectPoint, fn: (a: any) => void) {
   let newFn: any;
 
   if (isGeneratorFunction(fn)) {
@@ -60,7 +60,7 @@ export function funcWrapper(point: AspectPoint, fn: Function) {
         run(point.before, context);
         context.ret = fn.apply(this, context.args);
         if (context.ret instanceof Promise) {
-          context.ret = context.ret.then((ret) => {
+          context.ret = context.ret.then(ret => {
             context.ret = ret;
             run(point.after, context);
             return context.ret;
@@ -108,9 +108,9 @@ export function aspect<T = any>(point: AspectPoint<T> = {}) {
       get() {
         return fn;
       },
-      set(value: Function) {
-        fn = funcWrapper(point, value);
-      }
+      set(v: (a: any) => void) {
+        fn = funcWrapper(point, v);
+      },
     };
     Object.defineProperty(target, key, value);
     return value;

lib/decorators.ts

@@ -61,7 +61,7 @@ export function inject(type?: any) {
         const app = getApp(this) || (ctx && ctx.app);
         value = getInstance(clsType, app, ctx);
         return target[key];
-      }
+      },
     });
   };
 }
@@ -79,7 +79,7 @@ export function lazyInject(type?: any) {
     const defaultValue = descriptor && descriptor.value;
     Object.defineProperty(target, key, {
       configurable: true,
-      get: function () {
+      get () {
         const ctx = getCtx(this);
         const app = getApp(this) || (ctx && ctx.app);
         const value = getInstance(clsType, app, ctx);

lib/getInstance.ts

@@ -31,7 +31,7 @@ export function injectInstance(ioc: IocContext, inst: any, app: any, ctx: any) {
 }
 
 export function getInstance<T = undefined, KeyType = any>(clsType: KeyType, app: any, ctx?: any): GetReturnType<T, KeyType> {
-  let ioc: IocContext = undefined;
+  let ioc: IocContext;
 
   const { useCtxProxyForAppComponent, autoRegisterToCtx } = app.config.aop;
 
@@ -56,6 +56,7 @@ export function getInstance<T = undefined, KeyType = any>(clsType: KeyType, app:
       }
       ioc = ctx.iocContext;
       break;
+    default:
   }
 
   let value: any = ioc.get(clsType);
@@ -82,7 +83,7 @@ export function getInstance<T = undefined, KeyType = any>(clsType: KeyType, app:
               return target[property];
             }
             return typeof target[property] === 'function' ? target[property].bind(value) : target[property];
-          }
+          },
         });
 
         value = ciHooks.reduce((pre, cur) => cur(pre, app), value);
@@ -97,6 +98,8 @@ export function getInstance<T = undefined, KeyType = any>(clsType: KeyType, app:
       value = ciHooks.reduce((pre, cur) => cur(pre, app, ctx), new targetClsType(ctx));
       setCtx(value, ctx);
       break;
+
+    default:
   }
 
   ioc.register(value, clsType as any);

lib/index.ts

@@ -3,14 +3,3 @@ export { getApp, getCtx } from './appctx';
 export * from './getInstance';
 export { typeLoader } from './typeLoader';
 export * from './aspect';
-
-import 'egg';
-import { GetReturnType } from 'power-di';
-declare module 'egg' {
-  export interface Context {
-    getComponent<T = undefined, KeyType= any>(clsType: KeyType): GetReturnType<T, KeyType>;
-  }
-  export interface Application {
-    getComponent<T = undefined, KeyType= any>(clsType: KeyType): GetReturnType<T, KeyType>;
-  }
-}

lib/typeLoader.ts

@@ -1,11 +1,11 @@
 import { IocContext } from 'power-di';
 import { contextTypeSymbol, InstanceSource } from './getInstance';
 
-export const typeLoader = new IocContext;
+export const typeLoader = new IocContext();
 
 export function register(clsType: any, keyType: any, from: InstanceSource) {
   Object.defineProperty(clsType, contextTypeSymbol, {
-    value: from
+    value: from,
   });
   typeLoader.register(clsType, keyType, { autoNew: false });
 }

package.json

@@ -16,50 +16,50 @@
   "eggPlugin": {
     "name": "aop"
   },
-  "egg": {
-    "typescript": true
-  },
   "dependencies": {
-    "power-di": "^1.4.16",
-    "tslib": "^1.9.0"
+    "power-di": "^1.4.16"
   },
   "devDependencies": {
     "@types/mocha": "^5.1.0",
     "@types/node": "^9.6.5",
     "@types/supertest": "^2.0.4",
     "autod": "^3.0.1",
     "co": "^4.6.0",
+    "egg": "^2.7.1",
     "egg-bin": "^4.7.0",
     "egg-ci": "^1.8.0",
     "egg-mock": "^3.17.0",
     "egg-ts-helper": "^1.6.0",
-    "egg": "^2.7.1",
     "rimraf": "^2.6.2",
     "supertest": "^3.0.0",
-    "tslib": "^1.9.0",
-    "tslint": "^5.9.1",
-    "typescript": "~2.8.1"
+    "tslint": "^5.12.0",
+    "tslint-config-egg": "^1.0.0",
+    "typescript": "^2.8.1"
+  },
+  "egg": {
+    "typescript": true
   },
   "engines": {
     "node": ">=8.9.0"
   },
   "scripts": {
+    "lint": "tslint -p tsconfig.json",
     "test": "npm run lint -- --fix && npm run test-local",
     "test-local": "egg-bin test -r egg-ts-helper/register",
     "cov": "egg-bin cov -r egg-ts-helper/register",
-    "lint": "tslint .",
     "ci": "npm run cov",
     "autod": "autod",
-    "ts": "rimraf app/**/*.js lib/**/*.js && tsc",
+    "clean": "git clean -xf",
+    "ts": "npm run clean && ets && tsc",
     "prepublish": "npm run ts",
     "postpublish": "node scripts/published.js"
   },
   "ci": {
-    "version": "8"
+    "version": "8, 10"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/zhang740/egg-aop.git"
+    "url": "https://github.com/eggjs/egg-aop.git"
   },
   "eslintIgnore": [
     "coverage"
@@ -73,7 +73,7 @@
   "author": "zhang740",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/zhang740/egg-aop/issues"
+    "url": "https://github.com/eggjs/egg-aop/issues"
   },
-  "homepage": "https://github.com/zhang740/egg-aop#readme"
+  "homepage": "https://github.com/eggjs/egg-aop#readme"
 }

scripts/published.ts → scripts/published.js

@@ -3,5 +3,5 @@ const shell = require('child_process').execSync;
 const package = require('../package.json');
 
 shell(`git tag ${package.version}`);
-shell(`git push`);
+shell('git push');
 shell(`git push origin ${package.version}`);