@budibase/server 2.1.32-alpha.8 → 2.1.32

package/dist/utilities/budibaseDir.js

@@ -1,5 +1,3 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.budibaseTempDir = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-exports.budibaseTempDir = backend_core_1.objectStore.budibaseTempDir;
+const { budibaseTempDir } = require("@budibase/backend-core/objectStore");
+module.exports.budibaseTempDir = budibaseTempDir;

package/dist/utilities/fileSystem/clientLibrary.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { join } = require("path");
 const { ObjectStoreBuckets } = require("../../constants");
 const fs = require("fs");
-const { objectStore } = require("@budibase/backend-core");
+const { upload, retrieveToTmp, streamUpload } = require("./utilities");
 const { resolve } = require("../centralPath");
 const env = require("../../environment");
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
@@ -46,22 +46,22 @@ exports.backupClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, funct
     let tmpManifestPath;
     try {
         // Try to load the manifest from the new file location
-        tmpManifestPath = yield objectStore.retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "manifest.json"));
+        tmpManifestPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "manifest.json"));
     }
     catch (error) {
         // Fallback to loading it from the old location for old apps
-        tmpManifestPath = yield objectStore.retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "node_modules", "budibase", "standard-components", "package", "manifest.json"));
+        tmpManifestPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "node_modules", "budibase", "standard-components", "package", "manifest.json"));
     }
     // Copy existing client lib to tmp
-    const tmpClientPath = yield objectStore.retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js"));
+    const tmpClientPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js"));
     // Upload manifest and client library as backups
