fib-pool 1.6.0 → 1.6.1

package/.travis.yml

@@ -26,6 +26,15 @@ matrix:
     - os: linux
       env:
         - VERSION=0.27.0
+    - os: linux
+      env:
+        - VERSION=0.28.0
+    - os: linux
+      env:
+        - VERSION=0.29.0
+    - os: linux
+      env:
+        - VERSION=0.30.0
     - os: osx
       osx_image: xcode9
       env:
@@ -58,6 +67,18 @@ matrix:
       osx_image: xcode9
       env:
         - VERSION=0.27.0
+    - os: osx
+      osx_image: xcode9
+      env:
+        - VERSION=0.28.0
+    - os: osx
+      osx_image: xcode9
+      env:
+        - VERSION=0.29.0
+    - os: osx
+      osx_image: xcode9
+      env:
+        - VERSION=0.30.0
 before_install:
   - OS=linux
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

package/appveyor.yml

@@ -9,6 +9,9 @@ environment:
     - VERSION: 0.26.0
     - VERSION: 0.26.1
     - VERSION: 0.27.0
+    - VERSION: 0.28.0
+    - VERSION: 0.29.0
+    - VERSION: 0.30.0
 
 install:
   - ps: Install-Product node $env:nodejs_version

package/lib/index.js

