@budibase/server 2.1.32-alpha.7 → 2.1.32

package/dist/api/controllers/routing.js

@@ -8,40 +8,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clientFetch = exports.fetch = void 0;
-const routing_1 = require("../../utilities/routing");
-const backend_core_1 = require("@budibase/backend-core");
+const { getRoutingInfo } = require("../../utilities/routing");
+const { getUserRoleHierarchy, BUILTIN_ROLE_IDS, } = require("@budibase/backend-core/roles");
 const URL_SEPARATOR = "/";
-class Routing {
-    constructor() {
-        this.json = {};
-    }
-    getTopLevel(fullpath) {
-        if (fullpath.charAt(0) !== URL_SEPARATOR) {
-            fullpath = URL_SEPARATOR + fullpath;
-        }
-        // replace the first value with the home route
-        return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1];
+function Routing() {
+    this.json = {};
+}
+Routing.prototype.getTopLevel = function (fullpath) {
+    if (fullpath.charAt(0) !== URL_SEPARATOR) {
+        fullpath = URL_SEPARATOR + fullpath;
     }
-    getScreensProp(fullpath) {
-        const topLevel = this.getTopLevel(fullpath);
-        if (!this.json[topLevel]) {
-            this.json[topLevel] = {
-                subpaths: {},
-            };
-        }
-        if (!this.json[topLevel].subpaths[fullpath]) {
-            this.json[topLevel].subpaths[fullpath] = {
-                screens: {},
-            };
-        }
-        return this.json[topLevel].subpaths[fullpath].screens;
+    // replace the first value with the home route
+    return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1];
+};
+Routing.prototype.getScreensProp = function (fullpath) {
+    const topLevel = this.getTopLevel(fullpath);
+    if (!this.json[topLevel]) {
+        this.json[topLevel] = {
+            subpaths: {},
+        };
     }
-    addScreenId(fullpath, roleId, screenId) {
-        this.getScreensProp(fullpath)[roleId] = screenId;
+    if (!this.json[topLevel].subpaths[fullpath]) {
+        this.json[topLevel].subpaths[fullpath] = {
+            screens: {},
+        };
     }
-}
+    return this.json[topLevel].subpaths[fullpath].screens;
+};
+Routing.prototype.addScreenId = function (fullpath, roleId, screenId) {
+    this.getScreensProp(fullpath)[roleId] = screenId;
+};
 /**
  * Gets the full routing structure by querying the routing view and processing the result into the tree.
  * @returns {Promise<object>} The routing structure, this is the full structure designed for use in the builder,
@@ -49,7 +45,7 @@ class Routing {
  */
 function getRoutingStructure() {
     return __awaiter(this, void 0, void 0, function* () {
-        const screenRoutes = yield (0, routing_1.getRoutingInfo)();
+        const screenRoutes = yield getRoutingInfo();
         const routing = new Routing();
         for (let screenRoute of screenRoutes) {
             let fullpath = screenRoute.routing.route;
@@ -59,47 +55,38 @@ function getRoutingStructure() {
         return { routes: routing.json };
     });
 }
-function fetch(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield getRoutingStructure();
-    });
-}
-exports.fetch = fetch;
-function clientFetch(ctx) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const routing = yield getRoutingStructure();
-        let roleId = (_b = (_a = ctx.user) === null || _a === void 0 ? void 0 : _a.role) === null || _b === void 0 ? void 0 : _b._id;
-        const roleIds = (yield backend_core_1.roles.getUserRoleHierarchy(roleId, {
-            idOnly: true,
-        }));
-        for (let topLevel of Object.values(routing.routes)) {
-            for (let subpathKey of Object.keys(topLevel.subpaths)) {
-                let found = false;
-                const subpath = topLevel.subpaths[subpathKey];
-                const roleOptions = Object.keys(subpath.screens);
-                if (roleOptions.length === 1 && !roleOptions[0]) {
-                    subpath.screenId = subpath.screens[roleOptions[0]];
-                    subpath.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.BASIC;
-                    found = true;
-                }
-                else {
-                    for (let roleId of roleIds) {
-                        if (roleId && roleOptions.indexOf(roleId) !== -1) {
-                            subpath.screenId = subpath.screens[roleId];
-                            subpath.roleId = roleId;
-                            found = true;
-                            break;
-                        }
+exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    ctx.body = yield getRoutingStructure();
+});
+exports.clientFetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const routing = yield getRoutingStructure();
+    let roleId = ctx.user.role._id;
+    const roleIds = yield getUserRoleHierarchy(roleId);
+    for (let topLevel of Object.values(routing.routes)) {
+        for (let subpathKey of Object.keys(topLevel.subpaths)) {
+            let found = false;
+            const subpath = topLevel.subpaths[subpathKey];
+            const roleOptions = Object.keys(subpath.screens);
+            if (roleOptions.length === 1 && !roleOptions[0]) {
+                subpath.screenId = subpath.screens[roleOptions[0]];
+                subpath.roleId = BUILTIN_ROLE_IDS.BASIC;
+                found = true;
+            }
+            else {
+                for (let roleId of roleIds) {
+                    if (roleOptions.indexOf(roleId) !== -1) {
+                        subpath.screenId = subpath.screens[roleId];
+                        subpath.roleId = roleId;
+                        found = true;
+                        break;
                     }
                 }
-                delete subpath.screens;
-                if (!found) {
-                    delete topLevel.subpaths[subpathKey];
-                }
+            }
+            delete subpath.screens;
+            if (!found) {
+                delete topLevel.subpaths[subpathKey];
             }
         }
-        ctx.body = routing;
-    });
-}
-exports.clientFetch = clientFetch;
+    }
+    ctx.body = routing;
+});