-    const manifestUpload = objectStore.upload({
+    const manifestUpload = upload({
         bucket: ObjectStoreBuckets.APPS,
         filename: join(appId, "manifest.json.bak"),
         path: tmpManifestPath,
         type: "application/json",
     });
-    const clientUpload = objectStore.upload({
+    const clientUpload = upload({
         bucket: ObjectStoreBuckets.APPS,
         filename: join(appId, "budibase-client.js.bak"),
         path: tmpClientPath,
@@ -88,10 +88,10 @@ exports.updateClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, funct
         client = resolve(TOP_LEVEL_PATH, "client", "budibase-client.js");
     }
     // Upload latest manifest and client library
-    const manifestUpload = objectStore.streamUpload(ObjectStoreBuckets.APPS, join(appId, "manifest.json"), fs.createReadStream(manifest), {
+    const manifestUpload = streamUpload(ObjectStoreBuckets.APPS, join(appId, "manifest.json"), fs.createReadStream(manifest), {
         ContentType: "application/json",
     });
-    const clientUpload = objectStore.streamUpload(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js"), fs.createReadStream(client), {
+    const clientUpload = streamUpload(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js"), fs.createReadStream(client), {
         ContentType: "application/javascript",
     });
     yield Promise.all([manifestUpload, clientUpload]);
@@ -104,17 +104,17 @@ exports.updateClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, funct
  */
 exports.revertClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, function* () {
     // Copy backups manifest to tmp directory
-    const tmpManifestPath = yield objectStore.retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "manifest.json.bak"));
+    const tmpManifestPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "manifest.json.bak"));
     // Copy backup client lib to tmp
-    const tmpClientPath = yield objectStore.retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js.bak"));
+    const tmpClientPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js.bak"));
     // Upload backups as new versions
-    const manifestUpload = objectStore.upload({
+    const manifestUpload = upload({
         bucket: ObjectStoreBuckets.APPS,
         filename: join(appId, "manifest.json"),
         path: tmpManifestPath,
         type: "application/json",
     });
-    const clientUpload = objectStore.upload({
+    const clientUpload = upload({
         bucket: ObjectStoreBuckets.APPS,
         filename: join(appId, "budibase-client.js"),
         path: tmpClientPath,

package/dist/utilities/fileSystem/index.js

@@ -12,14 +12,14 @@ const { budibaseTempDir } = require("../budibaseDir");
 const fs = require("fs");
 const { join } = require("path");
 const uuid = require("uuid/v4");
-const { context, objectStore } = require("@budibase/backend-core");
 const { ObjectStoreBuckets } = require("../../constants");
+const { upload, retrieve, retrieveToTmp, deleteFolder, downloadTarball, downloadTarballDirect, deleteFiles, } = require("./utilities");
 const { updateClientLibrary } = require("./clientLibrary");
 const { checkSlashesInUrl } = require("../");
 const env = require("../../environment");
+const { getAppId } = require("@budibase/backend-core/context");
 const tar = require("tar");
 const fetch = require("node-fetch");
-const { upload, retrieve, retrieveToTmp, deleteFolder, downloadTarball, downloadTarballDirect, deleteFiles, } = objectStore;
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
 const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules");
 const DATASOURCE_PATH = join(budibaseTempDir(), "datasource");
@@ -153,7 +153,7 @@ exports.downloadTemplate = (type, name) => __awaiter(void 0, void 0, void 0, fun
  * Retrieves component libraries from object store (or tmp symlink if in local)
  */
 exports.getComponentLibraryManifest = (library) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = context.getAppId();
+    const appId = getAppId();
     const filename = "manifest.json";
     /* istanbul ignore next */
     // when testing in cypress and so on we need to get the package

package/dist/utilities/fileSystem/utilities.js

@@ -0,0 +1,22 @@
+"use strict";
+const { ObjectStore, makeSureBucketExists, upload, deleteFiles, streamUpload, retrieve, retrieveToTmp, retrieveDirectory, deleteFolder, uploadDirectory, downloadTarball, downloadTarballDirect, } = require("@budibase/backend-core/objectStore");
+/***********************************
+ *              NOTE               *
+ * This file purely exists so that *
+ *  the object store functionality *
+ *   can easily be mocked out of   *
+ *  the server without mocking the *
+ *      entire core library.       *
+ ***********************************/
+exports.ObjectStore = ObjectStore;
+exports.makeSureBucketExists = makeSureBucketExists;
+exports.upload = upload;
+exports.streamUpload = streamUpload;
+exports.retrieve = retrieve;
+exports.retrieveToTmp = retrieveToTmp;
+exports.retrieveDirectory = retrieveDirectory;
+exports.deleteFolder = deleteFolder;
+exports.uploadDirectory = uploadDirectory;
+exports.downloadTarball = downloadTarball;
+exports.downloadTarballDirect = downloadTarballDirect;
+exports.deleteFiles = deleteFiles;

package/dist/utilities/global.js

@@ -8,54 +8,49 @@ 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.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.updateAppRole = void 0;
-const utils_1 = require("../db/utils");
-const backend_core_1 = require("@budibase/backend-core");
-const environment_1 = __importDefault(require("../environment"));
-const pro_1 = require("@budibase/pro");
-function updateAppRole(user, { appId } = {}) {
+const { getMultiIDParams, getGlobalIDFromUserMetadataID, } = require("../db/utils");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { getProdAppID } = require("@budibase/backend-core/db");
+const { getGlobalUserParams } = require("@budibase/backend-core/db");
+const { user: userCache } = require("@budibase/backend-core/cache");
+const { getGlobalDB, isUserInAppTenant, } = require("@budibase/backend-core/tenancy");
+const env = require("../environment");
+const { getAppId } = require("@budibase/backend-core/context");
+const { groups } = require("@budibase/pro");
+exports.updateAppRole = (user, { appId } = {}) => {
     var _a, _b;
-    appId = appId || backend_core_1.context.getAppId();
+    appId = appId || getAppId();
     if (!user || !user.roles) {
         return user;
     }
     // if in an multi-tenancy environment make sure roles are never updated
-    if (environment_1.default.MULTI_TENANCY && appId && !backend_core_1.tenancy.isUserInAppTenant(appId, user)) {
+    if (env.MULTI_TENANCY && !isUserInAppTenant(appId, user)) {
         delete user.builder;
         delete user.admin;
-        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
+        user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
         return user;
     }
     // always use the deployed app
-    if (appId) {
-        user.roleId = user.roles[backend_core_1.db.getProdAppID(appId)];
-    }
+    user.roleId = user.roles[getProdAppID(appId)];
     // if a role wasn't found then either set as admin (builder) or public (everyone else)
     if (!user.roleId && user.builder && user.builder.global) {
-        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.ADMIN;
+        user.roleId = BUILTIN_ROLE_IDS.ADMIN;
     }
     else if (!user.roleId && !((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
-        user.roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
+        user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
     }
     else if ((_b = user === null || user === void 0 ? void 0 : user.userGroups) === null || _b === void 0 ? void 0 : _b.length) {
-        user.roleId = undefined;
+        user.roleId = null;
     }
     delete user.roles;
     return user;
-}
-exports.updateAppRole = updateAppRole;
+};
 function checkGroupRoles(user, { appId } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (user.roleId && user.roleId !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+        if (user.roleId && user.roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
             return user;
         }
-        if (appId) {
-            user.roleId = yield pro_1.groups.getGroupRoleId(user, appId);
-        }
+        user.roleId = yield groups.getGroupRoleId(user, appId);
         return user;
     });
 }
@@ -65,73 +60,57 @@ function processUser(user, { appId } = {}) {
         if (user) {
             delete user.password;
         }
-        user = yield updateAppRole(user, { appId });
+        user = yield exports.updateAppRole(user, { appId });
         if (!user.roleId && ((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
             user = yield checkGroupRoles(user, { appId });
         }
         return user;
     });
 }
-function getCachedSelf(ctx, appId) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        // this has to be tenant aware, can't depend on the context to find it out
-        // running some middlewares before the tenancy causes context to break
-        const user = yield backend_core_1.cache.user.getUser((_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id);
-        return processUser(user, { appId });
-    });
-}
-exports.getCachedSelf = getCachedSelf;
-function getRawGlobalUser(userId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.tenancy.getGlobalDB();
-        return db.get((0, utils_1.getGlobalIDFromUserMetadataID)(userId));
-    });
-}
-exports.getRawGlobalUser = getRawGlobalUser;
-function getGlobalUser(userId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const appId = backend_core_1.context.getAppId();
-        let user = yield getRawGlobalUser(userId);
-        return processUser(user, { appId });
-    });
-}
-exports.getGlobalUser = getGlobalUser;
-function getGlobalUsers(users) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const appId = backend_core_1.context.getAppId();
-        const db = backend_core_1.tenancy.getGlobalDB();
-        let globalUsers;
-        if (users) {
-            const globalIds = users.map(user => (0, utils_1.getGlobalIDFromUserMetadataID)(user._id));
-            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(globalIds))).rows.map(row => row.doc);
-        }
-        else {
-            globalUsers = (yield db.allDocs(backend_core_1.db.getGlobalUserParams(null, {
-                include_docs: true,
-            }))).rows.map(row => row.doc);
-        }
-        globalUsers = globalUsers
-            .filter(user => user != null)
-            .map(user => {
-            delete user.password;
-            delete user.forceResetPassword;
-            return user;
-        });
-        if (!appId) {
-            return globalUsers;
-        }
-        return globalUsers.map(user => updateAppRole(user));
+exports.getCachedSelf = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
+    // this has to be tenant aware, can't depend on the context to find it out
+    // running some middlewares before the tenancy causes context to break
+    const user = yield userCache.getUser(ctx.user._id);
+    return processUser(user, { appId });
+});
+exports.getRawGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getGlobalDB();
+    return db.get(getGlobalIDFromUserMetadataID(userId));
+});
+exports.getGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = getAppId();
+    let user = yield exports.getRawGlobalUser(userId);
+    return processUser(user, { appId });
+});
+exports.getGlobalUsers = (users = null) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = getAppId();
+    const db = getGlobalDB();
+    let globalUsers;
+    if (users) {
+        const globalIds = users.map(user => getGlobalIDFromUserMetadataID(user._id));
+        globalUsers = (yield db.allDocs(getMultiIDParams(globalIds))).rows.map(row => row.doc);
+    }
+    else {
+        globalUsers = (yield db.allDocs(getGlobalUserParams(null, {
+            include_docs: true,
+        }))).rows.map(row => row.doc);
+    }
+    globalUsers = globalUsers
+        .filter(user => user != null)
+        .map(user => {
+        delete user.password;
+        delete user.forceResetPassword;
+        return user;
     });
