@budibase/server 2.7.16-alpha.0 → 2.7.18

package/dist/automation.js

@@ -11,8 +11,8 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -671,13 +671,13 @@ var init_plan = __esm({
 var isStaticQuota, isMonthlyQuota, isConstantQuota;
 var init_quota = __esm({
   "../types/src/sdk/licensing/quota.ts"() {
-    isStaticQuota = (quotaType, usageType, name) => {
+    isStaticQuota = (quotaType, usageType, name2) => {
       return quotaType === "usage" /* USAGE */ && usageType === "static" /* STATIC */;
     };
-    isMonthlyQuota = (quotaType, usageType, name) => {
+    isMonthlyQuota = (quotaType, usageType, name2) => {
       return quotaType === "usage" /* USAGE */ && usageType === "monthly" /* MONTHLY */;
     };
-    isConstantQuota = (quotaType, name) => {
+    isConstantQuota = (quotaType, name2) => {
       return quotaType === "constant" /* CONSTANT */;
     };
   }
@@ -787,8 +787,8 @@ var init_locks = __esm({
 var isDocument;
 var init_db = __esm({
   "../types/src/sdk/db.ts"() {
-    isDocument = (doc) => {
-      return typeof doc === "object" && doc._id && doc._rev;
+    isDocument = (doc2) => {
+      return typeof doc2 === "object" && doc2._id && doc2._rev;
     };
   }
 });
@@ -946,7 +946,6 @@ var init_automation2 = __esm({
       AutomationIOType2["NUMBER"] = "number";
       AutomationIOType2["ARRAY"] = "array";
       AutomationIOType2["JSON"] = "json";
-      AutomationIOType2["DATE"] = "date";
       return AutomationIOType2;
     })(AutomationIOType || {});
     AutomationCustomIOType = /* @__PURE__ */ ((AutomationCustomIOType2) => {
@@ -2065,12 +2064,12 @@ function getPouchDB(dbName, opts) {
   checkInitialised();
   const db2 = new Pouch(dbName, opts);
   const dbPut = db2.put;
-  db2.put = async (doc, options2 = {}) => {
-    if (!doc.createdAt) {
-      doc.createdAt = (/* @__PURE__ */ new Date()).toISOString();
+  db2.put = async (doc2, options2 = {}) => {
+    if (!doc2.createdAt) {
+      doc2.createdAt = (/* @__PURE__ */ new Date()).toISOString();
     }
-    doc.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    return dbPut(doc, options2);
+    doc2.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    return dbPut(doc2, options2);
   };
   db2.exists = async () => {
     const info = await db2.info();
@@ -2240,7 +2239,7 @@ var init_DatabaseImpl = __esm({
         }
         return this.updateOutput(() => db2.get(id));
       }
-      async remove(idOrDoc, rev) {
+      async remove(idOrDoc, rev2) {
         const db2 = await this.checkSetup();
         let _id;
         let _rev;
@@ -2249,7 +2248,7 @@ var init_DatabaseImpl = __esm({
           _rev = idOrDoc._rev;
         } else {
           _id = idOrDoc;
-          _rev = rev;
+          _rev = rev2;
         }
         if (!_id || !_rev) {
           throw new Error("Unable to remove doc without a valid _id and _rev.");
@@ -3513,18 +3512,18 @@ async function newRedlock(opts = {}) {
 }
 function getLockName(opts) {
   const prefix = opts.systemLock ? "system" : getTenantId();
-  let name = `lock:${prefix}_${opts.name}`;
+  let name2 = `lock:${prefix}_${opts.name}`;
   if (opts.resource) {
-    name = name + `_${opts.resource}`;
+    name2 = name2 + `_${opts.resource}`;
   }
-  return name;
+  return name2;
 }
 async function doWithLock(opts, task) {
   const redlock = await getClient(opts.type, opts.customOptions);
   let lock;
   try {
-    const name = getLockName(opts);
-    lock = await redlock.lock(name, opts.ttl);
+    const name2 = getLockName(opts);
+    lock = await redlock.lock(name2, opts.ttl);
     const result = await task();
     return { executed: true, result };
   } catch (e) {
@@ -4038,8 +4037,8 @@ var init_ids = __esm({
     generateDevInfoID = (userId) => {
       return `${"devinfo" /* DEV_INFO */}${SEPARATOR}${userId}`;
     };
-    generatePluginID = (name) => {
-      return `${"plg" /* PLUGIN */}${SEPARATOR}${name}`;
+    generatePluginID = (name2) => {
+      return `${"plg" /* PLUGIN */}${SEPARATOR}${name2}`;
     };
   }
 });
@@ -4129,8 +4128,8 @@ var init_params = __esm({
     isDatasourceId = (id) => {
       return id && id.startsWith(`${"datasource" /* DATASOURCE */}${SEPARATOR}`);
     };
-    getPluginParams = (pluginId, otherProps = {}) => {
-      return getDocParams("plg" /* PLUGIN */, pluginId, otherProps);
+    getPluginParams = (pluginId2, otherProps = {}) => {
+      return getDocParams("plg" /* PLUGIN */, pluginId2, otherProps);
     };
   }
 });
@@ -4267,7 +4266,7 @@ function pagination(data2, pageSize, {
   const hasNextPage = data2.length > pageSize;
   let nextPage = void 0;
   if (!getKey) {
-    getKey = (doc) => property ? doc == null ? void 0 : doc[property] : doc == null ? void 0 : doc._id;
+    getKey = (doc2) => property ? doc2 == null ? void 0 : doc2[property] : doc2 == null ? void 0 : doc2._id;
   }
   if (hasNextPage) {
     nextPage = getKey(data2[pageSize]);
@@ -4485,8 +4484,8 @@ var init_Replication = __esm({
        * @param {String} source - the DB you want to replicate or rollback to
        * @param {String} target - the DB you want to replicate to, or rollback from
        */
-      constructor({ source, target }) {
-        this.source = getPouchDB(source);
+      constructor({ source: source2, target }) {
+        this.source = getPouchDB(source2);
         this.target = getPouchDB(target);
       }
       close() {
@@ -4521,8 +4520,8 @@ var init_Replication = __esm({
       }
       appReplicateOpts() {
         return {
-          filter: (doc) => {
-            return doc._id !== "app_metadata" /* APP_METADATA */;
+          filter: (doc2) => {
+            return doc2._id !== "app_metadata" /* APP_METADATA */;
           }
         };
       }
@@ -4703,9 +4702,9 @@ var init_lucene = __esm({
         __privateSet(this, _indexBuilder, builderFn);
         return this;
       }
-      setVersion(version) {
-        if (version != null) {
-          __privateSet(this, _version, version);
+      setVersion(version2) {
+        if (version2 != null) {
+          __privateSet(this, _version, version2);
         }
         return this;
       }
@@ -5289,36 +5288,36 @@ async function populateFromDB2(appId) {
     { skip_setup: true }
   );
 }
-function isInvalid(metadata) {
-  return !metadata || metadata.state === AppState.INVALID;
+function isInvalid(metadata2) {
+  return !metadata2 || metadata2.state === AppState.INVALID;
 }
 async function getAppMetadata(appId) {
   const client3 = await getAppClient();
-  let metadata = await client3.get(appId);
-  if (!metadata) {
+  let metadata2 = await client3.get(appId);
+  if (!metadata2) {
     let expiry = EXPIRY_SECONDS2;
     try {
-      metadata = await populateFromDB2(appId);
+      metadata2 = await populateFromDB2(appId);
     } catch (err) {
       if (err && err.status === 404) {
-        metadata = { state: AppState.INVALID };
+        metadata2 = { state: AppState.INVALID };
         expiry = void 0;
       } else {
         throw err;
       }
     }
-    if (isInvalid(metadata)) {
+    if (isInvalid(metadata2)) {
       const temp = await client3.get(appId);
       if (temp) {
-        metadata = temp;
+        metadata2 = temp;
       }
     }
-    await client3.store(appId, metadata, expiry);
+    await client3.store(appId, metadata2, expiry);
   }
-  if (isInvalid(metadata)) {
+  if (isInvalid(metadata2)) {
     throw { status: 404, message: "No app metadata found" };
   }
-  return metadata;
+  return metadata2;
 }
 async function invalidateAppMetadata(appId, newMetadata) {
   if (!appId) {
@@ -5357,18 +5356,18 @@ async function getCache() {
 function makeCacheKey(db2, key) {
   return db2.name + key;
 }
-function makeCacheItem(doc, lastWrite = null) {
-  return { doc, lastWrite: lastWrite || Date.now() };
+function makeCacheItem(doc2, lastWrite = null) {
+  return { doc: doc2, lastWrite: lastWrite || Date.now() };
 }
-async function put(db2, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
-  const cache3 = await getCache();
-  const key = doc._id;
+async function put(db2, doc2, writeRateMs = DEFAULT_WRITE_RATE_MS) {
+  const cache2 = await getCache();
+  const key = doc2._id;
   let cacheItem;
   if (key) {
-    cacheItem = await cache3.get(makeCacheKey(db2, key));
+    cacheItem = await cache2.get(makeCacheKey(db2, key));
   }
   const updateDb = !cacheItem || cacheItem.lastWrite < Date.now() - writeRateMs;
-  let output = doc;
+  let output = doc2;
   if (updateDb) {
     const lockResponse = await doWithLock(
       {
@@ -5381,13 +5380,13 @@ async function put(db2, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
         const writeDb = async (toWrite) => {
           const response2 = await db2.put(toWrite, { force: true });
           output = {
-            ...doc,
+            ...doc2,
             _id: response2.id,
             _rev: response2.rev
           };
         };
         try {
-          await writeDb(doc);
+          await writeDb(doc2);
         } catch (err) {
           if (err.status !== 409) {
             throw err;
@@ -5403,32 +5402,32 @@ async function put(db2, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
   }
   cacheItem = makeCacheItem(output, updateDb ? null : cacheItem == null ? void 0 : cacheItem.lastWrite);
   if (output._id) {
-    await cache3.store(makeCacheKey(db2, output._id), cacheItem);
+    await cache2.store(makeCacheKey(db2, output._id), cacheItem);
   }
   return { ok: true, id: output._id, rev: output._rev };
 }
 async function get2(db2, id) {
-  const cache3 = await getCache();
+  const cache2 = await getCache();
   const cacheKey = makeCacheKey(db2, id);
-  let cacheItem = await cache3.get(cacheKey);
+  let cacheItem = await cache2.get(cacheKey);
   if (!cacheItem) {
-    const doc = await db2.get(id);
-    cacheItem = makeCacheItem(doc);
-    await cache3.store(cacheKey, cacheItem);
+    const doc2 = await db2.get(id);
+    cacheItem = makeCacheItem(doc2);
+    await cache2.store(cacheKey, cacheItem);
   }
   return cacheItem.doc;
 }
-async function remove(db2, docOrId, rev) {
-  const cache3 = await getCache();
+async function remove(db2, docOrId, rev2) {
+  const cache2 = await getCache();
   if (!docOrId) {
     throw new Error("No ID/Rev provided.");
   }
   const id = typeof docOrId === "string" ? docOrId : docOrId._id;
-  rev = typeof docOrId === "string" ? rev : docOrId._rev;
+  rev2 = typeof docOrId === "string" ? rev2 : docOrId._rev;
   try {
-    await cache3.delete(makeCacheKey(db2, id));
+    await cache2.delete(makeCacheKey(db2, id));
   } finally {
-    await db2.remove(id, rev);
+    await db2.remove(id, rev2);
   }
 }
 var DEFAULT_WRITE_RATE_MS, CACHE, Writethrough;
@@ -5446,14 +5445,14 @@ var init_writethrough = __esm({
         this.db = db2;
         this.writeRateMs = writeRateMs;
       }
-      async put(doc) {
-        return put(this.db, doc, this.writeRateMs);
+      async put(doc2) {
+        return put(this.db, doc2, this.writeRateMs);
       }
       async get(id) {
         return get2(this.db, id);
       }
-      async remove(docOrId, rev) {
-        return remove(this.db, docOrId, rev);
+      async remove(docOrId, rev2) {
+        return remove(this.db, docOrId, rev2);
       }
     };
   }
@@ -5952,7 +5951,7 @@ var init_LoggingProcessor = __esm({
 });
 
 // ../backend-core/src/utils/hashing.ts
-async function hash(data2) {
+async function hash2(data2) {
   const salt = await bcrypt.genSalt(SALT_ROUNDS);
   return bcrypt.hash(data2, salt);
 }
@@ -6066,14 +6065,14 @@ function isValidInternalAPIKey(apiKey) {
   }
   return false;
 }
-function getCookie(ctx, name) {
-  const cookie = ctx.cookies.get(name);
+function getCookie(ctx, name2) {
+  const cookie = ctx.cookies.get(name2);
   if (!cookie) {
     return cookie;
   }
   return openJwt(cookie);
 }
-function setCookie(ctx, value, name = "builder", opts = { sign: true }) {
+function setCookie(ctx, value, name2 = "builder", opts = { sign: true }) {
   if (value && opts && opts.sign) {
     value = jwt.sign(value, environment_default2.JWT_SECRET);
   }
@@ -6086,10 +6085,10 @@ function setCookie(ctx, value, name = "builder", opts = { sign: true }) {
   if (environment_default2.COOKIE_DOMAIN) {
     config.domain = environment_default2.COOKIE_DOMAIN;
   }
-  ctx.cookies.set(name, value, config);
+  ctx.cookies.set(name2, value, config);
 }
-function clearCookie(ctx, name) {
-  setCookie(ctx, null, name);
+function clearCookie(ctx, name2) {
+  setCookie(ctx, null, name2);
 }
 function isClient(ctx) {
   return ctx.headers["x-budibase-type" /* TYPE */] === "client";
@@ -6137,7 +6136,7 @@ __export(utils_exports2, {
   compare: () => compare,
   getAppIdFromCtx: () => getAppIdFromCtx,
   getCookie: () => getCookie,
-  hash: () => hash,
+  hash: () => hash2,
   isAudited: () => isAudited,
   isClient: () => isClient,
   isPublicApiRequest: () => isPublicApiRequest,
@@ -6180,8 +6179,8 @@ var init_inMemoryQueue = __esm({
        * @param {object|null} opts This is not used by the in memory queue as there is no real use
        * case when in memory, but is the same API as Bull
        */
-      constructor(name, opts = null) {
-        this._name = name;
+      constructor(name2, opts = null) {
+        this._name = name2;
         this._opts = opts;
         this._messages = [];
         this._emitter = new import_events2.default.EventEmitter();
@@ -6678,13 +6677,13 @@ var init_installation = __esm({
         }
       );
     };
-    updateVersion = async (version) => {
+    updateVersion = async (version2) => {
       try {
         await doWithDB(
           StaticDatabases.PLATFORM_INFO.name,
           async (platformDb) => {
             const install = await getInstall();
-            install.version = version;
+            install.version = version2;
             await platformDb.put(install);
             await bustCache("installation" /* INSTALLATION */);
           }
@@ -6800,13 +6799,13 @@ var init_identification2 = __esm({
       const id = installId;
       const type = "installation" /* INSTALLATION */;
       const hosting = getHostingFromEnv();
-      const version = environment_default2.VERSION;
+      const version2 = environment_default2.VERSION;
       const environment3 = getDeploymentEnvironment();
       const group2 = {
         id,
         type,
         hosting,
-        version,
+        version: version2,
         environment: environment3
       };
       await identifyGroup(group2, timestamp);
@@ -6986,10 +6985,10 @@ var init_backfill2 = __esm({
     init_generic();
     init_generic();
     start = async (events2) => {
-      const metadata = {
+      const metadata2 = {
         eventWhitelist: events2
       };
-      return saveBackfillMetadata(metadata);
+      return saveBackfillMetadata(metadata2);
     };
     recordEvent2 = async (event, properties) => {
       const eventKey2 = getEventKey(event, properties);
@@ -7339,11 +7338,11 @@ var init_app5 = __esm({
 });
 
 // ../backend-core/src/events/publishers/auth.ts
-async function login(source, email) {
+async function login(source2, email) {
   const identity = await identification_default.getCurrentIdentity();
   const properties = {
     userId: identity.id,
-    source,
+    source: source2,
     audited: {
       email
     }
@@ -8223,9 +8222,9 @@ var init_view3 = __esm({
 });
 
 // ../backend-core/src/events/publishers/installation.ts
-async function versionChecked(version) {
+async function versionChecked(version2) {
   const properties = {
-    currentVersion: version
+    currentVersion: version2
   };
   await publishEvent("installation:version:checked" /* INSTALLATION_VERSION_CHECKED */, properties);
 }
@@ -8468,13 +8467,13 @@ async function appBackupRestored(backup) {
   };
   await publishEvent("app:backup:restored" /* APP_BACKUP_RESTORED */, properties);
 }
-async function appBackupTriggered(appId, backupId, type, trigger, name) {
+async function appBackupTriggered(appId, backupId, type, trigger, name2) {
   const properties = {
     appId,
     backupId,
     type,
     trigger,
-    name
+    name: name2
   };
   await publishEvent("app:backup:triggered" /* APP_BACKUP_TRIGGERED */, properties);
 }
@@ -8491,16 +8490,16 @@ var init_backup4 = __esm({
 });
 
 // ../backend-core/src/events/publishers/environmentVariable.ts
-async function created14(name, environments) {
+async function created14(name2, environments) {
   const properties = {
-    name,
+    name: name2,
     environments
   };
   await publishEvent("environment_variable:created" /* ENVIRONMENT_VARIABLE_CREATED */, properties);
 }
-async function deleted14(name) {
+async function deleted14(name2) {
   const properties = {
-    name
+    name: name2
   };
   await publishEvent("environment_variable:deleted" /* ENVIRONMENT_VARIABLE_DELETED */, properties);
 }
@@ -8879,7 +8878,7 @@ var init_users4 = __esm({
       let userList, property = "_id", getKey;
       if (appId) {
         userList = await searchGlobalUsersByApp(appId, opts);
-        getKey = (doc) => getGlobalUserByAppPage(appId, doc);
+        getKey = (doc2) => getGlobalUserByAppPage(appId, doc2);
       } else if (email) {
         userList = await searchGlobalUsersByEmail(email, opts);
         property = "email";
@@ -9029,7 +9028,7 @@ function lowerBuiltinRoleID(roleId1, roleId2) {
   }
   return builtinRoleToNumber(roleId1) > builtinRoleToNumber(roleId2) ? roleId2 : roleId1;
 }
-async function getRole(roleId, opts) {
+async function getRole(roleId) {
   if (!roleId) {
     return void 0;
   }
@@ -9045,9 +9044,6 @@ async function getRole(roleId, opts) {
     role = Object.assign(role, dbRole);
     role._id = getExternalRoleID(role._id);
   } catch (err) {
-    if (!isBuiltin(roleId) && (opts == null ? void 0 : opts.defaultPublic)) {
-      return cloneDeep2(BUILTIN_ROLES.PUBLIC);
-    }
     if (Object.keys(role).length === 0) {
       throw err;
     }
@@ -9187,10 +9183,10 @@ var init_roles = __esm({
       BUILTIN_IDS.PUBLIC
     ];
     Role2 = class {
-      constructor(id, name, permissionId) {
+      constructor(id, name2, permissionId) {
         this.permissions = {};
         this._id = id;
-        this.name = name;
+        this.name = name2;
         this.permissionId = permissionId;
       }
       addInheritance(inherits) {
@@ -9556,12 +9552,12 @@ async function syncUser(user, details) {
   if (details.profile) {
     const profile = details.profile;
     if (profile.name) {
-      const name = profile.name;
-      if (name.givenName) {
-        firstName = name.givenName;
+      const name2 = profile.name;
+      if (name2.givenName) {
+        firstName = name2.givenName;
       }
-      if (name.familyName) {
-        lastName = name.familyName;
+      if (name2.familyName) {
+        lastName = name2.familyName;
       }
     }
     pictureUrl = await getProfilePictureUrl(user, details);
@@ -9788,8 +9784,8 @@ async function preAuth(passport2, ctx, next) {
     callbackUrl,
     ssoSaveUserNoOp
   );
-  if (!ctx.query.appId) {
-    ctx.throw(400, "appId query param not present.");
+  if (!ctx.query.appId || !ctx.query.datasourceId) {
+    ctx.throw(400, "appId and datasourceId query params not present.");
   }
   return passport2.authenticate(strategy, {
     scope: ["profile", "email", "https://www.googleapis.com/auth/spreadsheets"],
@@ -9809,7 +9805,7 @@ async function postAuth(passport2, ctx, next) {
         clientSecret: config.clientSecret,
         callbackURL: callbackUrl
       },
-      (accessToken, refreshToken, _profile, done) => {
+      (accessToken, refreshToken, profile, done) => {
         clearCookie(ctx, "budibase:datasourceauth" /* DatasourceAuth */);
         done(null, { accessToken, refreshToken });
       }
@@ -9817,14 +9813,22 @@ async function postAuth(passport2, ctx, next) {
     { successRedirect: "/", failureRedirect: "/error" },
     async (err, tokens) => {
       const baseUrl = `/builder/app/${authStateCookie.appId}/data`;
-      const id = newid();
-      await store(
-        `datasource:creation:${authStateCookie.appId}:google:${id}`,
-        {
-          tokens
+      await doWithDB(authStateCookie.appId, async (db2) => {
+        let datasource2;
+        try {
+          datasource2 = await db2.get(authStateCookie.datasourceId);
+        } catch (err2) {
+          if (err2.status === 404) {
+            ctx.redirect(baseUrl);
+          }
         }
-      );
-      ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`);
+        if (!datasource2.config) {
+          datasource2.config = {};
+        }
+        datasource2.config.auth = { type: "google", ...tokens };
+        await db2.put(datasource2);
+        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`);
+      });
     }
   )(ctx, next);
 }
@@ -9833,9 +9837,9 @@ var init_google2 = __esm({
   "../backend-core/src/middleware/passport/datasource/google.ts"() {
     init_google();
     init_constants2();
-    init_configs3();
-    init_cache();
     init_utils5();
+    init_db5();
+    init_configs3();
     init_sso2();
     GoogleStrategy2 = require("passport-google-oauth").OAuth2Strategy;
   }
@@ -9885,9 +9889,7 @@ var encryption_exports = {};
 __export(encryption_exports, {
   SecretOption: () => SecretOption,
   decrypt: () => decrypt,
-  decryptFile: () => decryptFile,
   encrypt: () => encrypt,
-  encryptFile: () => encryptFile,
   getSecret: () => getSecret
 });
 function getSecret(secretOption) {
@@ -9908,11 +9910,11 @@ function getSecret(secretOption) {
   }
   return secret;
 }
-function stretchString(secret, salt) {
-  return import_crypto.default.pbkdf2Sync(secret, salt, ITERATIONS, STRETCH_LENGTH, "sha512");
+function stretchString(string, salt) {
+  return import_crypto.default.pbkdf2Sync(string, salt, ITERATIONS, STRETCH_LENGTH, "sha512");
 }
 function encrypt(input, secretOption = "api" /* API */) {
-  const salt = import_crypto.default.randomBytes(SALT_LENGTH);
+  const salt = import_crypto.default.randomBytes(RANDOM_BYTES);
   const stretched = stretchString(getSecret(secretOption), salt);
   const cipher = import_crypto.default.createCipheriv(ALGO, stretched, salt);
   const base = cipher.update(input);
@@ -9929,101 +9931,16 @@ function decrypt(input, secretOption = "api" /* API */) {
   const final = decipher.final();
   return Buffer.concat([base, final]).toString();
 }
-async function encryptFile({ dir, filename }, secret) {
-  const outputFileName = `${filename}.enc`;
-  const filePath = (0, import_path2.join)(dir, filename);
-  const inputFile = import_fs2.default.createReadStream(filePath);
-  const outputFile = import_fs2.default.createWriteStream((0, import_path2.join)(dir, outputFileName));
-  const salt = import_crypto.default.randomBytes(SALT_LENGTH);
-  const iv = import_crypto.default.randomBytes(IV_LENGTH);
-  const stretched = stretchString(secret, salt);
-  const cipher = import_crypto.default.createCipheriv(ALGO, stretched, iv);
-  outputFile.write(salt);
-  outputFile.write(iv);
-  inputFile.pipe(import_zlib.default.createGzip()).pipe(cipher).pipe(outputFile);
-  return new Promise((r) => {
-    outputFile.on("finish", () => {
-      r({
-        filename: outputFileName,
-        dir
-      });
-    });
-  });
-}
-async function getSaltAndIV(path2) {
-  const fileStream = import_fs2.default.createReadStream(path2);
-  const salt = await readBytes(fileStream, SALT_LENGTH);
-  const iv = await readBytes(fileStream, IV_LENGTH);
-  fileStream.close();
-  return { salt, iv };
-}
-async function decryptFile(inputPath, outputPath, secret) {
-  const { salt, iv } = await getSaltAndIV(inputPath);
-  const inputFile = import_fs2.default.createReadStream(inputPath, {
-    start: SALT_LENGTH + IV_LENGTH
-  });
-  const outputFile = import_fs2.default.createWriteStream(outputPath);
-  const stretched = stretchString(secret, salt);
-  const decipher = import_crypto.default.createDecipheriv(ALGO, stretched, iv);
-  const unzip = import_zlib.default.createGunzip();
-  inputFile.pipe(decipher).pipe(unzip).pipe(outputFile);
-  return new Promise((res, rej) => {
-    outputFile.on("finish", () => {
-      outputFile.close();
-      res();
-    });
-    inputFile.on("error", (e) => {
-      outputFile.close();
-      rej(e);
-    });
-    decipher.on("error", (e) => {
-      outputFile.close();
-      rej(e);
-    });
-    unzip.on("error", (e) => {
-      outputFile.close();
-      rej(e);
-    });
-    outputFile.on("error", (e) => {
-      outputFile.close();
-      rej(e);
-    });
-  });
-}
-function readBytes(stream3, length) {
-  return new Promise((resolve3, reject) => {
-    let bytesRead = 0;
-    const data2 = [];
-    stream3.on("readable", () => {
-      let chunk;
-      while ((chunk = stream3.read(length - bytesRead)) !== null) {
-        data2.push(chunk);
-        bytesRead += chunk.length;
-      }
-      resolve3(Buffer.concat(data2));
-    });
-    stream3.on("end", () => {
-      reject(new Error("Insufficient data in the stream."));
-    });
-    stream3.on("error", (error) => {
-      reject(error);
-    });
-  });
-}
-var import_crypto, import_fs2, import_zlib, import_path2, ALGO, SEPARATOR3, ITERATIONS, STRETCH_LENGTH, SALT_LENGTH, IV_LENGTH, SecretOption;
+var import_crypto, ALGO, SEPARATOR3, ITERATIONS, RANDOM_BYTES, STRETCH_LENGTH, SecretOption;
 var init_encryption = __esm({
   "../backend-core/src/security/encryption.ts"() {
     import_crypto = __toESM(require("crypto"));
-    import_fs2 = __toESM(require("fs"));
-    import_zlib = __toESM(require("zlib"));
     init_environment3();
-    import_path2 = require("path");
     ALGO = "aes-256-ctr";
     SEPARATOR3 = "-";
     ITERATIONS = 1e4;
+    RANDOM_BYTES = 16;
     STRETCH_LENGTH = 32;
-    SALT_LENGTH = 16;
-    IV_LENGTH = 16;
     SecretOption = /* @__PURE__ */ ((SecretOption2) => {
       SecretOption2["API"] = "api";
       SecretOption2["ENCRYPTION"] = "encryption";
@@ -10156,7 +10073,7 @@ function authenticated_default(noAuthPatterns = [], opts = {
   const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : [];
   return async (ctx, next) => {
     let publicEndpoint = false;
-    const version = ctx.request.headers["x-budibase-api-version" /* API_VER */];
+    const version2 = ctx.request.headers["x-budibase-api-version" /* API_VER */];
     const found = matches(ctx, noAuthOptions);
     if (found) {
       publicEndpoint = true;
@@ -10219,7 +10136,7 @@ function authenticated_default(noAuthPatterns = [], opts = {
       if (!authenticated) {
         authenticated = false;
       }
-      finalise(ctx, { authenticated, user, internal, version, publicEndpoint });
+      finalise(ctx, { authenticated, user, internal, version: version2, publicEndpoint });
       if (user && user.email) {
         return doInUserContext(user, ctx, next);
       } else {
@@ -10234,7 +10151,7 @@ function authenticated_default(noAuthPatterns = [], opts = {
         ctx.throw(403, err.message);
       }
       if (opts && opts.publicAllowed || publicEndpoint) {
-        finalise(ctx, { authenticated: false, version, publicEndpoint });
+        finalise(ctx, { authenticated: false, version: version2, publicEndpoint });
         return next();
       } else {
         ctx.throw(err.status || 403, err);
@@ -10934,12 +10851,12 @@ var init_plugin4 = __esm({
 function budibaseTempDir() {
   return bbTmp;
 }
-var import_path3, import_os, import_fs3, ObjectStoreBuckets, bbTmp;
+var import_path2, import_os, import_fs2, ObjectStoreBuckets, bbTmp;
 var init_utils8 = __esm({
   "../backend-core/src/objectStore/utils.ts"() {
-    import_path3 = require("path");
+    import_path2 = require("path");
     import_os = require("os");
-    import_fs3 = __toESM(require("fs"));
+    import_fs2 = __toESM(require("fs"));
     init_environment3();
     ObjectStoreBuckets = {
       BACKUPS: environment_default2.BACKUPS_BUCKET_NAME,
@@ -10948,9 +10865,9 @@ var init_utils8 = __esm({
       GLOBAL: environment_default2.GLOBAL_BUCKET_NAME,
       PLUGINS: environment_default2.PLUGIN_BUCKET_NAME
     };
-    bbTmp = (0, import_path3.join)((0, import_os.tmpdir)(), ".budibase");
-    if (!import_fs3.default.existsSync(bbTmp)) {
-      import_fs3.default.mkdirSync(bbTmp);
+    bbTmp = (0, import_path2.join)((0, import_os.tmpdir)(), ".budibase");
+    if (!import_fs2.default.existsSync(bbTmp)) {
+      import_fs2.default.mkdirSync(bbTmp);
     }
   }
 });
@@ -10962,17 +10879,17 @@ function sanitizeKey(input) {
 function sanitizeBucket(input) {
   return input.replace(new RegExp(APP_DEV_PREFIX, "g"), APP_PREFIX);
 }
-var import_aws_sdk, import_stream, import_node_fetch6, import_tar_fs, import_zlib2, import_util, import_path4, import_fs4, import_uuid3, sanitize, streamPipeline, STATE, CONTENT_TYPE_MAP, STRING_CONTENT_TYPES, ObjectStore, makeSureBucketExists, upload, streamUpload, retrieve, listAllObjects, getPresignedUrl, retrieveToTmp, retrieveDirectory, deleteFile, deleteFiles, deleteFolder, uploadDirectory, downloadTarballDirect, downloadTarball;
+var import_aws_sdk, import_stream, import_node_fetch6, import_tar_fs, import_zlib, import_util, import_path3, import_fs3, import_uuid3, sanitize, streamPipeline, STATE, CONTENT_TYPE_MAP, STRING_CONTENT_TYPES, ObjectStore, makeSureBucketExists, upload, streamUpload, retrieve, listAllObjects, getPresignedUrl, retrieveToTmp, retrieveDirectory, deleteFile, deleteFiles, deleteFolder, uploadDirectory, downloadTarballDirect, downloadTarball;
 var init_objectStore = __esm({
   "../backend-core/src/objectStore/objectStore.ts"() {
     import_aws_sdk = __toESM(require("aws-sdk"));
     import_stream = __toESM(require("stream"));
     import_node_fetch6 = __toESM(require("node-fetch"));
     import_tar_fs = __toESM(require("tar-fs"));
-    import_zlib2 = __toESM(require("zlib"));
+    import_zlib = __toESM(require("zlib"));
     import_util = require("util");
-    import_path4 = require("path");
-    import_fs4 = __toESM(require("fs"));
+    import_path3 = require("path");
+    import_fs3 = __toESM(require("fs"));
     init_environment3();
     init_utils8();
     import_uuid3 = require("uuid");
@@ -11048,10 +10965,10 @@ var init_objectStore = __esm({
       filename,
       path: path2,
       type,
-      metadata
+      metadata: metadata2
     }) => {
       const extension = filename.split(".").pop();
-      const fileBytes = import_fs4.default.readFileSync(path2);
+      const fileBytes = import_fs3.default.readFileSync(path2);
       const objectStore = ObjectStore(bucketName);
       await makeSureBucketExists(objectStore, bucketName);
       let contentType = type;
@@ -11064,13 +10981,13 @@ var init_objectStore = __esm({
         Body: fileBytes,
         ContentType: contentType
       };
-      if (metadata && typeof metadata === "object") {
-        for (let key of Object.keys(metadata)) {
-          if (!metadata[key] || typeof metadata[key] !== "string") {
-            delete metadata[key];
+      if (metadata2 && typeof metadata2 === "object") {
+        for (let key of Object.keys(metadata2)) {
+          if (!metadata2[key] || typeof metadata2[key] !== "string") {
+            delete metadata2[key];
           }
         }
-        config.Metadata = metadata;
+        config.Metadata = metadata2;
       }
       return objectStore.upload(config).promise();
     };
@@ -11153,13 +11070,13 @@ var init_objectStore = __esm({
       bucketName = sanitizeBucket(bucketName);
       filepath = sanitizeKey(filepath);
       const data2 = await retrieve(bucketName, filepath);
-      const outputPath = (0, import_path4.join)(budibaseTempDir(), (0, import_uuid3.v4)());
-      import_fs4.default.writeFileSync(outputPath, data2);
+      const outputPath = (0, import_path3.join)(budibaseTempDir(), (0, import_uuid3.v4)());
+      import_fs3.default.writeFileSync(outputPath, data2);
       return outputPath;
     };
     retrieveDirectory = async (bucketName, path2) => {
-      let writePath = (0, import_path4.join)(budibaseTempDir(), (0, import_uuid3.v4)());
-      import_fs4.default.mkdirSync(writePath);
+      let writePath = (0, import_path3.join)(budibaseTempDir(), (0, import_uuid3.v4)());
+      import_fs3.default.mkdirSync(writePath);
       const objects = await listAllObjects(bucketName, path2);
       let fullObjects = await Promise.all(
         objects.map((obj) => retrieve(bucketName, obj.Key))
@@ -11171,9 +11088,9 @@ var init_objectStore = __esm({
         const possiblePath = filename.split("/");
         if (possiblePath.length > 1) {
           const dirs = possiblePath.slice(0, possiblePath.length - 1);
-          import_fs4.default.mkdirSync((0, import_path4.join)(writePath, ...dirs), { recursive: true });
+          import_fs3.default.mkdirSync((0, import_path3.join)(writePath, ...dirs), { recursive: true });
         }
-        import_fs4.default.writeFileSync((0, import_path4.join)(writePath, ...possiblePath), data2);
+        import_fs3.default.writeFileSync((0, import_path3.join)(writePath, ...possiblePath), data2);
       }
       return writePath;
     };
@@ -11224,21 +11141,21 @@ var init_objectStore = __esm({
         return deleteFolder(bucketName, folder);
       }
     };
-    uploadDirectory = async (bucketName, localPath, bucketPath) => {
+    uploadDirectory = async (bucketName, localPath, bucketPath2) => {
       bucketName = sanitizeBucket(bucketName);
       let uploads = [];
-      const files = import_fs4.default.readdirSync(localPath, { withFileTypes: true });
-      for (let file of files) {
-        const path2 = sanitizeKey((0, import_path4.join)(bucketPath, file.name));
-        const local = (0, import_path4.join)(localPath, file.name);
+      const files2 = import_fs3.default.readdirSync(localPath, { withFileTypes: true });
+      for (let file of files2) {
+        const path2 = sanitizeKey((0, import_path3.join)(bucketPath2, file.name));
+        const local = (0, import_path3.join)(localPath, file.name);
         if (file.isDirectory()) {
           uploads.push(uploadDirectory(bucketName, local, path2));
         } else {
-          uploads.push(streamUpload(bucketName, path2, import_fs4.default.createReadStream(local)));
+          uploads.push(streamUpload(bucketName, path2, import_fs3.default.createReadStream(local)));
         }
       }
       await Promise.all(uploads);
-      return files;
+      return files2;
     };
     downloadTarballDirect = async (url, path2, headers = {}) => {
       path2 = sanitizeKey(path2);
@@ -11246,7 +11163,7 @@ var init_objectStore = __esm({
       if (!response2.ok) {
         throw new Error(`unexpected response ${response2.statusText}`);
       }
-      await streamPipeline(response2.body, import_zlib2.default.createUnzip(), import_tar_fs.default.extract(path2));
+      await streamPipeline(response2.body, import_zlib.default.createUnzip(), import_tar_fs.default.extract(path2));
     };
     downloadTarball = async (url, bucketName, path2) => {
       bucketName = sanitizeBucket(bucketName);
@@ -11255,8 +11172,8 @@ var init_objectStore = __esm({
       if (!response2.ok) {
         throw new Error(`unexpected response ${response2.statusText}`);
       }
-      const tmpPath = (0, import_path4.join)(budibaseTempDir(), path2);
-      await streamPipeline(response2.body, import_zlib2.default.createUnzip(), import_tar_fs.default.extract(tmpPath));
+      const tmpPath = (0, import_path3.join)(budibaseTempDir(), path2);
+      await streamPipeline(response2.body, import_zlib.default.createUnzip(), import_tar_fs.default.extract(tmpPath));
       if (!environment_default2.isTest() && environment_default2.SELF_HOSTED) {
         await uploadDirectory(bucketName, tmpPath, path2);
       }
@@ -11312,12 +11229,12 @@ var init_app6 = __esm({
     init_environment3();
     init_objectStore();
     init_cloudfront();
-    clientLibraryUrl = (appId, version) => {
+    clientLibraryUrl = (appId, version2) => {
       if (environment_default2.isProd()) {
         let file = `${sanitizeKey(appId)}/budibase-client.js`;
         if (environment_default2.CLOUDFRONT_CDN) {
-          if (version) {
-            file += `?v=${version}`;
+          if (version2) {
+            file += `?v=${version2}`;
           }
           return getUrl(file);
         } else {
@@ -11345,8 +11262,8 @@ var init_global3 = __esm({
     init_context2();
     init_objectStore();
     init_cloudfront();
-    getGlobalFileUrl = (type, name, etag) => {
-      let file = getGlobalFileS3Key(type, name);
+    getGlobalFileUrl = (type, name2, etag) => {
+      let file = getGlobalFileS3Key(type, name2);
       if (environment_default2.CLOUDFRONT_CDN) {
         if (etag) {
           file = `${file}?etag=${etag}`;
@@ -11356,8 +11273,8 @@ var init_global3 = __esm({
         return getPresignedUrl(environment_default2.GLOBAL_BUCKET_NAME, file);
       }
     };
-    getGlobalFileS3Key = (type, name) => {
-      let file = `${type}/${name}`;
+    getGlobalFileS3Key = (type, name2) => {
+      let file = `${type}/${name2}`;
       if (environment_default2.MULTI_TENANCY) {
         const tenantId = getTenantId();
         file = `${tenantId}/${file}`;
@@ -11407,11 +11324,11 @@ var init_plugins = __esm({
       return getPluginS3Key(plugin, "plugin.min.js");
     };
     getPluginIconKey = (plugin) => {
-      const iconFileName = plugin.iconUrl ? "icon.svg" : plugin.iconFileName;
-      if (!iconFileName) {
+      const iconFileName2 = plugin.iconUrl ? "icon.svg" : plugin.iconFileName;
+      if (!iconFileName2) {
         return;
       }
-      return getPluginS3Key(plugin, iconFileName);
+      return getPluginS3Key(plugin, iconFileName2);
     };
     getPluginS3Key = (plugin, fileName) => {
       const s3Key = getPluginS3Dir(plugin.name);
@@ -11842,11 +11759,11 @@ var init_utils9 = __esm({
       }
       usage.monthly.current = usage.monthly[currentMonth];
     };
-    getBreakdownName = (name, id) => {
-      if (!id || !name) {
+    getBreakdownName = (name2, id) => {
+      if (!id || !name2) {
         return;
       }
-      switch (name) {
+      switch (name2) {
         case "automations" /* AUTOMATIONS */:
           return "automations" /* AUTOMATIONS */;
         case "queries" /* QUERIES */:
@@ -11908,17 +11825,17 @@ var init_quotas2 = __esm({
       delete usage.usageQuota.developers;
       return usage;
     };
-    setUsage = async (value, name, type) => {
-      return setAllUsage(name, type, { total: value });
+    setUsage = async (value, name2, type) => {
+      return setAllUsage(name2, type, { total: value });
     };
-    setUsagePerApp = async (appValues, name, type) => {
+    setUsagePerApp = async (appValues, name2, type) => {
       const db2 = getDB2();
       let quotaUsage = await getQuotaUsage();
       const total = Object.values(appValues).reduce((sum, num) => sum + num, 0);
       for (let [appId, value] of Object.entries(appValues)) {
         quotaUsage = coreUsageUpdate(
           quotaUsage,
-          name,
+          name2,
           type,
           {
             total,
@@ -11933,8 +11850,8 @@ var init_quotas2 = __esm({
       quotaUsage._rev = response2.rev;
       return quotaUsage;
     };
-    setBreakdown = (monthUsage, name, id, values) => {
-      const breakdownName = getBreakdownName(name, id);
+    setBreakdown = (monthUsage, name2, id, values) => {
+      const breakdownName = getBreakdownName(name2, id);
       if (!breakdownName || !(values == null ? void 0 : values.breakdown)) {
         return monthUsage;
       }
@@ -11943,7 +11860,7 @@ var init_quotas2 = __esm({
       }
       if (!monthUsage.breakdown[breakdownName]) {
         monthUsage.breakdown[breakdownName] = {
-          parent: name,
+          parent: name2,
           values: {}
         };
       }
@@ -11951,14 +11868,14 @@ var init_quotas2 = __esm({
       breakdown.values[id] = values.breakdown;
       return monthUsage;
     };
-    setAppUsageValue = (quotaUsage, name, type, opts = {}, values) => {
+    setAppUsageValue = (quotaUsage, name2, type, opts = {}, values) => {
       var _a;
       let appId;
       try {
         appId = db_exports.getProdAppID((opts == null ? void 0 : opts.appId) || context_exports.getAppId());
       } catch (err) {
       }
-      if (!appId || !values.app || !APP_QUOTA_NAMES.includes(name)) {
+      if (!appId || !values.app || !APP_QUOTA_NAMES.includes(name2)) {
         return quotaUsage;
       }
       if (!((_a = quotaUsage.apps) == null ? void 0 : _a[appId])) {
@@ -11970,11 +11887,11 @@ var init_quotas2 = __esm({
       const appUsage = quotaUsage.apps[appId];
       switch (type) {
         case "static" /* STATIC */:
-          appUsage.usageQuota[name] = values.app;
+          appUsage.usageQuota[name2] = values.app;
           break;
         case "monthly" /* MONTHLY */:
           const currentMonth = getCurrentMonthString();
-          const monthlyName = name;
+          const monthlyName = name2;
           let monthUsage = appUsage.monthly[currentMonth];
           if (!monthUsage) {
             appUsage.monthly[currentMonth] = generateNewMonthlyQuotas();
@@ -11988,9 +11905,9 @@ var init_quotas2 = __esm({
       }
       return quotaUsage;
     };
-    getAppUsageValue = (quotaUsage, type, name, id) => {
+    getAppUsageValue = (quotaUsage, type, name2, id) => {
       var _a, _b, _c, _d, _e;
-      if (!APP_QUOTA_NAMES.includes(name)) {
+      if (!APP_QUOTA_NAMES.includes(name2)) {
         return {};
       }
       let appId;
@@ -12004,13 +11921,13 @@ var init_quotas2 = __esm({
       const appUsage = quotaUsage.apps[appId];
       switch (type) {
         case "static" /* STATIC */:
-          if ((_a = appUsage.usageQuota) == null ? void 0 : _a[name]) {
-            return { app: appUsage.usageQuota[name] };
+          if ((_a = appUsage.usageQuota) == null ? void 0 : _a[name2]) {
+            return { app: appUsage.usageQuota[name2] };
           }
           break;
         case "monthly" /* MONTHLY */:
           const currentMonth = getCurrentMonthString();
-          const monthlyName = name;
+          const monthlyName = name2;
           if (!((_c = (_b = appUsage.monthly) == null ? void 0 : _b[currentMonth]) == null ? void 0 : _c[monthlyName])) {
             break;
           }
@@ -12025,68 +11942,68 @@ var init_quotas2 = __esm({
       }
       return { app: 0 };
     };
-    setStaticTriggers = (name, quotaUsage, triggers) => {
+    setStaticTriggers = (name2, quotaUsage, triggers) => {
       if (!quotaUsage.usageQuota.triggers) {
         quotaUsage.usageQuota.triggers = {};
       }
       if (triggers) {
-        quotaUsage.usageQuota.triggers[name] = triggers;
+        quotaUsage.usageQuota.triggers[name2] = triggers;
       }
     };
-    setMonthlyTriggers = (name, currentMonth, quotaUsage, triggers) => {
+    setMonthlyTriggers = (name2, currentMonth, quotaUsage, triggers) => {
       if (!quotaUsage.monthly[currentMonth].triggers) {
         quotaUsage.monthly[currentMonth].triggers = {};
       }
       if (triggers) {
-        quotaUsage.monthly[currentMonth].triggers[name] = triggers;
+        quotaUsage.monthly[currentMonth].triggers[name2] = triggers;
       }
     };
-    coreUsageUpdate = (quotaUsage, name, type, values, opts = {}) => {
+    coreUsageUpdate = (quotaUsage, name2, type, values, opts = {}) => {
       if (type === "static" /* STATIC */) {
-        name = name;
-        quotaUsage.usageQuota[name] = values.total;
-        setStaticTriggers(name, quotaUsage, values.triggers);
+        name2 = name2;
+        quotaUsage.usageQuota[name2] = values.total;
+        setStaticTriggers(name2, quotaUsage, values.triggers);
       } else if (type === "monthly" /* MONTHLY */) {
-        name = name;
+        name2 = name2;
         const currentMonth = getCurrentMonthString();
-        quotaUsage.monthly[currentMonth][name] = values.total;
-        setMonthlyTriggers(name, currentMonth, quotaUsage, values.triggers);
+        quotaUsage.monthly[currentMonth][name2] = values.total;
+        setMonthlyTriggers(name2, currentMonth, quotaUsage, values.triggers);
       } else {
         throw new Error(`Invalid usage type: ${type}`);
       }
-      return setAppUsageValue(quotaUsage, name, type, opts, values);
+      return setAppUsageValue(quotaUsage, name2, type, opts, values);
     };
-    setAllUsage = async (name, type, values, opts = {}) => {
+    setAllUsage = async (name2, type, values, opts = {}) => {
       const db2 = getDB2();
       let quotaUsage = await getQuotaUsage();
-      quotaUsage = coreUsageUpdate(quotaUsage, name, type, values, opts);
+      quotaUsage = coreUsageUpdate(quotaUsage, name2, type, values, opts);
       const response2 = await db2.put(quotaUsage);
       quotaUsage._rev = response2.rev;
       return quotaUsage;
     };
-    getCurrentUsageValues = async (type, name, id) => {
+    getCurrentUsageValues = async (type, name2, id) => {
       const quotaUsage = await getQuotaUsage();
       let total = 0, appValues = {};
       switch (type) {
         case "static" /* STATIC */:
-          if (quotaUsage.usageQuota[name]) {
-            const staticName = name;
+          if (quotaUsage.usageQuota[name2]) {
+            const staticName = name2;
             total = quotaUsage.usageQuota[staticName];
-            appValues = getAppUsageValue(quotaUsage, type, name, id);
+            appValues = getAppUsageValue(quotaUsage, type, name2, id);
           }
           break;
         case "monthly" /* MONTHLY */:
           const currentMonth = getCurrentMonthString();
-          const monthlyName = name;
+          const monthlyName = name2;
           if (quotaUsage.monthly[currentMonth][monthlyName]) {
             total = quotaUsage.monthly[currentMonth][monthlyName];
-            appValues = getAppUsageValue(quotaUsage, type, name, id);
+            appValues = getAppUsageValue(quotaUsage, type, name2, id);
           }
           break;
         default:
           throw new Error(`Invalid usage type: ${type}`);
       }
-      if (APP_QUOTA_NAMES.includes(name) && !(appValues.app || appValues.breakdown)) {
+      if (APP_QUOTA_NAMES.includes(name2) && !(appValues.app || appValues.breakdown)) {
         appValues.app = appValues.app || 0;
         appValues.breakdown = appValues.breakdown || 0;
       }
@@ -12308,9 +12225,9 @@ async function getGroupUsers(groupId, params2) {
     createGroupUserLookupView,
     { arrayResponse: true }
   );
-  const users2 = userDocs.map((doc) => ({
-    _id: doc.userId,
-    email: doc.email
+  const users2 = userDocs.map((doc2) => ({
+    _id: doc2.userId,
+    email: doc2.email
   })) || [];
   return users2;
 }
@@ -12399,12 +12316,12 @@ async function destroy3(groupId, revision) {
   await cleanupUsers(group2);
   return resp;
 }
-async function getByName(name) {
+async function getByName(name2) {
   try {
     const groups = await db_exports.directCouchFind(tenancy.getGlobalDBName(), {
       selector: {
         name: {
-          $regex: `^(?i)${name}$`
+          $regex: `^(?i)${name2}$`
         }
       },
       limit: 1
@@ -12709,21 +12626,21 @@ __export(version_exports, {
   getLicenseVersion: () => getLicenseVersion,
   getProVersion: () => getProVersion
 });
-var import_fs5, import_path5, getLicenseVersion, getProVersion;
+var import_fs4, import_path4, getLicenseVersion, getProVersion;
 var init_version2 = __esm({
   "../pro/packages/pro/src/constants/version.ts"() {
     init_src2();
-    import_fs5 = __toESM(require("fs"));
-    import_path5 = __toESM(require("path"));
+    import_fs4 = __toESM(require("fs"));
+    import_path4 = __toESM(require("path"));
     getLicenseVersion = () => {
       if (environment_default2.isDev()) {
         const DEV_VER_FILENAME = "dev-version.txt";
-        const verFile = import_path5.default.join(objectStore_exports2.budibaseTempDir(), DEV_VER_FILENAME);
-        if (import_fs5.default.existsSync(verFile)) {
-          return import_fs5.default.readFileSync(verFile, "utf8");
+        const verFile = import_path4.default.join(objectStore_exports2.budibaseTempDir(), DEV_VER_FILENAME);
+        if (import_fs4.default.existsSync(verFile)) {
+          return import_fs4.default.readFileSync(verFile, "utf8");
         } else {
           const devVer = utils_exports2.newid();
-          import_fs5.default.writeFileSync(verFile, devVer);
+          import_fs4.default.writeFileSync(verFile, devVer);
           return devVer;
         }
       } else {
@@ -12731,11 +12648,11 @@ var init_version2 = __esm({
       }
     };
     getProVersion = () => {
-      const version = environment_default2.VERSION;
-      if (!version) {
+      const version2 = environment_default2.VERSION;
+      if (!version2) {
         throw new Error("No budibase pro version was specified");
       }
-      return version;
+      return version2;
     };
   }
 });
@@ -12879,15 +12796,15 @@ async function fetchAppBackups(appId, opts = {}) {
   }
   return pageData;
 }
-async function storeAppBackupMetadata(metadata, opts = {}) {
+async function storeAppBackupMetadata(metadata2, opts = {}) {
   const db2 = tenancy.getGlobalDB();
-  const prodAppId = db_exports.getProdAppID(metadata.appId);
-  let _id = generateAppBackupID(prodAppId, metadata.timestamp);
+  const prodAppId = db_exports.getProdAppID(metadata2.appId);
+  let _id = generateAppBackupID(prodAppId, metadata2.timestamp);
   const appBackupDoc = {
-    ...metadata,
+    ...metadata2,
     _id,
     appId: prodAppId,
-    name: metadata.name
+    name: metadata2.name
   };
   if (opts.filename) {
     appBackupDoc.filename = opts.filename;
@@ -12896,18 +12813,18 @@ async function storeAppBackupMetadata(metadata, opts = {}) {
     appBackupDoc._id = opts.docId;
     appBackupDoc._rev = opts.docRev;
   }
-  if (metadata.createdBy) {
+  if (metadata2.createdBy) {
     appBackupDoc.createdBy = db_exports.getGlobalIDFromUserMetadataID(
-      metadata.createdBy
+      metadata2.createdBy
     );
   }
   return await db2.put(appBackupDoc);
 }
-async function updateAppBackupMetadata(backupId, name) {
+async function updateAppBackupMetadata(backupId, name2) {
   const db2 = tenancy.getGlobalDB();
-  const metadata = await db2.get(backupId);
-  metadata.name = name;
-  return await db2.put(metadata);
+  const metadata2 = await db2.get(backupId);
+  metadata2.name = name2;
+  return await db2.put(metadata2);
 }
 async function deleteAppBackupMetadata(backupId) {
   const db2 = tenancy.getGlobalDB();
@@ -12942,9 +12859,9 @@ __export(environmentVariables_exports, {
 function getEnvVarID() {
   return StaticDatabases.GLOBAL.docs.environmentVariables;
 }
-function getCacheEnvVarID(rev) {
+function getCacheEnvVarID(rev2) {
   const tenantId = tenancy.getTenantId();
-  return `${tenantId}/${getEnvVarID()}/${rev || ""}`;
+  return `${tenantId}/${getEnvVarID()}/${rev2 || ""}`;
 }
 async function get5() {
   const id = getEnvVarID();
@@ -12984,14 +12901,14 @@ async function get5() {
   cache.set(cacheKey, finalDoc);
   return finalDoc;
 }
-async function update(doc) {
+async function update(doc2) {
   const id = getEnvVarID();
   const db2 = tenancy.getGlobalDB();
   return await db2.put({
-    _id: doc._id || id,
-    _rev: doc._rev || void 0,
+    _id: doc2._id || id,
+    _rev: doc2._rev || void 0,
     variables: encryption_exports.encrypt(
-      JSON.stringify(doc.variables),
+      JSON.stringify(doc2.variables),
       encryption_exports.SecretOption.ENCRYPTION
     )
   });
@@ -13169,31 +13086,31 @@ function getOfflineLicense() {
   }
 }
 function getOfflineLicenseFromDisk() {
-  if (import_fs6.default.existsSync(LICENSE_FILE_PATH)) {
-    const token = import_fs6.default.readFileSync(LICENSE_FILE_PATH, { encoding: "utf-8" });
+  if (import_fs5.default.existsSync(LICENSE_FILE_PATH)) {
+    const token = import_fs5.default.readFileSync(LICENSE_FILE_PATH, { encoding: "utf-8" });
     return import_jsonwebtoken.default.verify(token, PUBLIC_KEY, { algorithms: ["RS256"] });
   }
 }
 function writeOfflineLicenseToDisk(signedLicense) {
-  import_fs6.default.writeFileSync(LICENSE_FILE_PATH, signedLicense, { encoding: "utf-8" });
+  import_fs5.default.writeFileSync(LICENSE_FILE_PATH, signedLicense, { encoding: "utf-8" });
 }
 function deleteOfflineLicense() {
-  import_fs6.default.rmSync(LICENSE_FILE_PATH, { force: true });
+  import_fs5.default.rmSync(LICENSE_FILE_PATH, { force: true });
 }
-var import_fs6, import_path6, import_os2, import_jsonwebtoken, SUB_DIRECTORY, DIRECTORY, OFFLINE_LICENSE_FILE, LICENSE_FILE_PATH, PUBLIC_KEY;
+var import_fs5, import_path5, import_os2, import_jsonwebtoken, SUB_DIRECTORY, DIRECTORY, OFFLINE_LICENSE_FILE, LICENSE_FILE_PATH, PUBLIC_KEY;
 var init_offline = __esm({
   "../pro/packages/pro/src/sdk/licensing/licenses/offline.ts"() {
-    import_fs6 = __toESM(require("fs"));
-    import_path6 = require("path");
+    import_fs5 = __toESM(require("fs"));
+    import_path5 = require("path");
     import_os2 = require("os");
     import_jsonwebtoken = __toESM(require("jsonwebtoken"));
     init_src2();
     SUB_DIRECTORY = environment_default2.isTest() ? ".budibase-test" : ".budibase";
-    DIRECTORY = (0, import_path6.join)((0, import_os2.tmpdir)(), SUB_DIRECTORY);
+    DIRECTORY = (0, import_path5.join)((0, import_os2.tmpdir)(), SUB_DIRECTORY);
     OFFLINE_LICENSE_FILE = "offline_license.txt";
-    LICENSE_FILE_PATH = (0, import_path6.join)(DIRECTORY, OFFLINE_LICENSE_FILE);
-    if (!import_fs6.default.existsSync(DIRECTORY)) {
-      import_fs6.default.mkdirSync(DIRECTORY);
+    LICENSE_FILE_PATH = (0, import_path5.join)(DIRECTORY, OFFLINE_LICENSE_FILE);
+    if (!import_fs5.default.existsSync(DIRECTORY)) {
+      import_fs5.default.mkdirSync(DIRECTORY);
     }
     PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvz3jePLCFBXZ19c8Dpkv\nXtSgOhKFOcvQdo/LV0KJRUzQWDPWuO4ILtBtnqhjtIzZH4CH0qCYBet5L6Qr4CM1\nl2HXiAD1Q2rlHNW9wDaYyKb1F5f+v4RyqCAyzlkwRdksmkLeECTboojNnmRCrE3C\n8suunQP5bEScqEY2kclqzSf8e6xqMzPUg3mL/pNa1iEv7TuLbU9nJfgR36l0WmZY\n94fWnSaT8OSXSqcxsaByf06gfS3HAoTJNc7eqz1Hf9fUORQGPUAnFK8cT3SfdA36\nd/o3ZWE1TTj1zYwlCLN5qRKr3hU8nC3xEYNEbkB9SfTRaOq9Q7P8WmfLkoCPm3pR\nmwIDAQAB\n-----END PUBLIC KEY-----\n";
   }
@@ -13474,14 +13391,14 @@ var init_quotas5 = __esm({
     init_db6();
     init_src2();
     init_quotas3();
-    increment = (name, type, opts) => {
-      return tryIncrement(1, name, type, opts);
+    increment = (name2, type, opts) => {
+      return tryIncrement(1, name2, type, opts);
     };
-    incrementMany = (change, name, type, opts) => {
-      return tryIncrement(change, name, type, opts);
+    incrementMany = (change, name2, type, opts) => {
+      return tryIncrement(change, name2, type, opts);
     };
-    tryIncrement = async (change, name, type, opts = {}) => {
-      await updateUsage(change, name, type, {
+    tryIncrement = async (change, name2, type, opts = {}) => {
+      await updateUsage(change, name2, type, {
         dryRun: true,
         suppressErrorLog: opts.suppressErrorLog,
         id: opts.id
@@ -13490,7 +13407,7 @@ var init_quotas5 = __esm({
       if (opts.fn) {
         result = await opts.fn();
       }
-      await updateUsage(change, name, type, {
+      await updateUsage(change, name2, type, {
         dryRun: false,
         valueFn: opts.valueFn,
         suppressErrorLog: opts.suppressErrorLog,
@@ -13498,32 +13415,32 @@ var init_quotas5 = __esm({
       });
       return result;
     };
-    decrement = (name, type, opts = {}) => {
-      return updateUsage(-1, name, type, opts);
+    decrement = (name2, type, opts = {}) => {
+      return updateUsage(-1, name2, type, opts);
     };
-    decrementMany = (change, name, type, opts = {}) => {
-      return updateUsage(-change, name, type, opts);
+    decrementMany = (change, name2, type, opts = {}) => {
+      return updateUsage(-change, name2, type, opts);
     };
-    set2 = async (name, type, value) => {
-      return quotas_exports.setUsage(value, name, type);
+    set2 = async (name2, type, value) => {
+      return quotas_exports.setUsage(value, name2, type);
     };
-    getExistingTriggers = (type, name, quotaUsage) => {
+    getExistingTriggers = (type, name2, quotaUsage) => {
       if (type == "static" /* STATIC */) {
         const triggers = quotaUsage.usageQuota.triggers;
-        return triggers ? triggers[name] || {} : {};
+        return triggers ? triggers[name2] || {} : {};
       } else {
         const currentMonthString = quotas_exports.utils.getCurrentMonthString();
         const triggers = quotaUsage.monthly[currentMonthString].triggers;
-        return triggers ? triggers[name] || {} : {};
+        return triggers ? triggers[name2] || {} : {};
       }
     };
-    triggerQuota2 = async (name, quota, percentage, resetDate) => {
+    triggerQuota2 = async (name2, quota, percentage, resetDate) => {
       try {
         await redlockImpl_exports.doWithLock(
           {
             type: "try_once" /* TRY_ONCE */,
             name: "trigger_quota" /* TRIGGER_QUOTA */,
-            resource: name,
+            resource: name2,
             // use the quota name for extra uniqueness on the lock
             ttl: 1e4
             // auto expire after 10 seconds
@@ -13543,10 +13460,10 @@ var init_quotas5 = __esm({
         logging_exports.logAlert("Error triggering quota", e);
       }
     };
-    checkTriggers = async (type, name, totalValue, quota) => {
+    checkTriggers = async (type, name2, totalValue, quota) => {
       const usage = await getQuotaUsage();
       const resetDate = type === "monthly" /* MONTHLY */ ? usage.quotaReset : void 0;
-      const triggers = await getExistingTriggers(type, name, usage);
+      const triggers = await getExistingTriggers(type, name2, usage);
       const quotaTriggers = quota.triggers;
       let percentage = totalValue / quota.value * 100;
       if (percentage > 100) {
@@ -13562,7 +13479,7 @@ var init_quotas5 = __esm({
             const isAtTrigger = percentage === triggerPercentage;
             const sendNotification = !nextIsTriggered || isAtTrigger;
             if (sendNotification) {
-              await triggerQuota2(name, quota, percentage, resetDate);
+              await triggerQuota2(name2, quota, percentage, resetDate);
             }
           }
         } else {
@@ -13571,23 +13488,23 @@ var init_quotas5 = __esm({
       }
       return triggers;
     };
-    updateUsage = async (usageChange, name, type, opts = {}) => {
+    updateUsage = async (usageChange, name2, type, opts = {}) => {
       let appId = null;
       try {
         appId = context_exports.getAppId();
       } catch (err) {
       }
-      const isAppQuota = APP_QUOTA_NAMES.includes(name);
+      const isAppQuota = APP_QUOTA_NAMES.includes(name2);
       if (isAppQuota && !appId) {
         throw new Error("App context required for quota update");
       }
       try {
-        const licensedQuota = await getLicensedQuota("usage" /* USAGE */, name, type);
+        const licensedQuota = await getLicensedQuota("usage" /* USAGE */, name2, type);
         let {
           total: totalValue,
           app: appValue,
           breakdown: breakdownValue
-        } = await quotas_exports.getCurrentUsageValues(type, name, opts.id);
+        } = await quotas_exports.getCurrentUsageValues(type, name2, opts.id);
         totalValue += usageChange;
         if (appValue != null) {
           appValue += usageChange;
@@ -13597,7 +13514,7 @@ var init_quotas5 = __esm({
         }
         let triggers = {};
         if (!opts.dryRun) {
-          triggers = await checkTriggers(type, name, totalValue, licensedQuota);
+          triggers = await checkTriggers(type, name2, totalValue, licensedQuota);
         }
         if (licensedQuota.value !== quotas_exports2.UNLIMITED && totalValue > licensedQuota.value && usageChange > 0) {
           throw new UsageLimitError(
@@ -13620,7 +13537,7 @@ var init_quotas5 = __esm({
           appValue = totalValue;
         }
         await quotas_exports.setAllUsage(
-          name,
+          name2,
           type,
           {
             total: totalValue,
@@ -13632,30 +13549,30 @@ var init_quotas5 = __esm({
         );
       } catch (err) {
         if (!opts.suppressErrorLog) {
-          console.error(`Error updating usage quotas for ${name}`, err);
+          console.error(`Error updating usage quotas for ${name2}`, err);
         }
         throw err;
       }
     };
-    getLicensedQuota = async (quotaType, name, usageType) => {
+    getLicensedQuota = async (quotaType, name2, usageType) => {
       const license = await cache_exports2.getCachedLicense();
       if (!license) {
         const tenantId = tenancy.getTenantId();
         throw new Error("License not found for tenant id " + tenantId);
       }
-      if (usageType && isStaticQuota(quotaType, usageType, name)) {
-        return license.quotas[quotaType][usageType][name];
-      } else if (usageType && isMonthlyQuota(quotaType, usageType, name)) {
-        return license.quotas[quotaType][usageType][name];
-      } else if (isConstantQuota(quotaType, name)) {
-        return license.quotas[quotaType][name];
+      if (usageType && isStaticQuota(quotaType, usageType, name2)) {
+        return license.quotas[quotaType][usageType][name2];
+      } else if (usageType && isMonthlyQuota(quotaType, usageType, name2)) {
+        return license.quotas[quotaType][usageType][name2];
+      } else if (isConstantQuota(quotaType, name2)) {
+        return license.quotas[quotaType][name2];
       } else {
         throw new Error("Invalid quota type");
       }
     };
-    usageLimitIsExceeded = async (name, type) => {
+    usageLimitIsExceeded = async (name2, type) => {
       try {
-        await updateUsage(1, name, type, { dryRun: true });
+        await updateUsage(1, name2, type, { dryRun: true });
         return false;
       } catch (e) {
         if (e.code === "usage_limit_exceeded" /* USAGE_LIMIT_EXCEEDED */) {
@@ -14194,7 +14111,7 @@ async function getLogsByView(startDate, endDate, viewParams = {}) {
 async function writeLog(automation, results) {
   const db2 = context_exports.getProdAppDB();
   const automationId = automation._id;
-  const name = automation.name;
+  const name2 = automation.name;
   const status2 = getStatus(results);
   const isoDate = (/* @__PURE__ */ new Date()).toISOString();
   const id = generateAutomationLogID(isoDate, status2, automationId);
@@ -14203,7 +14120,7 @@ async function writeLog(automation, results) {
     ...results,
     automationId,
     status: status2,
-    automationName: name,
+    automationName: name2,
     createdAt: isoDate,
     _id: id
   };
@@ -14213,13 +14130,13 @@ async function writeLog(automation, results) {
 async function updateAppMetadataWithErrors(logIds, { clearing } = { clearing: false }) {
   const db2 = context_exports.getProdAppDB();
   await backOff(async () => {
-    const metadata = await db2.get(db_exports.DocumentType.APP_METADATA);
+    const metadata2 = await db2.get(db_exports.DocumentType.APP_METADATA);
     for (let logId of logIds) {
       const parts = logId.split(db_exports.SEPARATOR);
       const autoId = `${parts[parts.length - 3]}${db_exports.SEPARATOR}${parts[parts.length - 2]}`;
       let errors = {};
-      if (metadata.automationErrors) {
-        errors = metadata.automationErrors;
+      if (metadata2.automationErrors) {
+        errors = metadata2.automationErrors;
       }
       if (!Array.isArray(errors[autoId])) {
         errors[autoId] = [];
@@ -14233,10 +14150,10 @@ async function updateAppMetadataWithErrors(logIds, { clearing } = { clearing: fa
       if (errors[autoId].length === 0) {
         delete errors[autoId];
       }
-      metadata.automationErrors = errors;
+      metadata2.automationErrors = errors;
     }
-    await db2.put(metadata);
-    await cache_exports.app.invalidateAppMetadata(metadata.appId, metadata);
+    await db2.put(metadata2);
+    await cache_exports.app.invalidateAppMetadata(metadata2.appId, metadata2);
   }, "Failed to update app metadata with automation log error");
 }
 async function getExpiredLogs() {
@@ -14258,16 +14175,16 @@ async function clearOldHistory() {
     if (!expired.data || expired.data.length === 0) {
       return;
     }
-    const toDelete = expired.data.map((doc) => ({
-      _id: doc.id,
-      _rev: doc.value.rev,
+    const toDelete = expired.data.map((doc2) => ({
+      _id: doc2.id,
+      _rev: doc2.value.rev,
       _deleted: true
     }));
-    const errorLogIds = expired.data.filter((doc) => {
-      const parts = doc.id.split(db_exports.SEPARATOR);
+    const errorLogIds = expired.data.filter((doc2) => {
+      const parts = doc2.id.split(db_exports.SEPARATOR);
       const status2 = parts[parts.length - 1];
       return status2 === "error" /* ERROR */;
-    }).map((doc) => doc.id);
+    }).map((doc2) => doc2.id);
     await db2.bulkDocs(toDelete);
     if (errorLogIds.length) {
       await updateAppMetadataWithErrors(errorLogIds, { clearing: true });
@@ -14487,10 +14404,10 @@ async function get6(id) {
 async function getBulk2(ids, opts = { enriched: true }) {
   return await groups_exports.getBulk(ids, opts);
 }
-async function guardNameAvailility(name) {
-  const existingGroup = await groups_exports.getByName(name);
+async function guardNameAvailility(name2) {
+  const existingGroup = await groups_exports.getByName(name2);
   if (existingGroup) {
-    throw new GroupNameUnavailableError(name);
+    throw new GroupNameUnavailableError(name2);
   }
 }
 async function save4(group2) {
@@ -14649,14 +14566,14 @@ var init_groups6 = __esm({
 });
 
 // ../pro/packages/pro/src/utilities/fileSystem.ts
-function loadJSFile(directory, name) {
-  return import_fs7.default.readFileSync((0, import_path7.join)(directory, name), "utf8");
+function loadJSFile(directory2, name2) {
+  return import_fs6.default.readFileSync((0, import_path6.join)(directory2, name2), "utf8");
 }
-var import_fs7, import_path7;
+var import_fs6, import_path6;
 var init_fileSystem = __esm({
   "../pro/packages/pro/src/utilities/fileSystem.ts"() {
-    import_fs7 = __toESM(require("fs"));
-    import_path7 = require("path");
+    import_fs6 = __toESM(require("fs"));
+    import_path6 = require("path");
   }
 });
 
@@ -14668,8 +14585,8 @@ __export(plugins_exports, {
   storePlugin: () => storePlugin
 });
 async function storePlugin(metadata, directory, source) {
-  const db2 = tenancy.getGlobalDB();
-  const version = metadata.package.version, name = metadata.package.name, description = metadata.package.description, hash2 = metadata.schema.hash;
+  const db = tenancy.getGlobalDB();
+  const version = metadata.package.version, name = metadata.package.name, description = metadata.package.description, hash = metadata.schema.hash;
   const bucketPath = objectStore_exports2.getPluginS3Dir(name);
   const files = await objectStore_exports2.uploadDirectory(
     objectStore_exports2.ObjectStoreBuckets.PLUGINS,
@@ -14684,8 +14601,7 @@ async function storePlugin(metadata, directory, source) {
   if (metadata.schema.type === "datasource" /* DATASOURCE */) {
     const js = loadJSFile(directory, jsFile.name);
     try {
-      ;
-      (0, eval)(js);
+      eval(js);
     } catch (err) {
       const message = (err == null ? void 0 : err.message) ? err.message : JSON.stringify(err);
       throw new Error(`JS invalid: ${message}`);
@@ -14695,7 +14611,7 @@ async function storePlugin(metadata, directory, source) {
   const pluginId = db_exports.generatePluginID(name);
   let rev;
   try {
-    const existing = await db2.get(pluginId);
+    const existing = await db.get(pluginId);
     rev = existing._rev;
   } catch (err) {
     rev = void 0;
@@ -14706,7 +14622,7 @@ async function storePlugin(metadata, directory, source) {
     ...metadata,
     name,
     version,
-    hash: hash2,
+    hash,
     description
   };
   if (iconFileName) {
@@ -14718,8 +14634,8 @@ async function storePlugin(metadata, directory, source) {
       source
     };
   }
-  const write2 = async () => {
-    const response2 = await db2.put(doc);
+  const write = async () => {
+    const response2 = await db.put(doc);
     await events_exports.plugin.imported(doc);
     return {
       ...doc,
@@ -14727,21 +14643,21 @@ async function storePlugin(metadata, directory, source) {
     };
   };
   if (!rev) {
-    return await addPlugin(write2);
+    return await addPlugin(write);
   } else {
-    return await write2();
+    return await write();
   }
 }
-async function deletePlugin(pluginId) {
+async function deletePlugin(pluginId2) {
   const db2 = tenancy.getGlobalDB();
   try {
-    const plugin = await db2.get(pluginId);
-    const bucketPath = objectStore_exports2.getPluginS3Dir(plugin.name);
+    const plugin = await db2.get(pluginId2);
+    const bucketPath2 = objectStore_exports2.getPluginS3Dir(plugin.name);
     await objectStore_exports2.deleteFolder(
       objectStore_exports2.ObjectStoreBuckets.PLUGINS,
-      bucketPath
+      bucketPath2
     );
-    await db2.remove(pluginId, plugin._rev);
+    await db2.remove(pluginId2, plugin._rev);
     await events_exports.plugin.deleted(plugin);
     await removePlugin();
   } catch (err) {
@@ -14775,12 +14691,12 @@ function isEncryptionKeyAvailable() {
   return !!environment_default2.ENCRYPTION_KEY;
 }
 async function fetch10() {
-  const doc = await environmentVariables_exports.get();
-  return Object.keys(doc.variables);
+  const doc2 = await environmentVariables_exports.get();
+  return Object.keys(doc2.variables);
 }
 async function fetchValues(environment3) {
-  const doc = await environmentVariables_exports.get();
-  const decrypted = doc.variables;
+  const doc2 = await environmentVariables_exports.get();
+  const decrypted = doc2.variables;
   const output = {};
   for (let [key, value] of Object.entries(decrypted)) {
     switch (environment3) {
@@ -14802,9 +14718,9 @@ async function changeValues(cb) {
       "User does not have access to environment variables feature."
     );
   }
-  const doc = await environmentVariables_exports.get();
-  doc.variables = cb(doc.variables);
-  await environmentVariables_exports.update(doc);
+  const doc2 = await environmentVariables_exports.get();
+  doc2.variables = cb(doc2.variables);
+  await environmentVariables_exports.update(doc2);
 }
 async function update2(varName, value) {
   const checkName = isValid(varName);
@@ -14855,15 +14771,15 @@ var init_environmentVariables6 = __esm({
 function generateAuditLogID(timestamp) {
   return `${"al" /* AUDIT_LOG */}${SEPARATOR}${timestamp}${SEPARATOR}${utils_exports2.newid()}`;
 }
-async function save5(doc) {
-  if (!doc._id) {
-    doc._id = generateAuditLogID(doc.timestamp);
+async function save5(doc2) {
+  if (!doc2._id) {
+    doc2._id = generateAuditLogID(doc2.timestamp);
   }
   try {
     const db2 = context_exports.getAuditLogsDB();
-    const response2 = await db2.put(doc);
+    const response2 = await db2.put(doc2);
     return {
-      ...doc,
+      ...doc2,
       _rev: response2.rev
     };
   } catch (err) {
@@ -14891,9 +14807,9 @@ function dump(params2) {
   const db2 = context_exports.getAuditLogsDB();
   const stream3 = new MemoryStream();
   const promise = db2.dump(stream3, {
-    filter: (doc) => {
+    filter: (doc2) => {
       var _a;
-      const auditLog = doc;
+      const auditLog = doc2;
       if (!((_a = auditLog._id) == null ? void 0 : _a.startsWith("al" /* AUDIT_LOG */))) {
         return false;
       }
@@ -14911,7 +14827,7 @@ function dump(params2) {
         allMatched = allMatched && auditLog.timestamp >= params2.startDate && auditLog.timestamp <= params2.endDate;
       }
       if (params2.fullSearch) {
-        const json2 = JSON.stringify(doc);
+        const json2 = JSON.stringify(doc2);
         allMatched = allMatched && json2.includes(params2.fullSearch);
       }
       return allMatched;
@@ -14922,8 +14838,8 @@ function dump(params2) {
     const json2 = JSON.parse(Buffer.from(data2).toString());
     if (Array.isArray(json2.docs)) {
       let str = "";
-      for (let doc of json2.docs) {
-        str += JSON.stringify(doc) + "\n";
+      for (let doc2 of json2.docs) {
+        str += JSON.stringify(doc2) + "\n";
       }
       returnStream.write(str);
     }
@@ -14948,8 +14864,8 @@ var init_auditLogs4 = __esm({
 var require_Helper = __commonJS({
   "../string-templates/src/helpers/Helper.js"(exports2, module2) {
     var Helper = class {
-      constructor(name, fn2, useValueFallback = true) {
-        this.name = name;
+      constructor(name2, fn2, useValueFallback = true) {
+        this.name = name2;
         this.fn = fn2;
         this.useValueFallback = useValueFallback;
       }
@@ -15118,18 +15034,18 @@ var require_external = __commonJS({
     exports2.externalCollections = EXTERNAL_FUNCTION_COLLECTIONS;
     exports2.addedHelpers = ADDED_HELPERS;
     exports2.registerAll = (handlebars) => {
-      for (let [name, helper] of Object.entries(ADDED_HELPERS)) {
-        handlebars.registerHelper(name, helper);
+      for (let [name2, helper] of Object.entries(ADDED_HELPERS)) {
+        handlebars.registerHelper(name2, helper);
       }
       let externalNames = [];
       for (let collection of EXTERNAL_FUNCTION_COLLECTIONS) {
         let hbsHelperInfo = helpers[collection]();
         for (let entry of Object.entries(hbsHelperInfo)) {
-          const name = entry[0];
-          if (HelperFunctionBuiltin.indexOf(name) !== -1 || externalNames.indexOf(name) !== -1) {
+          const name2 = entry[0];
+          if (HelperFunctionBuiltin.indexOf(name2) !== -1 || externalNames.indexOf(name2) !== -1) {
             continue;
           }
-          externalNames.push(name);
+          externalNames.push(name2);
         }
         helpers[collection]({
           handlebars
@@ -15138,11 +15054,11 @@ var require_external = __commonJS({
       exports2.externalHelperNames = externalNames.concat(Object.keys(ADDED_HELPERS));
     };
     exports2.unregisterAll = (handlebars) => {
-      for (let name of Object.keys(ADDED_HELPERS)) {
-        handlebars.unregisterHelper(name);
+      for (let name2 of Object.keys(ADDED_HELPERS)) {
+        handlebars.unregisterHelper(name2);
       }
-      for (let name of module2.exports.externalHelperNames) {
-        handlebars.unregisterHelper(name);
+      for (let name2 of module2.exports.externalHelperNames) {
+        handlebars.unregisterHelper(name2);
       }
       exports2.externalHelperNames = [];
     };
@@ -15256,12 +15172,12 @@ var require_javascript = __commonJS({
         throw new Error("JS disabled in environment.");
       }
       try {
-        const js = `function run(){${atob(handlebars)}};run();`;
+        const js2 = `function run(){${atob(handlebars)}};run();`;
         const sandboxContext = {
           $: (path2) => getContextValue(path2, cloneDeep16(context)),
           helpers: getHelperList()
         };
-        const res = { data: runJS(js, sandboxContext) };
+        const res = { data: runJS(js2, sandboxContext) };
         return `{{${LITERAL_MARKER} js_result-${JSON.stringify(res)}}}`;
       } catch (error) {
         return "Error while executing JS";
@@ -15374,8 +15290,8 @@ var require_preprocessor = __commonJS({
       FINALISE: "finalise"
     };
     var Preprocessor = class {
-      constructor(name, fn2) {
-        this.name = name;
+      constructor(name2, fn2) {
+        this.name = name2;
         this.fn = fn2;
       }
       process(fullString, statement, opts) {
@@ -15439,8 +15355,8 @@ var require_postprocessor = __commonJS({
       CONVERT_LITERALS: "convert-literals"
     };
     var Postprocessor = class {
-      constructor(name, fn2) {
-        this.name = name;
+      constructor(name2, fn2) {
+        this.name = name2;
         this.fn = fn2;
       }
       process(statement) {
@@ -17082,10 +16998,10 @@ var require_src = __commonJS({
     };
     module2.exports.convertToJS = (hbs) => {
       const blocks = exports2.findHBSBlocks(hbs);
-      let js = "return `", prevBlock = null;
+      let js2 = "return `", prevBlock = null;
       const variables = {};
       if (blocks.length === 0) {
-        js += hbs;
+        js2 += hbs;
       }
       let count = 1;
       for (let block of blocks) {
@@ -17097,15 +17013,15 @@ var require_src = __commonJS({
         prevBlock = block;
         const { variable, value } = convertHBSBlock(block, count++);
         variables[variable] = value;
-        js += `${stringPart.split()}\${${variable}}`;
+        js2 += `${stringPart.split()}\${${variable}}`;
       }
       let varBlock = "";
       for (let [variable, value] of Object.entries(variables)) {
         varBlock += `const ${variable} = ${value};
 `;
       }
-      js += "`;";
-      return `${varBlock}${js}`;
+      js2 += "`;";
+      return `${varBlock}${js2}`;
     };
   }
 });
@@ -17132,12 +17048,12 @@ var require_src2 = __commonJS({
     if (!process.env.NO_JS) {
       const { VM: VM2 } = require("vm2");
       const { setJSRunner } = require_javascript();
-      setJSRunner((js, context) => {
+      setJSRunner((js2, context) => {
         const vm = new VM2({
           sandbox: context,
           timeout: 1e3
         });
-        return vm.run(js);
+        return vm.run(js2);
       });
     }
   }
@@ -17231,12 +17147,12 @@ async function auditLogsEnabled() {
   const license = await licensing_exports.cache.getCachedLicense();
   return license.features.includes("auditLogs" /* AUDIT_LOGS */);
 }
-function getEventFriendlyName(event, metadata) {
+function getEventFriendlyName(event, metadata2) {
   const friendly = AuditedEventFriendlyName[event];
   if (!friendly) {
     throw new Error("No friendly name found.");
   }
-  let processed = processStringSync(friendly, metadata);
+  let processed = processStringSync(friendly, metadata2);
   if (processed.includes(`""`)) {
     processed = removeTemplateStrings(friendly);
   }
@@ -17258,29 +17174,29 @@ var init_utils10 = __esm({
 });
 
 // ../pro/packages/pro/src/sdk/auditLogs/auditLogs.ts
-async function write(event, metadata, opts) {
+async function write2(event, metadata2, opts) {
   if (!await auditLogsEnabled() || !utils_exports2.isAudited(event)) {
     return;
   }
-  const friendly = getEventFriendlyName(event, metadata);
+  const friendly = getEventFriendlyName(event, metadata2);
   let date = /* @__PURE__ */ new Date();
   if (opts == null ? void 0 : opts.timestamp) {
     date = new Date(opts.timestamp);
   }
-  const doc = {
+  const doc2 = {
     timestamp: date.toISOString(),
     event,
     name: friendly,
     userId: (opts == null ? void 0 : opts.userId) || AuditLogSystemUser,
     metadata: {
-      ...metadata,
+      ...metadata2,
       ...opts == null ? void 0 : opts.hostInfo
     }
   };
   const fallback = {};
   try {
     if (opts == null ? void 0 : opts.appId) {
-      doc.appId = db_exports.getProdAppID(opts.appId);
+      doc2.appId = db_exports.getProdAppID(opts.appId);
       const appMetadata = await cache_exports.app.getAppMetadata(opts.appId);
       fallback.appName = appMetadata.name;
     }
@@ -17294,8 +17210,8 @@ async function write(event, metadata, opts) {
       err
     );
   }
-  doc.fallback = fallback;
-  return await save5(doc);
+  doc2.fallback = fallback;
+  return await save5(doc2);
 }
 async function enrich(logs) {
   const allUserIds = logs.map((log) => log.userId);
@@ -17367,7 +17283,7 @@ __export(auditLogs_exports2, {
   definitions: () => definitions2,
   download: () => download,
   fetch: () => fetch11,
-  write: () => write
+  write: () => write2
 });
 var init_auditLogs6 = __esm({
   "../pro/packages/pro/src/sdk/auditLogs/index.ts"() {
@@ -17390,8 +17306,8 @@ var init_queue4 = __esm({
 });
 
 // ../pro/packages/pro/src/sdk/backups/backup.ts
-async function storeAppBackupMetadata2(metadata, opts = {}) {
-  return backups_exports.storeAppBackupMetadata(metadata, opts);
+async function storeAppBackupMetadata2(metadata2, opts = {}) {
+  return backups_exports.storeAppBackupMetadata(metadata2, opts);
 }
 function getTimestamps(status2) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
@@ -17405,7 +17321,7 @@ function getTimestamps(status2) {
       return { timestamp, createdAt: timestamp };
   }
 }
-async function updateBackupStatus(id, rev, status2, contents, filename) {
+async function updateBackupStatus(id, rev2, status2, contents, filename) {
   const backup = await getAppBackup(id);
   return await backups_exports.storeAppBackupMetadata(
     {
@@ -17415,10 +17331,10 @@ async function updateBackupStatus(id, rev, status2, contents, filename) {
       status: status2,
       type: "backup" /* BACKUP */
     },
-    { filename, docId: id, docRev: rev }
+    { filename, docId: id, docRev: rev2 }
   );
 }
-async function updateRestoreStatus(id, rev, status2) {
+async function updateRestoreStatus(id, rev2, status2) {
   const restore = await getAppBackup(id);
   return await backups_exports.storeAppBackupMetadata(
     {
@@ -17428,7 +17344,7 @@ async function updateRestoreStatus(id, rev, status2) {
       type: "restore" /* RESTORE */,
       trigger: "manual" /* MANUAL */
     },
-    { docId: id, docRev: rev }
+    { docId: id, docRev: rev2 }
   );
 }
 async function getAppBackup(backupId) {
@@ -17438,11 +17354,11 @@ async function updateAppBackup(backupId, backupName) {
   return backups_exports.updateAppBackupMetadata(backupId, backupName);
 }
 async function deleteAppBackup(backupId) {
-  const metadata = await backups_exports.getAppBackupMetadata(backupId);
-  if (metadata.filename) {
+  const metadata2 = await backups_exports.getAppBackupMetadata(backupId);
+  if (metadata2.filename) {
     await objectStore_exports2.deleteFile(
       objectStore_exports2.ObjectStoreBuckets.BACKUPS,
-      metadata.filename
+      metadata2.filename
     );
   }
   return backups_exports.deleteAppBackupMetadata(backupId);
@@ -17451,15 +17367,15 @@ async function fetchAppBackups2(appId, opts) {
   return backups_exports.fetchAppBackups(appId, opts);
 }
 async function downloadAppBackup(backupId) {
-  const metadata = await backups_exports.getAppBackupMetadata(backupId);
-  if (!metadata.filename) {
+  const metadata2 = await backups_exports.getAppBackupMetadata(backupId);
+  if (!metadata2.filename) {
     throw new Error("Backup incomplete - cannot download.");
   }
   const path2 = await objectStore_exports2.retrieveToTmp(
     objectStore_exports2.ObjectStoreBuckets.BACKUPS,
-    metadata.filename
+    metadata2.filename
   );
-  return { metadata, path: path2 };
+  return { metadata: metadata2, path: path2 };
 }
 async function triggerAppBackup(appId, trigger, opts = {}) {
   let backup;
@@ -17498,7 +17414,7 @@ async function triggerAppBackup(appId, trigger, opts = {}) {
   return backup.id;
 }
 async function triggerAppRestore(appId, backupId, nameForBackup, createdBy) {
-  const metadata = await getAppBackup(backupId);
+  const metadata2 = await getAppBackup(backupId);
   let restore;
   try {
     restore = await storeAppBackupMetadata2({
@@ -17525,7 +17441,7 @@ async function triggerAppRestore(appId, backupId, nameForBackup, createdBy) {
       createdBy
     }
   });
-  return { restoreId: restore.id, metadata };
+  return { restoreId: restore.id, metadata: metadata2 };
 }
 var pkg, backup_default2;
 var init_backup5 = __esm({
@@ -17624,8 +17540,8 @@ async function runBackup(trigger, tenantId, appId, opts) {
       }
     });
     await updateMetadata2("complete" /* COMPLETE */, { filename, contents });
-    if (import_fs8.default.existsSync(tarPath)) {
-      import_fs8.default.rmSync(tarPath);
+    if (import_fs7.default.existsSync(tarPath)) {
+      import_fs7.default.rmSync(tarPath);
     }
   } catch (err) {
     logging_exports.logAlert("App backup error", err);
@@ -17638,7 +17554,7 @@ async function importProcessor(job, opts) {
   const tenantId = tenancy.getTenantIDFromAppID(appId);
   return tenancy.doInTenant(tenantId, async () => {
     const devAppId = db_exports.getDevAppID(appId);
-    const { rev } = await backup_default2.updateRestoreStatus(
+    const { rev: rev2 } = await backup_default2.updateRestoreStatus(
       data2.docId,
       data2.docRev,
       "started" /* STARTED */
@@ -17663,34 +17579,34 @@ async function importProcessor(job, opts) {
       logging_exports.logAlert("App restore error", err);
       status2 = "failed" /* FAILED */;
     }
-    await backup_default2.updateRestoreStatus(data2.docId, rev, status2);
+    await backup_default2.updateRestoreStatus(data2.docId, rev2, status2);
   });
 }
 async function exportProcessor(job, opts) {
   const data2 = job.data;
-  const appId = data2.appId, trigger = data2.export.trigger, name = data2.export.name;
+  const appId = data2.appId, trigger = data2.export.trigger, name2 = data2.export.name;
   const tenantId = tenancy.getTenantIDFromAppID(appId);
   await tenancy.doInTenant(tenantId, async () => {
-    const { rev } = await backup_default2.updateBackupStatus(
+    const { rev: rev2 } = await backup_default2.updateBackupStatus(
       data2.docId,
       data2.docRev,
       "started" /* STARTED */
     );
     return runBackup(trigger, tenantId, appId, {
       processing: opts,
-      doc: { id: data2.docId, rev },
-      name
+      doc: { id: data2.docId, rev: rev2 },
+      name: name2
     });
   });
 }
-var import_fs8;
+var import_fs7;
 var init_processing = __esm({
   "../pro/packages/pro/src/sdk/backups/processing.ts"() {
     init_src2();
     init_backup5();
     init_src();
     init_queue4();
-    import_fs8 = __toESM(require("fs"));
+    import_fs7 = __toESM(require("fs"));
   }
 });
 
@@ -17988,9 +17904,9 @@ var init_groups7 = __esm({
       ctx.body = { data: await fetch9() };
     };
     destroy4 = async (ctx) => {
-      const { id, rev } = ctx.params;
+      const { id, rev: rev2 } = ctx.params;
       try {
-        await remove2(id, rev);
+        await remove2(id, rev2);
         ctx.body = { message: "Group deleted successfully" };
       } catch (err) {
         ctx.throw(err.status, err);
@@ -18036,13 +17952,13 @@ async function fetch13(ctx) {
   };
 }
 async function create3(ctx) {
-  const { name, production, development } = ctx.request.body;
-  await environmentVariables_exports2.update(name, { production, development });
+  const { name: name2, production, development } = ctx.request.body;
+  await environmentVariables_exports2.update(name2, { production, development });
   const environments = ["production" /* PRODUCTION */];
   if (production !== development) {
     environments.push("development" /* DEVELOPMENT */);
   }
-  await events_exports.environmentVariable.created(name, environments);
+  await events_exports.environmentVariable.created(name2, environments);
   ctx.status = 200;
 }
 async function update4(ctx) {
@@ -18329,17 +18245,17 @@ async function downloadBackup(ctx) {
   const appId = ctx.params.appId;
   await checkAppID(ctx, appId);
   const backupId = ctx.params.backupId;
-  const { metadata, path: path2 } = await backups_default.downloadAppBackup(backupId);
-  ctx.attachment(`backup-${metadata.timestamp}.tar.gz`);
-  ctx.body = import_fs9.default.createReadStream(path2);
+  const { metadata: metadata2, path: path2 } = await backups_default.downloadAppBackup(backupId);
+  ctx.attachment(`backup-${metadata2.timestamp}.tar.gz`);
+  ctx.body = import_fs8.default.createReadStream(path2);
 }
-var import_fs9;
+var import_fs8;
 var init_backups3 = __esm({
   "../pro/packages/pro/src/api/controllers/apps/backups.ts"() {
     init_src();
     init_sdk2();
     init_src2();
-    import_fs9 = __toESM(require("fs"));
+    import_fs8 = __toESM(require("fs"));
   }
 });
 
@@ -18470,8 +18386,8 @@ var init_schedules2 = __esm({
 });
 
 // ../pro/packages/pro/src/api/controllers/global/scim/users.ts
-function tryGetQueryAsNumber(ctx, name) {
-  const value = ctx.request.query[name];
+function tryGetQueryAsNumber(ctx, name2) {
+  const value = ctx.request.query[name2];
   if (value === void 0) {
     return void 0;
   }
@@ -18862,11 +18778,11 @@ var init_filters = __esm({
         return docs;
       }
       query = cleanupQuery(query);
-      const match = (type, failFn) => (doc) => {
+      const match = (type, failFn) => (doc2) => {
         const filters = Object.entries(query[type] || {});
         for (let i = 0; i < filters.length; i++) {
           const [key, testValue] = filters[i];
-          const docValue = deepGet(doc, removeKeyNumbering2(key));
+          const docValue = deepGet(doc2, removeKeyNumbering2(key));
           if (failFn(docValue, testValue)) {
             return false;
           }
@@ -18927,8 +18843,8 @@ var init_filters = __esm({
           return testValue == null ? void 0 : testValue.every((item) => docValue == null ? void 0 : docValue.includes(item));
         }
       );
-      const docMatch = (doc) => {
-        return stringMatch(doc) && fuzzyMatch(doc) && rangeMatch(doc) && equalMatch(doc) && notEqualMatch(doc) && emptyMatch(doc) && notEmptyMatch(doc) && oneOf(doc) && contains(doc) && containsAny(doc) && notContains(doc);
+      const docMatch = (doc2) => {
+        return stringMatch(doc2) && fuzzyMatch(doc2) && rangeMatch(doc2) && equalMatch(doc2) && notEqualMatch(doc2) && emptyMatch(doc2) && notEmptyMatch(doc2) && oneOf(doc2) && contains(doc2) && containsAny(doc2) && notContains(doc2);
       };
       return docs.filter(docMatch);
     };
@@ -18975,39 +18891,11 @@ var init_filters = __esm({
 // ../shared-core/src/utils.ts
 var utils_exports5 = {};
 __export(utils_exports5, {
-  parallelForeach: () => parallelForeach,
   unreachable: () => unreachable
 });
 function unreachable(value, message = `No such case in exhaustive switch: ${value}`) {
   throw new Error(message);
 }
-async function parallelForeach(items, task, maxConcurrency) {
-  const promises = [];
-  let index2 = 0;
-  const processItem = async (item) => {
-    try {
-      await task(item);
-    } finally {
-      processNext();
-    }
-  };
-  const processNext = () => {
-    if (index2 >= items.length) {
-      return;
-    }
-    const item = items[index2];
-    index2++;
-    const promise = processItem(item);
-    promises.push(promise);
-    if (promises.length >= maxConcurrency) {
-      Promise.race(promises).then(processNext);
-    } else {
-      processNext();
-    }
-  };
-  processNext();
-  await Promise.all(promises);
-}
 var init_utils12 = __esm({
   "../shared-core/src/utils.ts"() {
   }
@@ -19631,32 +19519,32 @@ var init_centralPath = __esm({
 });
 
 // src/utilities/fileSystem/filesystem.ts
-var import_fs10, import_path8, import_tar, uuid2, TOP_LEVEL_PATH, apiFileReturn, streamFile, createTempFolder, extractTarball;
+var import_fs9, import_path7, import_tar, uuid2, TOP_LEVEL_PATH, apiFileReturn, streamFile, createTempFolder, extractTarball;
 var init_filesystem = __esm({
   "src/utilities/fileSystem/filesystem.ts"() {
-    import_fs10 = __toESM(require("fs"));
+    import_fs9 = __toESM(require("fs"));
     init_budibaseDir();
-    import_path8 = require("path");
+    import_path7 = require("path");
     init_environment();
     import_tar = __toESM(require("tar"));
     init_environment();
     uuid2 = require("uuid/v4");
-    TOP_LEVEL_PATH = environment_default.TOP_LEVEL_PATH || (0, import_path8.resolve)((0, import_path8.join)(__dirname, "..", "..", ".."));
+    TOP_LEVEL_PATH = environment_default.TOP_LEVEL_PATH || (0, import_path7.resolve)((0, import_path7.join)(__dirname, "..", "..", ".."));
     apiFileReturn = (contents) => {
-      const path2 = (0, import_path8.join)(budibaseTempDir2(), uuid2());
-      import_fs10.default.writeFileSync(path2, contents);
-      return import_fs10.default.createReadStream(path2);
+      const path2 = (0, import_path7.join)(budibaseTempDir2(), uuid2());
+      import_fs9.default.writeFileSync(path2, contents);
+      return import_fs9.default.createReadStream(path2);
     };
     streamFile = (path2) => {
-      return import_fs10.default.createReadStream(path2);
+      return import_fs9.default.createReadStream(path2);
     };
     createTempFolder = (item) => {
-      const path2 = (0, import_path8.join)(budibaseTempDir2(), item);
+      const path2 = (0, import_path7.join)(budibaseTempDir2(), item);
       try {
-        if (import_fs10.default.existsSync(path2)) {
-          import_fs10.default.rmSync(path2, { recursive: true, force: true });
+        if (import_fs9.default.existsSync(path2)) {
+          import_fs9.default.rmSync(path2, { recursive: true, force: true });
         }
-        import_fs10.default.mkdirSync(path2);
+        import_fs9.default.mkdirSync(path2);
       } catch (err) {
         throw new Error(`Path cannot be created: ${err.message}`);
       }
@@ -19683,37 +19571,37 @@ var init_clientLibrary = __esm({
 });
 
 // src/utilities/fileSystem/app.ts
-var import_path9, NODE_MODULES_PATH;
+var import_path8, NODE_MODULES_PATH;
 var init_app7 = __esm({
   "src/utilities/fileSystem/app.ts"() {
     init_budibaseDir();
-    import_path9 = require("path");
+    import_path8 = require("path");
     init_constants6();
     init_clientLibrary();
     init_environment();
     init_src2();
     init_filesystem();
-    NODE_MODULES_PATH = (0, import_path9.join)(TOP_LEVEL_PATH, "node_modules");
+    NODE_MODULES_PATH = (0, import_path8.join)(TOP_LEVEL_PATH, "node_modules");
   }
 });
 
 // src/utilities/fileSystem/plugin.ts
 async function getPluginImpl(path2, plugin) {
   var _a;
-  const hash2 = (_a = plugin.schema) == null ? void 0 : _a.hash;
-  if (!import_fs11.default.existsSync(path2)) {
-    import_fs11.default.mkdirSync(path2);
+  const hash3 = (_a = plugin.schema) == null ? void 0 : _a.hash;
+  if (!import_fs10.default.existsSync(path2)) {
+    import_fs10.default.mkdirSync(path2);
   }
-  const filename = (0, import_path10.join)(path2, plugin.name);
+  const filename = (0, import_path9.join)(path2, plugin.name);
   const metadataName = `${filename}.bbmetadata`;
-  if (import_fs11.default.existsSync(filename)) {
-    const currentHash = import_fs11.default.readFileSync(metadataName, "utf8");
-    if (currentHash === hash2) {
+  if (import_fs10.default.existsSync(filename)) {
+    const currentHash = import_fs10.default.readFileSync(metadataName, "utf8");
+    if (currentHash === hash3) {
       return require(filename);
     } else {
       console.log(`Updating plugin: ${plugin.name}`);
       delete require.cache[require.resolve(filename)];
-      import_fs11.default.unlinkSync(filename);
+      import_fs10.default.unlinkSync(filename);
     }
   }
   const pluginKey = objectStore_exports2.getPluginJSKey(plugin);
@@ -19721,27 +19609,27 @@ async function getPluginImpl(path2, plugin) {
     objectStore_exports2.ObjectStoreBuckets.PLUGINS,
     pluginKey
   );
-  import_fs11.default.writeFileSync(filename, pluginJs);
-  import_fs11.default.writeFileSync(metadataName, hash2);
+  import_fs10.default.writeFileSync(filename, pluginJs);
+  import_fs10.default.writeFileSync(metadataName, hash3);
   return require(filename);
 }
-var import_fs11, import_path10, DATASOURCE_PATH, AUTOMATION_PATH, getPluginMetadata, getDatasourcePlugin, getAutomationPlugin;
+var import_fs10, import_path9, DATASOURCE_PATH, AUTOMATION_PATH, getPluginMetadata, getDatasourcePlugin, getAutomationPlugin;
 var init_plugin5 = __esm({
   "src/utilities/fileSystem/plugin.ts"() {
     init_budibaseDir();
-    import_fs11 = __toESM(require("fs"));
-    import_path10 = require("path");
+    import_fs10 = __toESM(require("fs"));
+    import_path9 = require("path");
     init_src2();
-    DATASOURCE_PATH = (0, import_path10.join)(budibaseTempDir2(), "datasource");
-    AUTOMATION_PATH = (0, import_path10.join)(budibaseTempDir2(), "automation");
+    DATASOURCE_PATH = (0, import_path9.join)(budibaseTempDir2(), "datasource");
+    AUTOMATION_PATH = (0, import_path9.join)(budibaseTempDir2(), "automation");
     getPluginMetadata = async (path2) => {
-      let metadata = {};
+      let metadata2 = {};
       try {
-        const pkg2 = import_fs11.default.readFileSync((0, import_path10.join)(path2, "package.json"), "utf8");
-        const schema = import_fs11.default.readFileSync((0, import_path10.join)(path2, "schema.json"), "utf8");
-        metadata.schema = JSON.parse(schema);
-        metadata.package = JSON.parse(pkg2);
-        if (!metadata.package.name || !metadata.package.version || !metadata.package.description) {
+        const pkg2 = import_fs10.default.readFileSync((0, import_path9.join)(path2, "package.json"), "utf8");
+        const schema = import_fs10.default.readFileSync((0, import_path9.join)(path2, "schema.json"), "utf8");
+        metadata2.schema = JSON.parse(schema);
+        metadata2.package = JSON.parse(pkg2);
+        if (!metadata2.package.name || !metadata2.package.version || !metadata2.package.description) {
           throw new Error(
             "package.json is missing one of 'name', 'version' or 'description'."
           );
@@ -19751,7 +19639,7 @@ var init_plugin5 = __esm({
           `Unable to process schema.json/package.json in plugin. ${err.message}`
         );
       }
-      return { metadata, directory: path2 };
+      return { metadata: metadata2, directory: path2 };
     };
     getDatasourcePlugin = async (plugin) => {
       return getPluginImpl(DATASOURCE_PATH, plugin);
@@ -19768,9 +19656,9 @@ var init_template = __esm({
   "src/utilities/fileSystem/template.ts"() {
     init_constants6();
     init_src2();
-    downloadTemplate = async (type, name) => {
+    downloadTemplate = async (type, name2) => {
       const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com";
-      const templateUrl = `https://${DEFAULT_TEMPLATES_BUCKET}/templates/${type}/${name}.tar.gz`;
+      const templateUrl = `https://${DEFAULT_TEMPLATES_BUCKET}/templates/${type}/${name2}.tar.gz`;
       return objectStore_exports2.downloadTarball(
         templateUrl,
         ObjectStoreBuckets2.TEMPLATES,
@@ -19808,18 +19696,17 @@ __export(exports_exports, {
   exportDB: () => exportDB,
   streamExportApp: () => streamExportApp
 });
-function tarFilesToTmp(tmpDir, files) {
-  const fileName = `${uuid3()}.tar.gz`;
-  const exportFile = (0, import_path11.join)(budibaseTempDir2(), fileName);
-  import_tar2.default.create(
+function tarFilesToTmp(tmpDir, files2) {
+  const exportFile = (0, import_path10.join)(budibaseTempDir2(), `${uuid3()}.tar.gz`);
+  tar3.create(
     {
       sync: true,
       gzip: true,
       file: exportFile,
-      noDirRecurse: false,
+      recursive: true,
       cwd: tmpDir
     },
-    files
+    files2
   );
   return exportFile;
 }
@@ -19833,7 +19720,7 @@ async function exportDB(dbName, opts = {}) {
   return db_exports.doWithDB(dbName, async (db2) => {
     if (opts == null ? void 0 : opts.exportPath) {
       const path2 = opts == null ? void 0 : opts.exportPath;
-      const writeStream = import_fs12.default.createWriteStream(path2);
+      const writeStream = import_fs11.default.createWriteStream(path2);
       await db2.dump(writeStream, exportOpts);
       return path2;
     } else {
@@ -19855,7 +19742,7 @@ function defineFilter(excludeRows, excludeLogs) {
   if (excludeLogs) {
     ids.push(AUTOMATION_LOG_PREFIX);
   }
-  return (doc) => !ids.map((key) => doc._id.includes(key)).reduce((prev, curr) => prev || curr);
+  return (doc2) => !ids.map((key) => doc2._id.includes(key)).reduce((prev, curr) => prev || curr);
 }
 async function exportApp(appId, config) {
   const prodAppId = db_exports.getProdAppID(appId);
@@ -19866,9 +19753,9 @@ async function exportApp(appId, config) {
       for (let path2 of STATIC_APP_FILES) {
         const contents = await objectStore_exports2.retrieve(
           ObjectStoreBuckets2.APPS,
-          (0, import_path11.join)(appPath, path2)
+          (0, import_path10.join)(appPath, path2)
         );
-        import_fs12.default.writeFileSync((0, import_path11.join)(tmpPath, path2), contents);
+        import_fs11.default.writeFileSync((0, import_path10.join)(tmpPath, path2), contents);
       }
     } else {
       tmpPath = await objectStore_exports2.retrieveDirectory(
@@ -19877,52 +19764,37 @@ async function exportApp(appId, config) {
       );
     }
   }
-  const downloadedPath = (0, import_path11.join)(tmpPath, appPath);
-  if (import_fs12.default.existsSync(downloadedPath)) {
-    const allFiles = import_fs12.default.readdirSync(downloadedPath);
+  const downloadedPath = (0, import_path10.join)(tmpPath, appPath);
+  if (import_fs11.default.existsSync(downloadedPath)) {
+    const allFiles = import_fs11.default.readdirSync(downloadedPath);
     for (let file of allFiles) {
-      const path2 = (0, import_path11.join)(downloadedPath, file);
-      import_fs12.default.renameSync(path2, (0, import_path11.join)(downloadedPath, "..", file));
+      const path2 = (0, import_path10.join)(downloadedPath, file);
+      import_fs11.default.renameSync(path2, (0, import_path10.join)(downloadedPath, "..", file));
     }
-    import_fs12.default.rmdirSync(downloadedPath);
+    import_fs11.default.rmdirSync(downloadedPath);
   }
-  const dbPath = (0, import_path11.join)(tmpPath, DB_EXPORT_FILE);
+  const dbPath = (0, import_path10.join)(tmpPath, DB_EXPORT_FILE);
   await exportDB(appId, {
     filter: defineFilter(config == null ? void 0 : config.excludeRows, config == null ? void 0 : config.excludeLogs),
     exportPath: dbPath
   });
-  if (config == null ? void 0 : config.encryptPassword) {
-    for (let file of import_fs12.default.readdirSync(tmpPath)) {
-      const path2 = (0, import_path11.join)(tmpPath, file);
-      await encryption_exports.encryptFile(
-        { dir: tmpPath, filename: file },
-        config.encryptPassword
-      );
-      import_fs12.default.rmSync(path2);
-    }
-  }
   if (config == null ? void 0 : config.tar) {
-    const tarPath = tarFilesToTmp(tmpPath, import_fs12.default.readdirSync(tmpPath));
-    import_fs12.default.rmSync(tmpPath, { recursive: true, force: true });
+    const tarPath = tarFilesToTmp(tmpPath, import_fs11.default.readdirSync(tmpPath));
+    import_fs11.default.rmSync(tmpPath, { recursive: true, force: true });
     return tarPath;
   } else {
     return tmpPath;
   }
 }
-async function streamExportApp({
-  appId,
-  excludeRows,
-  encryptPassword
-}) {
+async function streamExportApp(appId, excludeRows) {
   const tmpPath = await exportApp(appId, {
     excludeRows,
     excludeLogs: true,
-    tar: true,
-    encryptPassword
+    tar: true
   });
   return streamFile(tmpPath);
 }
-var import_fs12, import_path11, import_tar2, uuid3, MemoryStream2;
+var import_fs11, import_path10, uuid3, tar3, MemoryStream2;
 var init_exports2 = __esm({
   "src/sdk/app/backups/exports.ts"() {
     init_src2();
@@ -19931,11 +19803,11 @@ var init_exports2 = __esm({
     init_constants6();
     init_utils13();
     init_constants7();
-    import_fs12 = __toESM(require("fs"));
-    import_path11 = require("path");
+    import_fs11 = __toESM(require("fs"));
+    import_path10 = require("path");
     init_environment();
-    import_tar2 = __toESM(require("tar"));
     uuid3 = require("uuid/v4");
+    tar3 = require("tar");
     MemoryStream2 = require("memorystream");
   }
 });
@@ -20012,16 +19884,16 @@ async function getTemplateStream(template) {
     throw new Error("Cannot import a non-text based file.");
   }
   if (template.file) {
-    return import_fs13.default.createReadStream(template.file.path);
+    return import_fs12.default.createReadStream(template.file.path);
   } else if (template.key) {
-    const [type, name] = template.key.split("/");
-    const tmpPath = await downloadTemplate(type, name);
-    return import_fs13.default.createReadStream((0, import_path12.join)(tmpPath, name, "db", "dump.txt"));
+    const [type, name2] = template.key.split("/");
+    const tmpPath = await downloadTemplate(type, name2);
+    return import_fs12.default.createReadStream((0, import_path11.join)(tmpPath, name2, "db", "dump.txt"));
   }
 }
 function untarFile(file) {
-  const tmpPath = (0, import_path12.join)(budibaseTempDir2(), uuid4());
-  import_fs13.default.mkdirSync(tmpPath);
+  const tmpPath = (0, import_path11.join)(budibaseTempDir2(), uuid4());
+  import_fs12.default.mkdirSync(tmpPath);
   tar4.extract({
     sync: true,
     cwd: tmpPath,
@@ -20029,49 +19901,31 @@ function untarFile(file) {
   });
   return tmpPath;
 }
-async function decryptFiles(path2, password) {
-  try {
-    for (let file of import_fs13.default.readdirSync(path2)) {
-      const inputPath = (0, import_path12.join)(path2, file);
-      const outputPath = inputPath.replace(/\.enc$/, "");
-      await encryption_exports.decryptFile(inputPath, outputPath, password);
-      import_fs13.default.rmSync(inputPath);
-    }
-  } catch (err) {
-    if (err.message === "incorrect header check") {
-      throw new Error("File cannot be imported");
-    }
-    throw err;
-  }
-}
 function getGlobalDBFile(tmpPath) {
-  return import_fs13.default.readFileSync((0, import_path12.join)(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8");
+  return import_fs12.default.readFileSync((0, import_path11.join)(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8");
 }
 function getListOfAppsInMulti(tmpPath) {
-  return import_fs13.default.readdirSync(tmpPath).filter((dir) => dir !== GLOBAL_DB_EXPORT_FILE);
+  return import_fs12.default.readdirSync(tmpPath).filter((dir) => dir !== GLOBAL_DB_EXPORT_FILE);
 }
 async function importApp(appId, db2, template) {
   var _a, _b;
   let prodAppId = db_exports.getProdAppID(appId);
   let dbStream;
   const isTar = template.file && ((_b = (_a = template == null ? void 0 : template.file) == null ? void 0 : _a.type) == null ? void 0 : _b.endsWith("gzip"));
-  const isDirectory = template.file && import_fs13.default.lstatSync(template.file.path).isDirectory();
+  const isDirectory = template.file && import_fs12.default.lstatSync(template.file.path).isDirectory();
   if (template.file && (isTar || isDirectory)) {
     const tmpPath = isTar ? untarFile(template.file) : template.file.path;
-    if (isTar && template.file.password) {
-      await decryptFiles(tmpPath, template.file.password);
-    }
-    const contents = import_fs13.default.readdirSync(tmpPath);
+    const contents = import_fs12.default.readdirSync(tmpPath);
     if (contents.length) {
       let promises = [];
       let excludedFiles = [GLOBAL_DB_EXPORT_FILE, DB_EXPORT_FILE];
       for (let filename of contents) {
-        const path2 = (0, import_path12.join)(tmpPath, filename);
+        const path2 = (0, import_path11.join)(tmpPath, filename);
         if (excludedFiles.includes(filename)) {
           continue;
         }
-        filename = (0, import_path12.join)(prodAppId, filename);
-        if (import_fs13.default.lstatSync(path2).isDirectory()) {
+        filename = (0, import_path11.join)(prodAppId, filename);
+        if (import_fs12.default.lstatSync(path2).isDirectory()) {
           promises.push(
             objectStore_exports2.uploadDirectory(ObjectStoreBuckets2.APPS, path2, filename)
           );
@@ -20087,7 +19941,7 @@ async function importApp(appId, db2, template) {
       }
       await Promise.all(promises);
     }
-    dbStream = import_fs13.default.createReadStream((0, import_path12.join)(tmpPath, DB_EXPORT_FILE));
+    dbStream = import_fs12.default.createReadStream((0, import_path11.join)(tmpPath, DB_EXPORT_FILE));
   } else {
     dbStream = await getTemplateStream(template);
   }
@@ -20099,7 +19953,7 @@ async function importApp(appId, db2, template) {
   await updateAutomations(prodAppId, db2);
   return ok;
 }
-var import_path12, import_fs13, uuid4, tar4;
+var import_path11, import_fs12, uuid4, tar4;
 var init_imports = __esm({
   "src/sdk/app/backups/imports.ts"() {
     init_src2();
@@ -20108,8 +19962,8 @@ var init_imports = __esm({
     init_constants7();
     init_fileSystem2();
     init_constants6();
-    import_path12 = require("path");
-    import_fs13 = __toESM(require("fs"));
+    import_path11 = require("path");
+    import_fs12 = __toESM(require("fs"));
     init_sdk3();
     init_src();
     uuid4 = require("uuid/v4");
@@ -20347,22 +20201,34 @@ function finaliseExternalTables(tables, entities) {
   let finalTables = {};
   const errors = {};
   const tableIds = Object.values(tables).map((table) => table._id);
-  for (let [name, table] of Object.entries(tables)) {
+  for (let [name2, table] of Object.entries(tables)) {
     const schemaFields = Object.keys(table.schema);
     if (table.primary == null || table.primary.length === 0) {
-      errors[name] = "no_key" /* NO_KEY */;
+      errors[name2] = "no_key" /* NO_KEY */;
       continue;
     } else if (schemaFields.find(
       (field) => invalidColumns.includes(field)
     )) {
-      errors[name] = "invalid_column" /* INVALID_COLUMN */;
+      errors[name2] = "invalid_column" /* INVALID_COLUMN */;
       continue;
     }
-    finalTables[name] = copyExistingPropsOver(name, table, entities, tableIds);
+    finalTables[name2] = copyExistingPropsOver(name2, table, entities, tableIds);
   }
   finalTables = Object.entries(finalTables).sort(([a], [b]) => a.localeCompare(b)).reduce((r, [k, v]) => ({ ...r, [k]: v }), {});
   return { tables: finalTables, errors };
 }
+function getPrimaryDisplay(testValue) {
+  if (testValue instanceof Date) {
+    return testValue.toISOString();
+  }
+  if (Array.isArray(testValue) && testValue[0] && typeof testValue[0] !== "object") {
+    return testValue.join(", ");
+  }
+  if (typeof testValue === "object") {
+    return void 0;
+  }
+  return testValue;
+}
 var DOUBLE_SEPARATOR, ROW_ID_REGEX, ENCODED_SPACE, SQL_NUMBER_TYPE_MAP, SQL_DATE_TYPE_MAP, SQL_DATE_ONLY_TYPES, SQL_TIME_ONLY_TYPES, SQL_STRING_TYPE_MAP, SQL_BOOLEAN_TYPE_MAP, SQL_MISC_TYPE_MAP, SQL_TYPE_MAP;
 var init_utils14 = __esm({
   "src/integrations/utils.ts"() {
@@ -21404,8 +21270,7 @@ var init_postgres = __esm({
         try {
           await this.openConnection();
           const columnsResponse = await this.client.query(this.COLUMNS_SQL);
-          const names = columnsResponse.rows.map((row) => row.table_name);
-          return [...new Set(names)];
+          return columnsResponse.rows.map((row) => row.table_name);
         } finally {
           await this.closeConnection();
         }
@@ -22034,8 +21899,6 @@ var init_mongodb = __esm({
           response2.connected = true;
         } catch (e) {
           response2.error = e.message;
-        } finally {
-          await this.client.close();
         }
         return response2;
       }
@@ -22256,21 +22119,21 @@ var init_mongodb = __esm({
           const collection = db2.collection(query.extra.collection);
           let response2 = [];
           if (((_a = query.extra) == null ? void 0 : _a.actionType) === "pipeline") {
-            for await (const doc of collection.aggregate(
+            for await (const doc2 of collection.aggregate(
               query.steps.map(({ key, value }) => {
                 let temp = {};
                 temp[key] = JSON.parse(value.value);
                 return this.createObjectIds(temp);
               })
             )) {
-              response2.push(doc);
+              response2.push(doc2);
             }
           } else {
             const stages = query.json;
-            for await (const doc of collection.aggregate(
+            for await (const doc2 of collection.aggregate(
               stages ? this.createObjectIds(stages) : []
             )) {
-              response2.push(doc);
+              response2.push(doc2);
             }
           }
           return response2;
@@ -22581,9 +22444,9 @@ var init_couchdb = __esm({
         });
       }
       async delete(query) {
-        const doc = await this.query("get", "Cannot find doc to be deleted", query);
+        const doc2 = await this.query("get", "Cannot find doc to be deleted", query);
         return this.query("remove", "Error deleting couchDB document", {
-          json: doc
+          json: doc2
         });
       }
     };
@@ -22769,7 +22632,7 @@ var init_microsoftSqlServer = __esm({
           throw "Unable to get list of tables in database";
         }
         const schema = this.config.schema || DEFAULT_SCHEMA;
-        const tableNames = tableInfo.filter((record) => record.TABLE_SCHEMA === schema).map((record) => record.TABLE_NAME).filter((name) => this.MASTER_TABLES.indexOf(name) === -1);
+        const tableNames = tableInfo.filter((record) => record.TABLE_SCHEMA === schema).map((record) => record.TABLE_NAME).filter((name2) => this.MASTER_TABLES.indexOf(name2) === -1);
         const tables = {};
         for (let tableName of tableNames) {
           const definition26 = await this.runSQL(this.getDefinitionSQL(tableName));
@@ -22784,16 +22647,16 @@ var init_microsoftSqlServer = __esm({
           const requiredColumns = columns.filter((col) => col.IS_NULLABLE === "NO").map((col) => col.COLUMN_NAME);
           let schema2 = {};
           for (let def of definition26) {
-            const name = def.COLUMN_NAME;
-            if (typeof name !== "string") {
+            const name2 = def.COLUMN_NAME;
+            if (typeof name2 !== "string") {
               continue;
             }
             const hasDefault = def.COLUMN_DEFAULT;
-            const isAuto = !!autoColumns.find((col) => col === name);
-            const required = !!requiredColumns.find((col) => col === name);
-            schema2[name] = {
+            const isAuto = !!autoColumns.find((col) => col === name2);
+            const required = !!requiredColumns.find((col) => col === name2);
+            schema2[name2] = {
               autocolumn: isAuto,
-              name,
+              name: name2,
               constraints: {
                 presence: required && !isAuto && !hasDefault
               },
@@ -22815,7 +22678,7 @@ var init_microsoftSqlServer = __esm({
       async queryTableNames() {
         let tableInfo = await this.runSQL(this.TABLES_SQL);
         const schema = this.config.schema || DEFAULT_SCHEMA;
-        return tableInfo.filter((record) => record.TABLE_SCHEMA === schema).map((record) => record.TABLE_NAME).filter((name) => this.MASTER_TABLES.indexOf(name) === -1);
+        return tableInfo.filter((record) => record.TABLE_SCHEMA === schema).map((record) => record.TABLE_NAME).filter((name2) => this.MASTER_TABLES.indexOf(name2) === -1);
       }
       async getTableNames() {
         await this.connect();
@@ -23249,7 +23112,12 @@ function bindingTypeCoerce(bindings) {
     if (matches2 && matches2[0] !== "" && !isNaN(Number(matches2[0]))) {
       bindings[i] = parseFloat(binding);
     } else if (/^\d/.test(binding) && (0, import_dayjs.default)(binding).isValid() && !binding.includes(",")) {
-      bindings[i] = (0, import_dayjs.default)(binding).toDate();
+      let value;
+      value = new Date(binding);
+      if (isNaN(value)) {
+        value = binding;
+      }
+      bindings[i] = value;
     }
   }
   return bindings;
@@ -23962,16 +23830,6 @@ var init_rest = __esm({
 });
 
 // src/integrations/googlesheets.ts
-async function setupCreationAuth(datasouce) {
-  if (datasouce.continueSetupId) {
-    const appId = context_exports.getAppId();
-    const tokens = await cache_exports.get(
-      `datasource:creation:${appId}:google:${datasouce.continueSetupId}`
-    );
-    datasouce.auth = tokens.tokens;
-    delete datasouce.continueSetupId;
-  }
-}
 var import_google_auth_library, import_google_spreadsheet, import_node_fetch9, ALLOWED_TYPES, SCHEMA12, GoogleSheetsIntegration, googlesheets_default;
 var init_googlesheets = __esm({
   "src/integrations/googlesheets.ts"() {
@@ -24009,7 +23867,7 @@ var init_googlesheets = __esm({
       },
       datasource: {
         spreadsheetId: {
-          display: "Spreadsheet URL",
+          display: "Google Sheet URL",
           type: "string" /* STRING */,
           required: true
         }
@@ -24130,7 +23988,6 @@ var init_googlesheets = __esm({
       async connect() {
         var _a;
         try {
-          await setupCreationAuth(this.config);
           let googleConfig = await configs_exports.getGoogleDatasourceConfig();
           if (!googleConfig) {
             throw new HTTPError("Google config not found", 400);
@@ -24181,22 +24038,21 @@ var init_googlesheets = __esm({
         return table;
       }
       async buildSchema(datasourceId, entities) {
+        if (!this.config.auth) {
+          return;
+        }
         await this.connect();
         const sheets = this.client.sheetsByIndex;
         const tables = {};
-        await utils_exports5.parallelForeach(
-          sheets,
-          async (sheet) => {
-            await sheet.getRows({ limit: 0, offset: 0 });
-            const id = buildExternalTableId(datasourceId, sheet.title);
-            tables[sheet.title] = this.getTableSchema(
-              sheet.title,
-              sheet.headerValues,
-              id
-            );
-          },
-          10
-        );
+        for (let sheet of sheets) {
+          await sheet.getRows();
+          const id = buildExternalTableId(datasourceId, sheet.title);
+          tables[sheet.title] = this.getTableSchema(
+            sheet.title,
+            sheet.headerValues,
+            id
+          );
+        }
         const final = finaliseExternalTables(tables, entities);
         this.tables = final.tables;
         this.schemaErrors = final.errors;
@@ -24244,13 +24100,13 @@ var init_googlesheets = __esm({
         }
         return rowObject;
       }
-      async createTable(name) {
-        if (!name) {
+      async createTable(name2) {
+        if (!name2) {
           throw new Error("Must provide name for new sheet.");
         }
         try {
           await this.connect();
-          return await this.client.addSheet({ title: name, headerValues: [name] });
+          return await this.client.addSheet({ title: name2, headerValues: [name2] });
         } catch (err) {
           console.error("Error creating new table in google sheets", err);
           throw err;
@@ -24576,7 +24432,7 @@ var init_firebase = __esm({
             snapshot = await collectionRef.get();
           }
           const result = [];
-          snapshot.forEach((doc) => result.push(doc.data()));
+          snapshot.forEach((doc2) => result.push(doc2.data()));
           return result;
         } catch (err) {
           console.error("Error querying Firestore", err);
@@ -25238,13 +25094,13 @@ var init_oracle = __esm({
 });
 
 // src/integrations/index.ts
-async function getDefinition(source) {
-  const definition26 = DEFINITIONS2[source];
+async function getDefinition(source2) {
+  const definition26 = DEFINITIONS2[source2];
   if (definition26) {
     return definition26;
   }
   const allDefinitions = await getDefinitions();
-  return allDefinitions[source];
+  return allDefinitions[source2];
 }
 async function getDefinitions() {
   const pluginSchemas = {};
@@ -25580,10 +25436,10 @@ __export(webhook_exports2, {
 function isWebhookID(id) {
   return id.startsWith(db_exports.DocumentType.WEBHOOK);
 }
-function newDoc(name, type, target) {
+function newDoc(name2, type, target) {
   return {
     live: true,
-    name,
+    name: name2,
     action: {
       type,
       target
@@ -25601,12 +25457,12 @@ async function save7(webhook) {
   webhook._rev = response2.rev;
   return webhook;
 }
-async function destroy6(id, rev) {
+async function destroy6(id, rev2) {
   const db2 = context_exports.getAppDB();
   if (!id || !isWebhookID(id)) {
     throw new Error("Provided webhook ID is not valid.");
   }
-  return await db2.remove(id, rev);
+  return await db2.remove(id, rev2);
 }
 var init_webhook2 = __esm({
   "src/sdk/app/automations/webhook.ts"() {
@@ -25783,9 +25639,9 @@ async function syncUsersToApp(appId, users2, groups) {
       if (roleId === roles_exports.BUILTIN_ROLE_IDS.PUBLIC) {
         roleId = void 0;
       }
-      let metadata;
+      let metadata2;
       try {
-        metadata = await db2.get(metadataId);
+        metadata2 = await db2.get(metadataId);
       } catch (err) {
         if (err.status !== 404) {
           throw err;
@@ -25793,19 +25649,19 @@ async function syncUsersToApp(appId, users2, groups) {
         if (!roleId) {
           continue;
         } else if (!deletedUser) {
-          metadata = {
+          metadata2 = {
             tableId: InternalTables.USER_METADATA
           };
         }
       }
       if (deletedUser || !roleId) {
-        await db2.remove(metadata);
+        await db2.remove(metadata2);
         continue;
       }
       if (roleId) {
-        metadata.roleId = roleId;
+        metadata2.roleId = roleId;
       }
-      let combined = sdk_default.users.combineMetadataAndUser(ctxUser, metadata);
+      let combined = sdk_default.users.combineMetadataAndUser(ctxUser, metadata2);
       if (combined) {
         await db2.put(combined);
       }
@@ -25862,7 +25718,7 @@ async function syncApp(appId, opts) {
     try {
       const replOpts = replication.appReplicateOpts();
       if (opts == null ? void 0 : opts.automationOnly) {
-        replOpts.filter = (doc) => doc._id.startsWith(db_exports.DocumentType.AUTOMATION);
+        replOpts.filter = (doc2) => doc2._id.startsWith(db_exports.DocumentType.AUTOMATION);
       }
       await replication.replicate(replOpts);
     } catch (err) {
@@ -26089,9 +25945,9 @@ __export(utils_exports8, {
   rawUserMetadata: () => rawUserMetadata,
   syncGlobalUsers: () => syncGlobalUsers
 });
-function combineMetadataAndUser(user, metadata) {
+function combineMetadataAndUser(user, metadata2) {
   const metadataId = generateUserMetadataID2(user._id);
-  const found = Array.isArray(metadata) ? metadata.find((doc) => doc._id === metadataId) : metadata;
+  const found = Array.isArray(metadata2) ? metadata2.find((doc2) => doc2._id === metadataId) : metadata2;
   if (user.roleId == null || user.roleId === roles_exports.BUILTIN_ROLE_IDS.PUBLIC) {
     if (found == null ? void 0 : found._id) {
       return { ...found, _deleted: true };
@@ -26136,16 +25992,16 @@ async function syncGlobalUsers() {
     }
     const resp = await Promise.all([getGlobalUsers(), rawUserMetadata(db2)]);
     const users2 = resp[0];
-    const metadata = resp[1];
+    const metadata2 = resp[1];
     const toWrite = [];
     for (let user of users2) {
-      const combined = combineMetadataAndUser(user, metadata);
+      const combined = combineMetadataAndUser(user, metadata2);
       if (combined) {
         toWrite.push(combined);
       }
     }
     let foundEmails = [];
-    for (let data2 of metadata) {
+    for (let data2 of metadata2) {
       if (!data2._id) {
         continue;
       }
@@ -26274,17 +26130,17 @@ var init_client2 = __esm({
 // src/utilities/users.ts
 async function getFullUser(ctx, userId) {
   const global = await getGlobalUser(userId);
-  let metadata = {};
+  let metadata2 = {};
   delete global._id;
   delete global._rev;
   try {
     const db2 = context_exports.getAppDB();
-    metadata = await db2.get(userId);
+    metadata2 = await db2.get(userId);
   } catch (err) {
   }
-  delete metadata.csrfToken;
+  delete metadata2.csrfToken;
   return {
-    ...metadata,
+    ...metadata2,
     ...global,
     roleId: global.roleId || roles_exports.BUILTIN_ROLE_IDS.PUBLIC,
     tableId: InternalTables.USER_METADATA,
@@ -26303,10 +26159,10 @@ var init_users12 = __esm({
 // src/api/controllers/user.ts
 async function fetchMetadata(ctx) {
   const global = await getGlobalUsers();
-  const metadata = await sdk_default.users.rawUserMetadata();
+  const metadata2 = await sdk_default.users.rawUserMetadata();
   const users2 = [];
   for (let user of global) {
-    const info = metadata.find((meta) => meta._id.includes(user._id));
+    const info = metadata2.find((meta) => meta._id.includes(user._id));
     users2.push({
       ...user,
       ...info,
@@ -26321,11 +26177,11 @@ async function updateMetadata(ctx) {
   const db2 = context_exports.getAppDB();
   const user = ctx.request.body;
   delete user.roles;
-  const metadata = {
+  const metadata2 = {
     tableId: InternalTables.USER_METADATA,
     ...user
   };
-  ctx.body = await db2.put(metadata);
+  ctx.body = await db2.put(metadata2);
 }
 async function destroyMetadata(ctx) {
   const db2 = context_exports.getAppDB();
@@ -26623,16 +26479,16 @@ async function fetch16(type) {
     return plugins2;
   }
 }
-async function processUploaded(plugin, source) {
+async function processUploaded(plugin, source2) {
   var _a, _b;
-  const { metadata, directory } = await fileUpload(plugin);
-  plugin_exports.validate(metadata == null ? void 0 : metadata.schema);
-  if (!environment_default.SELF_HOSTED && ((_a = metadata == null ? void 0 : metadata.schema) == null ? void 0 : _a.type) !== "component" /* COMPONENT */) {
+  const { metadata: metadata2, directory: directory2 } = await fileUpload(plugin);
+  plugin_exports.validate(metadata2 == null ? void 0 : metadata2.schema);
+  if (!environment_default.SELF_HOSTED && ((_a = metadata2 == null ? void 0 : metadata2.schema) == null ? void 0 : _a.type) !== "component" /* COMPONENT */) {
     throw new Error("Only component plugins are supported outside of self-host");
   }
-  const doc = await sdk_exports.plugins.storePlugin(metadata, directory, source);
-  (_b = clientAppSocket) == null ? void 0 : _b.emit("plugin-update", { name: doc.name, hash: doc.hash });
-  return doc;
+  const doc2 = await sdk_exports.plugins.storePlugin(metadata2, directory2, source2);
+  (_b = clientAppSocket) == null ? void 0 : _b.emit("plugin-update", { name: doc2.name, hash: doc2.hash });
+  return doc2;
 }
 var init_plugins4 = __esm({
   "src/sdk/plugins/plugins.ts"() {
@@ -27052,22 +26908,22 @@ function threadSetup() {
   init8();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
-  const cache3 = await getClient2();
-  return cache3.get(makeVariableKey(queryId, variable));
+  const cache2 = await getClient2();
+  return cache2.get(makeVariableKey(queryId, variable));
 }
 async function invalidateDynamicVariables(cachedVars) {
-  const cache3 = await getClient2();
+  const cache2 = await getClient2();
   let promises = [];
   for (let variable of cachedVars) {
     promises.push(
-      cache3.delete(makeVariableKey(variable.queryId, variable.name))
+      cache2.delete(makeVariableKey(variable.queryId, variable.name))
     );
   }
   await Promise.all(promises);
 }
 async function storeDynamicVariable(queryId, variable, value) {
-  const cache3 = await getClient2();
-  await cache3.store(
+  const cache2 = await getClient2();
+  await cache2.store(
     makeVariableKey(queryId, variable),
     value,
     VARIABLE_TTL_SECONDS
@@ -27535,16 +27391,7 @@ async function checkResponse(response2, errorMsg, { ctx } = {}) {
   }
   return response2.json();
 }
-async function sendSmtpEmail({
-  to,
-  from,
-  subject,
-  contents,
-  cc,
-  bcc,
-  automation,
-  invite
-}) {
+async function sendSmtpEmail(to, from, subject, contents, cc, bcc, automation) {
   const response2 = await (0, import_node_fetch10.default)(
     checkSlashesInUrl2(environment_default.WORKER_URL + `/api/global/email/send`),
     request(void 0, {
@@ -27557,8 +27404,7 @@ async function sendSmtpEmail({
         cc,
         bcc,
         purpose: "custom",
-        automation,
-        invite
+        automation
       }
     })
   );
@@ -27606,35 +27452,6 @@ var definition7 = {
         contents: {
           type: "string" /* STRING */,
           title: "HTML Contents"
-        },
-        addInvite: {
-          type: "boolean" /* BOOLEAN */,
-          title: "Add calendar invite"
-        },
-        startTime: {
-          type: "date" /* DATE */,
-          title: "Start Time",
-          dependsOn: "addInvite"
-        },
-        endTime: {
-          type: "date" /* DATE */,
-          title: "End Time",
-          dependsOn: "addInvite"
-        },
-        summary: {
-          type: "string" /* STRING */,
-          title: "Meeting Summary",
-          dependsOn: "addInvite"
-        },
-        location: {
-          type: "string" /* STRING */,
-          title: "Location",
-          dependsOn: "addInvite"
-        },
-        url: {
-          type: "string" /* STRING */,
-          title: "URL",
-          dependsOn: "addInvite"
         }
       },
       required: ["to", "from", "subject", "contents"]
@@ -27655,41 +27472,21 @@ var definition7 = {
   }
 };
 async function run3({ inputs }) {
-  let {
-    to,
-    from,
-    subject,
-    contents,
-    cc,
-    bcc,
-    addInvite,
-    startTime,
-    endTime,
-    summary,
-    location,
-    url
-  } = inputs;
+  let { to, from, subject, contents, cc, bcc } = inputs;
   if (!contents) {
     contents = "<h1>No content</h1>";
   }
   to = to || void 0;
   try {
-    let response2 = await sendSmtpEmail({
+    let response2 = await sendSmtpEmail(
       to,
       from,
       subject,
       contents,
       cc,
       bcc,
-      automation: true,
-      invite: addInvite ? {
-        startTime,
-        endTime,
-        summary,
-        location,
-        url
-      } : void 0
-    });
+      true
+    );
     return {
       success: true,
       response: response2
@@ -27733,20 +27530,20 @@ async function createLinkView() {
   const db2 = context_exports.getAppDB();
   const designDoc = await db2.get("_design/database");
   const view2 = {
-    map: function(doc) {
-      if (doc.type === "link") {
-        let doc1 = doc.doc1;
-        let doc2 = doc.doc2;
+    map: function(doc2) {
+      if (doc2.type === "link") {
+        let doc1 = doc2.doc1;
+        let doc22 = doc2.doc2;
         emit([doc1.tableId, doc1.rowId], {
-          id: doc2.rowId,
+          id: doc22.rowId,
           thisId: doc1.rowId,
           fieldName: doc1.fieldName
         });
-        if (doc1.tableId !== doc2.tableId) {
-          emit([doc2.tableId, doc2.rowId], {
+        if (doc1.tableId !== doc22.tableId) {
+          emit([doc22.tableId, doc22.rowId], {
             id: doc1.rowId,
-            thisId: doc2.rowId,
-            fieldName: doc2.fieldName
+            thisId: doc22.rowId,
+            fieldName: doc22.fieldName
           });
         }
       }
@@ -28048,11 +27845,11 @@ var LinkController = class {
             );
           }
         }
-        let toDeleteDocs = thisFieldLinkDocs.filter((doc) => {
-          let correctDoc = doc.doc1.fieldName === fieldName ? doc.doc2 : doc.doc1;
+        let toDeleteDocs = thisFieldLinkDocs.filter((doc2) => {
+          let correctDoc = doc2.doc1.fieldName === fieldName ? doc2.doc2 : doc2.doc1;
           return rowField.indexOf(correctDoc.rowId) === -1;
-        }).map((doc) => {
-          return { ...doc, _deleted: true };
+        }).map((doc2) => {
+          return { ...doc2, _deleted: true };
         });
         operations.push(...toDeleteDocs);
         delete row[fieldName];
@@ -28073,9 +27870,9 @@ var LinkController = class {
     if (linkDocs.length === 0) {
       return null;
     }
-    const toDelete = linkDocs.map((doc) => {
+    const toDelete = linkDocs.map((doc2) => {
       return {
-        ...doc,
+        ...doc2,
         _deleted: true
       };
     });
@@ -28096,9 +27893,9 @@ var LinkController = class {
       return correctFieldName === fieldName;
     });
     await this._db.bulkDocs(
-      toDelete.map((doc) => {
+      toDelete.map((doc2) => {
         return {
-          ...doc,
+          ...doc2,
           _deleted: true
         };
       })
@@ -28196,9 +27993,9 @@ var LinkController = class {
     if (linkDocs.length === 0) {
       return null;
     }
-    const toDelete = linkDocs.map((doc) => {
+    const toDelete = linkDocs.map((doc2) => {
       return {
-        ...doc,
+        ...doc2,
         _deleted: true
       };
     });
@@ -28537,10 +28334,10 @@ async function cleanupAttachments(table, {
       return;
     }
   }
-  let files = [];
+  let files2 = [];
   function addFiles(row2, key) {
     if (row2[key]) {
-      files = files.concat(row2[key].map((attachment) => attachment.key));
+      files2 = files2.concat(row2[key].map((attachment) => attachment.key));
     }
   }
   const schemaToUse = oldTable ? oldTable.schema : table.schema;
@@ -28551,15 +28348,15 @@ async function cleanupAttachments(table, {
     if (rows2 && oldTable && !table.schema[key]) {
       rows2.forEach((row2) => addFiles(row2, key));
     } else if (oldRow && row) {
-      files = files.concat(getRemovedAttachmentKeys(oldRow, row, key));
+      files2 = files2.concat(getRemovedAttachmentKeys(oldRow, row, key));
     } else if (row) {
       addFiles(row, key);
     } else if (rows2) {
       rows2.forEach((row2) => addFiles(row2, key));
     }
   }
-  if (files.length > 0) {
-    await objectStore_exports2.deleteFiles(ObjectStoreBuckets2.APPS, files);
+  if (files2.length > 0) {
+    await objectStore_exports2.deleteFiles(ObjectStoreBuckets2.APPS, files2);
   }
 }
 
@@ -28734,7 +28531,7 @@ async function runView(view, calculation, group, data) {
         _rev: void 0
       }))
     );
-    let fn = (doc, emit2) => emit2(doc._id);
+    let fn = (doc2, emit2) => emit2(doc2._id);
     eval("fn = " + ((_a = view == null ? void 0 : view.map) == null ? void 0 : _a.replace("function (doc)", "function (doc, emit)")));
     const queryFns = {
       meta: view.meta,
@@ -29500,7 +29297,7 @@ function cleanupConfig(config, table) {
   const fieldNames = Object.entries(table.schema).filter((schema) => primaryOptions.find((val) => val === schema[1].type)).map(([fieldName]) => fieldName);
   const iterateObject = (obj) => {
     for (let [field, value] of Object.entries(obj)) {
-      if (fieldNames.find((name) => name === field) && isRowId(value)) {
+      if (fieldNames.find((name2) => name2 === field) && isRowId(value)) {
         obj[field] = convertRowId(value);
       }
     }
@@ -29699,7 +29496,10 @@ var ExternalRequest = class {
           }
         }
         relatedRow = processFormulas(linkedTable, relatedRow);
-        const relatedDisplay = display ? relatedRow[display] : void 0;
+        let relatedDisplay;
+        if (display) {
+          relatedDisplay = getPrimaryDisplay(relatedRow[display]);
+        }
         row[relationship.column][key] = {
           primaryDisplay: relatedDisplay || "Invalid display column",
           _id: relatedRow._id
@@ -30910,15 +30710,8 @@ init_constants6();
 init_integrations2();
 init_utils20();
 init_src2();
-init_src();
 init_sdk3();
 init_websockets();
-init_googlesheets();
-var preSaveAction = {
-  ["GOOGLE_SHEETS" /* GOOGLE_SHEETS */]: async (datasource2) => {
-    await setupCreationAuth(datasource2.config);
-  }
-};
 
 // src/api/controllers/query/validation.ts
 init_src2();
@@ -32213,7 +32006,7 @@ function rowEmission({
   appId,
   row,
   table,
-  metadata
+  metadata: metadata2
 }) {
   let event = {
     row,
@@ -32227,8 +32020,8 @@ function rowEmission({
   if (row == null ? void 0 : row._rev) {
     event.revision = row._rev;
   }
-  if (metadata) {
-    event.metadata = metadata;
+  if (metadata2) {
+    event.metadata = metadata2;
   }
   emitter2.emit(eventName, event);
 }
@@ -32237,7 +32030,7 @@ function tableEmission({
   eventName,
   appId,
   table,
-  metadata
+  metadata: metadata2
 }) {
   const tableId = table == null ? void 0 : table._id;
   const inputTable = table;
@@ -32253,8 +32046,8 @@ function tableEmission({
   if (table == null ? void 0 : table._rev) {
     event.revision = table._rev;
   }
-  if (metadata) {
-    event.metadata = metadata;
+  if (metadata2) {
+    event.metadata = metadata2;
   }
   emitter2.emit(eventName, event);
 }
@@ -32396,8 +32189,8 @@ var Orchestrator = class {
   constructor(job) {
     let automation = job.data.automation;
     let triggerOutput = job.data.event;
-    const metadata = triggerOutput.metadata;
-    this._chainCount = metadata ? metadata.automationChainCount : 0;
+    const metadata2 = triggerOutput.metadata;
+    this._chainCount = metadata2 ? metadata2.automationChainCount : 0;
     this._appId = triggerOutput.appId;
     this._job = job;
     const triggerStepId = automation.definition.trigger.stepId;
@@ -32427,16 +32220,16 @@ var Orchestrator = class {
   async getMetadata() {
     const metadataId = generateAutomationMetadataID(this._automation._id);
     const db2 = context_exports.getAppDB();
-    let metadata;
+    let metadata2;
     try {
-      metadata = await db2.get(metadataId);
+      metadata2 = await db2.get(metadataId);
     } catch (err) {
-      metadata = {
+      metadata2 = {
         _id: metadataId,
         errorCount: 0
       };
     }
-    return metadata;
+    return metadata2;
   }
   async stopCron(reason) {
     if (!this._job.opts.repeat) {
@@ -32459,34 +32252,34 @@ var Orchestrator = class {
     );
     await storeLog2(automation, this.executionOutput);
   }
-  async checkIfShouldStop(metadata) {
-    if (!metadata.errorCount || !this._job.opts.repeat) {
+  async checkIfShouldStop(metadata2) {
+    if (!metadata2.errorCount || !this._job.opts.repeat) {
       return false;
     }
-    if (metadata.errorCount >= MAX_AUTOMATION_RECURRING_ERRORS) {
+    if (metadata2.errorCount >= MAX_AUTOMATION_RECURRING_ERRORS) {
       await this.stopCron("errors");
       return true;
     }
     return false;
   }
-  async updateMetadata(metadata) {
+  async updateMetadata(metadata2) {
     const output = this.executionOutput, automation = this._automation;
     if (!output || !isRecurring(automation)) {
       return;
     }
-    const count = metadata.errorCount;
+    const count = metadata2.errorCount;
     const isError = isErrorInOutput(output);
     if (!count && !isError) {
       return;
     }
     if (isError) {
-      metadata.errorCount = count ? count + 1 : 1;
+      metadata2.errorCount = count ? count + 1 : 1;
     } else {
-      metadata.errorCount = 0;
+      metadata2.errorCount = 0;
     }
     const db2 = context_exports.getAppDB();
     try {
-      await db2.put(metadata);
+      await db2.put(metadata2);
     } catch (err) {
       logging_exports.logAlertWithInfo(
         "Failed to write automation metadata",
@@ -32537,13 +32330,13 @@ var Orchestrator = class {
     let stepCount = 0;
     let loopStepNumber = void 0;
     let loopSteps = [];
-    let metadata;
+    let metadata2;
     let timeoutFlag = false;
     let wasLoopStep = false;
     let timeout2 = this._job.data.event.timeout;
     if (isProdAppID2(this._appId) && isRecurring(automation)) {
-      metadata = await this.getMetadata();
-      const shouldStop = await this.checkIfShouldStop(metadata);
+      metadata2 = await this.getMetadata();
+      const shouldStop = await this.checkIfShouldStop(metadata2);
       if (shouldStop) {
         return;
       }
@@ -32747,8 +32540,8 @@ var Orchestrator = class {
       }
       logging_exports.logAlert("Error writing automation log", e);
     }
-    if (isProdAppID2(this._appId) && isRecurring(automation) && metadata) {
-      await this.updateMetadata(metadata);
+    if (isProdAppID2(this._appId) && isRecurring(automation) && metadata2) {
+      await this.updateMetadata(metadata2);
     }
     return this.executionOutput;
   }