@budibase/server 2.2.26 → 2.2.27

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) {

package/dist/integrations/googlesheets.js

@@ -242,7 +242,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                return yield this.client.addSheet({ title: name });
+                return yield this.client.addSheet({ title: name, headerValues: ["test"] });
             }
             catch (err) {
                 console.error("Error creating new table in google sheets", err);

package/dist/integrations/index.js

@@ -32,8 +32,8 @@ const oracle_1 = __importDefault(require("./oracle"));
 const plugin_1 = require("../api/controllers/plugin");
 const types_1 = require("@budibase/types");
 const fileSystem_1 = require("../utilities/fileSystem");
-const environment = require("../environment");
-const { cloneDeep } = require("lodash");
+const environment_1 = __importDefault(require("../environment"));
+const lodash_1 = require("lodash");
 const DEFINITIONS = {
     [types_1.SourceName.POSTGRES]: postgres_1.default.schema,
     [types_1.SourceName.DYNAMODB]: dynamodb_1.default.schema,
@@ -79,7 +79,7 @@ if (process.arch &&
 function getDefinitions() {
     return __awaiter(this, void 0, void 0, function* () {
         const pluginSchemas = {};
-        if (environment.SELF_HOSTED) {
+        if (environment_1.default.SELF_HOSTED) {
             const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
             // extract the actual schema from each custom
             for (let plugin of plugins) {
@@ -90,22 +90,21 @@ function getDefinitions() {
                 }
             }
         }
-        return Object.assign(Object.assign({}, cloneDeep(DEFINITIONS)), pluginSchemas);
+        return Object.assign(Object.assign({}, (0, lodash_1.cloneDeep)(DEFINITIONS)), pluginSchemas);
     });
 }
 exports.getDefinitions = getDefinitions;
 function getIntegration(integration) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
         }
-        if (environment.SELF_HOSTED) {
+        if (environment_1.default.SELF_HOSTED) {
             const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
             for (let plugin of plugins) {
                 if (plugin.name === integration) {
                     // need to use commonJS require due to its dynamic runtime nature
-                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin.name, plugin.jsUrl, (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash);
+                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin);
                     if (retrieved.integration) {
                         return retrieved.integration;
                     }