package/dist/api/controllers/row/ExternalRequest.js

@@ -28,8 +28,9 @@ const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
 // @ts-ignore
 const fp_1 = require("lodash/fp");
-const rowProcessor_1 = require("../../../utilities/rowProcessor");
-const backend_core_1 = require("@budibase/backend-core");
+const utils_4 = require("../../../utilities/rowProcessor/utils");
+// @ts-ignore
+const context_1 = require("@budibase/backend-core/context");
 var External;
 (function (External) {
     function buildFilters(id, filters, table) {
@@ -155,7 +156,7 @@ var External;
         thisRow._id = generateIdForRow(row, table);
         thisRow.tableId = table._id;
         thisRow._rev = "rev";
-        return (0, rowProcessor_1.processFormulas)(table, thisRow);
+        return (0, utils_4.processFormulas)(table, thisRow);
     }
     function fixArrayTypes(row, table) {
         for (let [fieldName, schema] of Object.entries(table.schema)) {
@@ -195,7 +196,6 @@ var External;
             }
         }
         inputProcessing(row, table) {
-            var _a;
             if (!row) {
                 return { row, manyRelationships: [] };
             }
@@ -235,11 +235,7 @@ var External;
                 const linkTablePrimary = linkTable.primary[0];
                 // one to many
                 if (isOneSide(field)) {
-                    let id = row[key][0];
-                    if (typeof row[key] === "string") {
-                        id = (_a = decodeURIComponent(row[key]).match(/\[(.*?)\]/)) === null || _a === void 0 ? void 0 : _a[1];
-                    }
-                    newRow[field.foreignKey || linkTablePrimary] = (0, utils_1.breakRowIdField)(id)[0];
+                    newRow[field.foreignKey || linkTablePrimary] = (0, utils_1.breakRowIdField)(row[key][0])[0];
                 }
                 // many to many
                 else if (field.through) {
@@ -364,8 +360,8 @@ var External;
             }
             // Process some additional data types
             let finalRowArray = Object.values(finalRows);
-            finalRowArray = (0, rowProcessor_1.processDates)(table, finalRowArray);
-            finalRowArray = (0, rowProcessor_1.processFormulas)(table, finalRowArray);
+            finalRowArray = (0, utils_4.processDates)(table, finalRowArray);
+            finalRowArray = (0, utils_4.processFormulas)(table, finalRowArray);
             return finalRowArray.map((row) => this.squashRelationshipColumns(table, row, relationships));
         }
         /**
@@ -568,7 +564,7 @@ var External;
                     throw "Unable to run without a table name";
                 }
                 if (!this.datasource) {
-                    const db = backend_core_1.context.getAppDB();
+                    const db = (0, context_1.getAppDB)();
                     this.datasource = yield db.get(datasourceId);
                     if (!this.datasource || !this.datasource.entities) {
                         throw "No tables found, fetch tables before query.";

package/dist/api/controllers/row/external.js

@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 const { DataSourceOperation, SortDirection, FieldTypes, NoEmptyFilterStrings, } = require("../../../constants");
 const { breakExternalTableId, breakRowIdField, } = require("../../../integrations/utils");
 const ExternalRequest = require("./ExternalRequest");
-const { context } = require("@budibase/backend-core");
+const { getAppDB } = require("@budibase/backend-core/context");
 const exporters = require("../view/exporters");
 const { apiFileReturn } = require("../../../utilities/fileSystem");
 function handleRequest(operation, tableId, opts = {}) {
@@ -166,7 +166,7 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { datasourceId } = breakExternalTableId(ctx.params.tableId);
-    const db = context.getAppDB();
+    const db = getAppDB();
     const format = ctx.query.format;
     const { columns } = ctx.request.body;
     const datasource = yield db.get(datasourceId);
@@ -205,7 +205,7 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
     const id = ctx.params.rowId;
     const tableId = ctx.params.tableId;
     const { datasourceId, tableName } = breakExternalTableId(tableId);
-    const db = context.getAppDB();
+    const db = getAppDB();
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");

package/dist/api/controllers/row/index.js

@@ -43,22 +43,13 @@ function patch(ctx) {
         if (body && !body._id) {
             return (0, exports.save)(ctx);
         }
-        try {
-            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
-                datasourceId: tableId,
-            });
-            if (!row) {
-                ctx.throw(404, "Row not found");
-            }
-            ctx.status = 200;
-            ctx.eventEmitter &&
-                ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
-            ctx.message = `${table.name} updated successfully.`;
-            ctx.body = row;
-        }
-        catch (err) {
-            ctx.throw(400, err);
-        }
+        const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
+            datasourceId: tableId,
+        });
+        ctx.status = 200;
+        ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
+        ctx.message = `${table.name} updated successfully.`;
+        ctx.body = row;
     });
 }
 exports.patch = patch;

package/dist/api/controllers/row/internal.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 const linkRows = require("../../../db/linkedRows");
 const { generateRowID, getRowParams, getTableIDFromRowID, DocumentType, InternalTables, } = require("../../../db/utils");
+const { dangerousGetDB } = require("@budibase/backend-core/db");
 const userController = require("../user");
 const { inputProcessing, outputProcessing, cleanupAttachments, } = require("../../../utilities/rowProcessor");
 const { FieldTypes } = require("../../../constants");
@@ -31,7 +32,7 @@ const inMemoryViews = require("../../../db/inMemoryView");
 const env = require("../../../environment");
 const { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMemoryDoc, } = require("../view/utils");
 const { cloneDeep } = require("lodash/fp");
-const { context, db: dbCore } = require("@budibase/backend-core");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { finaliseRow, updateRelatedFormula } = require("./staticFormula");
 const exporters = require("../view/exporters");
 const { apiFileReturn } = require("../../../utilities/fileSystem");
@@ -85,7 +86,7 @@ function getRawTableData(ctx, db, tableId) {
     });
 }
 exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const inputs = ctx.request.body;
     const tableId = inputs.tableId;
     const isUserTable = tableId === InternalTables.USER_METADATA;
@@ -145,7 +146,7 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB();
+        const db = getAppDB();
         let inputs = ctx.request.body;
         inputs.tableId = ctx.params.tableId;
         if (!inputs._rev && !inputs._id) {
@@ -181,7 +182,7 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.params.tableId = viewName;
         return exports.fetch(ctx);
     }
-    const db = context.getAppDB();
+    const db = getAppDB();
     const { calculation, group, field } = ctx.query;
     const viewInfo = yield getView(db, viewName);
     let response;
@@ -226,14 +227,14 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return rows;
 });
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const tableId = ctx.params.tableId;
     let table = yield db.get(tableId);
     let rows = yield getRawTableData(ctx, db, tableId);
     return outputProcessing(table, rows);
 });
 exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = dbCore.getDB(ctx.appId);
+    const db = dangerousGetDB(ctx.appId);
     const table = yield db.get(ctx.params.tableId);
     let row = yield findRow(ctx, ctx.params.tableId, ctx.params.rowId);
     row = yield outputProcessing(table, row);
@@ -241,7 +242,7 @@ exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB();
+        const db = getAppDB();
         const { _id } = ctx.request.body;
         let row = yield db.get(_id);
         let _rev = ctx.request.body._rev || row._rev;
@@ -276,7 +277,7 @@ exports.destroy = function (ctx) {
     });
 };
 exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const tableId = ctx.params.tableId;
     const table = yield db.get(tableId);
     let { rows } = ctx.request.body;
@@ -312,7 +313,7 @@ exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         return { rows: yield exports.fetch(ctx) };
     }
     const { tableId } = ctx.params;
-    const db = context.getAppDB();
+    const db = getAppDB();
     const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
     params.version = ctx.version;
     params.tableId = tableId;
@@ -341,7 +342,7 @@ exports.validate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const table = yield db.get(ctx.params.tableId);
     const rowIds = ctx.request.body.rows;
     let format = ctx.query.format;
@@ -372,7 +373,7 @@ exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return apiFileReturn(exporter(headers, rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const tableId = ctx.params.tableId;
     const rowId = ctx.params.rowId;
     // need table to work out where links go in row

package/dist/api/controllers/row/internalSearch.js

@@ -8,15 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fullSearch = exports.paginatedSearch = exports.QueryBuilder = void 0;
-const utils_1 = require("../../../db/utils");
-const utils_2 = require("./utils");
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const backend_core_1 = require("@budibase/backend-core");
+const { SearchIndexes } = require("../../../db/utils");
+const { removeKeyNumbering } = require("./utils");
+const fetch = require("node-fetch");
+const { getCouchInfo } = require("@budibase/backend-core/db");
+const { getAppId } = require("@budibase/backend-core/context");
 /**
  * Class to build lucene query URLs.
  * Optionally takes a base lucene query object.
@@ -28,11 +24,10 @@ class QueryBuilder {
         this.sortOrder = "ascending";
         this.sortType = "string";
         this.includeDocs = true;
+        this.version = null;
     }
     setVersion(version) {
-        if (version != null) {
-            this.version = version;
-        }
+        this.version = version;
         return this;
     }
     setTable(tableId) {
@@ -64,9 +59,7 @@ class QueryBuilder {
         return this;
     }
     setBookmark(bookmark) {
-        if (bookmark != null) {
-            this.bookmark = bookmark;
-        }
+        this.bookmark = bookmark;
         return this;
     }
     excludeDocs() {
@@ -82,7 +75,7 @@ class QueryBuilder {
         return this;
     }
     addRange(key, low, high) {
-        this.query.range[key] = {
+        this.query.range = {
             low,
             high,
         };
@@ -181,7 +174,6 @@ class QueryBuilder {
             return `${key}:(${statement})`;
         };
         const notContains = (key, value) => {
-            // @ts-ignore
             const allPrefix = allOr === "" ? "*:* AND" : "";
             return allPrefix + "NOT " + contains(key, value);
         };
@@ -206,7 +198,7 @@ class QueryBuilder {
         function build(structure, queryFn) {
             for (let [key, value] of Object.entries(structure)) {
                 // check for new format - remove numbering if needed
-                key = (0, utils_2.removeKeyNumbering)(key);
+                key = removeKeyNumbering(key);
                 key = builder.preprocess(key.replace(/ /g, "_"), {
                     escape: true,
                 });
@@ -275,10 +267,10 @@ class QueryBuilder {
             });
         }
         if (this.query.empty) {
-            build(this.query.empty, (key) => `!${key}:["" TO *]`);
+            build(this.query.empty, key => `!${key}:["" TO *]`);
         }
         if (this.query.notEmpty) {
-            build(this.query.notEmpty, (key) => `${key}:["" TO *]`);
+            build(this.query.notEmpty, key => `${key}:["" TO *]`);
         }
         if (this.query.oneOf) {
             build(this.query.oneOf, oneOf);
@@ -318,14 +310,15 @@ class QueryBuilder {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const appId = backend_core_1.context.getAppId();
-            const { url, cookie } = backend_core_1.db.getCouchInfo();
-            const fullPath = `${url}/${appId}/_design/database/_search/${utils_1.SearchIndexes.ROWS}`;
+            const appId = getAppId();
+            const { url, cookie } = getCouchInfo();
+            const fullPath = `${url}/${appId}/_design/database/_search/${SearchIndexes.ROWS}`;
             const body = this.buildSearchBody();
             return yield runQuery(fullPath, body, cookie);
         });
     }
 }
+// exported for unit testing
 exports.QueryBuilder = QueryBuilder;
 /**
  * Executes a lucene search query.
@@ -335,7 +328,7 @@ exports.QueryBuilder = QueryBuilder;
  * @returns {Promise<{rows: []}>}
  */
 const runQuery = (url, body, cookie) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield (0, node_fetch_1.default)(url, {
+    const response = yield fetch(url, {
         body: JSON.stringify(body),
         method: "POST",
         headers: {
@@ -347,7 +340,7 @@ const runQuery = (url, body, cookie) => __awaiter(void 0, void 0, void 0, functi
         rows: [],
     };
     if (json.rows != null && json.rows.length > 0) {
-        output.rows = json.rows.map((row) => row.doc);
+        output.rows = json.rows.map(row => row.doc);
     }
     if (json.bookmark) {
         output.bookmark = json.bookmark;
@@ -370,36 +363,34 @@ const runQuery = (url, body, cookie) => __awaiter(void 0, void 0, void 0, functi
  *   rows {array|null} Current results in the recursive search
  * @returns {Promise<*[]|*>}
  */
-function recursiveSearch(query, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const bookmark = params.bookmark;
-        const rows = params.rows || [];
-        if (rows.length >= params.limit) {
-            return rows;
-        }
-        let pageSize = 200;
-        if (rows.length > params.limit - 200) {
-            pageSize = params.limit - rows.length;
-        }
-        const page = yield new QueryBuilder(query)
-            .setVersion(params.version)
-            .setTable(params.tableId)
-            .setBookmark(bookmark)
-            .setLimit(pageSize)
-            .setSort(params.sort)
-            .setSortOrder(params.sortOrder)
-            .setSortType(params.sortType)
-            .run();
-        if (!page.rows.length) {
-            return rows;
-        }
-        if (page.rows.length < 200) {
-            return [...rows, ...page.rows];
-        }
-        const newParams = Object.assign(Object.assign({}, params), { bookmark: page.bookmark, rows: [...rows, ...page.rows] });
-        return yield recursiveSearch(query, newParams);
-    });
-}
+const recursiveSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
+    const bookmark = params.bookmark;
+    const rows = params.rows || [];
+    if (rows.length >= params.limit) {
+        return rows;
+    }
+    let pageSize = 200;
+    if (rows.length > params.limit - 200) {
+        pageSize = params.limit - rows.length;
+    }
+    const page = yield new QueryBuilder(query)
+        .setVersion(params.version)
+        .setTable(params.tableId)
+        .setBookmark(bookmark)
+        .setLimit(pageSize)
+        .setSort(params.sort)
+        .setSortOrder(params.sortOrder)
+        .setSortType(params.sortType)
+        .run();
+    if (!page.rows.length) {
+        return rows;
+    }
+    if (page.rows.length < 200) {
+        return [...rows, ...page.rows];
+    }
+    const newParams = Object.assign(Object.assign({}, params), { bookmark: page.bookmark, rows: [...rows, ...page.rows] });
+    return yield recursiveSearch(query, newParams);
+});
 /**
  * Performs a paginated search. A bookmark will be returned to allow the next
  * page to be fetched. There is a max limit off 200 results per page in a
@@ -415,34 +406,31 @@ function recursiveSearch(query, params) {
  *   bookmark {string} The bookmark to resume from
  * @returns {Promise<{hasNextPage: boolean, rows: *[]}>}
  */
-function paginatedSearch(query, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let limit = params.limit;
-        if (limit == null || isNaN(limit) || limit < 0) {
-            limit = 50;
-        }
-        limit = Math.min(limit, 200);
-        const search = new QueryBuilder(query)
-            .setVersion(params.version)
-            .setTable(params.tableId)
-            .setSort(params.sort)
-            .setSortOrder(params.sortOrder)
-            .setSortType(params.sortType);
-        const searchResults = yield search
-            .setBookmark(params.bookmark)
-            .setLimit(limit)
-            .run();
-        // Try fetching 1 row in the next page to see if another page of results
-        // exists or not
-        const nextResults = yield search
-            .setTable(params.tableId)
-            .setBookmark(searchResults.bookmark)
-            .setLimit(1)
-            .run();
-        return Object.assign(Object.assign({}, searchResults), { hasNextPage: nextResults.rows && nextResults.rows.length > 0 });
-    });
-}
-exports.paginatedSearch = paginatedSearch;
+exports.paginatedSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
+    let limit = params.limit;
+    if (limit == null || isNaN(limit) || limit < 0) {
+        limit = 50;
+    }
+    limit = Math.min(limit, 200);
+    const search = new QueryBuilder(query)
+        .setVersion(params.version)
+        .setTable(params.tableId)
+        .setSort(params.sort)
+        .setSortOrder(params.sortOrder)
+        .setSortType(params.sortType);
+    const searchResults = yield search
+        .setBookmark(params.bookmark)
+        .setLimit(limit)
+        .run();
+    // Try fetching 1 row in the next page to see if another page of results
+    // exists or not
+    const nextResults = yield search
+        .setTable(params.tableId)
+        .setBookmark(searchResults.bookmark)
+        .setLimit(1)
+        .run();
+    return Object.assign(Object.assign({}, searchResults), { hasNextPage: nextResults.rows && nextResults.rows.length > 0 });
+});
 /**
  * Performs a full search, fetching multiple pages if required to return the
  * desired amount of results. There is a limit of 1000 results to avoid
@@ -458,15 +446,12 @@ exports.paginatedSearch = paginatedSearch;
  *   limit {number} The desired number of results
  * @returns {Promise<{rows: *}>}
  */
-function fullSearch(query, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let limit = params.limit;
-        if (limit == null || isNaN(limit) || limit < 0) {
-            limit = 1000;
-        }
-        params.limit = Math.min(limit, 1000);
-        const rows = yield recursiveSearch(query, params);
-        return { rows };
-    });
-}
-exports.fullSearch = fullSearch;
+exports.fullSearch = (query, params) => __awaiter(void 0, void 0, void 0, function* () {
+    let limit = params.limit;
+    if (limit == null || isNaN(limit) || limit < 0) {
+        limit = 1000;
+    }
+    params.limit = Math.min(limit, 1000);
+    const rows = yield recursiveSearch(query, params);
+    return { rows };
+});