@@ -1,3 +1,4 @@
+"use strict";
 const coroutine = require("coroutine");
 const util = require("util");
 function ensureError(e) {
@@ -5,7 +6,7 @@ function ensureError(e) {
         e = new Error(e);
     return e;
 }
-const GetPool = function (_opt, maxsize, timeout) {
+module.exports = function GetPool(_opt, maxsize, timeout) {
     let opt = _opt;
     if (util.isFunction(_opt)) {
         opt = {
@@ -87,6 +88,7 @@ const GetPool = function (_opt, maxsize, timeout) {
                 break;
             }
             catch (e) {
+                console.log(e);
                 if (++cn >= retry) {
                     err = e;
                     break;
@@ -160,4 +162,3 @@ const GetPool = function (_opt, maxsize, timeout) {
     };
     return pool;
 };
-module.exports = GetPool;

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "fib-pool",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "description": "Generic resource pooling for fibjs",
     "main": "./lib",
-    "types": "@types/index.d.ts",
+    "types": "typings/index.d.ts",
     "repository": "git://github.com/fibjs/fib-pool.git",
     "author": "Liu Hu <lion@9465.net>",
     "contributors": [
@@ -20,7 +20,7 @@
         "fibjs"
     ],
     "scripts": {
-        "build": "fib-typify src -o lib",
+        "build": "ftsc ./src/* --outDir lib",
         "test": "fibjs test",
         "ci": "npm run build && npm run test",
         "prepublishOnly": "npm run build"
@@ -28,7 +28,7 @@
     "devDependencies": {
         "@fibjs/ci": "^2.3.0",
         "@fibjs/types": "^0.27.1",
-        "fib-typify": "^0.6.0"
+        "fib-typify": "^0.8.4"
     },
     "ci": {
         "type": "travis, appveyor",
@@ -40,7 +40,10 @@
             "0.25.0",
             "0.26.0",
             "0.26.1",
-            "0.27.0"
+            "0.27.0",
+            "0.28.0",
+            "0.29.0",
+            "0.30.0"
         ]
     }
 }

package/tsconfig.json

@@ -4,9 +4,10 @@
         "module": "commonjs",
         "alwaysStrict": false,
         "removeComments": true,
-        "typeRoots": [
-            "node_modules",
-            "types"
+        "declaration": true,
+        "declarationDir": "typings",
+        "types": [
+            "@fibjs/types"
         ]
     }
 }

package/typings/index.d.ts

@@ -0,0 +1,41 @@
+declare namespace FibPoolNS {
+    type FirstParameter<T> = T extends (arg: infer T, ...args: any[]) => any ? T : never;
+    interface DippedItemStruct {
+        close?: FibPoolOptionResult['destroy'];
+        destroy?: FibPoolOptionResult['destroy'];
+        dispose?: FibPoolOptionResult['destroy'];
+    }
+    interface FibPoolOptionArgs<T extends DippedItemStruct = {}> {
+        create: (name: string) => T;
+        destroy?: (item?: T) => any;
+        maxsize?: number;
+        timeout?: number;
+        retry?: number | boolean;
+    }
+    interface FibPoolOptionResult<T extends DippedItemStruct = {}> {
+        create: FibPoolOptionArgs<T>['create'];
+        destroy: FibPoolOptionArgs<T>['destroy'];
+        maxsize: FibPoolOptionArgs<T>['maxsize'];
+        timeout: FibPoolOptionArgs<T>['timeout'];
+        retry: FibPoolOptionArgs<T>['retry'];
+    }
+    interface FibPoolDipperFn<T_CREATED_ITEM, T_POOL_FUNC_RETURN = any> {
+        (o: T_CREATED_ITEM): T_POOL_FUNC_RETURN;
+    }
+    type FibPool<T_CREATED_ITEM, T_POOL_FUNC_RETURN = any> = {
+        <T_RETURN = T_POOL_FUNC_RETURN>(name: string, func: FibPoolDipperFn<T_CREATED_ITEM, T_RETURN>): T_RETURN;
+        <T_RETURN = T_POOL_FUNC_RETURN>(func: FibPoolDipperFn<T_CREATED_ITEM, T_RETURN>): T_RETURN;
+    } & {
+        connections?(): number;
+        info?(): {
+            maxsize: number;
+            count: number;
+            running: number;
+            wait: number;
+            timeout: number;
+        };
+        clear?(): void;
+    };
+}
+declare const _default: <T_CREATED_ITEM extends FibPoolNS.DippedItemStruct, T_POOL_FUNC_RETURN>(_opt: FibPoolNS.FibPoolOptionArgs<T_CREATED_ITEM> | ((name: string) => T_CREATED_ITEM), maxsize?: number, timeout?: number) => FibPoolNS.FibPool<T_CREATED_ITEM, T_POOL_FUNC_RETURN>;
+export = _default;

package/@types/index.d.ts

@@ -1,3 +0,0 @@
-/// <reference path="type.d.ts" />
-
-export = FibPoolNS.FibPoolGenerator

package/@types/type.d.ts

@@ -1,58 +0,0 @@
-/// <reference types="@fibjs/types" />
-
-declare namespace FibPoolNS {
-    type FirstParameter<T> = T extends (arg: infer T, ...args: any[]) => any ? T : never; 
-
-    interface DippedItemStruct {
-        close?: FibPoolOptionResult['destroy'];
-        destroy?: FibPoolOptionResult['destroy'];
-        dispose?: FibPoolOptionResult['destroy'];
-    }
-
-    interface FibPoolOptionArgs<T extends DippedItemStruct = Fibjs.AnyObject> {
-        create: (name: string) => T
-        destroy?: (item?: T) => any;
-        maxsize?: number
-        timeout?: number
-        retry?: number | boolean
-    }
-    interface FibPoolOptionResult<T extends DippedItemStruct = Fibjs.AnyObject> {
-        create: FibPoolOptionArgs<T>['create']
-        destroy: FibPoolOptionArgs<T>['destroy']
-        maxsize: FibPoolOptionArgs<T>['maxsize']
-        timeout: FibPoolOptionArgs<T>['timeout']
-        retry: FibPoolOptionArgs<T>['retry']
-    }
-
-    interface FibPoolDipperFn<T_CREATED_ITEM, T_POOL_FUNC_RETURN = any> {
-        (o: T_CREATED_ITEM): T_POOL_FUNC_RETURN
-    }
-
-    type FibPool<T_CREATED_ITEM, T_POOL_FUNC_RETURN = any> = {
-        <T_RETURN = T_POOL_FUNC_RETURN>(name: string, func: FibPoolDipperFn<T_CREATED_ITEM, T_RETURN>): T_RETURN
-        <T_RETURN = T_POOL_FUNC_RETURN>(func: FibPoolDipperFn<T_CREATED_ITEM, T_RETURN>): T_RETURN
-    } & {
-        connections?(): number;
-        info?(): {
-            maxsize: number;
-            count: number;
-            running: number;
-            wait: number;
-            timeout: number;
-        }; 
-        clear?(): void;
-    }
-
-    function FibPoolGenerator<
-        T_CREATED_ITEM extends DippedItemStruct = Fibjs.AnyObject,
-        T_POOL_FUNC_RETURN = any
-    > (
-        opt: FibPoolOptionArgs<T_CREATED_ITEM> | FibPoolOptionArgs<T_CREATED_ITEM>['create'],
-        maxsize?: number,
-        timeout?: number
-    ): FibPool<T_CREATED_ITEM, T_POOL_FUNC_RETURN>;
-}
-
-declare module "fib-pool" {
-    export = FibPoolNS.FibPoolGenerator
-}