@saltcorn/db-common 0.6.1-beta.3 → 0.6.2-beta.2

package/dist/index.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.js"],"names":[],"mappings":""}

package/{index.js → dist/index.js}

@@ -1,17 +1,17 @@
-// for the jsdoc documentation
-/**
- * @category db-common
- * @module db-common/index
- */
-
-/**
- * All files in the db-common package.
- * @namespace db-common_overview
- * @property {module:internal} internal
- * @property {module:multi-tenant} multi-tenant
- * @property {module:single-tenant} single-tenant
- * @property {module:tenants} tenants
- * 
- * @category db-common
- */
-
+"use strict";
+// for the jsdoc documentation
+/**
+ * @category db-common
+ * @module db-common/index
+ */
+/**
+ * All files in the db-common package.
+ * @namespace db-common_overview
+ * @property {module:internal} internal
+ * @property {module:multi-tenant} multi-tenant
+ * @property {module:single-tenant} single-tenant
+ * @property {module:tenants} tenants
+ *
+ * @category db-common
+ */
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.js"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B;;;GAGG;AAEH;;;;;;;;;GASG"}

package/dist/internal.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Transform value to correct sql name.
+ * Note! Dont use other symbols than ^A-Za-z_0-9
+ * @function
+ * @param {string} nm
+ * @returns {string}
+ */
+export declare const sqlsanitize: (nm: string | any) => string;
+/**
+ * Transform value to correct sql name.
+ * Instead of sqlsanitize also allows .
+ * For e.g. table name
+ * Note! Dont use other symbols than ^A-Za-z_0-9.
+ * @function
+ * @param {string} nm
+ * @returns {string}
+ */
+export declare const sqlsanitizeAllowDots: (nm: string | any) => string;
+declare type WhereAndVals = {
+    where: string;
+    values: string[];
+};
+/**
+ * @param {object} whereObj
+ * @param {boolean} is_sqlite
+ * @param {number} initCount
+ * @returns {object}
+ */
+export declare const mkWhere: (whereObj: any, is_sqlite: boolean, initCount?: number) => WhereAndVals;
+/**
+ * @param {object} selopts
+ * @returns {string[]}
+ */
+export declare const mkSelectOptions: (selopts: any) => string;
+export {};
+//# sourceMappingURL=internal.d.ts.map

package/dist/internal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../internal.ts"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,OAAQ,MAAM,GAAG,GAAG,KAAG,MAK9C,CAAC;AACF;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,GAAG,GAAG,KAAG,MAKvD,CAAC;AA6OF,aAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF;;;;;GAKG;AACH,eAAO,MAAM,OAAO,aACR,GAAG,aACF,OAAO,yBAEjB,YAaF,CAAC;AAsCF;;;GAGG;AACH,eAAO,MAAM,eAAe,YAAa,GAAG,WAkB3C,CAAC"}

package/dist/internal.js

