@faasjs/knex 0.0.3-beta.1 → 0.0.3-beta.100

package/README.md

@@ -130,7 +130,7 @@ ___
 
 ### useKnex
 
-▸ **useKnex**(`config?`): [`Knex`](classes/Knex.md) & `UseifyPlugin`
+▸ **useKnex**(`config?`): `UseifyPlugin`<[`Knex`](classes/Knex.md)\>
 
 #### Parameters
 
@@ -140,4 +140,4 @@ ___
 
 #### Returns
 
-[`Knex`](classes/Knex.md) & `UseifyPlugin`
+`UseifyPlugin`<[`Knex`](classes/Knex.md)\>

package/dist/index.d.mts

@@ -0,0 +1,41 @@
+import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Logger } from '@faasjs/logger';
+import { Knex as Knex$1 } from 'knex';
+export { Knex as K } from 'knex';
+
+type KnexConfig = {
+    name?: string;
+    config?: Knex$1.Config;
+};
+
+declare class Knex implements Plugin {
+    readonly type: string;
+    readonly name: string;
+    config: Knex$1.Config;
+    adapter: Knex$1;
+    query: Knex$1;
+    logger: Logger;
+    constructor(config?: KnexConfig);
+    onDeploy(data: DeployData, next: Next): Promise<void>;
+    onMount(data: MountData, next: Next): Promise<void>;
+    onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
+    raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
+    transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: any): Promise<TResult>;
+    schema(): Knex$1.SchemaBuilder;
+    quit(): Promise<void>;
+}
+declare function useKnex(config?: KnexConfig): UseifyPlugin<Knex>;
+declare function query<TName extends Knex$1.TableNames>(table: TName): Knex$1.QueryBuilder<Knex$1.TableType<TName>, {
+    _base: Knex$1.ResolveTableType<Knex$1.TableType<TName>, 'base'>;
+    _hasSelection: false;
+    _keys: never;
+    _aliases: {};
+    _single: false;
+    _intersectProps: {};
+    _unionProps: never;
+}[]>;
+declare function query<TName extends {} = any, TResult = any[]>(table: string): Knex$1.QueryBuilder<TName, TResult>;
+declare function transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: any): Promise<TResult>;
+declare function raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<TResult>;
+
+export { Knex, KnexConfig, query, raw, transaction, useKnex };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Logger } from '@faasjs/logger';
 import { Knex as Knex$1 } from 'knex';
 export { Knex as K } from 'knex';
 
