@budibase/server 2.1.39 → 2.1.40-alpha.0

package/dist/utilities/budibaseDir.js

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

package/dist/utilities/centralPath.js

@@ -1,5 +1,10 @@
 "use strict";
-const path = require("path");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolve = exports.join = void 0;
+const path_1 = __importDefault(require("path"));
 // this simply runs all of our path join and resolve functions through
 // a central location incase we need to add some protection to file paths
 /**
@@ -7,14 +12,16 @@ const path = require("path");
  * @param args Any number of string arguments to add to a path
  * @returns {string} The final path ready to use
  */
-exports.join = function (...args) {
-    return path.join(...args);
-};
+function join(...args) {
+    return path_1.default.join(...args);
+}
+exports.join = join;
 /**
  * Exactly the same as path.resolve
  * @param args Any number of string arguments to add to a path
  * @returns {string} The final path ready to use
  */
-exports.resolve = function (...args) {
-    return path.resolve(...args);
-};
+function resolve(...args) {
+    return path_1.default.resolve(...args);
+}
+exports.resolve = resolve;

package/dist/utilities/csvParser.js

@@ -8,20 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const csv = require("csvtojson");
-const { FieldTypes } = require("../constants");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transform = exports.updateSchema = exports.parse = void 0;
+const csvtojson_1 = __importDefault(require("csvtojson"));
+const constants_1 = require("../constants");
 const VALIDATORS = {
-    [FieldTypes.STRING]: () => true,
-    [FieldTypes.OPTIONS]: () => true,
-    [FieldTypes.BARCODEQR]: () => true,
-    [FieldTypes.NUMBER]: attribute => {
+    [constants_1.FieldTypes.STRING]: () => true,
+    [constants_1.FieldTypes.OPTIONS]: () => true,
+    [constants_1.FieldTypes.BARCODEQR]: () => true,
+    [constants_1.FieldTypes.NUMBER]: (attribute) => {
         // allow not to be present
         if (!attribute) {
             return true;
         }
         return !isNaN(Number(attribute));
     },
-    [FieldTypes.DATETIME]: attribute => {
+    [constants_1.FieldTypes.DATETIME]: (attribute) => {
         // allow not to be present
         if (!attribute) {
             return true;
@@ -30,13 +35,13 @@ const VALIDATORS = {
     },
 };
 const PARSERS = {
-    [FieldTypes.NUMBER]: attribute => {
+    [constants_1.FieldTypes.NUMBER]: (attribute) => {
         if (!attribute) {
             return attribute;
         }
         return Number(attribute);
     },
-    [FieldTypes.DATETIME]: attribute => {
+    [constants_1.FieldTypes.DATETIME]: (attribute) => {
         if (!attribute) {
             return attribute;
         }
@@ -44,7 +49,7 @@ const PARSERS = {
     },
 };
 function parse(csvString, parsers) {
-    const result = csv().fromString(csvString);
+    const result = (0, csvtojson_1.default)().fromString(csvString);
     const schema = {};
     return new Promise((resolve, reject) => {
         result.on("header", headers => {
@@ -80,14 +85,15 @@ function parse(csvString, parsers) {
         });
     });
 }
-function updateSchema({ schema, existingTable }) {
+exports.parse = parse;
+function updateSchema({ schema, existingTable, }) {
     if (!schema) {
         return schema;
     }
     const finalSchema = {};
     const schemaKeyMap = {};
     Object.keys(schema).forEach(key => (schemaKeyMap[key.toLowerCase()] = key));
-    for (let [key, field] of Object.entries(existingTable.schema)) {
+    for (let [key, field] of Object.entries((existingTable === null || existingTable === void 0 ? void 0 : existingTable.schema) || {})) {
         const lcKey = key.toLowerCase();
         const foundKey = schemaKeyMap[lcKey];
         if (foundKey) {
@@ -97,23 +103,27 @@ function updateSchema({ schema, existingTable }) {
     }
     return finalSchema;
 }
-function transform({ schema, csvString, existingTable }) {
+exports.updateSchema = updateSchema;
+function transform({ schema, csvString, existingTable, }) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (!schema || !csvString) {
+            throw new Error("Unable to transform CSV without schema");
+        }
         const colParser = {};
         // make sure the table has all the columns required for import
         if (existingTable) {
             schema = updateSchema({ schema, existingTable });
         }
-        for (let [key, field] of Object.entries(schema)) {
+        for (let [key, field] of Object.entries(schema || {})) {
             // don't import data to auto columns
             if (!field.autocolumn) {
                 colParser[key] = PARSERS[field.type] || field.type;
             }
         }
         try {
-            const data = yield csv({ colParser }).fromString(csvString);
+            const data = yield (0, csvtojson_1.default)({ colParser }).fromString(csvString);
             const schemaKeyMap = {};
-            Object.keys(schema).forEach(key => (schemaKeyMap[key.toLowerCase()] = key));
+            Object.keys(schema || {}).forEach(key => (schemaKeyMap[key.toLowerCase()] = key));
             for (let element of data) {
                 if (!data) {
                     continue;
@@ -139,8 +149,4 @@ function transform({ schema, csvString, existingTable }) {
         }
     });
 }
-module.exports = {
-    parse,
-    transform,
-    updateSchema,
-};
+exports.transform = transform;

package/dist/utilities/fileSystem/clientLibrary.js

@@ -8,13 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { join } = require("path");
-const { ObjectStoreBuckets } = require("../../constants");
-const fs = require("fs");
-const { upload, retrieveToTmp, streamUpload } = require("./utilities");
-const { resolve } = require("../centralPath");
-const env = require("../../environment");
-const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.revertClientLibrary = exports.updateClientLibrary = exports.backupClientLibrary = void 0;
+const path_1 = require("path");
+const constants_1 = require("../../constants");
+const fs_1 = __importDefault(require("fs"));
+const backend_core_1 = require("@budibase/backend-core");
+const centralPath_1 = require("../centralPath");
+const environment_1 = __importDefault(require("../../environment"));
+const TOP_LEVEL_PATH = (0, path_1.join)(__dirname, "..", "..", "..");
 /**
  * Client library paths in the object store:
  * Previously, the entire client library package was downloaded from NPM
@@ -41,84 +46,93 @@ const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
  * @param appId The app ID to backup
  * @returns {Promise<void>}
  */
-exports.backupClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    // Copy existing manifest to tmp
-    let tmpManifestPath;
-    try {
-        // Try to load the manifest from the new file location
-        tmpManifestPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "manifest.json"));
-    }
-    catch (error) {
-        // Fallback to loading it from the old location for old apps
-        tmpManifestPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "node_modules", "budibase", "standard-components", "package", "manifest.json"));
-    }
-    // Copy existing client lib to tmp
-    const tmpClientPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js"));
-    // Upload manifest and client library as backups
-    const manifestUpload = upload({
-        bucket: ObjectStoreBuckets.APPS,
-        filename: join(appId, "manifest.json.bak"),
-        path: tmpManifestPath,
-        type: "application/json",
-    });
-    const clientUpload = upload({
-        bucket: ObjectStoreBuckets.APPS,
-        filename: join(appId, "budibase-client.js.bak"),
-        path: tmpClientPath,
-        type: "application/javascript",
+function backupClientLibrary(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Copy existing manifest to tmp
+        let tmpManifestPath;
+        try {
+            // Try to load the manifest from the new file location
+            tmpManifestPath = yield backend_core_1.objectStore.retrieveToTmp(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "manifest.json"));
+        }
+        catch (error) {
+            // Fallback to loading it from the old location for old apps
+            tmpManifestPath = yield backend_core_1.objectStore.retrieveToTmp(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "node_modules", "budibase", "standard-components", "package", "manifest.json"));
+        }
+        // Copy existing client lib to tmp
+        const tmpClientPath = yield backend_core_1.objectStore.retrieveToTmp(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "budibase-client.js"));
+        // Upload manifest and client library as backups
+        const manifestUpload = backend_core_1.objectStore.upload({
+            bucket: constants_1.ObjectStoreBuckets.APPS,
+            filename: (0, path_1.join)(appId, "manifest.json.bak"),
+            path: tmpManifestPath,
+            type: "application/json",
+        });
+        const clientUpload = backend_core_1.objectStore.upload({
+            bucket: constants_1.ObjectStoreBuckets.APPS,
+            filename: (0, path_1.join)(appId, "budibase-client.js.bak"),
+            path: tmpClientPath,
+            type: "application/javascript",
+        });
+        yield Promise.all([manifestUpload, clientUpload]);
     });
-    yield Promise.all([manifestUpload, clientUpload]);
-});
+}
+exports.backupClientLibrary = backupClientLibrary;
 /**
  * Uploads the latest version of the component manifest and the client library
  * to the object store, overwriting the existing version.
  * @param appId The app ID to update
  * @returns {Promise<void>}
  */
-exports.updateClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    let manifest, client;
-    if (env.isDev()) {
-        // Load the symlinked version in dev which is always the newest
-        manifest = require.resolve("@budibase/client/manifest.json");
-        client = require.resolve("@budibase/client");
-    }
-    else {
-        // Load the bundled version in prod
-        manifest = resolve(TOP_LEVEL_PATH, "client", "manifest.json");
-        client = resolve(TOP_LEVEL_PATH, "client", "budibase-client.js");
-    }
-    // Upload latest manifest and client library
-    const manifestUpload = streamUpload(ObjectStoreBuckets.APPS, join(appId, "manifest.json"), fs.createReadStream(manifest), {
-        ContentType: "application/json",
+function updateClientLibrary(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let manifest, client;
+        if (environment_1.default.isDev()) {
+            // Load the symlinked version in dev which is always the newest
+            manifest = require.resolve("@budibase/client/manifest.json");
+            client = require.resolve("@budibase/client");
+        }
+        else {
+            // Load the bundled version in prod
+            manifest = (0, centralPath_1.resolve)(TOP_LEVEL_PATH, "client", "manifest.json");
+            client = (0, centralPath_1.resolve)(TOP_LEVEL_PATH, "client", "budibase-client.js");
+        }
+        // Upload latest manifest and client library
+        const manifestUpload = backend_core_1.objectStore.streamUpload(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "manifest.json"), fs_1.default.createReadStream(manifest), {
+            ContentType: "application/json",
+        });
+        const clientUpload = backend_core_1.objectStore.streamUpload(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "budibase-client.js"), fs_1.default.createReadStream(client), {
+            ContentType: "application/javascript",
+        });
+        yield Promise.all([manifestUpload, clientUpload]);
     });
-    const clientUpload = streamUpload(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js"), fs.createReadStream(client), {
-        ContentType: "application/javascript",
-    });
-    yield Promise.all([manifestUpload, clientUpload]);
-});
+}
+exports.updateClientLibrary = updateClientLibrary;
 /**
  * Reverts the version of the client library and manifest to the previously
  * used version for an app.
  * @param appId The app ID to revert
  * @returns {Promise<void>}
  */
