@budibase/server 2.2.12-alpha.7 → 2.2.12-alpha.70

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -49,13 +26,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportView = exports.destroy = exports.filterEvents = exports.calculationEvents = exports.save = exports.fetch = void 0;
 const viewBuilder_1 = __importDefault(require("./viewBuilder"));
 const fileSystem_1 = require("../../../utilities/fileSystem");
-const exporters = __importStar(require("./exporters"));
+const exporters_1 = require("./exporters");
 const utils_1 = require("./utils");
 const row_1 = require("../row");
-const constants_1 = require("../../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const utils_2 = require("../../../db/utils");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const utils_3 = require("../row/utils");
 const { cloneDeep, isEqual } = require("lodash");
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -160,8 +137,8 @@ function exportView(ctx) {
         const viewName = decodeURIComponent(ctx.query.view);
         const view = yield (0, utils_1.getView)(viewName);
         const format = ctx.query.format;
-        if (!format || !Object.values(exporters.ExportFormats).includes(format)) {
-            ctx.throw(400, "Format must be specified, either csv or json");
+        if (!(0, exporters_1.isFormat)(format)) {
+            ctx.throw(400, "Format must be specified, either csv, json or jsonWithSchema");
         }
         if (view) {
             ctx.params.viewName = viewName;
@@ -187,35 +164,22 @@ function exportView(ctx) {
         if (!schema) {
             schema = table.schema;
         }
-        // remove any relationships
-        const relationships = Object.entries(schema)
-            .filter(entry => entry[1].type === constants_1.FieldTypes.LINK)
-            .map(entry => entry[0]);
-        // iterate relationship columns and remove from and row and schema
-        relationships.forEach(column => {
-            rows.forEach(row => {
-                delete row[column];
-            });
-            delete schema[column];
-        });
-        // make sure no "undefined" entries appear in the CSV
-        if (format === exporters.ExportFormats.CSV) {
-            const schemaKeys = Object.keys(schema);
-            for (let key of schemaKeys) {
-                for (let row of rows) {
-                    if (row[key] == null) {
-                        row[key] = "";
-                    }
-                }
-            }
-        }
-        // Export part
-        let headers = Object.keys(schema);
-        const exporter = format === "csv" ? exporters.csv : exporters.json;
-        const filename = `${viewName}.${format}`;
-        // send down the file
-        ctx.attachment(filename);
-        ctx.body = (0, fileSystem_1.apiFileReturn)(exporter(headers, rows));
+        let exportRows = (0, utils_3.cleanExportRows)(rows, schema, format, []);
+        if (format === exporters_1.Format.CSV) {
+            ctx.attachment(`${viewName}.csv`);
+            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(schema), exportRows));
+        }
+        else if (format === exporters_1.Format.JSON) {
+            ctx.attachment(`${viewName}.json`);
+            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(exportRows));
+        }
+        else if (format === exporters_1.Format.JSON_WITH_SCHEMA) {
+            ctx.attachment(`${viewName}.json`);
+            ctx.body = (0, fileSystem_1.apiFileReturn)((0, exporters_1.jsonWithSchema)(schema, exportRows));
+        }
+        else {
+            throw "Format not recognised";
+        }
         if (viewName.startsWith(utils_2.DocumentType.TABLE)) {
             yield backend_core_1.events.table.exported(table, format);
         }

package/dist/api/controllers/webhook.js

@@ -72,61 +72,63 @@ function destroy(ctx) {
 exports.destroy = destroy;
 function buildSchema(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield backend_core_1.context.updateAppId(ctx.params.instance);
-        const db = backend_core_1.context.getAppDB();
-        const webhook = (yield db.get(ctx.params.id));
-        webhook.bodySchema = toJsonSchema(ctx.request.body);
-        // update the automation outputs
-        if (webhook.action.type === types_1.WebhookActionType.AUTOMATION) {
-            let automation = (yield db.get(webhook.action.target));
-            const autoOutputs = automation.definition.trigger.schema.outputs;
-            let properties = webhook.bodySchema.properties;
-            // reset webhook outputs
-            autoOutputs.properties = {
-                body: autoOutputs.properties.body,
-            };
-            for (let prop of Object.keys(properties)) {
-                autoOutputs.properties[prop] = {
-                    type: properties[prop].type,
-                    description: AUTOMATION_DESCRIPTION,
+        yield backend_core_1.context.doInAppContext(ctx.params.instance, () => __awaiter(this, void 0, void 0, function* () {
+            const db = backend_core_1.context.getAppDB();
+            const webhook = (yield db.get(ctx.params.id));
+            webhook.bodySchema = toJsonSchema(ctx.request.body);
+            // update the automation outputs
+            if (webhook.action.type === types_1.WebhookActionType.AUTOMATION) {
+                let automation = (yield db.get(webhook.action.target));
+                const autoOutputs = automation.definition.trigger.schema.outputs;
+                let properties = webhook.bodySchema.properties;
+                // reset webhook outputs
+                autoOutputs.properties = {
+                    body: autoOutputs.properties.body,
                 };
+                for (let prop of Object.keys(properties)) {
+                    autoOutputs.properties[prop] = {
+                        type: properties[prop].type,
+                        description: AUTOMATION_DESCRIPTION,
+                    };
+                }
+                yield db.put(automation);
             }
-            yield db.put(automation);
-        }
-        ctx.body = yield db.put(webhook);
+            ctx.body = yield db.put(webhook);
+        }));
     });
 }
 exports.buildSchema = buildSchema;
 function trigger(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const prodAppId = backend_core_1.db.getProdAppID(ctx.params.instance);
-        yield backend_core_1.context.updateAppId(prodAppId);
-        try {
-            const db = backend_core_1.context.getAppDB();
-            const webhook = (yield db.get(ctx.params.id));
-            // validate against the schema
-            if (webhook.bodySchema) {
-                validate(ctx.request.body, webhook.bodySchema);
-            }
-            const target = yield db.get(webhook.action.target);
-            if (webhook.action.type === types_1.WebhookActionType.AUTOMATION) {
-                // trigger with both the pure request and then expand it
-                // incase the user has produced a schema to bind to
-                yield triggers.externalTrigger(target, Object.assign(Object.assign({ body: ctx.request.body }, ctx.request.body), { appId: prodAppId }));
-            }
-            ctx.status = 200;
-            ctx.body = {
-                message: "Webhook trigger fired successfully",
-            };
-        }
-        catch (err) {
-            if (err.status === 404) {
+        yield backend_core_1.context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const db = backend_core_1.context.getAppDB();
+                const webhook = (yield db.get(ctx.params.id));
+                // validate against the schema
+                if (webhook.bodySchema) {
+                    validate(ctx.request.body, webhook.bodySchema);
+                }
+                const target = yield db.get(webhook.action.target);
+                if (webhook.action.type === types_1.WebhookActionType.AUTOMATION) {
+                    // trigger with both the pure request and then expand it
+                    // incase the user has produced a schema to bind to
+                    yield triggers.externalTrigger(target, Object.assign(Object.assign({ body: ctx.request.body }, ctx.request.body), { appId: prodAppId }));
+                }
                 ctx.status = 200;
                 ctx.body = {
-                    message: "Application not deployed yet.",
+                    message: "Webhook trigger fired successfully",
                 };
             }
-        }
+            catch (err) {
+                if (err.status === 404) {
+                    ctx.status = 200;
+                    ctx.body = {
+                        message: "Application not deployed yet.",
+                    };
+                }
+            }
+        }));
     });
 }
 exports.trigger = trigger;