@@ -0,0 +1,292 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mkSelectOptions = exports.mkWhere = exports.sqlsanitizeAllowDots = exports.sqlsanitize = void 0;
+/**
+ * @category db-common
+ * @module internal
+ */
+const { footer } = require("@saltcorn/markup/tags");
+//https://stackoverflow.com/questions/15300704/regex-with-my-jquery-function-for-sql-variable-name-validation
+/**
+ * Transform value to correct sql name.
+ * Note! Dont use other symbols than ^A-Za-z_0-9
+ * @function
+ * @param {string} nm
+ * @returns {string}
+ */
+const sqlsanitize = (nm) => {
+    if (typeof nm === "symbol")
+        return (0, exports.sqlsanitize)(nm.description);
+    const s = nm.replace(/[^A-Za-z_0-9]*/g, "");
+    if (s[0] >= "0" && s[0] <= "9")
+        return `_${s}`;
+    else
+        return s;
+};
+exports.sqlsanitize = sqlsanitize;
+/**
+ * Transform value to correct sql name.
+ * Instead of sqlsanitize also allows .
+ * For e.g. table name
+ * Note! Dont use other symbols than ^A-Za-z_0-9.
+ * @function
+ * @param {string} nm
+ * @returns {string}
+ */
+const sqlsanitizeAllowDots = (nm) => {
+    if (typeof nm === "symbol")
+        return (0, exports.sqlsanitizeAllowDots)(nm.description);
+    const s = nm.replace(/[^A-Za-z_0-9."]*/g, "");
+    if (s[0] >= "0" && s[0] <= "9")
+        return `_${s}`;
+    else
+        return s;
+};
+exports.sqlsanitizeAllowDots = sqlsanitizeAllowDots;
+/**
+ *
+ * @param {object} v
+ * @param {string} i
+ * @param {boolean} is_sqlite
+ * @returns {string}
+ */
+const whereFTS = (v, i, is_sqlite) => {
+    const { fields, table } = v;
+    var flds = fields
+        .filter((f) => f.type && f.type.sql_name === "text")
+        .map((f) => "coalesce(" +
+        (table
+            ? `"${(0, exports.sqlsanitize)(table)}"."${(0, exports.sqlsanitize)(f.name)}"`
+            : `"${(0, exports.sqlsanitize)(f.name)}"`) +
+        ",'')")
+        .join(" || ' ' || ");
+    if (flds === "")
+        flds = "''";
+    if (is_sqlite)
+        return `${flds} LIKE '%' || ? || '%'`;
+    else
+        return `to_tsvector('english', ${flds}) @@ plainto_tsquery('english', $${i})`;
+};
+/**
+ * @param {boolean} is_sqlite
+ * @param {string} i
+ * @returns {string}
+ */
+const placeHolder = (is_sqlite, i) => is_sqlite ? `?` : `$${i}`;
+/**
+ * @returns {number}
+ */
+const mkCounter = (init = 0) => {
+    let i = init;
+    return () => {
+        i += 1;
+        return i;
+    };
+};
+/**
+ *
+ * @param {boolean} is_sqlite
+ * @param {string} i
+ * @returns {function}
+ */
+const subSelectWhere = (is_sqlite, i) => (k, v) => {
+    const whereObj = v.inSelect.where;
+    const wheres = whereObj ? Object.entries(whereObj) : [];
+    const where = whereObj && wheres.length > 0
+        ? "where " + wheres.map(whereClause(is_sqlite, i)).join(" and ")
+        : "";
+    return `${quote((0, exports.sqlsanitizeAllowDots)(k))} in (select ${v.inSelect.field} from ${v.inSelect.table} ${where})`;
+};
+/**
+ * @param {object} v
+ * @returns {object[]}
+ */
+const subSelectVals = (v) => {
+    const whereObj = v.inSelect.where;
+    const wheres = whereObj ? Object.entries(whereObj) : [];
+    const xs = wheres
+        .map(getVal)
+        .flat(1)
+        .filter((v) => v !== null);
+    return xs;
+};
+/**
+ * @param {string} s
+ * @returns {string}
+ */
+const wrapParens = (s) => (s ? `(${s})` : s);
+/**
+ * @param {string} s
+ * @returns {string}
+ */
+const quote = (s) => s.includes(".") || s.includes('"') ? s : `"${s}"`;
+/**
+ * @param {boolean} is_sqlite
+ * @param {string} i
+ * @returns {function}
+ */
+const whereOr = (is_sqlite, i) => (ors) => wrapParens(ors
+    .map((vi) => Object.entries(vi)
+    .map((kv) => whereClause(is_sqlite, i)(kv))
+    .join(" and "))
+    .join(" or "));
+const equals = ([v1, v2], is_sqlite, i) => {
+    const pVal = (v) => typeof v === "symbol"
+        ? quote((0, exports.sqlsanitizeAllowDots)(v.description))
+        : placeHolder(is_sqlite, i()) + (typeof v === "string" ? "::text" : "");
+    const isNull = (v) => `${pVal(v)} is null`;
+    if (v1 === null && v2 === null)
+        return "null is null";
+    if (v1 === null)
+        return isNull(v2);
+    if (v2 === null)
+        return isNull(v1);
+    return `${pVal(v1)}=${pVal(v2)}`;
+};
+const equalsVals = (vs) => {
+    let vals = new Array();
+    vs.forEach((v) => {
+        if (v !== null && typeof v !== "symbol")
+            vals.push(v);
+    });
+    //console.log({ vals });
+    return vals;
+};
+/**
+ * @param {boolean} is_sqlite
+ * @param {string} i
+ * @returns {function}
+ */
+const whereClause = (is_sqlite, i) => ([k, v]) => k === "_fts"
+    ? whereFTS(v, i(), is_sqlite)
+    : typeof (v || {}).in !== "undefined"
+        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} = ${is_sqlite ? "" : "ANY"} (${placeHolder(is_sqlite, i())})`
+        : k === "or" && Array.isArray(v)
+            ? whereOr(is_sqlite, i)(v)
+            : k === "not" && typeof v === "object"
+                ? `not (${Object.entries(v)
+                    .map((kv) => whereClause(is_sqlite, i)(kv))
+                    .join(" and ")})`
+                : k === "eq" && Array.isArray(v)
+                    ? // @ts-ignore
+                        equals(v, is_sqlite, i)
+                    : v && v.or && Array.isArray(v.or)
+                        ? wrapParens(v.or.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" or "))
+                        : Array.isArray(v)
+                            ? v.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" and ")
+                            : typeof (v || {}).ilike !== "undefined"
+                                ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${is_sqlite ? "LIKE" : "ILIKE"} '%' || ${placeHolder(is_sqlite, i())} || '%'`
+                                : typeof (v || {}).gt !== "undefined"
+                                    ? `${quote((0, exports.sqlsanitizeAllowDots)(k))}>${v.equal ? "=" : ""}${placeHolder(is_sqlite, i())}`
+                                    : typeof (v || {}).lt !== "undefined"
+                                        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))}<${v.equal ? "=" : ""}${placeHolder(is_sqlite, i())}`
+                                        : typeof (v || {}).inSelect !== "undefined"
+                                            ? subSelectWhere(is_sqlite, i)(k, v)
+                                            : typeof (v || {}).json !== "undefined"
+                                                ? is_sqlite
+                                                    ? `json_extract(${quote((0, exports.sqlsanitizeAllowDots)(k))}, '$.${(0, exports.sqlsanitizeAllowDots)(v.json[0])}')=${placeHolder(is_sqlite, i())}`
+                                                    : `${quote((0, exports.sqlsanitizeAllowDots)(k))}->>'${(0, exports.sqlsanitizeAllowDots)(v.json[0])}'=${placeHolder(is_sqlite, i())}`
+                                                : v === null
+                                                    ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} is null`
+                                                    : k === "not"
+                                                        ? `not (${typeof v === "symbol" ? v.description : placeHolder(is_sqlite, i())})`
+                                                        : `${quote((0, exports.sqlsanitizeAllowDots)(k))}=${typeof v === "symbol" ? v.description : placeHolder(is_sqlite, i())}`;
+/**
+ * @param {object[]} opts
+ * @param {object} opts.k
+ * @param {object} opts.v
+ * @returns {boolean|object}
+ */
+const getVal = ([k, v]) => k === "_fts"
+    ? v.searchTerm
+    : typeof (v || {}).in !== "undefined"
+        ? [v.in]
+        : k === "not" && typeof v === "object"
+            ? Object.entries(v).map(getVal).flat(1)
+            : k === "eq" && Array.isArray(v)
+                ? equalsVals(v).flat(1)
+                : k === "or" && Array.isArray(v)
+                    ? v
+                        .map((vi) => Object.entries(vi).map(getVal))
+                        .flat(1)
+                        .flat(1)
+                    : v && v.or && Array.isArray(v.or)
+                        ? v.or.map((vi) => getVal([k, vi])).flat(1)
+                        : Array.isArray(v)
+                            ? v.map((vi) => getVal([k, vi])).flat(1)
+                            : typeof (v || {}).ilike !== "undefined"
+                                ? v.ilike
+                                : typeof (v || {}).inSelect !== "undefined"
+                                    ? subSelectVals(v)
+                                    : typeof (v || {}).lt !== "undefined"
+                                        ? v.lt
+                                        : typeof (v || {}).gt !== "undefined"
+                                            ? v.gt
+                                            : typeof (v || {}).sql !== "undefined"
+                                                ? null
+                                                : typeof (v || {}).json !== "undefined"
+                                                    ? v.json[1]
+                                                    : typeof v === "symbol"
+                                                        ? null
+                                                        : v;
+/**
+ * @param {object} whereObj
+ * @param {boolean} is_sqlite
+ * @param {number} initCount
+ * @returns {object}
+ */
+const mkWhere = (whereObj, is_sqlite, initCount = 0) => {
+    const wheres = whereObj ? Object.entries(whereObj) : [];
+    //console.log({ wheres });
+    const where = whereObj && wheres.length > 0
+        ? "where " +
+            wheres.map(whereClause(is_sqlite, mkCounter(initCount))).join(" and ")
+        : "";
+    const values = wheres
+        .map(getVal)
+        .flat(1)
+        .filter((v) => v !== null);
+    return { where, values };
+};
+exports.mkWhere = mkWhere;
+/**
+ * @param {number|string} x
+ * @returns {number|null}
+ */
+const toInt = (x) => typeof x === "number"
+    ? Math.round(x)
+    : typeof x === "string"
+        ? parseInt(x)
+        : null;
+/**
+ * @param {object} opts
+ * @param {string} opts.latField
+ * @param {string} opts.longField
+ * @param {number} opts.lat
+ * @param {number} opts.long
+ * @returns {string}
+ */
+const getDistanceOrder = ({ latField, longField, lat, long }) => {
+    const cos_lat_2 = Math.pow(Math.cos((+lat * Math.PI) / 180), 2);
+    return `((${(0, exports.sqlsanitizeAllowDots)(latField)} - ${+lat})*(${(0, exports.sqlsanitizeAllowDots)(latField)} - ${+lat})) + ((${(0, exports.sqlsanitizeAllowDots)(longField)} - ${+long})*(${(0, exports.sqlsanitizeAllowDots)(longField)} - ${+long})*${cos_lat_2})`;
+};
+/**
+ * @param {object} selopts
+ * @returns {string[]}
+ */
+const mkSelectOptions = (selopts) => {
+    const orderby = selopts.orderBy === "RANDOM()"
+        ? "order by RANDOM()"
+        : selopts.orderBy && selopts.orderBy.distance
+            ? `order by ${getDistanceOrder(selopts.orderBy.distance)}`
+            : selopts.orderBy && selopts.nocase
+                ? `order by lower(${(0, exports.sqlsanitizeAllowDots)(selopts.orderBy)})${selopts.orderDesc ? " DESC" : ""}`
+                : selopts.orderBy
+                    ? `order by ${(0, exports.sqlsanitizeAllowDots)(selopts.orderBy)}${selopts.orderDesc ? " DESC" : ""}`
+                    : "";
+    const limit = selopts.limit ? `limit ${toInt(selopts.limit)}` : "";
+    const offset = selopts.offset ? `offset ${toInt(selopts.offset)}` : "";
+    return [orderby, limit, offset].filter((s) => s).join(" ");
+};
+exports.mkSelectOptions = mkSelectOptions;
+//# sourceMappingURL=internal.js.map