-exports.revertClientLibrary = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    // Copy backups manifest to tmp directory
-    const tmpManifestPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "manifest.json.bak"));
-    // Copy backup client lib to tmp
-    const tmpClientPath = yield retrieveToTmp(ObjectStoreBuckets.APPS, join(appId, "budibase-client.js.bak"));
-    // Upload backups as new versions
-    const manifestUpload = upload({
-        bucket: ObjectStoreBuckets.APPS,
-        filename: join(appId, "manifest.json"),
-        path: tmpManifestPath,
-        type: "application/json",
-    });
-    const clientUpload = upload({
-        bucket: ObjectStoreBuckets.APPS,
-        filename: join(appId, "budibase-client.js"),
-        path: tmpClientPath,
-        type: "application/javascript",
+function revertClientLibrary(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Copy backups manifest to tmp directory
+        const tmpManifestPath = yield backend_core_1.objectStore.retrieveToTmp(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "manifest.json.bak"));
+        // Copy backup client lib to tmp
+        const tmpClientPath = yield backend_core_1.objectStore.retrieveToTmp(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appId, "budibase-client.js.bak"));
+        // Upload backups as new versions
+        const manifestUpload = backend_core_1.objectStore.upload({
+            bucket: constants_1.ObjectStoreBuckets.APPS,
+            filename: (0, path_1.join)(appId, "manifest.json"),
+            path: tmpManifestPath,
+            type: "application/json",
+        });
+        const clientUpload = backend_core_1.objectStore.upload({
+            bucket: constants_1.ObjectStoreBuckets.APPS,
+            filename: (0, path_1.join)(appId, "budibase-client.js"),
+            path: tmpClientPath,
+            type: "application/javascript",
+        });
+        yield Promise.all([manifestUpload, clientUpload]);
     });
-    yield Promise.all([manifestUpload, clientUpload]);
-});
+}
+exports.revertClientLibrary = revertClientLibrary;