fix: fix typings url

darukjs · Feb 20, 2021 · 6d5832f · 6d5832f
1 parent da70cf5
commit 6d5832f
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 42 deletions.
diff --git a/src/core/daruk.ts b/src/core/daruk.ts
@@ -16,9 +16,9 @@ import deepAssign = require('object-assign-deep');
 import { dirname, join } from 'path';
 /** @internal */
 import recursive = require('recursive-readdir');
-import { Options, PartialOptions } from '../../types/daruk_options';
 import mockHttp from '../mock/http_server';
 import { PluginClass, Server } from '../typings/daruk';
+import { Options, PartialOptions } from '../typings/daruk_options';
 import { debugLog, isJsTsFile, JsTsReg } from '../utils';
 import getDefaultOptions from './daruk_default_options';
 import { darukContainer } from './inversify.config';

diff --git a/src/core/daruk_default_options.ts b/src/core/daruk_default_options.ts
@@ -2,7 +2,7 @@
  * @fileOverview 根据运行时环境获取默认的 daruk options
  */
 
-import { Options } from '../../types/daruk_options';
+import { Options } from '../typings/daruk_options';
 
 export default function getDefaultOptions(
   rootPath: string,

diff --git a/src/core/inversify.config.ts b/src/core/inversify.config.ts
@@ -1,5 +1,5 @@
 import { Container } from 'inversify';
-import { PartialOptions } from '../../types/daruk_options';
+import { PartialOptions } from '../typings/daruk_options';
 import Daruk from './daruk';
 
 const darukContainer = new Container({

diff --git a/types/daruk_options.d.ts → src/typings/daruk_options.d.ts b/types/daruk_options.d.ts → src/typings/daruk_options.d.ts
@@ -1,5 +1,5 @@
 import koaBody = require('koa-body');
-import { DarukContext } from '../src';
+import { DarukContext } from '../';
 
 type RecursivePartial<T> = {
   [P in keyof T]?: T[P] extends (infer U)[]

diff --git a/types/core/base_context.d.ts b/types/core/base_context.d.ts
diff --git a/types/core/daruk.d.ts b/types/core/daruk.d.ts
@@ -3,8 +3,8 @@ import KoaLogger = require('daruk-logger');
 import { EventEmitter } from 'events';
 import Koa = require('koa');
 import { ListenOptions } from 'net';
-import { Options, PartialOptions } from '../../types/daruk_options';
 import { Server } from '../typings/daruk';
+import { Options, PartialOptions } from '../typings/daruk_options';
 declare class Daruk extends EventEmitter {
     [key: string]: any;
     name: string;

diff --git a/types/core/daruk_default_options.d.ts b/types/core/daruk_default_options.d.ts
@@ -1,2 +1,2 @@
-import { Options } from '../../types/daruk_options';
+import { Options } from '../typings/daruk_options';
 export default function getDefaultOptions(rootPath: string, name?: string, debug?: boolean): Options;
diff --git a/types/core/inversify.config.d.ts b/types/core/inversify.config.d.ts
@@ -1,5 +1,5 @@
 import { Container } from 'inversify';
 import Daruk from './daruk';
 declare const darukContainer: Container;
-declare const DarukServer: (options?: import("../../types/daruk_options").RecursivePartial<import("../../types/daruk_options").Options> | undefined) => Daruk;
+declare const DarukServer: (options?: import("../typings/daruk_options").RecursivePartial<import("../typings/daruk_options").Options> | undefined) => Daruk;
 export { darukContainer, DarukServer };
diff --git a/types/core/loader.d.ts b/types/core/loader.d.ts
diff --git a/types/core/module.d.ts b/types/core/module.d.ts
diff --git a/types/decorators/help_decorator_class.d.ts b/types/decorators/help_decorator_class.d.ts
diff --git a/types/plugins/darukConfig.d.ts b/types/plugins/darukConfig.d.ts
diff --git a/types/typings/daruk_options.d.ts b/types/typings/daruk_options.d.ts
@@ -0,0 +1,41 @@
+import koaBody = require('koa-body');
+import { DarukContext } from '../';
+
+type RecursivePartial<T> = {
+  [P in keyof T]?: T[P] extends (infer U)[]
+    ? RecursivePartial<U>[]
+    : T[P] extends object
+    ? RecursivePartial<T[P]>
+    : T[P];
+};
+
+export interface Options {
+  middlewareOrder: string[];
+  name: string;
+  rootPath: string;
+  debug: boolean;
+  bodyOptions: koaBody.IKoaBodyOptions;
+  // monitor: {
+  //   enable: boolean;
+  //   v8AnalyticsPath: string;
+  //   v8ProfilerPath: string;
+  //   auth: {
+  //     name: string;
+  //     password: string;
+  //   };
+  // };
+  loggerOptions: any;
+  customLogger: any;
+  loggerMiddleware: {
+    filter?: (ctx: DarukContext) => boolean;
+    requiredLogs?: string[];
+  };
+  gracefulShutdown: {
+    enable: boolean;
+    timeout: number;
+  };
+  requestId: any;
+  [key: string]: any;
+}
+
+export type PartialOptions = RecursivePartial<Options>;
diff --git a/types/utils/filter_built_in_module.d.ts b/types/utils/filter_built_in_module.d.ts