@saltcorn/db-common 0.6.2-beta.3 → 0.6.3-beta.0

package/dist/coverage/lcov-report/sorter.js

@@ -0,0 +1,141 @@
+"use strict";
+/* eslint-disable */
+var addSorting = (function () {
+    'use strict';
+    var cols, currentSort = {
+        index: 0,
+        desc: false
+    };
+    // returns the summary table element
+    function getTable() {
+        return document.querySelector('.coverage-summary');
+    }
+    // returns the thead element of the summary table
+    function getTableHeader() {
+        return getTable().querySelector('thead tr');
+    }
+    // returns the tbody element of the summary table
+    function getTableBody() {
+        return getTable().querySelector('tbody');
+    }
+    // returns the th element for nth column
+    function getNthColumn(n) {
+        return getTableHeader().querySelectorAll('th')[n];
+    }
+    // loads all columns
+    function loadColumns() {
+        var colNodes = getTableHeader().querySelectorAll('th'), colNode, cols = [], col, i;
+        for (i = 0; i < colNodes.length; i += 1) {
+            colNode = colNodes[i];
+            col = {
+                key: colNode.getAttribute('data-col'),
+                sortable: !colNode.getAttribute('data-nosort'),
+                type: colNode.getAttribute('data-type') || 'string'
+            };
+            cols.push(col);
+            if (col.sortable) {
+                col.defaultDescSort = col.type === 'number';
+                colNode.innerHTML =
+                    colNode.innerHTML + '<span class="sorter"></span>';
+            }
+        }
+        return cols;
+    }
+    // attaches a data attribute to every tr element with an object
+    // of data values keyed by column name
+    function loadRowData(tableRow) {
+        var tableCols = tableRow.querySelectorAll('td'), colNode, col, data = {}, i, val;
+        for (i = 0; i < tableCols.length; i += 1) {
+            colNode = tableCols[i];
+            col = cols[i];
+            val = colNode.getAttribute('data-value');
+            if (col.type === 'number') {
+                val = Number(val);
+            }
+            data[col.key] = val;
+        }
+        return data;
+    }
+    // loads all row data
+    function loadData() {
+        var rows = getTableBody().querySelectorAll('tr'), i;
+        for (i = 0; i < rows.length; i += 1) {
+            rows[i].data = loadRowData(rows[i]);
+        }
+    }
+    // sorts the table using the data for the ith column
+    function sortByIndex(index, desc) {
+        var key = cols[index].key, sorter = function (a, b) {
+            a = a.data[key];
+            b = b.data[key];
+            return a < b ? -1 : a > b ? 1 : 0;
+        }, finalSorter = sorter, tableBody = document.querySelector('.coverage-summary tbody'), rowNodes = tableBody.querySelectorAll('tr'), rows = [], i;
+        if (desc) {
+            finalSorter = function (a, b) {
+                return -1 * sorter(a, b);
+            };
+        }
+        for (i = 0; i < rowNodes.length; i += 1) {
+            rows.push(rowNodes[i]);
+            tableBody.removeChild(rowNodes[i]);
+        }
+        rows.sort(finalSorter);
+        for (i = 0; i < rows.length; i += 1) {
+            tableBody.appendChild(rows[i]);
+        }
+    }
+    // removes sort indicators for current column being sorted
+    function removeSortIndicators() {
+        var col = getNthColumn(currentSort.index), cls = col.className;
+        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
+        col.className = cls;
+    }
+    // adds sort indicators for current column being sorted
+    function addSortIndicators() {
+        getNthColumn(currentSort.index).className += currentSort.desc
+            ? ' sorted-desc'
+            : ' sorted';
+    }
+    // adds event listeners for all sorter widgets
+    function enableUI() {
+        var i, el, ithSorter = function ithSorter(i) {
+            var col = cols[i];
+            return function () {
+                var desc = col.defaultDescSort;
+                if (currentSort.index === i) {
+                    desc = !currentSort.desc;
+                }
+                sortByIndex(i, desc);
+                removeSortIndicators();
+                currentSort.index = i;
+                currentSort.desc = desc;
+                addSortIndicators();
+            };
+        };
+        for (i = 0; i < cols.length; i += 1) {
+            if (cols[i].sortable) {
+                // add the click event handler on the th so users
+                // dont have to click on those tiny arrows
+                el = getNthColumn(i).querySelector('.sorter').parentElement;
+                if (el.addEventListener) {
+                    el.addEventListener('click', ithSorter(i));
+                }
+                else {
+                    el.attachEvent('onclick', ithSorter(i));
+                }
+            }
+        }
+    }
+    // adds sorting functionality to the UI
+    return function () {
+        if (!getTable()) {
+            return;
+        }
+        cols = loadColumns();
+        loadData();
+        addSortIndicators();
+        enableUI();
+    };
+})();
+window.addEventListener('load', addSorting);
+//# sourceMappingURL=sorter.js.map

