@saltcorn/db-common 1.6.0 → 1.7.0-alpha.0

package/dist/test_expect.js

@@ -0,0 +1,401 @@
+/**
+ * jest-compatible test helpers backed by node:test / node:assert, so test
+ * suites can run on node's built-in test runner without a jest dependency.
+ * Lives in db-common so it can be shared across packages, e.g.:
+ *   import { describe, it, expect, beforeAll, jest } from "@saltcorn/db-common/test_expect";
+ * Only the surface used by the migrated test suites is implemented.
+ */
+import assert from "node:assert";
+import { inspect } from "node:util";
+import { createRequire } from "node:module";
+// This module is ESM, so the CommonJS `require` is not defined. jest.mock needs
+// to reach into the shared CommonJS module cache to mutate cached exports;
+// createRequire gives us a require bound to the same cache as the (CJS) test
+// suites that call jest.mock.
+const require = createRequire(import.meta.url);
+import { describe, it, test, before, after, beforeEach as nodeBeforeEach, afterEach as nodeAfterEach, } from "node:test";
+// node:test names the once-per-file hooks before/after; jest calls them
+// beforeAll/afterAll. Wrap to drop jest's optional timeout 2nd argument.
+const beforeAll = (fn) => before(fn);
+const afterAll = (fn) => after(fn);
+const beforeEach = (fn) => nodeBeforeEach(fn);
+const afterEach = (fn) => nodeAfterEach(fn);
+export { describe, it, test, beforeAll, afterAll, beforeEach, afterEach, };
+// ---------------------------------------------------------------------------
+// asymmetric matchers (expect.arrayContaining / expect.objectContaining)
+// ---------------------------------------------------------------------------
+class ArrayContaining {
+    constructor(sample) {
+        this.sample = sample;
+    }
+    matches(actual) {
+        return (Array.isArray(actual) &&
+            this.sample.every((e) => actual.some((a) => looseEqual(a, e))));
+    }
+}
+class ObjectContaining {
+    constructor(sample) {
+        this.sample = sample;
+    }
+    matches(actual) {
+        if (actual == null || typeof actual !== "object")
+            return false;
+        return Object.keys(this.sample).every((k) => looseEqual(actual[k], this.sample[k]));
+    }
+}
+// expect.any(Constructor): matches any value of the given type/instance.
+class Any {
+    constructor(sample) {
+        this.sample = sample;
+    }
+    matches(actual) {
+        switch (this.sample) {
+            case String:
+                return typeof actual === "string" || actual instanceof String;
+            case Number:
+                return typeof actual === "number" || actual instanceof Number;
+            case Boolean:
+                return typeof actual === "boolean";
+            case BigInt:
+                return typeof actual === "bigint";
+            case Function:
+                return typeof actual === "function";
+            case Object:
+                return actual !== null && typeof actual === "object";
+            case Array:
+                return Array.isArray(actual);
+            default:
+                return actual != null && actual instanceof this.sample;
+        }
+    }
+}
+const isAsymmetric = (x) => x instanceof ArrayContaining ||
+    x instanceof ObjectContaining ||
+    x instanceof Any;
+// jest's toEqual: recursive equality that ignores prototypes and treats
+// undefined-valued properties as absent.
+const looseEqual = (a, b) => {
+    if (isAsymmetric(b))
+        return b.matches(a);
+    if (isAsymmetric(a))
+        return a.matches(b);
+    if (Object.is(a, b))
+        return true;
+    if (a == null || b == null)
+        return a === b;
+    if (typeof a !== "object" || typeof b !== "object")
+        return a === b;
+    if (a instanceof Date && b instanceof Date)
+        return a.getTime() === b.getTime();
+    if (a instanceof RegExp && b instanceof RegExp)
+        return a.source === b.source && a.flags === b.flags;
+    if (Array.isArray(a) || Array.isArray(b)) {
+        if (!Array.isArray(a) || !Array.isArray(b))
+            return false;
+        if (a.length !== b.length)
+            return false;
+        return a.every((v, i) => looseEqual(v, b[i]));
+    }
+    const ak = Object.keys(a).filter((k) => a[k] !== undefined);
+    const bk = Object.keys(b).filter((k) => b[k] !== undefined);
+    if (ak.length !== bk.length)
+        return false;
+    return ak.every((k) => Object.prototype.hasOwnProperty.call(b, k) && looseEqual(a[k], b[k]));
+};
+// jest's toMatchObject: recursive subset match (received may have extra keys).
+const matchObject = (actual, expected) => {
+    if (isAsymmetric(expected))
+        return expected.matches(actual);
+    if (Array.isArray(expected)) {
+        if (!Array.isArray(actual) || actual.length !== expected.length)
+            return false;
+        return expected.every((e, i) => matchObject(actual[i], e));
+    }
+    if (expected && typeof expected === "object") {
+        if (actual == null || typeof actual !== "object")
+            return false;
+        return Object.keys(expected).every((k) => matchObject(actual[k], expected[k]));
+    }
+    return Object.is(actual, expected);
+};
+const matchError = (error, expected) => {
+    const message = error && error.message ? String(error.message) : String(error);
+    if (typeof expected === "string")
+        return message.includes(expected);
+    if (expected instanceof RegExp)
+        return expected.test(message);
+    if (typeof expected === "function")
+        return error instanceof expected;
+    return true;
+};
+// ---------------------------------------------------------------------------
+// expect()
+// ---------------------------------------------------------------------------
+class Expectation {
+    constructor(actual, isNot = false) {
+        this.actual = actual;
+        this.isNot = isNot;
+    }
+    get not() {
+        return new Expectation(this.actual, !this.isNot);
+    }
+    get rejects() {
+        return new AsyncExpectation(this.actual, true, this.isNot);
+    }
+    get resolves() {
+        return new AsyncExpectation(this.actual, false, this.isNot);
+    }
+    assertPass(pass, message) {
+        assert.ok(this.isNot ? !pass : pass, message);
+    }
+    show(v) {
+        return inspect(v, { depth: 6 });
+    }
+    toBe(expected) {
+        if (this.isNot)
+            assert.notStrictEqual(this.actual, expected);
+        else
+            assert.strictEqual(this.actual, expected);
+    }
+    toEqual(expected) {
+        const pass = looseEqual(this.actual, expected);
+        this.assertPass(pass, `toEqual mismatch:\n  actual:   ${this.show(this.actual)}\n  expected: ${this.show(expected)}`);
+    }
+    toStrictEqual(expected) {
+        if (isAsymmetric(expected)) {
+            this.assertPass(expected.matches(this.actual), `toStrictEqual mismatch: ${this.show(this.actual)}`);
+            return;
+        }
+        if (this.isNot)
+            assert.notDeepStrictEqual(this.actual, expected);
+        else
+            assert.deepStrictEqual(this.actual, expected);
+    }
+    toContain(expected) {
+        const pass = (typeof this.actual === "string" || Array.isArray(this.actual)) &&
+            this.actual.includes(expected);
+        this.assertPass(pass, `expected ${this.show(this.actual)} to contain ${this.show(expected)}`);
+    }
+    toContainEqual(expected) {
+        const pass = Array.isArray(this.actual) &&
+            this.actual.some((x) => looseEqual(x, expected));
+        this.assertPass(pass, `expected ${this.show(this.actual)} to contain equal ${this.show(expected)}`);
+    }
+    toMatchObject(expected) {
+        this.assertPass(matchObject(this.actual, expected), `expected ${this.show(this.actual)} to match object ${this.show(expected)}`);
+    }
+    toMatch(expected) {
+        const pass = typeof expected === "string"
+            ? String(this.actual).includes(expected)
+            : expected.test(this.actual);
+        this.assertPass(pass, `expected ${this.show(String(this.actual))} to match ${expected}`);
+    }
+    toHaveLength(length) {
+        this.assertPass(this.actual != null && this.actual.length === length, `expected length ${this.actual?.length} to be ${length}`);
+    }
+    toBeDefined() {
+        this.assertPass(this.actual !== undefined, `expected value to be defined`);
+    }
+    toBeUndefined() {
+        this.assertPass(this.actual === undefined, `expected ${this.show(this.actual)} to be undefined`);
+    }
+    toBeNull() {
+        this.assertPass(this.actual === null, `expected ${this.show(this.actual)} to be null`);
+    }
+    toBeTruthy() {
+        this.assertPass(!!this.actual, `expected ${this.show(this.actual)} to be truthy`);
+    }
+    toBeFalsy() {
+        this.assertPass(!this.actual, `expected ${this.show(this.actual)} to be falsy`);
+    }
+    toBeGreaterThan(n) {
+        this.assertPass(this.actual > n, `expected ${this.show(this.actual)} > ${n}`);
+    }
+    toBeLessThan(n) {
+        this.assertPass(this.actual < n, `expected ${this.show(this.actual)} < ${n}`);
+    }
+    toBeGreaterThanOrEqual(n) {
+        this.assertPass(this.actual >= n, `expected ${this.show(this.actual)} >= ${n}`);
+    }
+    toBeLessThanOrEqual(n) {
+        this.assertPass(this.actual <= n, `expected ${this.show(this.actual)} <= ${n}`);
+    }
+    toBeInstanceOf(cls) {
+        this.assertPass(this.actual instanceof cls, `expected ${this.show(this.actual)} to be instance of ${cls?.name}`);
+    }
+    toThrow(expected) {
+        let threw = false;
+        let error;
+        try {
+            if (typeof this.actual === "function")
+                this.actual();
+        }
+        catch (e) {
+            threw = true;
+            error = e;
+        }
+        const pass = threw && (expected === undefined || matchError(error, expected));
+        this.assertPass(pass, `expected function to throw`);
+    }
+    toHaveBeenCalled() {
+        this.assertPass((this.actual?.mock?.calls?.length ?? 0) > 0, `expected mock function to have been called`);
+    }
+    // jest alias for toHaveBeenCalled
+    toBeCalled() {
+        this.toHaveBeenCalled();
+    }
+    toHaveBeenCalledTimes(n) {
+        const count = this.actual?.mock?.calls?.length ?? 0;
+        this.assertPass(count === n, `expected mock to have been called ${n} times, but was called ${count} times`);
+    }
+}
+// async matchers via expect(promise).rejects / .resolves
+class AsyncExpectation {
+    constructor(actual, wantReject, isNot) {
+        this.actual = actual;
+        this.wantReject = wantReject;
+        this.isNot = isNot;
+    }
+    async settle() {
+        try {
+            const value = typeof this.actual === "function" ? await this.actual() : await this.actual;
+            return { threw: false, value };
+        }
+        catch (error) {
+            return { threw: true, error };
+        }
+    }
+    async settledExpectation() {
+        const { threw, value, error } = await this.settle();
+        if (this.wantReject) {
+            assert.ok(threw, `expected promise to reject, but it resolved`);
+            return new Expectation(error, this.isNot);
+        }
+        assert.ok(!threw, `expected promise to resolve, but it rejected: ${error}`);
+        return new Expectation(value, this.isNot);
+    }
+    async toThrow(expected) {
+        const { threw, error } = await this.settle();
+        if (this.wantReject) {
+            const pass = threw && (expected === undefined || matchError(error, expected));
+            assert.ok(this.isNot ? !pass : pass, `expected promise to reject${expected !== undefined ? " with " + expected : ""}`);
+        }
+        else {
+            assert.ok(!threw, `expected promise to resolve`);
+        }
+    }
+    async toBe(expected) {
+        (await this.settledExpectation()).toBe(expected);
+    }
+    async toEqual(expected) {
+        (await this.settledExpectation()).toEqual(expected);
+    }
+    async toStrictEqual(expected) {
+        (await this.settledExpectation()).toStrictEqual(expected);
+    }
+}
+export const expect = ((actual) => new Expectation(actual));
+expect.arrayContaining = (sample) => new ArrayContaining(sample);
+expect.objectContaining = (sample) => new ObjectContaining(sample);
+expect.any = (sample) => new Any(sample);
+// assertion-count expectation is not tracked; accepted as a no-op.
+expect.assertions = (_n) => { };
+// ---------------------------------------------------------------------------
+// jest.fn() mock functions
+// ---------------------------------------------------------------------------
+export const fn = (impl) => {
+    const calls = [];
+    let implementation = impl;
+    let returnValue;
+    let hasReturnValue = false;
+    const mockFn = (...args) => {
+        calls.push(args);
+        if (implementation)
+            return implementation(...args);
+        if (hasReturnValue)
+            return returnValue;
+        return undefined;
+    };
+    mockFn.mock = { calls };
+    mockFn.mockReturnValue = (v) => {
+        returnValue = v;
+        hasReturnValue = true;
+        return mockFn;
+    };
+    mockFn.mockImplementation = (f) => {
+        implementation = f;
+        return mockFn;
+    };
+    mockFn.mockClear = () => {
+        calls.length = 0;
+    };
+    mockFn.mockReset = () => {
+        calls.length = 0;
+        implementation = undefined;
+        hasReturnValue = false;
+        returnValue = undefined;
+    };
+    return mockFn;
+};
+// jest.spyOn: wrap an object method with a mock that calls through to the
+// original by default and can be restored. Tracked so restoreAllMocks() can
+// undo every active spy.
+const activeSpies = [];
+const spyOn = (obj, method) => {
+    const original = obj[method];
+    const spy = fn((...args) => typeof original === "function" ? original.apply(obj, args) : undefined);
+    spy.mockRestore = () => {
+        obj[method] = original;
+    };
+    obj[method] = spy;
+    activeSpies.push(spy);
+    return spy;
+};
+// ---------------------------------------------------------------------------
+// jest object: setTimeout (no-op; node:test has no default timeout), fn, mock
+// ---------------------------------------------------------------------------
+export const jest = {
+    // node:test has no global default timeout, so raising it is unnecessary.
+    setTimeout: (_ms) => { },
+    fn,
+    spyOn,
+    // Mock a module. With a factory, the named exports it returns replace those
+    // on the (shared, require-cached) module; without one, function exports are
+    // auto-mocked. Mutating the cached exports means modules required afterwards
+    // see the mocks - so callers should require() the system-under-test after
+    // jest.mock (jest hoists mock calls above imports; node:test does not).
+    mock: (name, factory) => {
+        const mod = require(name);
+        if (factory) {
+            const replacement = factory();
+            for (const key of Object.keys(replacement)) {
+                try {
+                    mod[key] = replacement[key];
+                }
+                catch {
+                    // non-writable export; skip
+                }
+            }
+            return;
+        }
+        for (const key of Object.keys(mod)) {
+            if (typeof mod[key] === "function") {
+                try {
+                    mod[key] = fn();
+                }
+                catch {
+                    // non-writable export; skip
+                }
+            }
+        }
+    },
+    clearAllMocks: () => {
+        for (const spy of activeSpies)
+            spy.mockClear?.();
+    },
+    restoreAllMocks: () => {
+        while (activeSpies.length)
+            activeSpies.pop().mockRestore?.();
+    },
+};
+//# sourceMappingURL=test_expect.js.map

