Lint Code

.travis.yml

@@ -11,6 +11,7 @@ services:
 
 install:
   - "npm install"
+  - "npm run lint"
 
 script:
   - "npm run tsc && npm test"

package.json

@@ -15,7 +15,8 @@
     "test-spec": "cross-env NODE_ENV=test TS_NODE_PROJECT=./test/tsconfig.json mocha",
     "test-cov": "nyc npm run test-spec && nyc report",
     "test": "npm run test-cov",
-    "report-coverage": "cat ./coverage/lcov.info | coveralls"
+    "report-coverage": "cat ./coverage/lcov.info | coveralls",
+    "lint": "tslint src/**/*.ts test/**/*.ts"
   },
   "keywords": [
     "PandoraBox",

src/express.ts

@@ -1,13 +1,12 @@
-import * as express from "express";
-import session = require("express-session");
+import { config } from "@utils/config";
+import { isTest } from "@utils/env";
 import * as bodyParser from "body-parser";
-import * as cookieParser from "cookie-parser";
 import connectRedis = require("connect-redis");
-import { config } from "@utils/config";
+import * as cookieParser from "cookie-parser";
+import * as express from "express";
+import session = require("express-session");
 import helmet = require("helmet");
-
 import { error } from "./middlewares/logger.middleware";
-import { isTest } from "@utils/env";
 
 const RedisStore = connectRedis(session);
 

src/index.ts

@@ -1,11 +1,11 @@
 import { NestFactory } from "@nestjs/core";
-import { SwaggerModule, DocumentBuilder } from "@nestjs/swagger";
+import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger";
+import { ValidationPipe } from "@pipes/validation";
 import { config } from "@utils/config";
+import { isDevelopment } from "@utils/env";
+import { systemLogger } from "@utils/log";
 import { initExpress } from "./express";
 import { ApplicationModule } from "./modules/app.module";
-import { ValidationPipe } from "@pipes/validation";
-import { systemLogger } from "@utils/log";
-import { isDevelopment } from "@utils/env";
 
 const bootstrap = async () => {
     const server = initExpress();

src/interceptors/regexp-count-check.interceptor.ts

@@ -1,7 +1,7 @@
-import { Interceptor, NestInterceptor, BadRequestException } from "@nestjs/common";
-import { Observable } from "rxjs/Observable";
+import { BadRequestException, Interceptor, NestInterceptor } from "@nestjs/common";
 import { RegexpsService } from "@services/regexps";
 import * as fs from "fs-extra";
+import { Observable } from "rxjs/Observable";
 
 @Interceptor()
 export class RegexpCountCheckInterceptor implements NestInterceptor {

src/middlewares/logger.middleware.ts

@@ -1,10 +1,10 @@
-import { RequestHandler, ErrorRequestHandler, Request } from "express";
 import {
-    Middleware, NestMiddleware, ExpressMiddleware
+    ExpressMiddleware, Middleware, NestMiddleware
 } from "@nestjs/common";
 import {
-    getMeta, downloadLogger, apiLogger, accessLogger, systemLogger
+    accessLogger, apiLogger, downloadLogger, getMeta, systemLogger
 } from "@utils/log";
+import { ErrorRequestHandler, Request, RequestHandler } from "express";
 
 const access: RequestHandler = (req, res, next) => {
     // const logger = accessLogger;

src/middlewares/reloadSession.middleware.ts

@@ -1,5 +1,5 @@
 import { ExpressMiddleware, Middleware, NestMiddleware } from "@nestjs/common";
-import { Request, Response, NextFunction } from "express";
+import { NextFunction, Request, Response } from "express";
 
 /**
  * 延长Session过期时间

src/middlewares/roles.middleware.ts

@@ -1,11 +1,11 @@
+import { Model as TokensModel } from "@models/Token";
 import {
-    Middleware, NestMiddleware, ExpressMiddleware, HttpStatus,
+    ExpressMiddleware, HttpStatus, Middleware, NestMiddleware,
     UnauthorizedException
 } from "@nestjs/common";
-import { Request, Response } from "express";
-import basicAuth = require("basic-auth");
-import { Model as TokensModel } from "@models/Token";
 import { TokensService } from "@services/tokens";
+import basicAuth = require("basic-auth");
+import { Request, Response } from "express";
 
 @Middleware()
 export class RolesMiddleware implements NestMiddleware {

src/middlewares/upload.middleware.ts

@@ -1,8 +1,8 @@
 import {
-    Middleware, NestMiddleware, ExpressMiddleware, HttpStatus
+    ExpressMiddleware, HttpStatus, Middleware, NestMiddleware
 } from "@nestjs/common";
-import multer  = require("multer");
 import { config } from "@utils/config";
+import multer  = require("multer");
 
 @Middleware()
 export class UploadFileMiddleware implements NestMiddleware {

src/models/Categroy.ts

@@ -1,11 +1,11 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
-import { Base, IDoc, IDocRaw, ObjectId, MODIFY_MOTHODS, existsValidator } from "@models/common";
-import { IValues, Flag as ValueFlag } from "@models/Value";
 import { DEF_PER_COUNT } from "@dtos/page";
-import { isArray } from "util";
-import { reduce, includes, difference } from "lodash";
-import { MongoError } from "mongodb";
+import { Base, existsValidator, IDoc, IDocRaw, MODIFY_MOTHODS, ObjectId } from "@models/common";
+import { Flag as ValueFlag, IValues } from "@models/Value";
 import newCache  = require("@utils/newCache");
+import { difference, includes, reduce } from "lodash";
+import { MongoError } from "mongodb";
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
+import { isArray } from "util";
 
 export const FLAG = "categories";
 

src/models/Collection.ts

@@ -1,10 +1,10 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
 import {
-    Base, IDoc, IDocRaw, ObjectId, MODIFY_MOTHODS, existsValidator
+    Base, existsValidator, IDoc, IDocRaw, MODIFY_MOTHODS, ObjectId
 } from "@models/common";
-import { IGoods, FLAG as GoodFlag, Model as GoodsModels } from "@models/Good";
-import { IUser, FLAG as UserFlag } from "@models/User";
+import { FLAG as GoodFlag, IGoods, Model as GoodsModels } from "@models/Good";
+import { FLAG as UserFlag, IUser } from "@models/User";
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
 
 export const FLAG = "collections";
 

src/models/Good.ts

@@ -1,11 +1,11 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
+import { FLAG as CategoryFlag, ICategory } from "@models/Categroy";
 import {
-    Base, IDoc, IDocRaw, ObjectId, MODIFY_MOTHODS, existsValidator
+    Base, existsValidator, IDoc, IDocRaw, MODIFY_MOTHODS, ObjectId
 } from "@models/common";
-import { IValues, Flag as ValueFlag } from "@models/Value";
-import { IUser, FLAG as UserFlag } from "@models/User";
-import { ICategory, FLAG as CategoryFlag } from "@models/Categroy";
+import { FLAG as UserFlag, IUser } from "@models/User";
+import { Flag as ValueFlag, IValues } from "@models/Value";
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
 
 export const FLAG = "goods";
 

src/models/Log.ts

@@ -1,6 +1,6 @@
-import { model, SchemaDefinition, Model as M } from "mongoose";
-import { Base, IDoc, IDocRaw } from "./common";
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition } from "mongoose";
+import { Base, IDoc, IDocRaw } from "./common";
 
 const Definition: SchemaDefinition = {
     key: { type: String, required: true },

src/models/Regexp.ts

@@ -1,11 +1,11 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
+import { DEF_PER_COUNT } from "@dtos/page";
+import { FLAG as CF, ICategory, Model as CM } from "@models/Categroy";
 import {
-    Base, IDoc, IDocRaw, ObjectId, MODIFY_MOTHODS, existsValidator
+    Base, existsValidator, IDoc, IDocRaw, MODIFY_MOTHODS, ObjectId
 } from "@models/common";
-import { ICategory, FLAG as CF, Model as CM } from "@models/Categroy";
-import { DEF_PER_COUNT } from "@dtos/page";
 import isRegExp = require("@utils/isRegExp");
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
 
 import { INewRegexp } from "../modules/admin/regexps/regexps.dto";
 

src/models/System.ts

@@ -1,6 +1,6 @@
-import { model, SchemaDefinition, Model as M } from "mongoose";
-import { Base, IDoc, IDocRaw, MODIFY_MOTHODS } from "./common";
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition } from "mongoose";
+import { Base, IDoc, IDocRaw, MODIFY_MOTHODS } from "./common";
 
 export const FLAG = "systems";
 

src/models/Tag.ts

@@ -1,4 +1,4 @@
-import { model, SchemaDefinition, Model as M } from "mongoose";
+import { model, Model as M, SchemaDefinition } from "mongoose";
 import { Base, IDoc, IDocRaw } from "./common";
 
 const Definition: SchemaDefinition = {

src/models/Token.ts

@@ -1,9 +1,9 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
 import {
-    Base, IDoc, IDocRaw, ObjectId, MODIFY_MOTHODS, existsValidator
+    Base, existsValidator, IDoc, IDocRaw, MODIFY_MOTHODS, ObjectId
 } from "@models/common";
-import { IUser, FLAG as UserFlag } from "@models/User";
+import { FLAG as UserFlag, IUser } from "@models/User";
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
 
 export const FLAG = "tokens";
 

src/models/User-Usergroup.ts

@@ -1,7 +1,7 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
+import { ObjectId } from "@models/common";
 import { FLAG as UF, IUser } from "@models/User";
 import { FLAG as GF, IUsergroups } from "@models/Usergroup";
-import { ObjectId } from "@models/common";
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
 import { Base, IDoc, IDocRaw } from "./common";
 
 const Definition: SchemaDefinition = {

src/models/User.ts

@@ -1,10 +1,10 @@
-import { model, SchemaDefinition, Model as M } from "mongoose";
-import * as md5 from "md5";
-import { config } from "@utils/config";
-import { ObjectId, existsValidator } from "@models/common";
 import { DEF_PER_COUNT } from "@dtos/page";
-import { Base, IDoc, IDocRaw, MODIFY_MOTHODS } from "./common";
+import { existsValidator, ObjectId } from "@models/common";
+import { config } from "@utils/config";
 import newCache  = require("@utils/newCache");
+import * as md5 from "md5";
+import { model, Model as M, SchemaDefinition } from "mongoose";
+import { Base, IDoc, IDocRaw, MODIFY_MOTHODS } from "./common";
 
 export const FLAG = "users";
 

src/models/Usergroup.ts

@@ -1,8 +1,8 @@
-import { model, SchemaDefinition, Model as M, SchemaTypes } from "mongoose";
+import { existsValidator, ObjectId } from "@models/common";
 import { FLAG as UF, IUser } from "@models/User";
-import { ObjectId, existsValidator } from "@models/common";
-import { Base, IDoc, IDocRaw } from "./common";
 import newCache  = require("@utils/newCache");
+import { model, Model as M, SchemaDefinition, SchemaTypes } from "mongoose";
+import { Base, IDoc, IDocRaw } from "./common";
 
 const Definition: SchemaDefinition = {
     name: { type: String, required: true }

src/models/Value.ts

@@ -1,4 +1,4 @@
-import { model, SchemaDefinition, Model as M } from "mongoose";
+import { model, Model as M, SchemaDefinition } from "mongoose";
 import { Base, IDoc, IDocRaw } from "./common";
 
 const Definition: SchemaDefinition = {

src/models/common.ts

@@ -1,5 +1,5 @@
 import * as lodash from "lodash";
-import { Schema, Document as Doc, Model as M } from "mongoose";
+import { Document as Doc, Model as M, Schema } from "mongoose";
 
 export type ObjectId = Schema.Types.ObjectId | string;
 

src/modules/admin/categroies/categroies.controller.ts

@@ -1,27 +1,26 @@
+import { Roles } from "@decorators/roles";
+import { CidDto } from "@dtos/ids";
+import { ListResponse, PerPageDto } from "@dtos/page";
+import { DefResDto } from "@dtos/res";
+import { CreateValueDto, EditValueDto } from "@dtos/values";
+import { RolesGuard } from "@guards/roles";
+import { IValues, Model as ValuesModel, ValueDoc } from "@models/Value";
 import {
-    Controller, Post, Res, Body, Get, HttpStatus, HttpCode, Param,
-    BadRequestException, UseGuards, Delete, Query, BadGatewayException, Put
+    BadGatewayException, BadRequestException, Body, Controller, Delete, Get, HttpCode, HttpStatus,
+    Param, Post, Put, Query, Res, UseGuards
 } from "@nestjs/common";
 import {
-    ApiBearerAuth, ApiUseTags, ApiResponse, ApiImplicitParam, ApiOperation
+    ApiBearerAuth, ApiImplicitParam, ApiOperation, ApiResponse, ApiUseTags
 } from "@nestjs/swagger";
-import { Model as ValuesModel, ValueDoc, IValues } from "@models/Value";
-import { Roles } from "@decorators/roles";
-import { RolesGuard } from "@guards/roles";
 import { ParseIntPipe } from "@pipes/parse-int";
-import { PerPageDto, ListResponse } from "@dtos/page";
-import { CreateValueDto, EditValueDto } from "@dtos/values";
-import { CidDto } from "@dtos/ids";
-import { DefResDto } from "@dtos/res";
+import { ToArrayPipe } from "@pipes/to-array";
 import { CategoriesService } from "@services/categories";
 import { GoodsService } from "@services/goods";
 import { UtilService } from "@services/util";
 import md5 = require("md5");
-
 import {
-    NewCategoryDto, EditCategoryDto, CategoryAttributeParamDto
+    CategoryAttributeParamDto, EditCategoryDto, NewCategoryDto
 } from "./categroies.dto";
-import { ToArrayPipe } from "@pipes/to-array";
 
 @UseGuards(RolesGuard)
 @Controller("api/v1/categories")

src/modules/admin/categroies/categroies.dto.ts

@@ -1,9 +1,9 @@
-import {
-    IsMongoId, IsString, IsArray, ArrayUnique, IsOptional, IsJSON
-} from "class-validator";
+import { IAidDto, ICidDto } from "@dtos/ids";
 import { ObjectId } from "@models/common";
 import { ApiModelProperty, ApiModelPropertyOptional } from "@nestjs/swagger";
-import { ICidDto, IAidDto } from "@dtos/ids";
+import {
+    ArrayUnique, IsArray, IsJSON, IsMongoId, IsOptional, IsString
+} from "class-validator";
 
 export class NewCategoryDto {
     @ApiModelProperty({ type: String })

src/modules/admin/collections/collections.controller.ts

@@ -1,24 +1,24 @@
+import { Roles } from "@decorators/roles";
 import {
-    ApiBearerAuth, ApiUseTags, ApiOperation, ApiResponse
-} from "@nestjs/swagger";
-import {
-    Controller, UseGuards, Get, HttpCode, HttpStatus, Session, Query, Post,
-    Body, Param, Delete, BadRequestException
-} from "@nestjs/common";
+    CreateCollectionDto, EditCollectionDto, ICollection, IEditCollection
+} from "@dtos/collections";
+import { CCidDto } from "@dtos/ids";
+import { DEF_PER_COUNT, ListResponse, PerPageDto } from "@dtos/page";
+import { DefResDto } from "@dtos/res";
+import { RolesGuard } from "@guards/roles";
 import { CollectionDoc } from "@models/Collection";
 import { ObjectId } from "@models/common";
-import { RolesGuard } from "@guards/roles";
+import {
+    BadRequestException, Body, Controller, Delete, Get, HttpCode, HttpStatus, Param,
+    Post, Query, Session, UseGuards
+} from "@nestjs/common";
+import {
+    ApiBearerAuth, ApiOperation, ApiResponse, ApiUseTags
+} from "@nestjs/swagger";
+import { ParseIntPipe } from "@pipes/parse-int";
 import { CollectionsService } from "@services/collections";
 import { LogsService } from "@services/logs";
 import { UtilService } from "@services/util";
-import { Roles } from "@decorators/roles";
-import { ParseIntPipe } from "@pipes/parse-int";
-import { PerPageDto, DEF_PER_COUNT, ListResponse } from "@dtos/page";
-import { CCidDto } from "@dtos/ids";
-import { DefResDto } from "@dtos/res";
-import {
-    CreateCollectionDto, EditCollectionDto, ICollection, IEditCollection
-} from "@dtos/collections";
 
 @UseGuards(RolesGuard)
 @Controller("api/v1/collections")