package/dist/coverage/lcov-report/sorter.js.map

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

package/dist/internal.d.ts

@@ -1,3 +1,7 @@
+/**
+ * @category db-common
+ * @module internal
+ */
 /**
  * Transform value to correct sql name.
  * Note! Dont use other symbols than ^A-Za-z_0-9
@@ -5,7 +9,7 @@
  * @param {string} nm
  * @returns {string}
  */
-export declare const sqlsanitize: (nm: string | any) => string;
+export declare const sqlsanitize: (nm: string | symbol) => string;
 /**
  * Transform value to correct sql name.
  * Instead of sqlsanitize also allows .
@@ -15,10 +19,38 @@ export declare const sqlsanitize: (nm: string | any) => string;
  * @param {string} nm
  * @returns {string}
  */
-export declare const sqlsanitizeAllowDots: (nm: string | any) => string;
+export declare const sqlsanitizeAllowDots: (nm: string | symbol) => string;
+export declare type Value = string | number | boolean | Date | Value[];
+export declare type Where = {
+    _fts?: {
+        fields: any[];
+        table?: string;
+        searchTerm: string;
+    };
+    or?: Where[];
+    not?: Where | symbol;
+    eq?: Value[];
+    [key: string]: {
+        in: Value[];
+    } | {
+        or: Value[];
+    } | {
+        gt: Value;
+        equal?: boolean;
+    } | {
+        lt: Value;
+        equal?: boolean;
+    } | Value[] | {
+        inSelect: {
+            where: Where;
+            field: string;
+            table: string;
+        };
+    } | null | symbol | any;
+};
 declare type WhereAndVals = {
     where: string;
-    values: string[];
+    values: Value[];
 };
 /**
  * @param {object} whereObj
@@ -26,11 +58,64 @@ declare type WhereAndVals = {
  * @param {number} initCount
  * @returns {object}
  */
-export declare const mkWhere: (whereObj: any, is_sqlite: boolean, initCount?: number) => WhereAndVals;
+export declare const mkWhere: (whereObj: Where, is_sqlite: boolean, initCount?: number) => WhereAndVals;
+export declare type CoordOpts = {
+    latField: string;
+    longField: string;
+    lat: string;
+    long: string;
+};
+export declare type SelectOptions = {
+    orderBy?: {
+        distance: CoordOpts;
+    } | string;
+    limit?: string | number;
+    offset?: string | number;
+    nocase?: boolean;
+    orderDesc?: boolean;
+    cached?: boolean;
+    versioned?: boolean;
+    min_role_read?: number;
+    min_role_write?: number;
+    ownership_field_id?: string;
+    ownership_formula?: string;
+    description?: string;
+};
+export declare const orderByIsObject: (object: any) => object is {
+    distance: CoordOpts;
+};
+export declare type JoinField = {
+    ref: any;
+    target: any;
+    through: any;
+    [key: string]: any;
+};
+export declare type JoinOptions = {
+    joinFields?: JoinField;
+    aggregations?: AggregationOptions[];
+    where: any;
+} & SelectOptions;
+export declare type AggregationOptions = {
+    table: string;
+    ref: string;
+    field: string;
+    where?: string;
+    aggregate: string;
+    subselect?: SubselectOptions;
+};
+export declare type SubselectOptions = {
+    tableName: string;
+    whereField: string;
+    field: string;
+    table: any;
+};
 /**
  * @param {object} selopts
- * @returns {string[]}
+ * @returns {string}
  */