-}
-exports.getGlobalUsers = getGlobalUsers;
-function getGlobalUsersFromMetadata(users) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const globalUsers = yield getGlobalUsers(users);
-        return users.map(user => {
-            const globalUser = globalUsers.find(globalUser => { var _a; return globalUser && ((_a = user._id) === null || _a === void 0 ? void 0 : _a.includes(globalUser._id)); });
-            return Object.assign(Object.assign({}, globalUser), user);
-        });
+    if (!appId) {
+        return globalUsers;
+    }
+    return globalUsers.map(user => exports.updateAppRole(user));
+});
+exports.getGlobalUsersFromMetadata = (users) => __awaiter(void 0, void 0, void 0, function* () {
+    const globalUsers = yield exports.getGlobalUsers(users);
+    return users.map(user => {
+        const globalUser = globalUsers.find(globalUser => globalUser && user._id.includes(globalUser._id));
+        return Object.assign(Object.assign({}, globalUser), user);
     });
-}
-exports.getGlobalUsersFromMetadata = getGlobalUsersFromMetadata;
+});

package/dist/utilities/index.js

@@ -8,55 +8,44 @@ 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.isQsTrue = exports.convertBookmark = exports.formatBytes = exports.stringToReadStream = exports.escapeDangerousCharacters = exports.deleteEntityMetadata = exports.saveEntityMetadata = exports.updateEntityMetadata = exports.attachmentsRelativeURL = exports.clientLibraryPath = exports.objectStoreUrl = exports.checkSlashesInUrl = exports.removeFromArray = exports.NUMBER_REGEX = exports.isDev = exports.wait = void 0;
-const environment_1 = __importDefault(require("../environment"));
-const constants_1 = require("../constants");
-const backend_core_1 = require("@budibase/backend-core");
-const utils_1 = require("../db/utils");
-const stream_1 = __importDefault(require("stream"));
-const Readable = stream_1.default.Readable;
-function wait(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-exports.wait = wait;
-exports.isDev = environment_1.default.isDev;
+const env = require("../environment");
+const { OBJ_STORE_DIRECTORY } = require("../constants");
+const { sanitizeKey } = require("@budibase/backend-core/objectStore");
+const { generateMetadataID } = require("../db/utils");
+const Readable = require("stream").Readable;
+const { getAppDB } = require("@budibase/backend-core/context");
+exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+exports.isDev = env.isDev;
 exports.NUMBER_REGEX = /^[+-]?([0-9]*[.])?[0-9]+$/g;
-function removeFromArray(array, element) {
+exports.removeFromArray = (array, element) => {
     const index = array.indexOf(element);
     if (index !== -1) {
         array.splice(index, 1);
     }
     return array;
-}
-exports.removeFromArray = removeFromArray;
+};
 /**
  * Makes sure that a URL has the correct number of slashes, while maintaining the
  * http(s):// double slashes.
  * @param {string} url The URL to test and remove any extra double slashes.
  * @return {string} The updated url.
  */
-function checkSlashesInUrl(url) {
+exports.checkSlashesInUrl = url => {
     return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2");
-}
-exports.checkSlashesInUrl = checkSlashesInUrl;
+};
 /**
  * Gets the address of the object store, depending on whether self hosted or in cloud.
  * @return {string} The base URL of the object store (MinIO or S3).
  */
-function objectStoreUrl() {
-    if (environment_1.default.SELF_HOSTED || environment_1.default.MINIO_URL) {
+exports.objectStoreUrl = () => {
+    if (env.SELF_HOSTED || env.MINIO_URL) {
         // can use a relative url for this as all goes through the proxy (this is hosted in minio)
-        return constants_1.OBJ_STORE_DIRECTORY;
+        return OBJ_STORE_DIRECTORY;
     }
     else {
-        return environment_1.default.CDN_URL;
+        return env.CDN_URL;
     }
-}
-exports.objectStoreUrl = objectStoreUrl;
+};
 /**
  * In production the client library is stored in the object store, however in development
  * we use the symlinked version produced by lerna, located in node modules. We link to this
@@ -67,9 +56,9 @@ exports.objectStoreUrl = objectStoreUrl;
  * @return {string} The URL to be inserted into appPackage response or server rendered
  * app index file.
  */
-function clientLibraryPath(appId, version) {
-    if (environment_1.default.isProd()) {
-        let url = `${objectStoreUrl()}/${backend_core_1.objectStore.sanitizeKey(appId)}/budibase-client.js`;
+exports.clientLibraryPath = (appId, version) => {
+    if (env.isProd()) {
+        let url = `${exports.objectStoreUrl()}/${sanitizeKey(appId)}/budibase-client.js`;
         // append app version to bust the cache
         if (version) {
             url += `?v=${version}`;
@@ -79,65 +68,54 @@ function clientLibraryPath(appId, version) {
     else {
         return `/api/assets/client`;
     }
-}
-exports.clientLibraryPath = clientLibraryPath;
-function attachmentsRelativeURL(attachmentKey) {
-    return checkSlashesInUrl(`${objectStoreUrl()}/${attachmentKey}`);
-}
-exports.attachmentsRelativeURL = attachmentsRelativeURL;
-function updateEntityMetadata(type, entityId, updateFn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const id = (0, utils_1.generateMetadataID)(type, entityId);
-        // read it to see if it exists, we'll overwrite it no matter what
-        let rev, metadata;
-        try {
-            const oldMetadata = yield db.get(id);
-            rev = oldMetadata._rev;
-            metadata = updateFn(oldMetadata);
-        }
-        catch (err) {
-            rev = null;
-            metadata = updateFn({});
-        }
-        metadata._id = id;
-        if (rev) {
-            metadata._rev = rev;
-        }
-        const response = yield db.put(metadata);
-        return Object.assign(Object.assign({}, metadata), { _id: id, _rev: response.rev });
-    });
-}
-exports.updateEntityMetadata = updateEntityMetadata;
-function saveEntityMetadata(type, entityId, metadata) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return updateEntityMetadata(type, entityId, () => {
-            return metadata;
-        });
+};
+exports.attachmentsRelativeURL = attachmentKey => {
+    return exports.checkSlashesInUrl(`${exports.objectStoreUrl()}/${attachmentKey}`);
+};
+exports.updateEntityMetadata = (type, entityId, updateFn) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    const id = generateMetadataID(type, entityId);
+    // read it to see if it exists, we'll overwrite it no matter what
+    let rev, metadata = {};
+    try {
+        const oldMetadata = yield db.get(id);
+        rev = oldMetadata._rev;
+        metadata = updateFn(oldMetadata);
+    }
+    catch (err) {
+        rev = null;
+        metadata = updateFn({});
+    }
+    metadata._id = id;
+    if (rev) {
+        metadata._rev = rev;
+    }
+    const response = yield db.put(metadata);
+    return Object.assign(Object.assign({}, metadata), { _id: id, _rev: response.rev });
+});
+exports.saveEntityMetadata = (type, entityId, metadata) => __awaiter(void 0, void 0, void 0, function* () {
+    return exports.updateEntityMetadata(type, entityId, () => {
+        return metadata;
     });
-}
-exports.saveEntityMetadata = saveEntityMetadata;
-function deleteEntityMetadata(type, entityId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const id = (0, utils_1.generateMetadataID)(type, entityId);
-        let rev;
-        try {
-            const metadata = yield db.get(id);
-            if (metadata) {
-                rev = metadata._rev;
-            }
-        }
-        catch (err) {
-            // don't need to error if it doesn't exist
-        }
-        if (id && rev) {
-            yield db.remove(id, rev);
+});
+exports.deleteEntityMetadata = (type, entityId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    const id = generateMetadataID(type, entityId);
+    let rev;
+    try {
+        const metadata = yield db.get(id);
+        if (metadata) {
+            rev = metadata._rev;
         }
-    });
-}
-exports.deleteEntityMetadata = deleteEntityMetadata;
-function escapeDangerousCharacters(string) {
+    }
+    catch (err) {
+        // don't need to error if it doesn't exist
+    }
+    if (id && rev) {
+        yield db.remove(id, rev);
+    }
+});
+exports.escapeDangerousCharacters = string => {
     return string
         .replace(/[\\]/g, "\\\\")
         .replace(/[\b]/g, "\\b")
@@ -145,18 +123,16 @@ function escapeDangerousCharacters(string) {
         .replace(/[\n]/g, "\\n")
         .replace(/[\r]/g, "\\r")
         .replace(/[\t]/g, "\\t");
-}
-exports.escapeDangerousCharacters = escapeDangerousCharacters;
-function stringToReadStream(string) {
+};
+exports.stringToReadStream = string => {
     return new Readable({
         read() {
             this.push(string);
             this.push(null);
         },
     });
-}
-exports.stringToReadStream = stringToReadStream;
-function formatBytes(bytes) {
+};
+exports.formatBytes = bytes => {
     const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
     const byteIncrements = 1024;
     let unit = 0;
@@ -165,22 +141,19 @@ function formatBytes(bytes) {
         size /= byteIncrements;
     }
     return `${size.toFixed(size < 10 && unit > 0 ? 1 : 0)}${units[unit]}`;
-}
-exports.formatBytes = formatBytes;
-function convertBookmark(bookmark) {
+};
+exports.convertBookmark = bookmark => {
     const IS_NUMBER = /^\d+\.?\d*$/;
     if (typeof bookmark === "string" && bookmark.match(IS_NUMBER)) {
         return parseFloat(bookmark);
     }
     return bookmark;
-}
-exports.convertBookmark = convertBookmark;
-function isQsTrue(param) {
+};
+exports.isQsTrue = param => {
     if (typeof param === "string") {
         return param.toLowerCase() === "true";
     }
     else {
         return param === true;
     }
-}
-exports.isQsTrue = isQsTrue;
+};