package/dist/internal.js.map

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

package/dist/internal.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=internal.test.d.ts.map

package/dist/internal.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.test.d.ts","sourceRoot":"","sources":["../internal.test.js"],"names":[],"mappings":""}

package/dist/internal.test.js

@@ -0,0 +1,190 @@
+"use strict";
+const { sqlsanitize, mkWhere, sqlsanitizeAllowDots } = require("./internal");
+describe("sqlsanitize", () => {
+    it("should not alter valid name", () => {
+        expect(sqlsanitize("ffoo_oo")).toBe("ffoo_oo");
+    });
+    it("should not alter valid symbol", () => {
+        expect(sqlsanitize(Symbol("ffoo_oo"))).toBe("ffoo_oo");
+    });
+    it("should remove spaces", () => {
+        expect(sqlsanitize(" ")).toBe("");
+    });
+    it("should remove chars from invalid name", () => {
+        expect(sqlsanitize("ffoo--oo--uu")).toBe("ffoooouu");
+    });
+    it("should remove chars from invalid symbol", () => {
+        expect(sqlsanitize(Symbol("ffoo--oo--uu"))).toBe("ffoooouu");
+    });
+    it("should not allow dots", () => {
+        expect(sqlsanitize("ffoo.oo")).toBe("ffoooo");
+    });
+    it("should allow dots when specified", () => {
+        expect(sqlsanitizeAllowDots("ffoo.oo")).toBe("ffoo.oo");
+    });
+    it("should allow quotes when dots specified", () => {
+        expect(sqlsanitizeAllowDots('ffoo."oo"')).toBe('ffoo."oo"');
+    });
+    it("should allow numbers", () => {
+        expect(sqlsanitize("ff1oo_oo")).toBe("ff1oo_oo");
+    });
+    it("should not allow numbers in initial position", () => {
+        expect(sqlsanitize("1ffoo_o1o")).toBe("_1ffoo_o1o");
+    });
+});
+describe("mkWhere", () => {
+    it("should empty on no arg", () => {
+        expect(mkWhere()).toStrictEqual({ values: [], where: "" });
+    });
+    it("should empty on null obj arg", () => {
+        expect(mkWhere({})).toStrictEqual({ values: [], where: "" });
+    });
+    it("should query json", () => {
+        expect(mkWhere({ foo: { json: ["bar", 5] } })).toStrictEqual({
+            values: [5],
+            where: `where "foo"->>'bar'=$1`,
+        });
+    });
+    it("should set id", () => {
+        expect(mkWhere({ id: 5 })).toStrictEqual({
+            values: [5],
+            where: 'where "id"=$1',
+        });
+        expect(mkWhere({ id: 5, hello: "world" })).toStrictEqual({
+            values: [5, "world"],
+            where: 'where "id"=$1 and "hello"=$2',
+        });
+    });
+    it("should read eq", () => {
+        expect(mkWhere({ eq: [Symbol("id"), 5] })).toStrictEqual({
+            values: [5],
+            where: 'where "id"=$1',
+        });
+        expect(mkWhere({ eq: [Symbol("id"), null] })).toStrictEqual({
+            values: [],
+            where: 'where "id" is null',
+        });
+        expect(mkWhere({ eq: ["id", null] })).toStrictEqual({
+            values: ["id"],
+            where: "where $1::text is null",
+        });
+        expect(mkWhere({ eq: [4, 5] })).toStrictEqual({
+            values: [4, 5],
+            where: "where $1=$2",
+        });
+        expect(mkWhere({ eq: [null, 5] })).toStrictEqual({
+            values: [5],
+            where: "where $1 is null",
+        });
+        expect(mkWhere({ not: { eq: [Symbol("id"), 5] } })).toStrictEqual({
+            values: [5],
+            where: 'where not ("id"=$1)',
+        });
+    });
+    it("should query null", () => {
+        expect(mkWhere({ id: null })).toStrictEqual({
+            values: [],
+            where: 'where "id" is null',
+        });
+        expect(mkWhere({ id: null, foo: 1 })).toStrictEqual({
+            values: [1],
+            where: 'where "id" is null and "foo"=$1',
+        });
+        expect(mkWhere({ foo: 1, id: null })).toStrictEqual({
+            values: [1],
+            where: 'where "foo"=$1 and "id" is null',
+        });
+    });
+    it("should query lt/gt", () => {
+        expect(mkWhere({ id: { lt: 5 } })).toStrictEqual({
+            values: [5],
+            where: 'where "id"<$1',
+        });
+        expect(mkWhere({ id: { gt: 8 } })).toStrictEqual({
+            values: [8],
+            where: 'where "id">$1',
+        });
+        expect(mkWhere({ id: { lt: 5, equal: true } })).toStrictEqual({
+            values: [5],
+            where: 'where "id"<=$1',
+        });
+        expect(mkWhere({ id: { gt: 8, equal: true } })).toStrictEqual({
+            values: [8],
+            where: 'where "id">=$1',
+        });
+        expect(mkWhere({ id: [{ gt: 0 }, { lt: 10 }] })).toStrictEqual({
+            values: [0, 10],
+            where: 'where "id">$1 and "id"<$2',
+        });
+        expect(mkWhere({ id: { or: [{ gt: 10 }, { lt: 5 }] } })).toStrictEqual({
+            values: [10, 5],
+            where: 'where ("id">$1 or "id"<$2)',
+        });
+    });
+    it("should query subselect", () => {
+        expect(mkWhere({
+            id: [{ inSelect: { table: "foo", field: "bar", where: { baz: 7 } } }],
+        })).toStrictEqual({
+            values: [7],
+            where: 'where "id" in (select bar from foo where "baz"=$1)',
+        });
+        expect(mkWhere({
+            age: 45,
+            id: [{ inSelect: { table: "foo", field: "bar", where: { baz: 7 } } }],
+            name: "Alice",
+        })).toStrictEqual({
+            values: [45, 7, "Alice"],
+            where: `where "age"=$1 and "id" in (select bar from foo where "baz"=$2) and "name"=$3`,
+        });
+    });
+    it("should query or", () => {
+        expect(mkWhere({ or: [{ id: 5 }, { x: 7 }] })).toStrictEqual({
+            values: [5, 7],
+            where: 'where ("id"=$1 or "x"=$2)',
+        });
+        expect(mkWhere({ or: [{ id: 5 }, { x: { gt: 7 } }] })).toStrictEqual({
+            values: [5, 7],
+            where: 'where ("id"=$1 or "x">$2)',
+        });
+        expect(mkWhere({ or: [{ id: 5 }, { x: 7, y: 8 }] })).toStrictEqual({
+            values: [5, 7, 8],
+            where: 'where ("id"=$1 or "x"=$2 and "y"=$3)',
+        });
+        expect(mkWhere({ not: { id: 5 } })).toStrictEqual({
+            values: [5],
+            where: 'where not ("id"=$1)',
+        });
+        expect(mkWhere({ not: { id: 5, y: 1 } })).toStrictEqual({
+            values: [5, 1],
+            where: 'where not ("id"=$1 and "y"=$2)',
+        });
+        expect(mkWhere({ not: { y: { in: [1, 2, 3] } } })).toStrictEqual({
+            values: [[1, 2, 3]],
+            where: 'where not ("y" = ANY ($1))',
+        });
+        expect(mkWhere({ y: { in: [1, 2, 3] } })).toStrictEqual({
+            values: [[1, 2, 3]],
+            where: 'where "y" = ANY ($1)',
+        });
+        expect(mkWhere({
+            or: [
+                { not: { eq: ["1", null] } },
+                { not: { eq: [null, null] }, married_to: null },
+            ],
+        })).toStrictEqual({
+            values: ["1"],
+            where: 'where (not ($1::text is null) or not (null is null) and "married_to" is null)',
+        });
+        /*
+    
+        expect(mkWhere([{ id: 5 }, { x: 7 }])).toStrictEqual({
+          values: [5, 7],
+          where: 'where "id"=$1 and "x"=$2',
+        });
+        expect(mkWhere([{ or: [{ id: 5 }, { x: 7 }] }, { z: 9 }])).toStrictEqual({
+          values: [5, 7, 9],
+          where: 'where ("id"=$1 or "x"=$2) and "z"=$3',
+        });*/
+    });
+});
+//# sourceMappingURL=internal.test.js.map