@@ -13,7 +14,7 @@ declare class Knex implements Plugin {
     config: Knex$1.Config;
     adapter: Knex$1;
     query: Knex$1;
-    private logger;
+    logger: Logger;
     constructor(config?: KnexConfig);
     onDeploy(data: DeployData, next: Next): Promise<void>;
     onMount(data: MountData, next: Next): Promise<void>;
@@ -23,7 +24,7 @@ declare class Knex implements Plugin {
     schema(): Knex$1.SchemaBuilder;
     quit(): Promise<void>;
 }
-declare function useKnex(config?: KnexConfig): Knex & UseifyPlugin;
+declare function useKnex(config?: KnexConfig): UseifyPlugin<Knex>;
 declare function query<TName extends Knex$1.TableNames>(table: TName): Knex$1.QueryBuilder<Knex$1.TableType<TName>, {
     _base: Knex$1.ResolveTableType<Knex$1.TableType<TName>, 'base'>;
     _hasSelection: false;

package/dist/index.js

@@ -1,42 +1,21 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+'use strict';
+
+var func = require('@faasjs/func');
+var logger = require('@faasjs/logger');
+var deep_merge = require('@faasjs/deep_merge');
+var knex = require('knex');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  Knex: () => Knex,
-  query: () => query,
-  raw: () => raw,
-  transaction: () => transaction,
-  useKnex: () => useKnex
+var knex__default = /*#__PURE__*/_interopDefault(knex);
+
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
-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");
-var import_knex = __toESM(require("knex"));
 var Name = "knex";
 if (!global["FaasJS_Knex"]) {
   global.FaasJS_Knex = {};
@@ -62,11 +41,11 @@ var Knex = class {
       data.dependencies["better-sqlite3"] = "*";
     else
       data.dependencies[client] = "*";
-    new import_logger.Logger(this.name).debug("add dependencies: " + client);
+    new logger.Logger(this.name).debug("add dependencies: " + client);
     await next();
   }
   async onMount(data, next) {
-    var _a;
+    var _a, _b;
     this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
@@ -90,12 +69,25 @@ 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 = deep_merge.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);
+    if (this.config.client === "pg" && typeof ((_b = this.config.pool) == null ? void 0 : _b.propagateCreateError) === "undefined") {
+      if (!this.config.pool)
+        this.config.pool = /* @__PURE__ */ Object.create(null);
+      this.config.pool = Object.assign({
+        propagateCreateError: false,
+        min: 0,
+        max: 10,
+        acquireTimeoutMillis: 5e3,
+        idleTimeoutMillis: 3e4
+      }, this.config.pool);
+      if (typeof this.config.connection === "string" && !this.config.connection.includes("json=true"))
+        this.config.connection = this.config.connection + "?json=true";
+    }
+    this.adapter = knex__default.default(this.config);
     if (this.config.client === "pg") {
-      const pg = require("pg");
+      const pg = __require("pg");
       const intTypes = [
         "INT2",
         "INT4",
@@ -171,8 +163,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 func.usePlugin(global.FaasJS_Knex[name]);
+  return func.usePlugin(new Knex(config));
 }
 function query(table) {
   return useKnex().query(table);
@@ -183,11 +175,9 @@ async function transaction(scope, config) {
 async function raw(sql, bindings = []) {
   return useKnex().raw(sql, bindings);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Knex,
-  query,
-  raw,
-  transaction,
-  useKnex
-});
+
+exports.Knex = Knex;
+exports.query = query;
+exports.raw = raw;
+exports.transaction = transaction;
+exports.useKnex = useKnex;

package/dist/index.mjs

@@ -1,18 +1,15 @@
+import { usePlugin } from '@faasjs/func';
+import { Logger } from '@faasjs/logger';
+import { deepMerge } from '@faasjs/deep_merge';
+import knex from 'knex';
+
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
   if (typeof require !== "undefined")
     return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
-
-// 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"]) {
   global.FaasJS_Knex = {};
@@ -42,7 +39,7 @@ var Knex = class {
     await next();
   }
   async onMount(data, next) {
-    var _a;
+    var _a, _b;
     this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
@@ -69,6 +66,19 @@ var Knex = class {
       this.config = deepMerge(data.config.plugins[this.name].config, this.config);
     if (this.config.client === "sqlite3")
       this.config.client = "better-sqlite3";
+    if (this.config.client === "pg" && typeof ((_b = this.config.pool) == null ? void 0 : _b.propagateCreateError) === "undefined") {
+      if (!this.config.pool)
+        this.config.pool = /* @__PURE__ */ Object.create(null);
+      this.config.pool = Object.assign({
+        propagateCreateError: false,
+        min: 0,
+        max: 10,
+        acquireTimeoutMillis: 5e3,
+        idleTimeoutMillis: 3e4
+      }, this.config.pool);
+      if (typeof this.config.connection === "string" && !this.config.connection.includes("json=true"))
+        this.config.connection = this.config.connection + "?json=true";
+    }
     this.adapter = knex(this.config);
     if (this.config.client === "pg") {
       const pg = __require("pg");
@@ -159,10 +169,5 @@ async function transaction(scope, config) {
 async function raw(sql, bindings = []) {
   return useKnex().raw(sql, bindings);
 }
-export {
-  Knex,
-  query,
-  raw,
-  transaction,
-  useKnex
-};
+
+export { Knex, query, raw, transaction, useKnex };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "0.0.3-beta.1",
+  "version": "0.0.3-beta.100",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,16 +15,15 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup-node src/index.ts --format esm,cjs",
-    "build:types": "tsup-node src/index.ts --dts-only"
+    "build": "tsup-node src/index.ts --config ../../tsup.config.json"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "^0.0.3-beta.1",
-    "@faasjs/func": "^0.0.3-beta.1",
-    "@faasjs/logger": "^0.0.3-beta.1",
+    "@faasjs/deep_merge": "0.0.3-beta.100",
+    "@faasjs/func": "0.0.3-beta.100",
+    "@faasjs/logger": "0.0.3-beta.100",
     "knex": "*"
   },
   "devDependencies": {