fix: tweak up test config, fix IPromise definition

qiwi · May 17, 2019 · 098e9e7 · 098e9e7
1 parent 2ec98c1
commit 098e9e7
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 28 deletions.
diff --git a/packages/facade/src/test/tsconfig.json b/packages/facade/src/test/tsconfig.json
@@ -24,9 +24,8 @@
     },
     "typeRoots": ["."]
   },
-  "files": [
-    "index.d.ts",
-    "index.ts"
+  "include": [
+    "./*"
   ],
   "exclude": [
     "node_modules"

diff --git a/packages/types/src/main/IPromise.ts b/packages/types/src/main/IPromise.ts
@@ -1,15 +1,13 @@
+import * as Bluebird from 'bluebird'
+
+export type IPromise<T> = Bluebird<T> | Promise<T>
+
 export type TPromiseExecutor<TValue = any, TReason = any> = (resolve: (value: TValue) => void, reject: (reason: TReason) => void) => void
 
 export interface IPromiseConstructor<TValue = any, TReason = any> {
-  new(executor: TPromiseExecutor<TValue>): IPromise<TValue, TReason>
-  all: (values: Array<IPromise<TValue, TReason>>) => IPromise<TValue[], TReason>
-  race: (values: Array<IPromise<TValue, TReason>>) => IPromise<TValue, TReason>
-  reject: (reason?: TReason) => IPromise<TValue, TReason>
-  resolve: (value?: TValue) => IPromise<TValue, TReason>
-}
-
-export interface IPromise<TValue = any, TReason = any> {
-  then: (onSuccess?: (value: TValue) => any, onReject?: (reason: TReason) => any) => IPromise
-  catch: (onReject: (reason: TReason) => any) => IPromise
-  finally?: (onFinally: () => any) => IPromise
+  new(executor: TPromiseExecutor<TValue>): IPromise<TValue>
+  all: (values: Array<IPromise<TValue>>) => IPromise<TValue[]>
+  race: (values: Array<IPromise<TValue>>) => IPromise<TValue>
+  reject: (reason?: TReason) => IPromise<TValue>
+  resolve: (value?: TValue) => IPromise<TValue>
 }
diff --git a/packages/types/src/test/ICloneable.ts b/packages/types/src/test/ICloneable.ts
@@ -1,4 +1,4 @@
-import { ICloneable } from './index'
+import { ICloneable } from './index';
 
 const cloneable: ICloneable<string> = {
   clone(): string { return 'clone'; }

diff --git a/packages/types/src/test/ICurrency.ts b/packages/types/src/test/ICurrency.ts
@@ -1,4 +1,4 @@
-import { ICurrency } from './index'
+import { ICurrency } from './index';
 
 const brokenCurrency: ICurrency = 123; // $ExpectError
 const brokenCurrency2: ICurrency = {}; // $ExpectError

diff --git a/packages/types/src/test/IEventEmitter.ts b/packages/types/src/test/IEventEmitter.ts
@@ -1,4 +1,4 @@
-import { IEventEmitter } from './index'
+import { IEventEmitter } from './index';
 
 const brokenEmitter: IEventEmitter = {  // $ExpectError
   on(event: string, handler: (...args: any[]) => void) { handler(event); }

diff --git a/packages/types/src/test/ILogger.ts b/packages/types/src/test/ILogger.ts
@@ -1,4 +1,4 @@
-import { ILoggerMethod, ILogger, TLogLevel } from './index'
+import { ILoggerMethod, ILogger, TLogLevel } from './index';
 
 const brokenLogLevel: TLogLevel = 'info'; // $ExpectError
 const traceLogLevel: TLogLevel = 5e3;

diff --git a/packages/types/src/test/IMoney.ts b/packages/types/src/test/IMoney.ts
@@ -1,4 +1,4 @@
-import { IMoney } from './index'
+import { IMoney } from './index';
 
 const brokenMoney: IMoney = {
   value: 123,

diff --git a/packages/types/src/test/IPromise.ts b/packages/types/src/test/IPromise.ts
@@ -1,4 +1,4 @@
-import { IPromise, IPromiseConstructor, BluebirdPromise } from './index'
+import { IPromise, IPromiseConstructor, BluebirdPromise } from './index';
 
 const executor = (resolve: (value: number) => void, reject: (value: number) => void) => {
   const value = Math.random();

diff --git a/packages/types/src/test/IStorage.ts b/packages/types/src/test/IStorage.ts
@@ -1,4 +1,4 @@
-import { IStorage } from './index'
+import { IStorage } from './index';
 
 const storage: IStorage = {
   get: (key: string): any => key,

diff --git a/packages/types/src/test/IStringMap.ts b/packages/types/src/test/IStringMap.ts
@@ -1,4 +1,4 @@
-import { IStringMap } from './index'
+import { IStringMap } from './index';
 
 // IStringMap
 const map: IStringMap = {

diff --git a/packages/types/src/test/IUtilEach.ts b/packages/types/src/test/IUtilEach.ts
@@ -1,4 +1,4 @@
-import { TUtilEach, lodashEach, underscoreEach } from './index'
+import { TUtilEach, lodashEach, underscoreEach } from './index';
 
 const brokenUtilEach: TUtilEach = (collection: object, handler: (value: string, key: boolean, collection: object) => void) =>  { handler || collection; }; // $ExpectError
 const utilEach: TUtilEach = (collection: object, handler: (value: string, key: number, collection: object) => void): object => {

diff --git a/packages/types/src/test/IUtilGet.ts b/packages/types/src/test/IUtilGet.ts
@@ -1,4 +1,4 @@
-import { TUtilGet, lodashGet } from './index'
+import { TUtilGet, lodashGet } from './index';
 
 const brokenUtilGet: TUtilGet = (obj: object, path: any[], defaultValue?: any) => { obj || path || defaultValue; }; // $ExpectError
 const utilGet: TUtilGet = (obj: object, path: Array<string | number> | string, defaultValue?: any) => {

diff --git a/packages/types/src/test/IUtilMap.ts b/packages/types/src/test/IUtilMap.ts
@@ -1,4 +1,4 @@
-import { TUtilMap, lodashMap, underscoreMap } from './index'
+import { TUtilMap, lodashMap, underscoreMap } from './index';
 
 const brokenUtilMap: TUtilMap = (collection: object, handler: (value: string, key: boolean, collection: object) => object): any[] => [handler(JSON.stringify(collection), false, collection)]; // $ExpectError
 const utilMap: TUtilMap = (collection: object, handler: (value: string, key: string, collection: object) => object): any[] => [handler(JSON.stringify(collection), 'key', collection)];

diff --git a/packages/types/src/test/tsconfig.json b/packages/types/src/test/tsconfig.json
@@ -24,9 +24,8 @@
     },
     "typeRoots": ["."]
   },
-  "files": [
-    "index.d.ts",
-    "index.ts"
+  "include": [
+    "./*"
   ],
   "exclude": [
     "node_modules"