@faasjs/knex 0.0.2-beta.233 → 0.0.2-beta.253

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin, Next, DeployData, MountData, UseifyPlugin } from '@faasjs/func';
-import Logger from '@faasjs/logger';
+import { Logger } from '@faasjs/logger';
 import { Knex as K } from 'knex';
 export interface KnexConfig {
     name?: string;

package/lib/index.es.js

@@ -1,10 +1,12 @@
 import { usePlugin } from '@faasjs/func';
-import Logger from '@faasjs/logger';
-import deepMerge from '@faasjs/deep_merge';
+import { Logger } from '@faasjs/logger';
+import { deepMerge } from '@faasjs/deep_merge';
 import knex from 'knex';
 
 const Name = 'knex';
-const globals = {};
+if (!global['FaasJS_Knex']) {
+    global.FaasJS_Knex = {};
+}
 /**
  * Knex 插件
  */
@@ -38,9 +40,9 @@ class Knex {
     }
     async onMount(data, next) {
         var _a;
-        if (globals[this.name]) {
-            this.config = globals[this.name].config;
-            this.adapter = globals[this.name].adapter;
+        if (global.FaasJS_Knex[this.name]) {
+            this.config = global.FaasJS_Knex[this.name].config;
+            this.adapter = global.FaasJS_Knex[this.name].adapter;
             this.query = this.adapter;
             await next();
             return;
@@ -75,7 +77,7 @@ class Knex {
         });
         this.query = this.adapter;
         this.logger.debug('connected');
-        globals[this.name] = this;
+        global.FaasJS_Knex[this.name] = this;
         await next();
     }
     async raw(sql, bindings = []) {
@@ -95,8 +97,8 @@ class Knex {
     }
     async quit() {
         try {
-            await globals[this.name].adapter.destroy();
-            delete globals[this.name];
+            await global.FaasJS_Knex[this.name].adapter.destroy();
+            delete global.FaasJS_Knex[this.name];
         }
         catch (error) {
             console.error(error);
@@ -105,8 +107,8 @@ class Knex {
 }
 function useKnex(config) {
     const name = (config === null || config === void 0 ? void 0 : config.name) || Name;
-    if (globals[name])
-        return usePlugin(globals[name]);
+    if (global.FaasJS_Knex[name])
+        return usePlugin(global.FaasJS_Knex[name]);
     return usePlugin(new Knex(config));
 }
 function query(table) {

package/lib/index.js

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var func = require('@faasjs/func');
-var Logger = require('@faasjs/logger');
-var deepMerge = require('@faasjs/deep_merge');
+var logger = require('@faasjs/logger');
+var deep_merge = require('@faasjs/deep_merge');
 var knex = require('knex');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var Logger__default = /*#__PURE__*/_interopDefaultLegacy(Logger);
-var deepMerge__default = /*#__PURE__*/_interopDefaultLegacy(deepMerge);
 var knex__default = /*#__PURE__*/_interopDefaultLegacy(knex);
 
 const Name = 'knex';
-const globals = {};
+if (!global['FaasJS_Knex']) {
+    global.FaasJS_Knex = {};
+}
 /**
  * Knex 插件
  */
@@ -36,7 +36,7 @@ class Knex {
             this.name = this.type;
             this.config = Object.create(null);
         }
-        this.logger = new Logger__default['default'](this.name);
+        this.logger = new logger.Logger(this.name);
     }
     async onDeploy(data, next) {
         const client = data.config.plugins[this.name].config.client;
@@ -48,9 +48,9 @@ class Knex {
     }
     async onMount(data, next) {
         var _a;
-        if (globals[this.name]) {
-            this.config = globals[this.name].config;
-            this.adapter = globals[this.name].adapter;
+        if (global.FaasJS_Knex[this.name]) {
+            this.config = global.FaasJS_Knex[this.name].config;
+            this.adapter = global.FaasJS_Knex[this.name].adapter;
             this.query = this.adapter;
             await next();
             return;
@@ -70,8 +70,8 @@ class Knex {
                         this.config[key] = value;
             }
         if (data.config.plugins && ((_a = data.config.plugins[this.name]) === null || _a === void 0 ? void 0 : _a.config))
-            this.config = deepMerge__default['default'](data.config.plugins[this.name].config, this.config);
-        this.adapter = knex__default['default'](this.config);
+            this.config = deep_merge.deepMerge(data.config.plugins[this.name].config, this.config);
+        this.adapter = knex__default["default"](this.config);
         this.adapter
             .on('query', ({ sql, __knexQueryUid, bindings }) => {
             this.logger.time(`Knex${__knexQueryUid}`);
@@ -85,7 +85,7 @@ class Knex {
         });
         this.query = this.adapter;
         this.logger.debug('connected');
-        globals[this.name] = this;
+        global.FaasJS_Knex[this.name] = this;
         await next();
     }
     async raw(sql, bindings = []) {
@@ -105,8 +105,8 @@ class Knex {
     }
     async quit() {
         try {
-            await globals[this.name].adapter.destroy();
-            delete globals[this.name];
+            await global.FaasJS_Knex[this.name].adapter.destroy();
+            delete global.FaasJS_Knex[this.name];
         }
         catch (error) {
             console.error(error);
@@ -115,8 +115,8 @@ class Knex {
 }
 function useKnex(config) {
     const name = (config === null || config === void 0 ? void 0 : config.name) || Name;
-    if (globals[name])
-        return func.usePlugin(globals[name]);
+    if (global.FaasJS_Knex[name])
+        return func.usePlugin(global.FaasJS_Knex[name]);
     return func.usePlugin(new Knex(config));
 }
 function query(table) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "0.0.2-beta.233",
+  "version": "0.0.2-beta.253",
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,12 +18,12 @@
     "lib"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "^0.0.2-beta.217",
-    "@faasjs/logger": "^0.0.2-beta.212",
+    "@faasjs/deep_merge": "^0.0.2-beta.244",
+    "@faasjs/logger": "^0.0.2-beta.243",
     "knex": "*"
   },
   "devDependencies": {
-    "@faasjs/func": "^0.0.2-beta.233",
+    "@faasjs/func": "^0.0.2-beta.253",
     "@types/debug": "*",
     "@types/jest": "*",
     "@types/mysql": "*",
@@ -37,5 +37,5 @@
     "sqlite3": "*",
     "typescript": "*"
   },
-  "gitHead": "8b0cea370da01aaee6716ee058edc360287888d8"
+  "gitHead": "e1a54598c7bc4f74d645f5a85c58ec1d1f1c9c16"
 }