package/dist/api/routes/index.js

@@ -38,6 +38,7 @@ var public_1 = require("./public");
 Object.defineProperty(exports, "publicRoutes", { enumerable: true, get: function () { return __importDefault(public_1).default; } });
 const appBackupRoutes = pro_1.api.appBackups;
 const scheduleRoutes = pro_1.api.schedules;
+const environmentVariableRoutes = pro_1.api.environmentVariables;
 exports.mainRoutes = [
     appBackupRoutes,
     backup_1.default,
@@ -67,6 +68,7 @@ exports.mainRoutes = [
     migrations_1.default,
     plugin_1.default,
     scheduleRoutes,
+    environmentVariableRoutes,
     // these need to be handled last as they still use /api/:tableId
     // this could be breaking as koa may recognise other routes as this
     table_1.default,

package/dist/api/routes/row.js

@@ -31,7 +31,7 @@ const rowController = __importStar(require("../controllers/row"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
 const resourceId_1 = require("../../middleware/resourceId");
 const backend_core_1 = require("@budibase/backend-core");
-const { internalSearchValidator } = require("./utils/validators");
+const validators_1 = require("./utils/validators");
 const { PermissionType, PermissionLevel } = backend_core_1.permissions;
 const router = new router_1.default();
 router
@@ -142,7 +142,7 @@ router
      * @apiSuccess {string} bookmark The bookmark to be sent with the next request to get the next
      * page.
      */
-    .post("/api/:tableId/search", internalSearchValidator(), (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(PermissionType.TABLE, PermissionLevel.READ), rowController.search)
+    .post("/api/:tableId/search", (0, validators_1.internalSearchValidator)(), (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(PermissionType.TABLE, PermissionLevel.READ), rowController.search)
     // DEPRECATED - this is an old API, but for backwards compat it needs to be
     // supported still
     .post("/api/search/:tableId/rows", (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(PermissionType.TABLE, PermissionLevel.READ), rowController.search)

package/dist/api/routes/table.js

@@ -88,10 +88,7 @@ router
      * structure, and the "updated", new column name should also be supplied. The schema should also be updated, this field
      * lets the server know that a field hasn't just been deleted, that the data has moved to a new name, this will fix
      * the rows in the table. This functionality is only available for internal tables.
-     * @apiParam (Body) {object} [dataImport] When creating an internal table it can be built from a CSV, by using the
-     * CSV validation endpoint. Send the CSV data to the validation endpoint, then put the results of that call
-     * into this property, along with the CSV and a table/rows will be built from it. This is not supported when updating
-     * or for external tables.
+     * @apiParam (Body) {object[]} [rows] When creating a table using a compatible data source, an array of objects to be imported into the new table can be provided.
      *
      * @apiParamExample {json} Example:
      * {
@@ -120,15 +117,7 @@ router
      *     "old": "columnName",
      *     "updated": "newColumnName",
      *   },
-     *   "dataImport": {
-     *     "csvString": "column\nvalue",
-     *     "primaryDisplay": "column",
-     *     "schema": {
-     *       "column": {
-     *         "type": "string"
-     *       }
-     *     }
-     *   }
+     *   "rows": []
      * }
      *
      * @apiSuccess {object} table The response body will contain the table structure after being cleaned up and
@@ -137,27 +126,9 @@ router
     .post("/api/tables", 
 // allows control over updating a table
 (0, resourceId_1.bodyResource)("_id"), (0, authorized_1.default)(BUILDER), (0, validators_1.tableValidator)(), tableController.save)
-    /**
-     * @api {post} /api/tables/csv/validate Validate a CSV for a table
-     * @apiName Validate a CSV for a table
-     * @apiGroup tables
-     * @apiPermission builder
-     * @apiDescription When creating a new table, or importing a CSV to an existing table the CSV must be validated and
-     * converted into a Budibase schema; this endpoint does this.
-     *
-     * @apiParam (Body) {string} csvString The CSV which is to be validated as a string.
-     * @apiParam (Body) {object} [schema] When a CSV has been validated it is possible to re-validate after changing the
-     * type of a field, by default everything will be strings as there is no way to infer types. The returned schema can
-     * be updated and then returned to the endpoint to re-validate and check if the type will work for the CSV, e.g.
-     * using a number instead of strings.
-     * @apiParam (Body) {string} [tableId] If importing data to an existing table this will pull the current table and
-     * remove any fields from the CSV schema which do not exist on the table/don't match the type of the table. When
-     * importing a CSV to an existing table only fields that are present on the table can be imported.
-     *
-     * @apiSuccess {object} schema The response body will contain a "schema" object that represents the schema found for
-     * the CSV - this will be in the same format used for table schema.s
-     */
-    .post("/api/tables/csv/validate", (0, authorized_1.default)(BUILDER), tableController.validateCSVSchema)
+    .post("/api/convert/csvToJson", (0, authorized_1.default)(BUILDER), tableController.csvToJson)
+    .post("/api/tables/validateNewTableImport", (0, authorized_1.default)(BUILDER), tableController.validateNewTableImport)
+    .post("/api/tables/validateExistingTableImport", (0, authorized_1.default)(BUILDER), tableController.validateExistingTableImport)
     /**
      * @api {post} /api/tables/:tableId/:revId Delete a table
      * @apiName Delete a table
@@ -184,9 +155,7 @@ router
      *
      * @apiParam {string} tableId The ID of the table which the data should be imported to.
      *
-     * @apiParam (Body) {object} dataImport This is the same as the structure used when creating an internal table with
-     * a CSV, it will have the "schema" returned from the CSV validation endpoint and the "csvString" which is to be
-     * turned into rows.
+     * @apiParam (Body) {object[]} rows An array of objects representing the rows to be imported, key-value pairs not matching the table schema will be ignored.
      *
      * @apiSuccess {string} message A message stating that the data was imported successfully.
      */

package/dist/api/routes/utils/validators.js

@@ -22,7 +22,7 @@ function tableValidator() {
         schema: joi_1.default.object().required(),
         name: joi_1.default.string().required(),
         views: joi_1.default.object(),
-        dataImport: joi_1.default.object(),
+        rows: joi_1.default.array(),
     }).unknown(true));
 }
 exports.tableValidator = tableValidator;

package/dist/app.js

@@ -69,6 +69,7 @@ app.use((0, koa_body_1.default)({
     enableTypes: ["json", "form", "text"],
     parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
 }));
+app.use(backend_core_1.middleware.logging);
 if (environment_1.default.isProd()) {
     environment_1.default._set("NODE_ENV", "production");
     Sentry.init();

package/dist/automations/triggers.js

@@ -134,6 +134,7 @@ function externalTrigger(automation, params, { getResponses } = {}) {
         }
         const data = { automation, event: params };
         if (getResponses) {
+            data.event = Object.assign(Object.assign({}, data.event), { appId: backend_core_1.context.getAppId(), automation });
             return utils.processEvent({ data });
         }
         else {

package/dist/definitions/datasource.js

@@ -5,9 +5,3 @@
  * be exposed for use by other services.    *
  ********************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthType = void 0;
-var AuthType;
-(function (AuthType) {
-    AuthType["BASIC"] = "basic";
-    AuthType["BEARER"] = "bearer";
-})(AuthType = exports.AuthType || (exports.AuthType = {}));

package/dist/index.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const global_agent_1 = require("global-agent");
 const fixPath = require("fix-path");
-const { checkDevelopmentEnvironment } = require("./utilities/fileSystem");
+const fileSystem_1 = require("./utilities/fileSystem");
 function runServer() {
     // this will shutdown the system if development environment not ready
     // will print an error explaining what to do
-    checkDevelopmentEnvironment();
+    (0, fileSystem_1.checkDevelopmentEnvironment)();
     fixPath();
     // this will setup http and https proxies form env variables
     process.env.GLOBAL_AGENT_FORCE_GLOBAL_AGENT = "false";

package/dist/integrations/base/query.js

@@ -8,12 +8,17 @@ 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.makeExternalQuery = void 0;
-const { getIntegration } = require("../index");
+const index_1 = require("../index");
+const sdk_1 = __importDefault(require("../../sdk"));
 function makeExternalQuery(datasource, json) {
     return __awaiter(this, void 0, void 0, function* () {
-        const Integration = yield getIntegration(datasource.source);
+        datasource = yield sdk_1.default.datasources.enrich(datasource);
+        const Integration = yield (0, index_1.getIntegration)(datasource.source);
         // query is the opinionated function
         if (Integration.prototype.query) {
             const integration = new Integration(datasource.config);

package/dist/integrations/base/sqlTable.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const knex_1 = require("knex");
 const types_1 = require("@budibase/types");
 const utils_1 = require("../utils");
-const { FieldTypes, RelationshipTypes } = require("../../constants");
+const constants_1 = require("../../constants");
 function generateSchema(schema, table, tables, oldTable = null, renamed) {
     let primaryKey = table && table.primary ? table.primary[0] : null;
     const columns = Object.values(table.schema);
@@ -28,13 +28,13 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
             continue;
         }
         switch (column.type) {
-            case FieldTypes.STRING:
-            case FieldTypes.OPTIONS:
-            case FieldTypes.LONGFORM:
-            case FieldTypes.BARCODEQR:
+            case constants_1.FieldTypes.STRING:
+            case constants_1.FieldTypes.OPTIONS:
+            case constants_1.FieldTypes.LONGFORM:
+            case constants_1.FieldTypes.BARCODEQR:
                 schema.text(key);
                 break;
-            case FieldTypes.NUMBER:
+            case constants_1.FieldTypes.NUMBER:
                 // if meta is specified then this is a junction table entry
                 if (column.meta && column.meta.toKey && column.meta.toTable) {
                     const { toKey, toTable } = column.meta;
@@ -45,21 +45,21 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
                     schema.float(key);
                 }
                 break;
-            case FieldTypes.BOOLEAN:
+            case constants_1.FieldTypes.BOOLEAN:
                 schema.boolean(key);
                 break;
-            case FieldTypes.DATETIME:
+            case constants_1.FieldTypes.DATETIME:
                 schema.datetime(key, {
                     useTz: !column.ignoreTimezones,
                 });
                 break;
-            case FieldTypes.ARRAY:
+            case constants_1.FieldTypes.ARRAY:
                 schema.json(key);
                 break;
-            case FieldTypes.LINK:
+            case constants_1.FieldTypes.LINK:
                 // this side of the relationship doesn't need any SQL work
-                if (column.relationshipType !== RelationshipTypes.MANY_TO_ONE &&
-                    column.relationshipType !== RelationshipTypes.MANY_TO_MANY) {
+                if (column.relationshipType !== constants_1.RelationshipTypes.MANY_TO_ONE &&
+                    column.relationshipType !== constants_1.RelationshipTypes.MANY_TO_MANY) {
                     if (!column.foreignKey || !column.tableId) {
                         throw "Invalid relationship schema";
                     }
@@ -83,8 +83,8 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
     // need to check if any columns have been deleted
     if (oldTable) {
         const deletedColumns = Object.entries(oldTable.schema)
-            .filter(([key, schema]) => schema.type !== FieldTypes.LINK &&
-            schema.type !== FieldTypes.FORMULA &&
+            .filter(([key, schema]) => schema.type !== constants_1.FieldTypes.LINK &&
+            schema.type !== constants_1.FieldTypes.FORMULA &&
             table.schema[key] == null)
             .map(([key]) => key);
         deletedColumns.forEach(key => {

package/dist/integrations/couchdb.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const PouchDB = require("pouchdb");
+const backend_core_1 = require("@budibase/backend-core");
 const SCHEMA = {
     docs: "https://docs.couchdb.org/en/stable/",
     friendlyName: "CouchDB",
@@ -37,6 +37,15 @@ const SCHEMA = {
         update: {
             type: types_1.QueryType.JSON,
         },
+        get: {
+            type: types_1.QueryType.FIELDS,
+            fields: {
+                id: {
+                    type: types_1.DatasourceFieldType.STRING,
+                    required: true,
+                },
+            },
+        },
         delete: {
             type: types_1.QueryType.FIELDS,
             fields: {
@@ -51,14 +60,12 @@ const SCHEMA = {
 class CouchDBIntegration {
     constructor(config) {
         this.config = config;
-        this.client = new PouchDB(`${config.url}/${config.database}`);
+        this.client = backend_core_1.db.DatabaseWithConnection(config.database, config.url);
     }
     query(command, errorMsg, query) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield this.client[command](query.id || query.json);
-                yield this.client.close();
-                return response;
+                return yield this.client[command](query.id || query.json);
             }
             catch (err) {
                 console.error(errorMsg, err);
@@ -66,22 +73,41 @@ class CouchDBIntegration {
             }
         });
     }
+    parse(query) {
+        return typeof query.json === "string" ? JSON.parse(query.json) : query.json;
+    }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.query("post", "Error writing to couchDB", query);
+            const parsed = this.parse(query);
+            return this.query("post", "Error writing to couchDB", { json: parsed });
         });
     }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
+            const parsed = this.parse(query);
             const result = yield this.query("allDocs", "Error querying couchDB", {
-                json: Object.assign({ include_docs: true }, query.json),
+                json: Object.assign({ include_docs: true }, parsed),
             });
             return result.rows.map((row) => row.doc);
         });
     }
     update(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.query("put", "Error updating couchDB document", query);
+            const parsed = this.parse(query);
+            if (!(parsed === null || parsed === void 0 ? void 0 : parsed._rev) && (parsed === null || parsed === void 0 ? void 0 : parsed._id)) {
+                const oldDoc = yield this.get({ id: parsed._id });
+                parsed._rev = oldDoc._rev;
+            }
+            return this.query("put", "Error updating couchDB document", {
+                json: parsed,
+            });
+        });
+    }
+    get(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.query("get", "Error retrieving couchDB document by ID", {
+                id: query.id,
+            });
         });
     }
     delete(query) {

package/dist/integrations/dynamodb.js

@@ -8,10 +8,13 @@ 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 });
 const types_1 = require("@budibase/types");
-const AWS = require("aws-sdk");
-const { AWS_REGION } = require("../db/dynamoClient");
+const aws_sdk_1 = __importDefault(require("aws-sdk"));
+const dynamoClient_1 = require("../db/dynamoClient");
 const SCHEMA = {
     docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet",
     description: "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.",
@@ -129,8 +132,8 @@ class DynamoDBIntegration {
             // @ts-ignore
             this.config = {};
         }
-        this.config = Object.assign(Object.assign({}, this.config), { currentClockSkew: true, region: config.region || AWS_REGION, endpoint: config.endpoint || undefined });
-        this.client = new AWS.DynamoDB.DocumentClient(this.config);
+        this.config = Object.assign(Object.assign({}, this.config), { currentClockSkew: true, region: config.region || dynamoClient_1.AWS_REGION, endpoint: config.endpoint || undefined });
+        this.client = new aws_sdk_1.default.DynamoDB.DocumentClient(this.config);
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -163,7 +166,7 @@ class DynamoDBIntegration {
             const params = {
                 TableName: query.table,
             };
-            return new AWS.DynamoDB(this.config).describeTable(params).promise();
+            return new aws_sdk_1.default.DynamoDB(this.config).describeTable(params).promise();
         });
     }
     get(query) {

package/dist/integrations/elasticsearch.js

@@ -76,11 +76,11 @@ const SCHEMA = {
         delete: {
             type: types_1.QueryType.FIELDS,
             fields: {
-                index: {
+                id: {
                     type: types_1.DatasourceFieldType.STRING,
                     required: true,
                 },
-                id: {
+                index: {
                     type: types_1.DatasourceFieldType.STRING,
                     required: true,
                 },
@@ -162,8 +162,12 @@ class ElasticSearchIntegration {
     }
     delete(query) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { id, index } = query;
             try {
-                const result = yield this.client.delete(query);
+                const result = yield this.client.delete({
+                    id,
+                    index,
+                });
                 return result.body;
             }
             catch (err) {