@budibase/server 2.1.30 → 2.1.32-alpha.0

package/dist/db/inMemoryView.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const newid = require("./newid");
 // bypass the main application db config
 // use in memory pouchdb directly
-const { getPouch, closeDB } = require("@budibase/backend-core/db");
+const { getPouch, closePouchDB } = require("@budibase/backend-core/db");
 const Pouch = getPouch({ inMemory: true });
 exports.runView = (view, calculation, group, data) => __awaiter(void 0, void 0, void 0, function* () {
     // use a different ID each time for the DB, make sure they
@@ -48,6 +48,6 @@ exports.runView = (view, calculation, group, data) => __awaiter(void 0, void 0,
     }
     finally {
         yield db.destroy();
-        yield closeDB(db);
+        yield closePouchDB(db);
     }
 });

package/dist/db/utils.js

@@ -1,87 +1,93 @@
 "use strict";
-const newid = require("./newid");
-const { DocumentType: CoreDocType, InternalTable, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, getQueryIndex, ViewName, getDocParams, getRowParams, generateRowID, getUserMetadataParams, generateUserMetadataID, getGlobalIDFromUserMetadataID, } = require("@budibase/backend-core/db");
-const UNICODE_MAX = "\ufff0";
-const AppStatus = {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateMemoryViewID = exports.getMetadataParams = exports.generateMetadataID = exports.generateUserFlagID = exports.getQueryParams = exports.getAutomationMetadataParams = exports.generateAutomationMetadataID = exports.generateQueryID = exports.getDatasourceParams = exports.generateDatasourceID = exports.getWebhookParams = exports.generateWebhookID = exports.getScreenParams = exports.generateScreenID = exports.getLayoutParams = exports.generateLayoutID = exports.getLinkParams = exports.generateLinkID = exports.generateAutomationID = exports.getAutomationParams = exports.getTableIDFromRowID = exports.generateTableID = exports.getTableParams = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.getUserMetadataParams = exports.generateRowID = exports.getRowParams = exports.getDocParams = exports.getQueryIndex = exports.getRoleParams = exports.generateRoleID = exports.generateDevAppID = exports.generateAppID = exports.UNICODE_MAX = exports.InternalTables = exports.ViewName = exports.TABLE_ROW_PREFIX = exports.LINK_USER_METADATA_PREFIX = exports.USER_METDATA_PREFIX = exports.isProdAppID = exports.isDevAppID = exports.APP_DEV_PREFIX = exports.APP_PREFIX = exports.DocumentType = exports.StaticDatabases = exports.SEPARATOR = exports.BudibaseInternalDB = exports.SearchIndexes = exports.AppStatus = void 0;
+exports.getMultiIDParams = exports.generatePluginID = exports.getMemoryViewParams = void 0;
+const newid_1 = __importDefault(require("./newid"));
+const backend_core_1 = require("@budibase/backend-core");
+exports.AppStatus = {
     DEV: "development",
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentType = CoreDocType;
-const SearchIndexes = {
+exports.SearchIndexes = {
     ROWS: "rows",
 };
-exports.StaticDatabases = StaticDatabases;
-const BudibaseInternalDB = {
+exports.BudibaseInternalDB = {
     _id: "bb_internal",
     type: "budibase",
     name: "Budibase DB",
     source: "BUDIBASE",
     config: {},
 };
-exports.APP_PREFIX = APP_PREFIX;
-exports.APP_DEV_PREFIX = APP_DEV_PREFIX;
-exports.isDevAppID = isDevAppID;
-exports.isProdAppID = isProdAppID;
-exports.USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`;
-exports.LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`;
-exports.TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}`;
-exports.ViewName = ViewName;
-exports.InternalTables = InternalTable;
-exports.DocumentType = DocumentType;
-exports.SEPARATOR = SEPARATOR;
-exports.UNICODE_MAX = UNICODE_MAX;
-exports.SearchIndexes = SearchIndexes;
-exports.AppStatus = AppStatus;
-exports.BudibaseInternalDB = BudibaseInternalDB;
-exports.generateAppID = generateAppID;
-exports.generateDevAppID = getDevelopmentAppID;
-exports.generateRoleID = generateRoleID;
-exports.getRoleParams = getRoleParams;
-exports.getQueryIndex = getQueryIndex;
-exports.getDocParams = getDocParams;
-exports.getRowParams = getRowParams;
-exports.generateRowID = generateRowID;
-exports.getUserMetadataParams = getUserMetadataParams;
-exports.generateUserMetadataID = generateUserMetadataID;
-exports.getGlobalIDFromUserMetadataID = getGlobalIDFromUserMetadataID;
+exports.SEPARATOR = backend_core_1.db.SEPARATOR;
+exports.StaticDatabases = backend_core_1.db.StaticDatabases;
+exports.DocumentType = backend_core_1.db.DocumentType;
+exports.APP_PREFIX = backend_core_1.db.APP_PREFIX;
+exports.APP_DEV_PREFIX = backend_core_1.db.APP_DEV_PREFIX;
+exports.isDevAppID = backend_core_1.db.isDevAppID;
+exports.isProdAppID = backend_core_1.db.isProdAppID;
+exports.USER_METDATA_PREFIX = `${exports.DocumentType.ROW}${exports.SEPARATOR}${backend_core_1.db.InternalTable.USER_METADATA}${exports.SEPARATOR}`;
+exports.LINK_USER_METADATA_PREFIX = `${exports.DocumentType.LINK}${exports.SEPARATOR}${backend_core_1.db.InternalTable.USER_METADATA}${exports.SEPARATOR}`;
+exports.TABLE_ROW_PREFIX = `${exports.DocumentType.ROW}${exports.SEPARATOR}${exports.DocumentType.TABLE}`;
+exports.ViewName = backend_core_1.db.ViewName;
+exports.InternalTables = backend_core_1.db.InternalTable;
+exports.UNICODE_MAX = backend_core_1.db.UNICODE_MAX;
+exports.generateAppID = backend_core_1.db.generateAppID;
+exports.generateDevAppID = backend_core_1.db.getDevelopmentAppID;
+exports.generateRoleID = backend_core_1.db.generateRoleID;
+exports.getRoleParams = backend_core_1.db.getRoleParams;
+exports.getQueryIndex = backend_core_1.db.getQueryIndex;
+exports.getDocParams = backend_core_1.db.getDocParams;
+exports.getRowParams = backend_core_1.db.getRowParams;
+exports.generateRowID = backend_core_1.db.generateRowID;
+exports.getUserMetadataParams = backend_core_1.db.getUserMetadataParams;
+exports.generateUserMetadataID = backend_core_1.db.generateUserMetadataID;
+exports.getGlobalIDFromUserMetadataID = backend_core_1.db.getGlobalIDFromUserMetadataID;
 /**
  * Gets parameters for retrieving tables, this is a utility function for the getDocParams function.
  */
-exports.getTableParams = (tableId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.TABLE, tableId, otherProps);
-};
+function getTableParams(tableId, otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.TABLE, tableId, otherProps);
+}
+exports.getTableParams = getTableParams;
 /**
  * Generates a new table ID.
  * @returns {string} The new table ID which the table doc can be stored under.
  */
-exports.generateTableID = () => {
-    return `${DocumentType.TABLE}${SEPARATOR}${newid()}`;
-};
+function generateTableID() {
+    return `${exports.DocumentType.TABLE}${exports.SEPARATOR}${(0, newid_1.default)()}`;
+}
+exports.generateTableID = generateTableID;
 /**
  * Given a row ID this will find the table ID within it (only works for internal tables).
  * @param {string} rowId The ID of the row.
  * @returns {string} The table ID.
  */
-exports.getTableIDFromRowID = rowId => {
+function getTableIDFromRowID(rowId) {
     const components = rowId
-        .split(DocumentType.TABLE + SEPARATOR)[1]
-        .split(SEPARATOR);
-    return `${DocumentType.TABLE}${SEPARATOR}${components[0]}`;
-};
+        .split(exports.DocumentType.TABLE + exports.SEPARATOR)[1]
+        .split(exports.SEPARATOR);
+    return `${exports.DocumentType.TABLE}${exports.SEPARATOR}${components[0]}`;
+}
+exports.getTableIDFromRowID = getTableIDFromRowID;
 /**
  * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
  */
-exports.getAutomationParams = (automationId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.AUTOMATION, automationId, otherProps);
-};
+function getAutomationParams(automationId, otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.AUTOMATION, automationId, otherProps);
+}
+exports.getAutomationParams = getAutomationParams;
 /**
  * Generates a new automation ID.
  * @returns {string} The new automation ID which the automation doc can be stored under.
  */
-exports.generateAutomationID = () => {
-    return `${DocumentType.AUTOMATION}${SEPARATOR}${newid()}`;
-};
+function generateAutomationID() {
+    return `${exports.DocumentType.AUTOMATION}${exports.SEPARATOR}${(0, newid_1.default)()}`;
+}
+exports.generateAutomationID = generateAutomationID;
 /**
  * Generates a new link doc ID. This is currently not usable with the alldocs call,
  * instead a view is built to make walking to tree easier.
@@ -93,131 +99,152 @@ exports.generateAutomationID = () => {
  * @param {string} fieldName2 the name of the field in the linked row.
  * @returns {string} The new link doc ID which the automation doc can be stored under.
  */
-exports.generateLinkID = (tableId1, tableId2, rowId1, rowId2, fieldName1, fieldName2) => {
-    const tables = `${SEPARATOR}${tableId1}${SEPARATOR}${tableId2}`;
-    const rows = `${SEPARATOR}${rowId1}${SEPARATOR}${rowId2}`;
-    const fields = `${SEPARATOR}${fieldName1}${SEPARATOR}${fieldName2}`;
-    return `${DocumentType.LINK}${tables}${rows}${fields}`;
-};
+function generateLinkID(tableId1, tableId2, rowId1, rowId2, fieldName1, fieldName2) {
+    const tables = `${exports.SEPARATOR}${tableId1}${exports.SEPARATOR}${tableId2}`;
+    const rows = `${exports.SEPARATOR}${rowId1}${exports.SEPARATOR}${rowId2}`;
+    const fields = `${exports.SEPARATOR}${fieldName1}${exports.SEPARATOR}${fieldName2}`;
+    return `${exports.DocumentType.LINK}${tables}${rows}${fields}`;
+}
+exports.generateLinkID = generateLinkID;
 /**
  * Gets parameters for retrieving link docs, this is a utility function for the getDocParams function.
  */
-exports.getLinkParams = (otherProps = {}) => {
-    return getDocParams(DocumentType.LINK, null, otherProps);
-};
+function getLinkParams(otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.LINK, null, otherProps);
+}
+exports.getLinkParams = getLinkParams;
 /**
  * Generates a new layout ID.
  * @returns {string} The new layout ID which the layout doc can be stored under.
  */
-exports.generateLayoutID = id => {
-    return `${DocumentType.LAYOUT}${SEPARATOR}${id || newid()}`;
-};
+function generateLayoutID(id) {
+    return `${exports.DocumentType.LAYOUT}${exports.SEPARATOR}${id || (0, newid_1.default)()}`;
+}
+exports.generateLayoutID = generateLayoutID;
 /**
  * Gets parameters for retrieving layout, this is a utility function for the getDocParams function.
  */
-exports.getLayoutParams = (layoutId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.LAYOUT, layoutId, otherProps);
-};
+function getLayoutParams(layoutId, otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.LAYOUT, layoutId, otherProps);
+}
+exports.getLayoutParams = getLayoutParams;
 /**
  * Generates a new screen ID.
  * @returns {string} The new screen ID which the screen doc can be stored under.
  */
-exports.generateScreenID = () => {
-    return `${DocumentType.SCREEN}${SEPARATOR}${newid()}`;
-};
+function generateScreenID() {
+    return `${exports.DocumentType.SCREEN}${exports.SEPARATOR}${(0, newid_1.default)()}`;
+}
+exports.generateScreenID = generateScreenID;
 /**
  * Gets parameters for retrieving screens, this is a utility function for the getDocParams function.
  */
-exports.getScreenParams = (screenId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.SCREEN, screenId, otherProps);
-};
+function getScreenParams(screenId, otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.SCREEN, screenId, otherProps);
+}
+exports.getScreenParams = getScreenParams;
 /**
  * Generates a new webhook ID.
  * @returns {string} The new webhook ID which the webhook doc can be stored under.
  */
-exports.generateWebhookID = () => {
-    return `${DocumentType.WEBHOOK}${SEPARATOR}${newid()}`;
-};
+function generateWebhookID() {
+    return `${exports.DocumentType.WEBHOOK}${exports.SEPARATOR}${(0, newid_1.default)()}`;
+}
+exports.generateWebhookID = generateWebhookID;
 /**
  * Gets parameters for retrieving a webhook, this is a utility function for the getDocParams function.
  */
-exports.getWebhookParams = (webhookId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.WEBHOOK, webhookId, otherProps);
-};
+function getWebhookParams(webhookId, otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.WEBHOOK, webhookId, otherProps);
+}
+exports.getWebhookParams = getWebhookParams;
 /**
  * Generates a new datasource ID.
  * @returns {string} The new datasource ID which the webhook doc can be stored under.
  */
-exports.generateDatasourceID = ({ plus = false } = {}) => {
-    return `${plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE}${SEPARATOR}${newid()}`;
-};
+function generateDatasourceID({ plus = false } = {}) {
+    return `${plus ? exports.DocumentType.DATASOURCE_PLUS : exports.DocumentType.DATASOURCE}${exports.SEPARATOR}${(0, newid_1.default)()}`;
+}
+exports.generateDatasourceID = generateDatasourceID;
 /**
  * Gets parameters for retrieving a datasource, this is a utility function for the getDocParams function.
  */
-exports.getDatasourceParams = (datasourceId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.DATASOURCE, datasourceId, otherProps);
-};
+function getDatasourceParams(datasourceId, otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.DATASOURCE, datasourceId, otherProps);
+}
+exports.getDatasourceParams = getDatasourceParams;
 /**
  * Generates a new query ID.
  * @returns {string} The new query ID which the query doc can be stored under.
  */
-exports.generateQueryID = datasourceId => {
-    return `${DocumentType.QUERY}${SEPARATOR}${datasourceId}${SEPARATOR}${newid()}`;
-};
+function generateQueryID(datasourceId) {
+    return `${exports.DocumentType.QUERY}${exports.SEPARATOR}${datasourceId}${exports.SEPARATOR}${(0, newid_1.default)()}`;
+}
+exports.generateQueryID = generateQueryID;
 /**
  * Generates a metadata ID for automations, used to track errors in recurring
  * automations etc.
  */
-exports.generateAutomationMetadataID = automationId => {
-    return `${DocumentType.AUTOMATION_METADATA}${SEPARATOR}${automationId}`;
-};
+function generateAutomationMetadataID(automationId) {
+    return `${exports.DocumentType.AUTOMATION_METADATA}${exports.SEPARATOR}${automationId}`;
+}
+exports.generateAutomationMetadataID = generateAutomationMetadataID;
 /**
  * Retrieve all automation metadata in an app database.
  */
-exports.getAutomationMetadataParams = (otherProps = {}) => {
-    return getDocParams(DocumentType.AUTOMATION_METADATA, null, otherProps);
-};
+function getAutomationMetadataParams(otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.AUTOMATION_METADATA, null, otherProps);
+}
+exports.getAutomationMetadataParams = getAutomationMetadataParams;
 /**
  * Gets parameters for retrieving a query, this is a utility function for the getDocParams function.
  */
-exports.getQueryParams = (datasourceId = null, otherProps = {}) => {
+function getQueryParams(datasourceId, otherProps = {}) {
     if (datasourceId == null) {
-        return getDocParams(DocumentType.QUERY, null, otherProps);
+        return (0, exports.getDocParams)(exports.DocumentType.QUERY, null, otherProps);
     }
-    return getDocParams(DocumentType.QUERY, `${datasourceId}${SEPARATOR}`, otherProps);
-};
+    return (0, exports.getDocParams)(exports.DocumentType.QUERY, `${datasourceId}${exports.SEPARATOR}`, otherProps);
+}
+exports.getQueryParams = getQueryParams;
 /**
  * Generates a new flag document ID.
  * @returns {string} The ID of the flag document that was generated.
  */
-exports.generateUserFlagID = userId => {
-    return `${DocumentType.USER_FLAG}${SEPARATOR}${userId}`;
-};
-exports.generateMetadataID = (type, entityId) => {
-    return `${DocumentType.METADATA}${SEPARATOR}${type}${SEPARATOR}${entityId}`;
-};
-exports.getMetadataParams = (type, entityId = null, otherProps = {}) => {
-    let docId = `${type}${SEPARATOR}`;
+function generateUserFlagID(userId) {
+    return `${exports.DocumentType.USER_FLAG}${exports.SEPARATOR}${userId}`;
+}
+exports.generateUserFlagID = generateUserFlagID;
+function generateMetadataID(type, entityId) {
+    return `${exports.DocumentType.METADATA}${exports.SEPARATOR}${type}${exports.SEPARATOR}${entityId}`;
+}
+exports.generateMetadataID = generateMetadataID;
+function getMetadataParams(type, entityId, otherProps = {}) {
+    let docId = `${type}${exports.SEPARATOR}`;
     if (entityId != null) {
         docId += entityId;
     }
-    return getDocParams(DocumentType.METADATA, docId, otherProps);
-};
-exports.generateMemoryViewID = viewName => {
-    return `${DocumentType.MEM_VIEW}${SEPARATOR}${viewName}`;
-};
-exports.getMemoryViewParams = (otherProps = {}) => {
-    return getDocParams(DocumentType.MEM_VIEW, null, otherProps);
-};
-exports.generatePluginID = name => {
-    return `${DocumentType.PLUGIN}${SEPARATOR}${name}`;
-};
+    return (0, exports.getDocParams)(exports.DocumentType.METADATA, docId, otherProps);
+}
+exports.getMetadataParams = getMetadataParams;
+function generateMemoryViewID(viewName) {
+    return `${exports.DocumentType.MEM_VIEW}${exports.SEPARATOR}${viewName}`;
+}
+exports.generateMemoryViewID = generateMemoryViewID;
+function getMemoryViewParams(otherProps = {}) {
+    return (0, exports.getDocParams)(exports.DocumentType.MEM_VIEW, null, otherProps);
+}
+exports.getMemoryViewParams = getMemoryViewParams;
+function generatePluginID(name) {
+    return `${exports.DocumentType.PLUGIN}${exports.SEPARATOR}${name}`;
+}
+exports.generatePluginID = generatePluginID;
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */
-exports.getMultiIDParams = ids => {
+function getMultiIDParams(ids) {
     return {
         keys: ids,
         include_docs: true,
     };
-};
+}
+exports.getMultiIDParams = getMultiIDParams;

package/dist/integrations/elasticsearch.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 { Client } = require("@elastic/elasticsearch");
+const elasticsearch_1 = require("@elastic/elasticsearch");
 const SCHEMA = {
     docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
     description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
@@ -22,6 +22,21 @@ const SCHEMA = {
             required: true,
             default: "http://localhost:9200",
         },
+        ssl: {
+            type: types_1.DatasourceFieldType.BOOLEAN,
+            default: false,
+            required: false,
+        },
+        rejectUnauthorized: {
+            type: types_1.DatasourceFieldType.BOOLEAN,
+            default: true,
+            required: false,
+        },
+        ca: {
+            type: types_1.DatasourceFieldType.LONGFORM,
+            default: false,
+            required: false,
+        },
     },
     query: {
         create: {
@@ -76,7 +91,16 @@ const SCHEMA = {
 class ElasticSearchIntegration {
     constructor(config) {
         this.config = config;
-        this.client = new Client({ node: config.url });
+        const clientConfig = {
+            node: this.config.url,
+        };
+        if (this.config.ssl) {
+            clientConfig.ssl = {
+                rejectUnauthorized: this.config.rejectUnauthorized,
+                ca: this.config.ca || undefined,
+            };
+        }
+        this.client = new elasticsearch_1.Client(clientConfig);
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/googlesheets.js

@@ -18,9 +18,7 @@ const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const google_spreadsheet_1 = require("google-spreadsheet");
 const environment_1 = __importDefault(require("../environment"));
-const { getGlobalDB } = require("@budibase/backend-core/tenancy");
-const { getScopedConfig } = require("@budibase/backend-core/db");
-const { Configs } = require("@budibase/backend-core/constants");
+const backend_core_1 = require("@budibase/backend-core");
 const fetch = require("node-fetch");
 const SCHEMA = {
     plus: true,
@@ -140,9 +138,9 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Initialise oAuth client
-                const db = getGlobalDB();
-                let googleConfig = yield getScopedConfig(db, {
-                    type: Configs.GOOGLE,
+                const db = backend_core_1.tenancy.getGlobalDB();
+                let googleConfig = yield backend_core_1.db.getScopedConfig(db, {
+                    type: backend_core_1.constants.Config.GOOGLE,
                 });
                 if (!googleConfig) {
                     googleConfig = {

package/dist/integrations/s3.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const AWS = require("aws-sdk");
+const csv = require("csvtojson");
 const SCHEMA = {
     docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
     description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
@@ -41,16 +42,106 @@ const SCHEMA = {
         },
     },
     query: {
+        create: {
+            type: types_1.QueryType.FIELDS,
+            fields: {
+                bucket: {
+                    display: "New Bucket",
+                    type: types_1.DatasourceFieldType.STRING,
+                    required: true,
+                },
+                location: {
+                    required: true,
+                    default: "us-east-1",
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                grantFullControl: {
+                    display: "Grant full control",
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                grantRead: {
+                    display: "Grant read",
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                grantReadAcp: {
+                    display: "Grant read ACP",
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                grantWrite: {
+                    display: "Grant write",
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                grantWriteAcp: {
+                    display: "Grant write ACP",
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+            },
+        },
         read: {
             type: types_1.QueryType.FIELDS,
             fields: {
                 bucket: {
-                    type: "string",
+                    type: types_1.DatasourceFieldType.STRING,
+                    required: true,
+                },
+                delimiter: {
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                marker: {
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+                maxKeys: {
+                    type: types_1.DatasourceFieldType.NUMBER,
+                    display: "Max Keys",
+                },
+                prefix: {
+                    type: types_1.DatasourceFieldType.STRING,
+                },
+            },
+        },
+        readCsv: {
+            displayName: "Read CSV",
+            type: types_1.QueryType.FIELDS,
+            fields: {
+                bucket: {
+                    type: types_1.DatasourceFieldType.STRING,
+                    required: true,
+                },
+                key: {
+                    type: types_1.DatasourceFieldType.STRING,
+                    required: true,
+                },
+            },
+        },
+        delete: {
+            type: types_1.QueryType.FIELDS,
+            fields: {
+                bucket: {
+                    type: types_1.DatasourceFieldType.STRING,
+                    required: true,
+                },
+                delete: {
+                    type: types_1.DatasourceFieldType.JSON,
                     required: true,
                 },
             },
         },
     },
+    extra: {
+        acl: {
+            required: false,
+            displayName: "ACL",
+            type: types_1.DatasourceFieldType.LIST,
+            data: {
+                create: [
+                    "private",
+                    "public-read",
+                    "public-read-write",
+                    "authenticated-read",
+                ],
+            },
+        },
+    },
 };
 class S3Integration {
     constructor(config) {
@@ -63,16 +154,81 @@ class S3Integration {
         }
         this.client = new AWS.S3(this.config);
     }
+    create(query) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let params = {
+                Bucket: query.bucket,
+                ACL: (_a = query.extra) === null || _a === void 0 ? void 0 : _a.acl,
+                GrantFullControl: query.grantFullControl,
+                GrantRead: query.grantRead,
+                GrantReadACP: query.grantReadAcp,
+                GrantWrite: query.grantWrite,
+                GrantWriteACP: query.grantWriteAcp,
+            };
+            if (query.location) {
+                params["CreateBucketConfiguration"] = {
+                    LocationConstraint: query.location,
+                };
+            }
+            return yield this.client.createBucket(params).promise();
+        });
+    }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.client
                 .listObjects({
                 Bucket: query.bucket,
+                Delimiter: query.delimiter,
+                Marker: query.marker,
+                MaxKeys: query.maxKeys,
+                Prefix: query.prefix,
             })
                 .promise();
             return response.Contents;
         });
     }
+    readCsv(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stream = this.client
+                .getObject({
+                Bucket: query.bucket,
+                Key: query.key,
+            })
+                .createReadStream();
+            let csvError = false;
+            return new Promise((resolve, reject) => {
+                stream.on("error", (err) => {
+                    reject(err);
+                });
+                const response = csv()
+                    .fromStream(stream)
+                    .on("error", () => {
+                    csvError = true;
+                });
+                stream.on("finish", () => {
+                    resolve(response);
+                });
+            }).catch(err => {
+                if (csvError) {
+                    throw new Error("Could not read CSV");
+                }
+                else {
+                    throw err;
+                }
+            });
+        });
+    }
+    delete(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.client
+                .deleteObjects({
+                Bucket: query.bucket,
+                Delete: JSON.parse(query.delete),
+            })
+                .promise();
+        });
+    }
 }
 exports.default = {
     schema: SCHEMA,