diff options
| -rw-r--r-- | src/db.mjs | 11 | ||||
| -rw-r--r-- | src/utils.mjs | 4 | ||||
| -rw-r--r-- | tests/js/utils.mjs | 33 |
3 files changed, 6 insertions, 42 deletions
@@ -3,6 +3,7 @@ import fs from "node:fs"; import path from "node:path"; import process from "node:process"; import url from "node:url"; +import util from "node:util"; import sqlite from "./sqlite.cjs"; @@ -12,9 +13,9 @@ import * as accretion from "./accretion.mjs"; export const promisifyDb = dbHandle => ({ ref: dbHandle, - all: u.promisify((...args) => dbHandle.all(...args)), - exec: u.promisify((...args) => dbHandle.exec(...args)), - run: u.promisify((...args) => dbHandle.run(...args)), + all: util.promisify((...args) => dbHandle.all(...args)), + exec: util.promisify((...args) => dbHandle.exec(...args)), + run: util.promisify((...args) => dbHandle.run(...args)), each: (...args) => new Promise((resolve, reject) => { const cb = args[args.length - 1]; @@ -28,8 +29,8 @@ export const promisifyDb = dbHandle => ({ new Promise((resolve, reject) => { const mkStmt = stmtRef => ({ ref: stmtRef, - run: u.promisify((...args) => stmtRef.run(...args)), - finalize: u.promisify((...args) => stmtRef.finalize(...args)), + run: util.promisify((...args) => stmtRef.run(...args)), + finalize: util.promisify((...args) => stmtRef.finalize(...args)), }); const ref = dbHandle.prepare( ...args, diff --git a/src/utils.mjs b/src/utils.mjs index 30a0f1a..ca4e4fc 100644 --- a/src/utils.mjs +++ b/src/utils.mjs @@ -73,10 +73,6 @@ export const first = (arr, fn) => { return null; }; -export const promisify = fn => (...args) => - new Promise((resolve, reject) => - fn(...args, (err, data) => err ? reject(err) : resolve(data))); - export const partial = (fn, ...startArgs) => (...endArgs) => fn(...startArgs, ...endArgs); diff --git a/tests/js/utils.mjs b/tests/js/utils.mjs index d16bae8..edd804f 100644 --- a/tests/js/utils.mjs +++ b/tests/js/utils.mjs @@ -8,7 +8,6 @@ import { assocIn, getIn, first, - promisify, partial, strSortFn, undefinedAsNull, @@ -247,37 +246,6 @@ const test_first = t => { }); }; -const test_promisify = t => { - t.start("promisify()"); - - t.test("we wrap the callbacky function", async () => { - const okFn1 = (a, b, cb) => - setTimeout(() => cb(null, { a, b, ok: true })); - const errFn1 = (a, b, c, cb) => - setTimeout(() => cb({ err: true, a }, "ignored")); - - const okFn2 = promisify(okFn1); - const errFn2 = promisify(errFn1); - - assert.deepEqual( - await okFn2("a-value", "b-value"), - { - a: "a-value", - b: "b-value", - ok: true, - }, - ); - - assert.rejects( - async () => await errFn2("aa", "bb", "cc"), - { - err: true, - a: "aa", - }, - ); - }); -}; - const test_partial = t => { t.start("partial()"); @@ -388,7 +356,6 @@ await runner.runTests([ test_assocIn, test_getIn, test_first, - test_promisify, test_partial, test_strSortFn, test_undefinedAsNull, |