package/dist/test_expect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test_expect.js","sourceRoot":"","sources":["../test_expect.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,17 +1,22 @@
-import * as multiTenant from "./multi-tenant";
+import * as multiTenant from "./multi-tenant.js";
 import { ReadStream, WriteStream } from "fs";
-import { Row, Where, SelectOptions, PrimaryKeyValue } from "./internal";
+import { Row, Where, SelectOptions, PrimaryKeyValue } from "./internal.js";
 type RequestContext = {
     tenant: string;
     client?: any;
     req?: any;
 };
+export type DbClient = {
+    query: (text: string, values?: any[]) => Promise<any>;
+    release: () => void;
+};
 export type DbExportsType = {
     tenant: typeof multiTenant;
     sqlsanitize: (s?: string) => string;
     connectObj: GenObj;
     isSQLite: boolean;
     is_node: boolean;
+    driverName: string;
     mkWhere: (q: Where) => any;
     getTenantSchemaPrefix: () => string;
     insert: (table: string, data: GenObj, opts?: any) => Promise<any>;
@@ -37,7 +42,8 @@ export type DbExportsType = {
             getLocale: () => string;
             __: (str: string) => string;
         };
-        client?: object | string;
+        client?: DbClient | null;
+        inTransaction?: boolean;
     };
     drop_fts_index: (table: string) => Promise<void>;
     drop_index: (table: string, columns: string[]) => Promise<void>;