-export declare const mkSelectOptions: (selopts: any) => string;
+export declare const mkSelectOptions: (selopts: SelectOptions) => string;
+export declare type Row = {
+    [key: string]: any;
+};
 export {};
 //# sourceMappingURL=internal.d.ts.map

package/dist/internal.d.ts.map

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

package/dist/internal.js

@@ -1,11 +1,10 @@
 "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");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mkSelectOptions = exports.orderByIsObject = exports.mkWhere = exports.sqlsanitizeAllowDots = exports.sqlsanitize = void 0;
 //https://stackoverflow.com/questions/15300704/regex-with-my-jquery-function-for-sql-variable-name-validation
 /**
  * Transform value to correct sql name.
@@ -15,8 +14,9 @@ const { footer } = require("@saltcorn/markup/tags");
  * @returns {string}
  */
 const sqlsanitize = (nm) => {
-    if (typeof nm === "symbol")
-        return (0, exports.sqlsanitize)(nm.description);
+    if (typeof nm === "symbol") {
+        return nm.description ? (0, exports.sqlsanitize)(nm.description) : "";
+    }
     const s = nm.replace(/[^A-Za-z_0-9]*/g, "");
     if (s[0] >= "0" && s[0] <= "9")
         return `_${s}`;
@@ -34,8 +34,9 @@ exports.sqlsanitize = sqlsanitize;
  * @returns {string}
  */
 const sqlsanitizeAllowDots = (nm) => {
-    if (typeof nm === "symbol")
-        return (0, exports.sqlsanitizeAllowDots)(nm.description);
+    if (typeof nm === "symbol") {
+        return nm.description ? (0, exports.sqlsanitizeAllowDots)(nm.description) : "";
+    }
     const s = nm.replace(/[^A-Za-z_0-9."]*/g, "");
     if (s[0] >= "0" && s[0] <= "9")
         return `_${s}`;
@@ -43,6 +44,34 @@ const sqlsanitizeAllowDots = (nm) => {
         return s;
 };
 exports.sqlsanitizeAllowDots = sqlsanitizeAllowDots;
+const postgresPlaceHolderStack = (init = 0) => {
+    let values = [];
+    let i = init;
+    return {
+        push(x) {
+            values.push(x);
+            i += 1;
+            return `$${i}`;
+        },
+        is_sqlite: false,
+        getValues() {
+            return values;
+        },
+    };
+};
+const sqlitePlaceHolderStack = () => {
+    let values = [];
+    return {
+        push(x) {
+            values.push(x);
+            return `?`;
+        },
+        is_sqlite: true,
+        getValues() {
+            return values;
+        },
+    };
+};
 /**
  *
  * @param {object} v
@@ -50,9 +79,9 @@ exports.sqlsanitizeAllowDots = sqlsanitizeAllowDots;
  * @param {boolean} is_sqlite
  * @returns {string}
  */
-const whereFTS = (v, i, is_sqlite) => {
+const whereFTS = (v, phs) => {
     const { fields, table } = v;
-    var flds = fields
+    let flds = fields
         .filter((f) => f.type && f.type.sql_name === "text")
         .map((f) => "coalesce(" +
         (table
@@ -62,26 +91,10 @@ const whereFTS = (v, i, is_sqlite) => {
         .join(" || ' ' || ");
     if (flds === "")
         flds = "''";
-    if (is_sqlite)
-        return `${flds} LIKE '%' || ? || '%'`;
+    if (phs.is_sqlite)
+        return `${flds} LIKE '%' || ${phs.push(v.searchTerm)} || '%'`;
     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;
-    };
+        return `to_tsvector('english', ${flds}) @@ plainto_tsquery('english', ${phs.push(v.searchTerm)})`;
 };
 /**
  *
@@ -89,27 +102,14 @@ const mkCounter = (init = 0) => {
  * @param {string} i
  * @returns {function}
  */
-const subSelectWhere = (is_sqlite, i) => (k, v) => {
+const subSelectWhere = (phs) => (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 ")
+        ? "where " + wheres.map(whereClause(phs)).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}
@@ -119,21 +119,25 @@ const wrapParens = (s) => (s ? `(${s})` : s);
  * @param {string} s
  * @returns {string}
  */
-const quote = (s) => s.includes(".") || s.includes('"') ? s : `"${s}"`;
+const quote = (s) => s.includes(".")
+    ? s.split(".").map(quote).join(".")
+    : s.includes('"')
+        ? s
+        : `"${s}"`;
 /**
  * @param {boolean} is_sqlite
  * @param {string} i
  * @returns {function}
  */
-const whereOr = (is_sqlite, i) => (ors) => wrapParens(ors
+const whereOr = (phs) => (ors) => wrapParens(ors
     .map((vi) => Object.entries(vi)
-    .map((kv) => whereClause(is_sqlite, i)(kv))
+    .map((kv) => whereClause(phs)(kv))
     .join(" and "))
     .join(" or "));
-const equals = ([v1, v2], is_sqlite, i) => {
+const equals = ([v1, v2], phs) => {
     const pVal = (v) => typeof v === "symbol"
-        ? quote((0, exports.sqlsanitizeAllowDots)(v.description))
-        : placeHolder(is_sqlite, i()) + (typeof v === "string" ? "::text" : "");
+        ? quote((0, exports.sqlsanitizeAllowDots)(v))
+        : phs.push(v) + (typeof v === "string" ? "::text" : "");
     const isNull = (v) => `${pVal(v)} is null`;
     if (v1 === null && v2 === null)
         return "null is null";
@@ -143,92 +147,45 @@ const equals = ([v1, v2], is_sqlite, i) => {
         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)
+const whereClause = (phs) => ([k, v]) => k === "_fts"
+    ? whereFTS(v, phs)
     : typeof (v || {}).in !== "undefined"
-        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} = ${is_sqlite ? "" : "ANY"} (${placeHolder(is_sqlite, i())})`
+        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} = ${phs.is_sqlite ? "" : "ANY"} (${phs.push(v.in)})`
         : k === "or" && Array.isArray(v)
-            ? whereOr(is_sqlite, i)(v)
+            ? whereOr(phs)(v)
             : k === "not" && typeof v === "object"
                 ? `not (${Object.entries(v)
-                    .map((kv) => whereClause(is_sqlite, i)(kv))
+                    .map((kv) => whereClause(phs)(kv))
                     .join(" and ")})`
                 : k === "eq" && Array.isArray(v)
                     ? // @ts-ignore
-                        equals(v, is_sqlite, i)
+                        equals(v, phs)
                     : v && v.or && Array.isArray(v.or)
-                        ? wrapParens(v.or.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" or "))
+                        ? wrapParens(v.or.map((vi) => whereClause(phs)([k, vi])).join(" or "))
                         : Array.isArray(v)
-                            ? v.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" and ")
+                            ? v.map((vi) => whereClause(phs)([k, vi])).join(" and ")
                             : typeof (v || {}).ilike !== "undefined"
-                                ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${is_sqlite ? "LIKE" : "ILIKE"} '%' || ${placeHolder(is_sqlite, i())} || '%'`
+                                ? `${quote((0, exports.sqlsanitizeAllowDots)(k))} ${phs.is_sqlite ? "LIKE" : "ILIKE"} '%' || ${phs.push(v.ilike)} || '%'`
                                 : typeof (v || {}).gt !== "undefined"
-                                    ? `${quote((0, exports.sqlsanitizeAllowDots)(k))}>${v.equal ? "=" : ""}${placeHolder(is_sqlite, i())}`
+                                    ? `${quote((0, exports.sqlsanitizeAllowDots)(k))}>${v.equal ? "=" : ""}${phs.push(v.gt)}`
                                     : typeof (v || {}).lt !== "undefined"
-                                        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))}<${v.equal ? "=" : ""}${placeHolder(is_sqlite, i())}`
+                                        ? `${quote((0, exports.sqlsanitizeAllowDots)(k))}<${v.equal ? "=" : ""}${phs.push(v.lt)}`
                                         : typeof (v || {}).inSelect !== "undefined"
-                                            ? subSelectWhere(is_sqlite, i)(k, v)
+                                            ? subSelectWhere(phs)(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())}`
+                                                ? phs.is_sqlite
+                                                    ? `json_extract(${quote((0, exports.sqlsanitizeAllowDots)(k))}, '$.${(0, exports.sqlsanitizeAllowDots)(v.json[0])}')=${phs.push(v.json[1])}`
+                                                    : `${quote((0, exports.sqlsanitizeAllowDots)(k))}->>'${(0, exports.sqlsanitizeAllowDots)(v.json[0])}'=${phs.push(v.json[1])}`
                                                 : 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;
+                                                        ? `not (${typeof v === "symbol" ? v.description : phs.push(v)})`
+                                                        : `${quote((0, exports.sqlsanitizeAllowDots)(k))}=${typeof v === "symbol" ? v.description : phs.push(v)}`;
 /**
  * @param {object} whereObj
  * @param {boolean} is_sqlite
@@ -238,14 +195,13 @@ const getVal = ([k, v]) => k === "_fts"
 const mkWhere = (whereObj, is_sqlite, initCount = 0) => {
     const wheres = whereObj ? Object.entries(whereObj) : [];
     //console.log({ wheres });
+    const placeHolderStack = is_sqlite
+        ? sqlitePlaceHolderStack()
+        : postgresPlaceHolderStack(initCount);
     const where = whereObj && wheres.length > 0
-        ? "where " +
-            wheres.map(whereClause(is_sqlite, mkCounter(initCount))).join(" and ")
+        ? "where " + wheres.map(whereClause(placeHolderStack)).join(" and ")
         : "";
-    const values = wheres
-        .map(getVal)
-        .flat(1)
-        .filter((v) => v !== null);
+    const values = placeHolderStack.getValues();
     return { where, values };
 };
 exports.mkWhere = mkWhere;
@@ -270,19 +226,25 @@ 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})`;
 };
+const orderByIsObject = (object) => {
+    return object && object.distance;
+};
+exports.orderByIsObject = orderByIsObject;
 /**
  * @param {object} selopts
- * @returns {string[]}
+ * @returns {string}
  */
 const mkSelectOptions = (selopts) => {
     const orderby = selopts.orderBy === "RANDOM()"
         ? "order by RANDOM()"
-        : selopts.orderBy && selopts.orderBy.distance
+        : selopts.orderBy &&
+            typeof selopts.orderBy === "object" &&
+            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" : ""}`
+            : selopts.orderBy && typeof selopts.orderBy === "string" && selopts.nocase
+                ? `order by lower(${quote((0, exports.sqlsanitizeAllowDots)(selopts.orderBy))})${selopts.orderDesc ? " DESC" : ""}`
+                : selopts.orderBy && typeof selopts.orderBy === "string"
+                    ? `order by ${quote((0, exports.sqlsanitizeAllowDots)(selopts.orderBy))}${selopts.orderDesc ? " DESC" : ""}`
                     : "";
     const limit = selopts.limit ? `limit ${toInt(selopts.limit)}` : "";
     const offset = selopts.offset ? `offset ${toInt(selopts.offset)}` : "";