@budibase/server 2.2.12-alpha.4 → 2.2.12-alpha.40

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

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroy = exports.executeV2 = exports.executeV1 = exports.preview = exports.find = exports.save = exports.import = exports.fetch = void 0;
 const utils_1 = require("../../../db/utils");
@@ -16,11 +19,11 @@ const threads_1 = require("../../../threads");
 const datasource_1 = require("../datasource");
 const import_1 = require("./import");
 const utils_2 = require("../../../threads/utils");
-const environment_1 = require("../../../environment");
+const environment_1 = __importDefault(require("../../../environment"));
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
 const Runner = new threads_1.Thread(threads_1.ThreadType.QUERY, {
-    timeoutMs: environment_1.QUERY_THREAD_TIMEOUT || 10000,
+    timeoutMs: environment_1.default.QUERY_THREAD_TIMEOUT || 10000,
 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {

package/dist/api/controllers/row/ExternalRequest.js

@@ -562,6 +562,7 @@ class ExternalRequest {
         return fields;
     }
     run(config) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { operation, tableId } = this;
             let { datasourceId, tableName } = (0, utils_3.breakExternalTableId)(tableId);
@@ -583,6 +584,12 @@ class ExternalRequest {
             }
             // look for specific components of config which may not be considered acceptable
             let { id, row, filters, sort, paginate, rows } = cleanupConfig(config, table);
+            //if the sort column is a formula, remove it
+            for (let sortColumn of Object.keys(sort || {})) {
+                if (((_a = table.schema[sortColumn]) === null || _a === void 0 ? void 0 : _a.type) === "formula") {
+                    sort === null || sort === void 0 ? true : delete sort[sortColumn];
+                }
+            }
             filters = buildFilters(id, filters || {}, table);
             const relationships = this.buildRelationships(table);
             // clean up row on ingress using schema

package/dist/api/controllers/row/internal.js

@@ -61,7 +61,7 @@ const utils_2 = require("../view/utils");
 const fp_1 = require("lodash/fp");
 const backend_core_1 = require("@budibase/backend-core");
 const staticFormula_1 = require("./staticFormula");
-const exporters = __importStar(require("../view/exporters"));
+const exporters_1 = require("../view/exporters");
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const CALCULATION_TYPES = {
     SUM: "sum",
@@ -418,13 +418,17 @@ function exportRows(ctx) {
         else {
             rows = result;
         }
-        let headers = Object.keys(rows[0]);
-        // @ts-ignore
-        const exporter = exporters[format];
-        const filename = `export.${format}`;
-        // send down the file
-        ctx.attachment(filename);
-        return (0, fileSystem_1.apiFileReturn)(exporter(headers, rows));
+        if (format === exporters_1.Format.CSV) {
+            ctx.attachment("export.csv");
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(rows[0]), rows));
+        }
+        else if (format === exporters_1.Format.JSON) {
+            ctx.attachment("export.json");
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(rows));
+        }
+        else {
+            throw "Format not recognised";
+        }
     });
 }
 exports.exportRows = exportRows;

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

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
 require("svelte/register");
@@ -17,7 +20,7 @@ const uuid = require("uuid");
 const constants_1 = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
-const env = require("../../../environment");
+const environment_1 = __importDefault(require("../../../environment"));
 const { DocumentType } = require("../../../db/utils");
 const { context, objectStore, utils } = require("@budibase/backend-core");
 const AWS = require("aws-sdk");
@@ -101,13 +104,13 @@ const serveApp = function (ctx) {
         const db = context.getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentType.APP_METADATA);
         let appId = context.getAppId();
