@budibase/server 2.2.25 → 2.2.27-alpha.0

package/dist/api/controllers/public/applications.js

@@ -32,10 +32,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
+exports.publish = exports.unpublish = exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("./utils");
 const controller = __importStar(require("../application"));
+const deployController = __importStar(require("../deploy"));
 function fixAppID(app, params) {
     if (!params) {
         return app;
@@ -116,10 +117,30 @@ function destroy(ctx, next) {
     });
 }
 exports.destroy = destroy;
+function unpublish(ctx, next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
+            yield controller.unpublish(ctx);
+            yield next();
+        }));
+    });
+}
+exports.unpublish = unpublish;
+function publish(ctx, next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
+            yield deployController.publishApp(ctx);
+            yield next();
+        }));
+    });
+}
+exports.publish = publish;
 exports.default = {
     create,
     update,
     read,
     destroy,
     search,
+    publish,
+    unpublish,
 };

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,12 @@ 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 sdk_1 = __importDefault(require("../../../sdk"));
 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) {
@@ -81,7 +85,7 @@ function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const query = ctx.request.body;
-        const datasource = yield db.get(query.datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(query.datasourceId);
         let eventFn;
         if (!query._id) {
             query._id = (0, utils_1.generateQueryID)(query.datasourceId);
@@ -126,15 +130,14 @@ function getAuthConfig(ctx) {
 }
 function preview(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(ctx.request.body.datasourceId);
+        const { datasource, envVars } = yield sdk_1.default.datasources.getWithEnvVars(ctx.request.body.datasourceId);
         const query = ctx.request.body;
         // preview may not have a queryId as it hasn't been saved, but if it does
         // this stops dynamic variables from calling the same query
         const { fields, parameters, queryVerb, transformer, queryId } = query;
         const authConfigCtx = getAuthConfig(ctx);
         try {
-            const runFn = () => Runner.run({
+            const inputs = {
                 appId: ctx.appId,
                 datasource,
                 queryVerb,
@@ -142,11 +145,14 @@ function preview(ctx) {
                 parameters,
                 transformer,
                 queryId,
+                // have to pass down to the thread runner - can't put into context now
+                environmentVariables: envVars,
                 ctx: {
                     user: ctx.user,
                     auth: Object.assign({}, authConfigCtx),
                 },
-            });
+            };
+            const runFn = () => Runner.run(inputs);
             const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn, {
                 datasourceId: datasource._id,
             });
@@ -196,7 +202,7 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const query = yield db.get(ctx.params.queryId);
-        const datasource = yield db.get(query.datasourceId);
+        const { datasource, envVars } = yield sdk_1.default.datasources.getWithEnvVars(query.datasourceId);
         let authConfigCtx = {};
         if (!opts.isAutomation) {
             authConfigCtx = getAuthConfig(ctx);
@@ -212,7 +218,7 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
         }
         // call the relevant CRUD method on the integration class
         try {
-            const runFn = () => Runner.run({
+            const inputs = {
                 appId: ctx.appId,
                 datasource,
                 queryVerb: query.queryVerb,
@@ -221,11 +227,14 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
                 parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
+                // have to pass down to the thread runner - can't put into context now
+                environmentVariables: envVars,
                 ctx: {
                     user: ctx.user,
                     auth: Object.assign({}, authConfigCtx),
                 },
-            });
+            };
+            const runFn = () => Runner.run(inputs);
             const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn, {
                 datasourceId: datasource._id,
             });
@@ -258,10 +267,11 @@ function executeV2(ctx, { isAutomation } = {}) {
 }
 exports.executeV2 = executeV2;
 const removeDynamicVariables = (queryId) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const db = backend_core_1.context.getAppDB();
     const query = yield db.get(queryId);
-    const datasource = yield db.get(query.datasourceId);
-    const dynamicVariables = datasource.config.dynamicVariables;
+    const datasource = yield sdk_1.default.datasources.get(query.datasourceId);
+    const dynamicVariables = (_a = datasource.config) === null || _a === void 0 ? void 0 : _a.dynamicVariables;
     if (dynamicVariables) {
         // delete dynamic variables from the datasource
         datasource.config.dynamicVariables = dynamicVariables.filter((dv) => dv.queryId !== queryId);
@@ -277,7 +287,7 @@ function destroy(ctx) {
         const queryId = ctx.params.queryId;
         yield removeDynamicVariables(queryId);
         const query = yield db.get(queryId);
-        const datasource = yield db.get(query.datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(query.datasourceId);
         yield db.remove(ctx.params.queryId, ctx.params.revId);
         ctx.message = `Query deleted.`;
         ctx.status = 200;

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

@@ -19,6 +19,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalRequest = void 0;
 const types_1 = require("@budibase/types");
@@ -27,11 +30,10 @@ const utils_2 = require("./utils");
 const constants_1 = require("../../../constants");
 const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
-// @ts-ignore
 const fp_1 = require("lodash/fp");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
-const backend_core_1 = require("@budibase/backend-core");
 const utils_4 = require("./utils");
+const sdk_1 = __importDefault(require("../../../sdk"));
 function buildFilters(id, filters, table) {
     const primary = table.primary;
     // if passed in array need to copy for shifting etc
@@ -563,6 +565,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);
@@ -570,8 +573,7 @@ class ExternalRequest {
                 throw "Unable to run without a table name";
             }
             if (!this.datasource) {
-                const db = backend_core_1.context.getAppDB();
-                this.datasource = yield db.get(datasourceId);
+                this.datasource = yield sdk_1.default.datasources.get(datasourceId);
                 if (!this.datasource || !this.datasource.entities) {
                     throw "No tables found, fetch tables before query.";
                 }
@@ -584,6 +586,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/external.js

@@ -42,15 +42,19 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchEnrichedRow = exports.exportRows = exports.validate = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = exports.handleRequest = void 0;
 const constants_1 = require("../../../constants");
 const utils_1 = require("../../../integrations/utils");
 const ExternalRequest_1 = require("./ExternalRequest");
-const backend_core_1 = require("@budibase/backend-core");
 const exporters = __importStar(require("../view/exporters"));
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const types_1 = require("@budibase/types");
+const sdk_1 = __importDefault(require("../../../sdk"));
+const { cleanExportRows } = require("./utils");
 function handleRequest(operation, tableId, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
@@ -222,20 +226,21 @@ exports.validate = validate;
 function exportRows(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { datasourceId } = (0, utils_1.breakExternalTableId)(ctx.params.tableId);
-        const db = backend_core_1.context.getAppDB();
         const format = ctx.query.format;
         const { columns } = ctx.request.body;
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         if (!datasource || !datasource.entities) {
             ctx.throw(400, "Datasource has not been configured for plus API.");
         }
-        ctx.request.body = {
-            query: {
-                oneOf: {
-                    _id: ctx.request.body.rows.map((row) => JSON.parse(decodeURI(row))[0]),
+        if (ctx.request.body.rows) {
+            ctx.request.body = {
+                query: {
+                    oneOf: {
+                        _id: ctx.request.body.rows.map((row) => JSON.parse(decodeURI(row))[0]),
+                    },
                 },
-            },
-        };
+            };
+        }
         let result = yield search(ctx);
         let rows = [];
         // Filter data to only specified columns if required
@@ -250,13 +255,16 @@ function exportRows(ctx) {
         else {
             rows = result.rows;
         }
-        let headers = Object.keys(rows[0]);
+        // @ts-ignore
+        let schema = datasource.entities[tableName].schema;
+        let exportRows = cleanExportRows(rows, schema, format, columns);
+        let headers = Object.keys(schema);
         // @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));
+        return (0, fileSystem_1.apiFileReturn)(exporter(headers, exportRows));
     });
 }
 exports.exportRows = exportRows;
@@ -266,8 +274,7 @@ function fetchEnrichedRow(ctx) {
         const id = ctx.params.rowId;
         const tableId = ctx.params.tableId;
         const { datasourceId, tableName } = (0, utils_1.breakExternalTableId)(tableId);
-        const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         if (!tableName) {
             ctx.throw(400, "Unable to find table.");
         }

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

@@ -52,17 +52,18 @@ const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_1 = require("../../../constants");
-const utils_2 = require("./utils");
+const utils = __importStar(require("./utils"));
 const internalSearch_1 = require("./internalSearch");
 const global_1 = require("../../../utilities/global");
 const inMemoryViews = __importStar(require("../../../db/inMemoryView"));
 const environment_1 = __importDefault(require("../../../environment"));
-const utils_3 = require("../view/utils");
+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 { cleanExportRows } = require("./utils");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
@@ -70,9 +71,9 @@ const CALCULATION_TYPES = {
 };
 function getView(db, viewName) {
     return __awaiter(this, void 0, void 0, function* () {
-        let mainGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromDesignDoc : utils_3.getFromMemoryDoc;
-        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromMemoryDoc : utils_3.getFromDesignDoc;
-        let migration = environment_1.default.SELF_HOSTED ? utils_3.migrateToDesignView : utils_3.migrateToInMemoryView;
+        let mainGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromDesignDoc : utils_2.getFromMemoryDoc;
+        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromMemoryDoc : utils_2.getFromDesignDoc;
+        let migration = environment_1.default.SELF_HOSTED ? utils_2.migrateToDesignView : utils_2.migrateToInMemoryView;
         let viewInfo, migrate = false;
         try {
             viewInfo = yield mainGetter(db, viewName);
@@ -121,7 +122,7 @@ function patch(ctx) {
         let oldRow;
         try {
             let dbTable = yield db.get(tableId);
-            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield (0, utils_2.findRow)(ctx, tableId, inputs._id));
+            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield utils.findRow(ctx, tableId, inputs._id));
         }
         catch (err) {
             if (isUserTable) {
@@ -145,7 +146,7 @@ function patch(ctx) {
         }
         // this returns the table and row incase they have been updated
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, combinedRow);
-        const validateResult = yield (0, utils_2.validate)({
+        const validateResult = yield utils.validate({
             row,
             table,
         });
@@ -185,7 +186,7 @@ function save(ctx) {
         // this returns the table and row incase they have been updated
         const dbTable = yield db.get(inputs.tableId);
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, inputs);
-        const validateResult = yield (0, utils_2.validate)({
+        const validateResult = yield utils.validate({
             row,
             table,
         });
@@ -208,7 +209,7 @@ function save(ctx) {
 exports.save = save;
 function fetchView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const viewName = ctx.params.viewName;
+        const viewName = decodeURIComponent(ctx.params.viewName);
         // if this is a table view being looked for just transfer to that
         if (viewName.startsWith(utils_1.DocumentType.TABLE)) {
             ctx.params.tableId = viewName;
@@ -274,7 +275,7 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.db.getDB(ctx.appId);
         const table = yield db.get(ctx.params.tableId);
-        let row = yield (0, utils_2.findRow)(ctx, ctx.params.tableId, ctx.params.rowId);
+        let row = yield utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId);
         row = yield (0, rowProcessor_1.outputProcessing)(table, row);
         return row;
     });
@@ -364,6 +365,13 @@ function search(ctx) {
         const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
         params.version = ctx.version;
         params.tableId = tableId;
+        let table;
+        if (params.sort && !params.sortType) {
+            table = yield db.get(tableId);
+            const schema = table.schema;
+            const sortField = schema[params.sort];
+            params.sortType = sortField.type == "number" ? "number" : "string";
+        }
         let response;
         if (paginate) {
             response = yield (0, internalSearch_1.paginatedSearch)(query, params);
@@ -377,7 +385,7 @@ function search(ctx) {
             if (tableId === utils_1.InternalTables.USER_METADATA) {
                 response.rows = yield (0, global_1.getGlobalUsersFromMetadata)(response.rows);
             }
-            const table = yield db.get(tableId);
+            table = table || (yield db.get(tableId));
             response.rows = yield (0, rowProcessor_1.outputProcessing)(table, response.rows);
         }
         return response;
@@ -386,7 +394,7 @@ function search(ctx) {
 exports.search = search;
 function validate(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (0, utils_2.validate)({
+        return utils.validate({
             tableId: ctx.params.tableId,
             row: ctx.request.body,
         });
@@ -399,13 +407,21 @@ function exportRows(ctx) {
         const table = yield db.get(ctx.params.tableId);
         const rowIds = ctx.request.body.rows;
         let format = ctx.query.format;
-        const { columns } = ctx.request.body;
-        let response = (yield db.allDocs({
-            include_docs: true,
-            keys: rowIds,
-        })).rows.map(row => row.doc);
-        let result = (yield (0, rowProcessor_1.outputProcessing)(table, response));
+        const { columns, query } = ctx.request.body;
+        let result;
+        if (rowIds) {
+            let response = (yield db.allDocs({
+                include_docs: true,
+                keys: rowIds,
+            })).rows.map(row => row.doc);
+            result = yield (0, rowProcessor_1.outputProcessing)(table, response);
+        }
+        else if (query) {
+            let searchResponse = yield exports.search(ctx);
+            result = searchResponse.rows;
+        }
         let rows = [];
+        let schema = table.schema;
         // Filter data to only specified columns if required
         if (columns && columns.length) {
             for (let i = 0; i < result.length; i++) {
@@ -418,13 +434,22 @@ 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));
+        let exportRows = cleanExportRows(rows, schema, format, columns);
+        if (format === exporters_1.Format.CSV) {
+            ctx.attachment("export.csv");
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.csv)(Object.keys(rows[0]), exportRows));
+        }
+        else if (format === exporters_1.Format.JSON) {
+            ctx.attachment("export.json");
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.json)(exportRows));
+        }
+        else if (format === exporters_1.Format.JSON_WITH_SCHEMA) {
+            ctx.attachment("export.json");
+            return (0, fileSystem_1.apiFileReturn)((0, exporters_1.jsonWithSchema)(schema, exportRows));
+        }
+        else {
+            throw "Format not recognised";
+        }
     });
 }
 exports.exportRows = exportRows;
@@ -436,7 +461,7 @@ function fetchEnrichedRow(ctx) {
         // need table to work out where links go in row
         let [table, row] = yield Promise.all([
             db.get(tableId),
-            (0, utils_2.findRow)(ctx, tableId, rowId),
+            utils.findRow(ctx, tableId, rowId),
         ]);
         // get the link docs
         const linkVals = (yield linkRows.getLinkDocuments({

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

@@ -153,7 +153,7 @@ function finaliseRow(table, row, { oldTable, updateFormula } = {
         enrichedRow = yield (0, rowProcessor_1.processFormulas)(table, enrichedRow, { dynamic: false });
         // this updates the related formulas in other rows based on the relations to this row
         if (updateFormula) {
-            yield exports.updateRelatedFormula(table, enrichedRow);
+            yield updateRelatedFormula(table, enrichedRow);
         }
         return { row: enrichedRow, table };
     });

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

@@ -31,8 +31,11 @@ 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.validate = exports.findRow = exports.getDatasourceAndQuery = exports.removeKeyNumbering = void 0;
+exports.cleanExportRows = exports.validate = exports.findRow = exports.getDatasourceAndQuery = exports.removeKeyNumbering = void 0;
 const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
 const constants_1 = require("../../../constants");
@@ -42,6 +45,8 @@ var utils_2 = require("../../../integrations/base/utils");
 Object.defineProperty(exports, "removeKeyNumbering", { enumerable: true, get: function () { return utils_2.removeKeyNumbering; } });
 const validateJs = require("validate.js");
 const { cloneDeep } = require("lodash/fp");
+const exporters_1 = require("../view/exporters");
+const sdk_1 = __importDefault(require("../../../sdk"));
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -54,8 +59,7 @@ validateJs.extend(validateJs.validators.datetime, {
 function getDatasourceAndQuery(json) {
     return __awaiter(this, void 0, void 0, function* () {
         const datasourceId = json.endpoint.datasourceId;
-        const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         return (0, query_1.makeExternalQuery)(datasource, json);
     });
 }
@@ -151,3 +155,31 @@ function validate({ tableId, row, table, }) {
     });
 }
 exports.validate = validate;
+function cleanExportRows(rows, schema, format, columns) {
+    let cleanRows = [...rows];
+    const relationships = Object.entries(schema)
+        .filter((entry) => entry[1].type === constants_1.FieldTypes.LINK)
+        .map(entry => entry[0]);
+    relationships.forEach(column => {
+        cleanRows.forEach(row => {
+            delete row[column];
+        });
+        delete schema[column];
+    });
+    // Intended to avoid 'undefined' in export
+    if (format === exporters_1.Format.CSV) {
+        const schemaKeys = Object.keys(schema);
+        for (let key of schemaKeys) {
+            if ((columns === null || columns === void 0 ? void 0 : columns.length) && columns.indexOf(key) > 0) {
+                continue;
+            }
+            for (let row of cleanRows) {
+                if (row[key] == null) {
+                    row[key] = "";
+                }
+            }
+        }
+    }
+    return cleanRows;
+}
+exports.cleanExportRows = cleanExportRows;