package/dist/internal.test.js.map

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

package/dist/multi-tenant.d.ts

@@ -0,0 +1,28 @@
+/**
+ * @category db-common
+ * @module multi-tenant
+ */
+/// <reference types="node" />
+import { AsyncLocalStorage } from "async_hooks";
+export declare const tenantNamespace: AsyncLocalStorage<unknown>;
+/**
+ * set the connection object of the the multi-tenant
+ * @param connObjPara
+ */
+export declare const init: (connObjPara: any) => void;
+/**
+ * @returns {boolean}
+ */
+export declare const is_it_multi_tenant: () => boolean;
+/**
+ * @returns {void}
+ */
+export declare const enable_multi_tenant: () => void;
+/**
+ * @param {object} tenant
+ * @param {function} f
+ * @returns {object}
+ */
+export declare const runWithTenant: (tenant: any, f: () => any) => any;
+export declare const getTenantSchema: () => string;
+//# sourceMappingURL=multi-tenant.d.ts.map

package/dist/multi-tenant.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"multi-tenant.d.ts","sourceRoot":"","sources":["../multi-tenant.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKhD,eAAO,MAAM,eAAe,4BAA0B,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,IAAI,gBAAiB,GAAG,KAAG,IAEvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,QAAO,OAA0B,CAAC;AAEjE;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAO,IAAU,CAAC;AAElD;;;;GAIG;AACH,eAAO,MAAM,aAAa,WAAY,GAAG,KAAK,MAAM,GAAG,KAAG,GAGzD,CAAC;AAEF,eAAO,MAAM,eAAe,QAAO,MAIlC,CAAC"}