-        if (!env.isJest()) {
+        if (!environment_1.default.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
             const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins);
             const { head, html, css } = App.render({
                 metaImage: "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
                 title: appInfo.name,
-                production: env.isProd(),
+                production: environment_1.default.isProd(),
                 appId,
                 clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
                 usedPlugins: plugins,
@@ -131,7 +134,7 @@ const serveBuilderPreview = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = context.getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentType.APP_METADATA);
-        if (!env.isJest()) {
+        if (!environment_1.default.isJest()) {
             let appId = context.getAppId();
             const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
             ctx.body = yield processString(previewHbs, {

package/dist/api/controllers/static/templates/BudibaseApp.svelte

@@ -2,7 +2,6 @@
   export let title = ""
   export let favicon = ""
   export let metaImage = ""
-  export let url = ""
 
   export let clientLibPath
   export let usedPlugins

package/dist/api/controllers/table/external.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,9 +17,9 @@ const utils_1 = require("../../../integrations/utils");
 const utils_2 = require("./utils");
 const constants_1 = require("../../../constants");
 const query_1 = require("../../../integrations/base/query");
-const csvParser = __importStar(require("../../../utilities/csvParser"));
 const external_1 = require("../row/external");
 const backend_core_1 = require("@budibase/backend-core");
+const schema_1 = require("../../../utilities/schema");
 const types_1 = require("@budibase/types");
 const sdk_1 = __importDefault(require("../../../sdk"));
 const { cloneDeep } = require("lodash/fp");
@@ -176,7 +153,7 @@ function save(ctx) {
         const table = ctx.request.body;
         const renamed = table === null || table === void 0 ? void 0 : table._rename;
         // can't do this right now
-        delete table.dataImport;
+        delete table.rows;
         const datasourceId = getDatasourceId(ctx.request.body);
         // table doesn't exist already, note that it is created
         if (!table._id) {
@@ -279,15 +256,16 @@ exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
-        const { dataImport } = ctx.request.body;
-        if (!dataImport || !dataImport.schema || !dataImport.csvString) {
+        const { rows } = ctx.request.body;
+        const schema = table.schema;
+        if (!rows || !(0, schema_1.isRows)(rows) || !(0, schema_1.isSchema)(schema)) {
             ctx.throw(400, "Provided data import information is invalid.");
         }
-        const rows = yield csvParser.transform(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
+        const parsedRows = yield (0, schema_1.parse)(rows, schema);
         yield (0, external_1.handleRequest)(types_1.Operation.BULK_CREATE, table._id, {
-            rows,
+            rows: parsedRows,
         });
-        yield backend_core_1.events.rows.imported(table, "csv", rows.length);
+        yield backend_core_1.events.rows.imported(table, parsedRows.length);
         return table;
     });
 }

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

@@ -35,14 +35,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateCSVSchema = exports.bulkImport = exports.destroy = exports.save = exports.find = exports.fetch = void 0;
+exports.validateExistingTableImport = exports.validateNewTableImport = exports.csvToJson = exports.bulkImport = exports.destroy = exports.save = exports.find = exports.fetch = void 0;
 const internal = __importStar(require("./internal"));
 const external = __importStar(require("./external"));
-const csvParser = __importStar(require("../../../utilities/csvParser"));
+const schema_1 = require("../../../utilities/schema");
 const utils_1 = require("../../../integrations/utils");
 const utils_2 = require("../../../db/utils");
 const backend_core_1 = require("@budibase/backend-core");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const csvtojson_1 = __importDefault(require("csvtojson"));
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -87,7 +88,7 @@ function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const table = ctx.request.body;
-        const importFormat = table.dataImport && table.dataImport.csvString ? "csv" : undefined;
+        const isImport = table.rows;
         const savedTable = yield pickApi({ table }).save(ctx);
         if (!table._id) {
             yield backend_core_1.events.table.created(savedTable);
@@ -95,8 +96,8 @@ function save(ctx) {
         else {
             yield backend_core_1.events.table.updated(savedTable);
         }
-        if (importFormat) {
-            yield backend_core_1.events.table.imported(savedTable, importFormat);
+        if (isImport) {
+            yield backend_core_1.events.table.imported(savedTable);
         }
         ctx.status = 200;
         ctx.message = `Table ${table.name} saved successfully.`;
@@ -132,19 +133,47 @@ function bulkImport(ctx) {
     });
 }
 exports.bulkImport = bulkImport;
-function validateCSVSchema(ctx) {
+function csvToJson(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        // tableId being specified means its an import to an existing table
-        const { csvString, schema = {}, tableId } = ctx.request.body;
-        let existingTable;
+        const { csvString } = ctx.request.body;
+        const result = yield (0, csvtojson_1.default)().fromString(csvString);
+        ctx.status = 200;
+        ctx.body = result;
+    });
+}
+exports.csvToJson = csvToJson;
+function validateNewTableImport(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { rows, schema } = ctx.request.body;
+        if ((0, schema_1.isRows)(rows) && (0, schema_1.isSchema)(schema)) {
+            ctx.status = 200;
+            ctx.body = (0, schema_1.validate)(rows, schema);
+        }
+        else {
+            ctx.status = 422;
+        }
+    });
+}
+exports.validateNewTableImport = validateNewTableImport;
+function validateExistingTableImport(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { rows, tableId } = ctx.request.body;
+        let schema = null;
         if (tableId) {
-            existingTable = yield sdk_1.default.tables.getTable(tableId);
+            const table = yield sdk_1.default.tables.getTable(tableId);
+            schema = table.schema;
         }
-        let result = yield csvParser.parse(csvString, schema);
-        if (existingTable) {
-            result = csvParser.updateSchema({ schema: result, existingTable });
+        else {
+            ctx.status = 422;
+            return;
+        }
+        if (tableId && (0, schema_1.isRows)(rows) && (0, schema_1.isSchema)(schema)) {
+            ctx.status = 200;
+            ctx.body = (0, schema_1.validate)(rows, schema);
+        }
+        else {
+            ctx.status = 422;
         }
-        ctx.body = { schema: result };
     });
 }
-exports.validateCSVSchema = validateCSVSchema;
+exports.validateExistingTableImport = validateExistingTableImport;

package/dist/api/controllers/table/internal.js

@@ -29,13 +29,12 @@ const utils_1 = require("../../../db/utils");
 const constants_1 = require("../../../constants");
 const utils_2 = require("./utils");
 const backend_core_1 = require("@budibase/backend-core");
-const environment_1 = require("../../../environment");
+const environment_1 = __importDefault(require("../../../environment"));
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const bulkFormula_1 = require("./bulkFormula");
 const pro_1 = require("@budibase/pro");
 const lodash_1 = require("lodash");
 const fp_1 = require("lodash/fp");
-const environment_2 = __importDefault(require("../../../environment"));
 const sdk_1 = __importDefault(require("../../../sdk"));
 function checkAutoColumns(table, oldTable) {
     if (!table.schema) {
@@ -58,7 +57,7 @@ function checkAutoColumns(table, oldTable) {
 function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
-        const _a = ctx.request.body, { dataImport } = _a, rest = __rest(_a, ["dataImport"]);
+        const _a = ctx.request.body, { rows } = _a, rest = __rest(_a, ["rows"]);
         let tableToSave = Object.assign({ type: "table", _id: (0, utils_1.generateTableID)(), views: {} }, rest);
         // if the table obj had an _id then it will have been retrieved
         let oldTable;
@@ -76,7 +75,7 @@ function save(ctx) {
         const tableSaveFunctions = new utils_2.TableSaveFunctions({
             user: ctx.user,
             oldTable,
-            dataImport,
+            importRows: rows,
         });
         tableToSave = yield tableSaveFunctions.before(tableToSave);
         // make sure that types don't change of a column, have to remove
@@ -166,7 +165,7 @@ function destroy(ctx) {
         // don't remove the table itself until very end
         yield db.remove(tableToDelete._id, tableToDelete._rev);
         // remove table search index
-        if (!(0, environment_1.isTest)() || environment_2.default.COUCH_DB_URL) {
+        if (!environment_1.default.isTest() || environment_1.default.COUCH_DB_URL) {
             const currentIndexes = yield db.getIndexes();
             const existingIndex = currentIndexes.indexes.find((existing) => existing.name === `search:${ctx.params.tableId}`);
             if (existingIndex) {
@@ -187,8 +186,8 @@ exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
-        const { dataImport } = ctx.request.body;
-        yield (0, utils_2.handleDataImport)(ctx.user, table, dataImport);
+        const { rows } = ctx.request.body;
+        yield (0, utils_2.handleDataImport)(ctx.user, table, rows);
         return table;
     });
 }

package/dist/api/controllers/table/utils.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.importToRows = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
-const csvParser_1 = require("../../../utilities/csvParser");
+const schema_1 = require("../../../utilities/schema");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
 const constants_1 = require("../../../constants");
@@ -124,19 +124,19 @@ function importToRows(data, table, user = {}) {
     return finalData;
 }
 exports.importToRows = importToRows;
-function handleDataImport(user, table, dataImport) {
+function handleDataImport(user, table, rows) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!dataImport || !dataImport.csvString) {
+        const schema = table.schema;
+        if (!rows || !(0, schema_1.isRows)(rows) || !(0, schema_1.isSchema)(schema)) {
             return table;
         }
         const db = backend_core_1.context.getAppDB();
-        // Populate the table with rows imported from CSV in a bulk update
-        const data = yield (0, csvParser_1.transform)(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
+        const data = (0, schema_1.parse)(rows, schema);
         let finalData = importToRows(data, table, user);
         yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
             tableId: table._id,
         });
-        yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
+        yield backend_core_1.events.rows.imported(table, finalData.length);
         return table;
     });
 }
@@ -195,11 +195,11 @@ function checkStaticTables(table) {
 }
 exports.checkStaticTables = checkStaticTables;
 class TableSaveFunctions {
-    constructor({ user, oldTable, dataImport }) {
+    constructor({ user, oldTable, importRows }) {
         this.db = backend_core_1.context.getAppDB();
         this.user = user;
         this.oldTable = oldTable;
-        this.dataImport = dataImport;
+        this.importRows = importRows;
         // any rows that need updated
         this.rows = [];
     }
@@ -225,7 +225,7 @@ class TableSaveFunctions {
     after(table) {
         return __awaiter(this, void 0, void 0, function* () {
             table = yield handleSearchIndexes(table);
-            table = yield handleDataImport(this.user, table, this.dataImport);
+            table = yield handleDataImport(this.user, table, this.importRows);
             return table;
         });
     }

package/dist/api/controllers/user.js

@@ -20,11 +20,13 @@ const users_1 = require("../../utilities/users");
 const backend_core_1 = require("@budibase/backend-core");
 const sdk_1 = __importDefault(require("../../sdk"));
 function syncUser(ctx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         let deleting = false, user;
         const userId = ctx.params.id;
+        const previousUser = (_a = ctx.request.body) === null || _a === void 0 ? void 0 : _a.previousUser;
         try {
-            user = yield (0, global_1.getRawGlobalUser)(userId);
+            user = (yield (0, global_1.getRawGlobalUser)(userId));
         }
         catch (err) {
             if (err && err.status === 404) {
@@ -35,6 +37,9 @@ function syncUser(ctx) {
                 throw err;
             }
         }
+        let previousApps = previousUser
+            ? Object.keys(previousUser.roles).map(appId => appId)
+            : [];
         const roles = deleting ? {} : user.roles;
         // remove props which aren't useful to metadata
         delete user.password;
@@ -51,8 +56,9 @@ function syncUser(ctx) {
                 .filter(entry => entry[1] !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC)
                 .map(([appId]) => appId);
         }
-        for (let prodAppId of prodAppIds) {
+        for (let prodAppId of new Set([...prodAppIds, ...previousApps])) {
             const roleId = roles[prodAppId];
+            const deleteFromApp = !roleId;
             const devAppId = backend_core_1.db.getDevelopmentAppID(prodAppId);
             for (let appId of [prodAppId, devAppId]) {
                 if (!(yield backend_core_1.db.dbExists(appId))) {
@@ -66,20 +72,22 @@ function syncUser(ctx) {
                         metadata = yield db.get(metadataId);
                     }
                     catch (err) {
-                        if (deleting) {
+                        if (deleteFromApp) {
                             return;
                         }
                         metadata = {
                             tableId: utils_2.InternalTables.USER_METADATA,
                         };
                     }
+                    if (deleteFromApp) {
+                        yield db.remove(metadata);
+                        return;
+                    }
                     // assign the roleId for the metadata doc
                     if (roleId) {
                         metadata.roleId = roleId;
                     }
-                    let combined = !deleting
-                        ? sdk_1.default.users.combineMetadataAndUser(user, metadata)
-                        : Object.assign(Object.assign({}, metadata), { status: backend_core_1.constants.UserStatus.INACTIVE, metadata: backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC });
+                    let combined = sdk_1.default.users.combineMetadataAndUser(user, metadata);
                     // if its null then there was no updates required
                     if (combined) {
                         yield db.put(combined);

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportFormats = exports.json = exports.csv = void 0;
+exports.isFormat = exports.Format = exports.jsonWithSchema = exports.json = exports.csv = void 0;
 function csv(headers, rows) {
     let csv = headers.map(key => `"${key}"`).join(",");
     for (let row of rows) {
@@ -18,11 +18,27 @@ function csv(headers, rows) {
     return csv;
 }
 exports.csv = csv;
-function json(headers, rows) {
+function json(rows) {
     return JSON.stringify(rows, undefined, 2);
 }
 exports.json = json;
-exports.ExportFormats = {
-    CSV: "csv",
-    JSON: "json",
-};
+function jsonWithSchema(schema, rows) {
+    const newSchema = {};
+    Object.values(schema).forEach(column => {
+        if (!column.autocolumn) {
+            newSchema[column.name] = column;
+        }
+    });
+    return JSON.stringify({ schema: newSchema, rows }, undefined, 2);
+}
+exports.jsonWithSchema = jsonWithSchema;
+var Format;
+(function (Format) {
+    Format["CSV"] = "csv";
+    Format["JSON"] = "json";
+    Format["JSON_WITH_SCHEMA"] = "jsonWithSchema";
+})(Format = exports.Format || (exports.Format = {}));
+function isFormat(format) {
+    return Object.values(Format).includes(format);
+}
+exports.isFormat = isFormat;

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

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

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

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const TOKEN_MAP = {
     EQUALS: "===",
     NOT_EQUALS: "!==",
@@ -102,7 +103,18 @@ function parseFilterExpression(filters) {
 function parseEmitExpression(field, groupBy) {
     return `emit(doc["${groupBy || "_id"}"], doc["${field}"]);`;
 }
-module.exports = function ({ field, tableId, groupBy, filters = [], calculation, }) {
+/**
+ * Return a fully parsed CouchDB compliant view definition
+ * that will be stored in the design document in the database.
+ *
+ * @param {Object} viewDefinition - the JSON definition for a custom view.
+ * field: field that calculations will be performed on
+ * tableId: tableId of the table this view was created from
+ * groupBy: field that calculations will be grouped by. Field must be present for this to be useful
+ * filters: Array of filter objects containing predicates that are parsed into a JS expression
+ * calculation: an optional calculation to be performed over the view data.
+ */
+function default_1({ field, tableId, groupBy, filters = [], calculation, }) {
     // first filter can't have a conjunction
     if (filters && filters.length > 0 && filters[0].conjunction) {
         delete filters[0].conjunction;
@@ -136,4 +148,5 @@ module.exports = function ({ field, tableId, groupBy, filters = [], calculation,
         ${emitExpression}
       }
     }` }, reduction);
-};
+}
+exports.default = default_1;

package/dist/api/routes/analytics.js

@@ -25,9 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/analytics"));
 const router = new router_1.default();
 router.get("/api/bbtel", controller.isEnabled);
 router.post("/api/bbtel/ping", controller.ping);
-module.exports = router;
+exports.default = router;