@@ -50,6 +56,7 @@ export type DbExportsType = {
     is_sqlite: boolean;
     copyFrom: (readStream: ReadStream, table: string, fieldNames: any[], client: any) => Promise<any>;
     set_sql_logging: (enabled: boolean) => void;
+    setRequestUserContext: (client: any, isLocal?: boolean) => Promise<void>;
     is_it_multi_tenant: () => boolean;
     updateWhere: (table: string, data: Row, where: Where) => Promise<any>;
     slugify: (str: string) => string;
@@ -69,6 +76,19 @@ export type DbExportsType = {
     get_sql_logging: () => boolean;
     getVersion: (arg?: boolean) => Promise<string>;
     enable_multi_tenant: () => void;
+    create_tenant_schema: (name: string, ifNotExists?: boolean) => Promise<void>;
+    drop_tenant_schema: (name: string) => Promise<void>;
+    serial_pk_sql_type: string;
+    json_sql_type: string;
+    indexable_text_sql_type: string;
+    translateMigrationsFromPostgresql?: (sql: string) => string;
+    upsert_config: (key: string, value: any) => Promise<void>;
+    array_agg_sql_fn?: string;
+    sqlDialectFactory?: (initCount?: number) => any;
+    supports_search_path: boolean;
+    getExpressSessionStore: (session: any, opts?: {
+        pruneInterval?: number;
+    }) => any;
     [key: string]: any;
 };
 export type GenObj = {

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@saltcorn/db-common",
-  "version": "1.6.0",
+  "version": "1.7.0-alpha.0",
   "description": "Db common structures for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
-    "test": "jest dist --runInBand",
+    "test": "cd dist && node --test",
     "tsc": "tsc -p tsconfig.json",
     "clean": "rm -rf ./dist/*"
   },
+  "type": "module",
   "main": "./dist/index.js",
   "author": "Tom Nielsen",
   "license": "MIT",
@@ -28,21 +29,9 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "jest": "29.7.0",
     "@types/node": "^20.14.7",
     "typescript": "5.9.2"
   },
-  "jest": {
-    "testEnvironment": "node",
-    "moduleNameMapper": {
-      "@saltcorn/sqlite/(.*)": "<rootDir>/../sqlite/dist/$1",
-      "@saltcorn/db-common/(.*)": "<rootDir>/../db-common/dist/$1",
-      "@saltcorn/data/(.*)": "<rootDir>/../saltcorn/data/dist/$1",
-      "@saltcorn/types/(.*)": "<rootDir>/../saltcorn-types/dist/$1",
-      "@saltcorn/markup$": "<rootDir>/../saltcorn-markup/dist",
-      "@saltcorn/markup/(.*)": "<rootDir>/../saltcorn-markup/dist/$1"
-    }
-  },
   "repository": "github:saltcorn/saltcorn",
   "publishConfig": {
     "access": "public"