refactor assertions

lib/assert.js

@@ -0,0 +1,10 @@
+const {assertOptions} = require(`assert-options`);
+
+// this to allow override options-related errors globally (for pg-promise)
+global.pgPromiseAssert = assertOptions;
+
+module.exports = {
+    assert() {
+        return global.pgPromiseAssert.apply(null, [...arguments]);
+    }
+};

lib/database.js

@@ -8,7 +8,7 @@
  */
 
 const {Events} = require(`./events`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`./assert`);
 const {resultQuery, multiResultQuery, streamQuery} = require(`./special-query`);
 const {ConnectionContext} = require(`./context`);
 const {DatabasePool} = require(`./database-pool`);
@@ -1289,7 +1289,7 @@ function Database(cn, dc, config) {
          */
         obj.task = function () {
             const args = npm.pubUtils.taskArgs(arguments);
-            assertOptions(args.options, [`tag`]);
+            assert(args.options, [`tag`]);
             return taskProcessor.call(this, args, false);
         };
 
@@ -1347,7 +1347,7 @@ function Database(cn, dc, config) {
          */
         obj.taskIf = function () {
             const args = npm.pubUtils.taskArgs(arguments);
-            assertOptions(args.options, [`tag`, `cnd`]);
+            assert(args.options, [`tag`, `cnd`]);
             try {
                 let cnd = args.options.cnd;
                 if (`cnd` in args.options) {
@@ -1456,7 +1456,7 @@ function Database(cn, dc, config) {
          */
         obj.tx = function () {
             const args = npm.pubUtils.taskArgs(arguments);
-            assertOptions(args.options, [`tag`, `mode`]);
+            assert(args.options, [`tag`, `mode`]);
             return taskProcessor.call(this, args, true);
         };
 
@@ -1529,7 +1529,7 @@ function Database(cn, dc, config) {
          */
         obj.txIf = function () {
             const args = npm.pubUtils.taskArgs(arguments);
-            assertOptions(args.options, [`tag`, `mode`, `cnd`, `reusable`]);
+            assert(args.options, [`tag`, `mode`, `cnd`, `reusable`]);
             try {
                 let cnd;
                 if (`cnd` in args.options) {

lib/formatting.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`./assert`);
 
 const npm = {
     pgUtils: require(`pg/lib/utils`),
@@ -683,7 +683,7 @@ const $as = {
      * @returns {string}
      */
     array(arr, options) {
-        options = assertOptions(options, [`capSQL`]);
+        options = assert(options, [`capSQL`]);
         arr = resolveFunc(arr);
         if (isNull(arr)) {
             return `null`;
@@ -850,7 +850,7 @@ const $as = {
      * The function will throw an error, if any occurs during formatting.
      */
     format(query, values, options) {
-        options = assertOptions(options, [`capSQL`, `partial`, `def`]);
+        options = assert(options, [`capSQL`, `partial`, `def`]);
         const ctf = getCTF(query);
         if (ctf) {
             query = ctf.toPostgres.call(query, query);

lib/helpers/column-set.js

@@ -8,7 +8,7 @@
  */
 
 const {InnerState} = require(`../inner-state`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../assert`);
 const {TableName} = require(`./table-name`);
 const {Column} = require(`./column`);
 
@@ -172,7 +172,7 @@ class ColumnSet extends InnerState {
             throw new TypeError(`Invalid parameter 'columns' specified.`);
         }
 
-        opt = assertOptions(opt, [`table`, `inherit`]);
+        opt = assert(opt, [`table`, `inherit`]);
 
         if (!npm.utils.isNull(opt.table)) {
             this.table = (opt.table instanceof TableName) ? opt.table : new TableName(opt.table);
@@ -400,7 +400,7 @@ ColumnSet.prototype.assign = function (options) {
  *
  */
 ColumnSet.prototype.assignColumns = function (options) {
-    options = assertOptions(options, [`from`, `to`, `skip`]);
+    options = assert(options, [`from`, `to`, `skip`]);
     const skip = (typeof options.skip === `string` && [options.skip]) || ((Array.isArray(options.skip) || typeof options.skip === `function`) && options.skip);
     const from = (typeof options.from === `string` && options.from && (npm.formatting.as.alias(options.from) + `.`)) || ``;
     const to = (typeof options.to === `string` && options.to && (npm.formatting.as.alias(options.to) + `.`)) || ``;

lib/helpers/column.js

@@ -8,7 +8,7 @@
  */
 
 const {InnerState} = require(`../inner-state`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../assert`);
 
 const npm = {
     os: require(`os`),
@@ -142,7 +142,7 @@ class Column extends InnerState {
                 this.cnd = info.cnd;
             }
         } else {
-            col = assertOptions(col, [`name`, `prop`, `mod`, `cast`, `cnd`, `def`, `init`, `skip`]);
+            col = assert(col, [`name`, `prop`, `mod`, `cast`, `cnd`, `def`, `init`, `skip`]);
             if (`name` in col) {
                 if (!npm.utils.isText(col.name)) {
                     throw new TypeError(`Invalid 'name' value: ${npm.utils.toJson(col.name)}. A non-empty string was expected.`);

lib/helpers/methods/update.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../../assert`);
 const {TableName} = require(`../table-name`);
 const {ColumnSet} = require(`../column-set`);
 
@@ -168,7 +168,7 @@ function update(data, columns, table, options, capSQL) {
         columns = new ColumnSet(columns || data);
     }
 
-    options = assertOptions(options, [`tableAlias`, `valueAlias`, `emptyUpdate`]);
+    options = assert(options, [`tableAlias`, `valueAlias`, `emptyUpdate`]);
 
     const format = npm.formatting.as.format,
         useEmptyUpdate = `emptyUpdate` in options,

lib/helpers/table-name.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../assert`);
 
 const npm = {
     utils: require(`../utils`),
@@ -65,7 +65,7 @@ class TableName {
         if (typeof table === `string`) {
             this.table = table;
         } else {
-            const config = assertOptions(table, [`table`, `schema`]);
+            const config = assert(table, [`table`, `schema`]);
             this.table = config.table;
             if (npm.utils.isText(config.schema)) {
                 this.schema = config.schema;

lib/main.js

@@ -13,7 +13,7 @@ const {PreparedStatement, ParameterizedQuery} = require(`./types`);
 const {QueryFile} = require(`./query-file`);
 const {queryResult} = require(`./query-result`);
 const {parsePromise} = require(`./promise-parser`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`./assert`);
 
 const npm = {
     path: require(`path`),
@@ -191,7 +191,7 @@ let originalClientConnect;
  */
 function $main(options) {
 
-    options = assertOptions(options, [`pgFormatting`, `pgNative`, `promiseLib`, `noLocking`, `capSQL`, `noWarnings`,
+    options = assert(options, [`pgFormatting`, `pgNative`, `promiseLib`, `noLocking`, `capSQL`, `noWarnings`,
         `connect`, `disconnect`, `query`, `receive`, `task`, `transact`, `error`, `extend`, `schema`]);
 
     let pg = npm.pg;

lib/promise-adapter.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`./assert`);
 
 /**
  * @class PromiseAdapter
@@ -58,7 +58,7 @@ class PromiseAdapter {
             throw new TypeError(`Adapter requires an api configuration object.`);
         }
 
-        api = assertOptions(api, [`create`, `resolve`, `reject`, `all`]);
+        api = assert(api, [`create`, `resolve`, `reject`, `all`]);
 
         this.create = api.create;
         this.resolve = api.resolve;

lib/query-file.js

@@ -9,7 +9,7 @@
 
 const {InnerState} = require(`./inner-state`);
 const {QueryFileError} = require(`./errors`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`./assert`);
 const {ColorConsole} = require(`./utils/color`);
 
 const npm = {
@@ -106,7 +106,7 @@ class QueryFile extends InnerState {
 
         let filePath = file;
 
-        options = assertOptions(options, {
+        options = assert(options, {
             debug: npm.utils.isDev(),
             minify: (options && options.compress && options.minify === undefined) ? true : undefined,
             compress: undefined,

lib/tx-mode.js

@@ -9,7 +9,7 @@
 
 const {InnerState} = require(`./inner-state`);
 const {addInspection} = require(`./utils`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`./assert`);
 
 /**
  * @enum {number}
@@ -103,7 +103,7 @@ const isolationLevel = {
 class TransactionMode extends InnerState {
 
     constructor(options) {
-        options = assertOptions(options, [`tiLevel`, `deferrable`, `readOnly`]);
+        options = assert(options, [`tiLevel`, `deferrable`, `readOnly`]);
         const {readOnly, deferrable} = options;
         let {tiLevel} = options;
         let level, accessMode, deferrableMode, begin = `begin`;

lib/types/parameterized-query.js

@@ -10,7 +10,7 @@
 const {ServerFormatting} = require(`./server-formatting`);
 const {ParameterizedQueryError} = require(`../errors`);
 const {QueryFile} = require(`../query-file`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../assert`);
 
 const npm = {
     EOL: require(`os`).EOL,
@@ -91,7 +91,7 @@ class ParameterizedQuery extends ServerFormatting {
                 text: options
             };
         } else {
-            options = assertOptions(options, [`text`, `values`, `binary`, `rowMode`]);
+            options = assert(options, [`text`, `values`, `binary`, `rowMode`]);
         }
         super(options);
     }

lib/types/prepared-statement.js

@@ -10,7 +10,7 @@
 const {ServerFormatting} = require(`./server-formatting`);
 const {PreparedStatementError} = require(`../errors`);
 const {QueryFile} = require(`../query-file`);
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../assert`);
 
 const npm = {
     EOL: require(`os`).EOL,
@@ -89,7 +89,7 @@ const npm = {
  */
 class PreparedStatement extends ServerFormatting {
     constructor(options) {
-        options = assertOptions(options, [`name`, `text`, `values`, `binary`, `rowMode`, `rows`]);
+        options = assert(options, [`name`, `text`, `values`, `binary`, `rowMode`, `rows`]);
         super(options);
     }
 

lib/utils/public.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assertOptions} = require(`assert-options`);
+const {assert} = require(`../assert`);
 
 const npm = {
     fs: require(`fs`),
@@ -187,7 +187,7 @@ function enumSql(dir, options, cb) {
     if (!npm.utils.isText(dir)) {
         throw new TypeError(`Parameter 'dir' must be a non-empty text string.`);
     }
-    options = assertOptions(options, [`recursive`, `ignoreErrors`]);
+    options = assert(options, [`recursive`, `ignoreErrors`]);
     cb = (typeof cb === `function`) ? cb : null;
     return _enumSql(dir, options, cb, ``);
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "10.14.1",
+  "version": "10.14.2",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
@@ -40,7 +40,7 @@
     "node": ">=12.0"
   },
   "dependencies": {
-    "assert-options": "0.7.0",
+    "assert-options": "0.8.0",
     "pg": "8.8.0",
     "pg-minify": "1.6.2",
     "spex": "3.2.0"