@faasjs/knex 0.0.2-beta.451 → 0.0.2-beta.453

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@
 import { Knex as Knex$1 } from 'knex';
 export { Knex as K } from 'knex';
 
-declare type KnexConfig = {
+type KnexConfig = {
     name?: string;
     config?: Knex$1.Config;
 };

package/dist/index.js

@@ -33,9 +33,158 @@ __export(src_exports, {
   useKnex: () => useKnex
 });
 module.exports = __toCommonJS(src_exports);
-var import_func = require("@faasjs/func");
-var import_logger = require("@faasjs/logger");
-var import_deep_merge = require("@faasjs/deep_merge");
+
+// ../logger/src/index.ts
+var import_util = require("util");
+var LevelColor = ((LevelColor2) => {
+  LevelColor2[LevelColor2["debug"] = 90 /* GRAY */] = "debug";
+  LevelColor2[LevelColor2["info"] = 32 /* GREEN */] = "info";
+  LevelColor2[LevelColor2["warn"] = 33 /* ORANGE */] = "warn";
+  LevelColor2[LevelColor2["error"] = 31 /* RED */] = "error";
+  return LevelColor2;
+})(LevelColor || {});
+var LevelPriority = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
+var Logger = class {
+  constructor(label) {
+    this.colorfyOutput = true;
+    if (label)
+      this.label = label;
+    this.silent = !process.env.FaasLog && process.env.npm_config_argv && JSON.parse(process.env.npm_config_argv).original.includes("--silent");
+    if (["remote", "mono"].includes(process.env.FaasMode))
+      this.colorfyOutput = false;
+    this.level = process.env.FaasLog ? LevelPriority[process.env.FaasLog.toLowerCase()] : 0;
+    this.cachedTimers = {};
+    this.size = 500;
+    this.stdout = console.log;
+    this.stderr = console.error;
+  }
+  debug(message, ...args) {
+    this.log("debug", message, ...args);
+    return this;
+  }
+  info(message, ...args) {
+    this.log("info", message, ...args);
+    return this;
+  }
+  warn(message, ...args) {
+    this.log("warn", message, ...args);
+    return this;
+  }
+  error(message, ...args) {
+    let stack = false;
+    [message].concat(Array.from(args)).forEach((e) => {
+      if (e.stack) {
+        stack = true;
+        this.log("error", e.stack);
+      }
+    });
+    if (!stack)
+      this.log("error", message, ...args);
+    return this;
+  }
+  time(key, level = "debug") {
+    this.cachedTimers[key] = {
+      level,
+      time: new Date().getTime()
+    };
+    return this;
+  }
+  timeEnd(key, message, ...args) {
+    if (this.cachedTimers[key]) {
+      const timer = this.cachedTimers[key];
+      message = message + " +%ims";
+      args.push(new Date().getTime() - timer.time);
+      this[timer.level](message, ...args);
+      delete this.cachedTimers[key];
+    } else {
+      this.warn("timeEnd not found key %s", key);
+      this.debug(message);
+    }
+    return this;
+  }
+  raw(message, ...args) {
+    if (this.silent)
+      return this;
+    this.stdout((0, import_util.format)(message, ...args));
+    return this;
+  }
+  colorfy(color, message) {
+    return `\x1B[0${color}m${message}\x1B[39m`;
+  }
+  log(level, message, ...args) {
+    if (this.silent)
+      return this;
+    if (LevelPriority[level] < this.level)
+      return this;
+    let output = level.toUpperCase() + " " + (this.label ? `[${this.label}] ` : "") + (0, import_util.format)(message, ...args);
+    if (this.colorfyOutput && level !== "error")
+      output = this.colorfy(LevelColor[level], output);
+    else if (!this.colorfyOutput)
+      output = output.replace(/\n/g, "");
+    if (!output)
+      return this;
+    if (output.length > this.size)
+      output = output.slice(0, this.size) + "...";
+    if (level === "error")
+      this.stderr(output);
+    else
+      this.stdout(output);
+    return this;
+  }
+};
+
+// ../func/src/index.ts
+var import_crypto = require("crypto");
+var plugins = [];
+function usePlugin(plugin) {
+  if (!plugins.find((p) => p.name === plugin.name))
+    plugins.push(plugin);
+  if (!plugin.mount)
+    plugin.mount = async function({ config }) {
+      if (plugin.onMount)
+        await plugin.onMount({
+          config,
+          event: {},
+          context: {},
+          logger: new Logger(plugin.name)
+        }, async () => Promise.resolve());
+    };
+  return plugin;
+}
+
+// ../deep_merge/src/index.ts
+var shouldMerge = function(item) {
+  const type = Object.prototype.toString.call(item);
+  return type === "[object Object]" || type === "[object Array]";
+};
+function deepMerge(...sources) {
+  let acc = /* @__PURE__ */ Object.create(null);
+  for (const source of sources)
+    if (source instanceof Array) {
+      if (!(acc instanceof Array))
+        acc = [];
+      acc = [...new Set(source.concat(...acc))];
+    } else if (shouldMerge(source))
+      for (const [key, value] of Object.entries(source)) {
+        let val;
+        if (shouldMerge(value))
+          val = deepMerge(acc[key], value);
+        else
+          val = value;
+        acc = {
+          ...acc,
+          [key]: val
+        };
+      }
+  return acc;
+}
+
+// src/index.ts
 var import_knex = __toESM(require("knex"));
 var Name = "knex";
 if (!global["FaasJS_Knex"]) {
@@ -62,7 +211,7 @@ var Knex = class {
       data.dependencies["better-sqlite3"] = "*";
     else
       data.dependencies[client] = "*";
-    new import_logger.Logger(this.name).debug("add dependencies: " + client);
+    new Logger(this.name).debug("add dependencies: " + client);
     await next();
   }
   async onMount(data, next) {
@@ -90,7 +239,7 @@ var Knex = class {
             this.config[key] = value;
       }
     if (data.config.plugins && ((_a = data.config.plugins[this.name]) == null ? void 0 : _a.config))
-      this.config = (0, import_deep_merge.deepMerge)(data.config.plugins[this.name].config, this.config);
+      this.config = deepMerge(data.config.plugins[this.name].config, this.config);
     if (this.config.client === "sqlite3")
       this.config.client = "better-sqlite3";
     this.adapter = (0, import_knex.default)(this.config);
@@ -171,8 +320,8 @@ var Knex = class {
 function useKnex(config) {
   const name = (config == null ? void 0 : config.name) || Name;
   if (global.FaasJS_Knex[name])
-    return (0, import_func.usePlugin)(global.FaasJS_Knex[name]);
-  return (0, import_func.usePlugin)(new Knex(config));
+    return usePlugin(global.FaasJS_Knex[name]);
+  return usePlugin(new Knex(config));
 }
 function query(table) {
   return useKnex().query(table);

package/dist/index.mjs

@@ -6,12 +6,157 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
 
+// ../logger/src/index.ts
+import { format } from "util";
+var LevelColor = ((LevelColor2) => {
+  LevelColor2[LevelColor2["debug"] = 90 /* GRAY */] = "debug";
+  LevelColor2[LevelColor2["info"] = 32 /* GREEN */] = "info";
+  LevelColor2[LevelColor2["warn"] = 33 /* ORANGE */] = "warn";
+  LevelColor2[LevelColor2["error"] = 31 /* RED */] = "error";
+  return LevelColor2;
+})(LevelColor || {});
+var LevelPriority = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
+var Logger = class {
+  constructor(label) {
+    this.colorfyOutput = true;
+    if (label)
+      this.label = label;
+    this.silent = !process.env.FaasLog && process.env.npm_config_argv && JSON.parse(process.env.npm_config_argv).original.includes("--silent");
+    if (["remote", "mono"].includes(process.env.FaasMode))
+      this.colorfyOutput = false;
+    this.level = process.env.FaasLog ? LevelPriority[process.env.FaasLog.toLowerCase()] : 0;
+    this.cachedTimers = {};
+    this.size = 500;
+    this.stdout = console.log;
+    this.stderr = console.error;
+  }
+  debug(message, ...args) {
+    this.log("debug", message, ...args);
+    return this;
+  }
+  info(message, ...args) {
+    this.log("info", message, ...args);
+    return this;
+  }
+  warn(message, ...args) {
+    this.log("warn", message, ...args);
+    return this;
+  }
+  error(message, ...args) {
+    let stack = false;
+    [message].concat(Array.from(args)).forEach((e) => {
+      if (e.stack) {
+        stack = true;
+        this.log("error", e.stack);
+      }
+    });
+    if (!stack)
+      this.log("error", message, ...args);
+    return this;
+  }
+  time(key, level = "debug") {
+    this.cachedTimers[key] = {
+      level,
+      time: new Date().getTime()
+    };
+    return this;
+  }
+  timeEnd(key, message, ...args) {
+    if (this.cachedTimers[key]) {
+      const timer = this.cachedTimers[key];
+      message = message + " +%ims";
+      args.push(new Date().getTime() - timer.time);
+      this[timer.level](message, ...args);
+      delete this.cachedTimers[key];
+    } else {
+      this.warn("timeEnd not found key %s", key);
+      this.debug(message);
+    }
+    return this;
+  }
+  raw(message, ...args) {
+    if (this.silent)
+      return this;
+    this.stdout(format(message, ...args));
+    return this;
+  }
+  colorfy(color, message) {
+    return `\x1B[0${color}m${message}\x1B[39m`;
+  }
+  log(level, message, ...args) {
+    if (this.silent)
+      return this;
+    if (LevelPriority[level] < this.level)
+      return this;
+    let output = level.toUpperCase() + " " + (this.label ? `[${this.label}] ` : "") + format(message, ...args);
+    if (this.colorfyOutput && level !== "error")
+      output = this.colorfy(LevelColor[level], output);
+    else if (!this.colorfyOutput)
+      output = output.replace(/\n/g, "");
+    if (!output)
+      return this;
+    if (output.length > this.size)
+      output = output.slice(0, this.size) + "...";
+    if (level === "error")
+      this.stderr(output);
+    else
+      this.stdout(output);
+    return this;
+  }
+};
+
+// ../func/src/index.ts
+import { randomBytes } from "crypto";
+var plugins = [];
+function usePlugin(plugin) {
+  if (!plugins.find((p) => p.name === plugin.name))
+    plugins.push(plugin);
+  if (!plugin.mount)
+    plugin.mount = async function({ config }) {
+      if (plugin.onMount)
+        await plugin.onMount({
+          config,
+          event: {},
+          context: {},
+          logger: new Logger(plugin.name)
+        }, async () => Promise.resolve());
+    };
+  return plugin;
+}
+
+// ../deep_merge/src/index.ts
+var shouldMerge = function(item) {
+  const type = Object.prototype.toString.call(item);
+  return type === "[object Object]" || type === "[object Array]";
+};
+function deepMerge(...sources) {
+  let acc = /* @__PURE__ */ Object.create(null);
+  for (const source of sources)
+    if (source instanceof Array) {
+      if (!(acc instanceof Array))
+        acc = [];
+      acc = [...new Set(source.concat(...acc))];
+    } else if (shouldMerge(source))
+      for (const [key, value] of Object.entries(source)) {
+        let val;
+        if (shouldMerge(value))
+          val = deepMerge(acc[key], value);
+        else
+          val = value;
+        acc = {
+          ...acc,
+          [key]: val
+        };
+      }
+  return acc;
+}
+
 // src/index.ts
-import {
-  usePlugin
-} from "@faasjs/func";
-import { Logger } from "@faasjs/logger";
-import { deepMerge } from "@faasjs/deep_merge";
 import knex from "knex";
 var Name = "knex";
 if (!global["FaasJS_Knex"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "0.0.2-beta.451",
+  "version": "0.0.2-beta.453",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,9 +22,9 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "^0.0.2-beta.451",
-    "@faasjs/func": "^0.0.2-beta.451",
-    "@faasjs/logger": "^0.0.2-beta.451",
+    "@faasjs/deep_merge": "^0.0.2-beta.453",
+    "@faasjs/func": "^0.0.2-beta.453",
+    "@faasjs/logger": "^0.0.2-beta.453",
     "knex": "*"
   },
   "devDependencies": {