@budibase/server 2.1.40-alpha.6 → 2.1.42

package/dist/tests/utilities/structures.js

@@ -1,14 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.basicWebhook = exports.basicLayout = exports.basicScreen = exports.basicUser = exports.basicQuery = exports.basicDatasource = exports.basicRole = exports.basicLinkedRow = exports.basicRow = exports.basicAutomation = exports.newAutomation = exports.automationTrigger = exports.automationStep = exports.view = exports.calculationView = exports.filterView = exports.basicView = exports.basicTable = exports.TENANT_ID = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-const screens_1 = require("../../constants/screens");
-const layouts_1 = require("../../constants/layouts");
-const fp_1 = require("lodash/fp");
-const automations_1 = require("../../automations");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { BUILTIN_PERMISSION_IDS } = require("@budibase/backend-core/permissions");
+const { createHomeScreen } = require("../../constants/screens");
+const { EMPTY_LAYOUT } = require("../../constants/layouts");
+const { cloneDeep } = require("lodash/fp");
 const { v4: uuidv4 } = require("uuid");
+const { TRIGGER_DEFINITIONS, ACTION_DEFINITIONS } = require("../../automations");
 exports.TENANT_ID = "default";
-function basicTable() {
+exports.basicTable = () => {
     return {
         name: "TestTable",
         type: "table",
@@ -28,59 +27,51 @@ function basicTable() {
             },
         },
     };
-}
-exports.basicTable = basicTable;
-function basicView(tableId) {
+};
+exports.basicView = tableId => {
     return {
         tableId,
         name: "ViewTest",
     };
-}
-exports.basicView = basicView;
-function filterView(tableId) {
-    return Object.assign(Object.assign({}, basicView(tableId)), { filters: [
+};
+exports.filterView = tableId => {
+    return Object.assign(Object.assign({}, this.basicView(tableId)), { filters: [
             {
                 value: 0,
                 condition: "MT",
                 key: "count",
             },
         ] });
-}
-exports.filterView = filterView;
-function calculationView(tableId) {
-    return Object.assign(Object.assign({}, basicView(tableId)), { field: "count", calculation: "sum" });
-}
-exports.calculationView = calculationView;
-function view(tableId) {
-    return Object.assign(Object.assign({}, filterView(tableId)), calculationView(tableId));
-}
-exports.view = view;
-function automationStep(actionDefinition = automations_1.ACTION_DEFINITIONS.CREATE_ROW) {
+};
+exports.calculationView = tableId => {
+    return Object.assign(Object.assign({}, this.basicView(tableId)), { field: "count", calculation: "sum" });
+};
+exports.view = tableId => {
+    return Object.assign(Object.assign({}, this.filterView(tableId)), this.calculationView(tableId));
+};
+exports.automationStep = (actionDefinition = ACTION_DEFINITIONS.CREATE_ROW) => {
     return Object.assign({ id: uuidv4() }, actionDefinition);
-}
-exports.automationStep = automationStep;
-function automationTrigger(triggerDefinition = automations_1.TRIGGER_DEFINITIONS.ROW_SAVED) {
+};
+exports.automationTrigger = (triggerDefinition = TRIGGER_DEFINITIONS.ROW_SAVED) => {
     return Object.assign({ id: uuidv4() }, triggerDefinition);
-}
-exports.automationTrigger = automationTrigger;
-function newAutomation({ steps, trigger } = {}) {
-    const automation = basicAutomation();
+};
+exports.newAutomation = ({ steps, trigger } = {}) => {
+    const automation = exports.basicAutomation();
     if (trigger) {
         automation.definition.trigger = trigger;
     }
     else {
-        automation.definition.trigger = automationTrigger();
+        automation.definition.trigger = exports.automationTrigger();
     }
     if (steps) {
         automation.definition.steps = steps;
     }
     else {
-        automation.definition.steps = [automationStep()];
+        automation.definition.steps = [exports.automationStep()];
     }
     return automation;
-}
-exports.newAutomation = newAutomation;
-function basicAutomation() {
+};
+exports.basicAutomation = () => {
     return {
         name: "My Automation",
         screenId: "kasdkfldsafkl",
@@ -94,30 +85,26 @@ function basicAutomation() {
         },
         type: "automation",
     };
-}
-exports.basicAutomation = basicAutomation;
-function basicRow(tableId) {
+};
+exports.basicRow = tableId => {
     return {
         name: "Test Contact",
         description: "original description",
         tableId: tableId,
     };
-}
-exports.basicRow = basicRow;
-function basicLinkedRow(tableId, linkedRowId, linkField = "link") {
+};
+exports.basicLinkedRow = (tableId, linkedRowId, linkField = "link") => {
     // this is based on the basic linked tables you get from the test configuration
-    return Object.assign(Object.assign({}, basicRow(tableId)), { [linkField]: [linkedRowId] });
-}
-exports.basicLinkedRow = basicLinkedRow;
-function basicRole() {
+    return Object.assign(Object.assign({}, exports.basicRow(tableId)), { [linkField]: [linkedRowId] });
+};
+exports.basicRole = () => {
     return {
         name: "NewRole",
-        inherits: backend_core_1.roles.BUILTIN_ROLE_IDS.BASIC,
-        permissionId: backend_core_1.permissions.BuiltinPermissionID.READ_ONLY,
+        inherits: BUILTIN_ROLE_IDS.BASIC,
+        permissionId: BUILTIN_PERMISSION_IDS.READ_ONLY,
     };
-}
-exports.basicRole = basicRole;
-function basicDatasource() {
+};
+exports.basicDatasource = () => {
     return {
         datasource: {
             type: "datasource",
@@ -126,9 +113,8 @@ function basicDatasource() {
             config: {},
         },
     };
-}
-exports.basicDatasource = basicDatasource;
-function basicQuery(datasourceId) {
+};
+exports.basicQuery = datasourceId => {
     return {
         datasourceId: datasourceId,
         name: "New Query",
@@ -137,25 +123,21 @@ function basicQuery(datasourceId) {
         schema: {},
         queryVerb: "read",
     };
-}
-exports.basicQuery = basicQuery;
-function basicUser(role) {
+};
+exports.basicUser = role => {
     return {
         email: "bill@bill.com",
         password: "yeeooo",
         roleId: role,
     };
-}
-exports.basicUser = basicUser;
-function basicScreen() {
-    return (0, screens_1.createHomeScreen)();
-}
-exports.basicScreen = basicScreen;
-function basicLayout() {
-    return (0, fp_1.cloneDeep)(layouts_1.EMPTY_LAYOUT);
-}
-exports.basicLayout = basicLayout;
-function basicWebhook(automationId) {
+};
+exports.basicScreen = () => {
+    return createHomeScreen();
+};
+exports.basicLayout = () => {
+    return cloneDeep(EMPTY_LAYOUT);
+};
+exports.basicWebhook = automationId => {
     return {
         live: true,
         name: "webhook",
@@ -164,5 +146,4 @@ function basicWebhook(automationId) {
             target: automationId,
         },
     };
-}
-exports.basicWebhook = basicWebhook;
+};

package/dist/threads/automation.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) {
@@ -39,8 +16,8 @@ exports.removeStalled = exports.execute = void 0;
 const utils_1 = __importDefault(require("./utils"));
 utils_1.default.threadSetup();
 const utils_2 = require("../automations/utils");
-const actions = __importStar(require("../automations/actions"));
-const automationUtils = __importStar(require("../automations/automationUtils"));
+const actions_1 = __importDefault(require("../automations/actions"));
+const automationUtils_1 = __importDefault(require("../automations/automationUtils"));
 const AutomationEmitter_1 = __importDefault(require("../events/AutomationEmitter"));
 const utils_3 = require("../db/utils");
 const triggerInfo_1 = require("../automations/triggerInfo");
@@ -48,14 +25,15 @@ const constants_1 = require("../constants");
 const logging_1 = require("../automations/logging");
 const types_1 = require("@budibase/types");
 const automations_1 = require("../definitions/automations");
-const backend_core_1 = require("@budibase/backend-core");
-const string_templates_1 = require("@budibase/string-templates");
-const fp_1 = require("lodash/fp");
-const environment_1 = __importDefault(require("../environment"));
-const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
-const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { logAlertWithInfo, logWarn } = require("@budibase/backend-core/logging");
+const { processObject } = require("@budibase/string-templates");
+const FILTER_STEP_ID = actions_1.default.ACTION_DEFINITIONS.FILTER.stepId;
+const LOOP_STEP_ID = actions_1.default.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
+const { cloneDeep } = require("lodash/fp");
+const env = require("../environment");
 function typecastForLooping(loopStep, input) {
     if (!input || !input.binding) {
         return null;
@@ -86,7 +64,7 @@ function getLoopIterations(loopStep, input) {
     }
     return Array.isArray(binding)
         ? binding.length
-        : automationUtils.stringSplit(binding).length;
+        : automationUtils_1.default.stringSplit(binding).length;
 }
 /**
  * The automation orchestrator is a class responsible for executing automations.
@@ -124,7 +102,7 @@ class Orchestrator {
     }
     getStepFunctionality(stepId) {
         return __awaiter(this, void 0, void 0, function* () {
-            let step = yield actions.getAction(stepId);
+            let step = yield actions_1.default.getAction(stepId);
             if (step == null) {
                 throw `Cannot find automation step by name ${stepId}`;
             }
@@ -134,7 +112,7 @@ class Orchestrator {
     getMetadata() {
         return __awaiter(this, void 0, void 0, function* () {
             const metadataId = (0, utils_3.generateAutomationMetadataID)(this._automation._id);
-            const db = backend_core_1.context.getAppDB();
+            const db = getAppDB();
             let metadata;
             try {
                 metadata = yield db.get(metadataId);
@@ -153,7 +131,7 @@ class Orchestrator {
             if (!this._job.opts.repeat) {
                 return;
             }
-            backend_core_1.logging.logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
+            logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
             const automation = this._automation;
             const trigger = automation.definition.trigger;
             yield (0, utils_2.disableCronById)(this._job.id);
@@ -194,12 +172,12 @@ class Orchestrator {
             else {
                 metadata.errorCount = 0;
             }
-            const db = backend_core_1.context.getAppDB();
+            const db = getAppDB();
             try {
                 yield db.put(metadata);
             }
             catch (err) {
-                backend_core_1.logging.logAlertWithInfo("Failed to write automation metadata", db.name, automation._id, err);
+                logAlertWithInfo("Failed to write automation metadata", db.name, automation._id, err);
             }
         });
     }
@@ -259,14 +237,14 @@ class Orchestrator {
                     continue;
                 }
                 if (loopStep) {
-                    input = yield (0, string_templates_1.processObject)(loopStep.inputs, this._context);
+                    input = yield processObject(loopStep.inputs, this._context);
                     iterations = getLoopIterations(loopStep, input);
                 }
                 for (let index = 0; index < iterations; index++) {
-                    let originalStepInput = (0, fp_1.cloneDeep)(step.inputs);
+                    let originalStepInput = cloneDeep(step.inputs);
                     // Handle if the user has set a max iteration count or if it reaches the max limit set by us
                     if (loopStep && input.binding) {
-                        let newInput = yield (0, string_templates_1.processObject)(loopStep.inputs, (0, fp_1.cloneDeep)(this._context));
+                        let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         try {
                             newInput.binding = typecastForLooping(loopStep, newInput);
@@ -283,7 +261,7 @@ class Orchestrator {
                         let item;
                         if (typeof loopStep.inputs.binding === "string" &&
                             loopStep.inputs.option === "String") {
-                            item = automationUtils.stringSplit(newInput.binding);
+                            item = automationUtils_1.default.stringSplit(newInput.binding);
                         }
                         else {
                             item = loopStep.inputs.binding;
@@ -298,23 +276,23 @@ class Orchestrator {
                                 for (let [innerKey, innerValue] of Object.entries(originalStepInput[key])) {
                                     if (typeof innerValue === "string") {
                                         originalStepInput[key][innerKey] =
-                                            automationUtils.substituteLoopStep(innerValue, `steps.${loopStepNumber}`);
+                                            automationUtils_1.default.substituteLoopStep(innerValue, `steps.${loopStepNumber}`);
                                     }
                                     else if (typeof value === "object") {
                                         for (let [innerObject, innerValue] of Object.entries(originalStepInput[key][innerKey])) {
                                             originalStepInput[key][innerKey][innerObject] =
-                                                automationUtils.substituteLoopStep(innerValue, `steps.${loopStepNumber}`);
+                                                automationUtils_1.default.substituteLoopStep(innerValue, `steps.${loopStepNumber}`);
                                         }
                                     }
                                 }
                             }
                             else {
                                 if (typeof value === "string") {
-                                    originalStepInput[key] = automationUtils.substituteLoopStep(value, `steps.${loopStepNumber}`);
+                                    originalStepInput[key] = automationUtils_1.default.substituteLoopStep(value, `steps.${loopStepNumber}`);
                                 }
                             }
                         }
-                        if (index === environment_1.default.AUTOMATION_MAX_ITERATIONS ||
+                        if (index === env.AUTOMATION_MAX_ITERATION ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: constants_1.AutomationErrors.MAX_ITERATIONS,
@@ -351,8 +329,8 @@ class Orchestrator {
                     }
                     // If it's a loop step, we need to manually add the bindings to the context
                     let stepFn = yield this.getStepFunctionality(step.stepId);
-                    let inputs = yield (0, string_templates_1.processObject)(originalStepInput, this._context);
-                    inputs = automationUtils.cleanInputValues(inputs, step.schema.inputs);
+                    let inputs = yield processObject(originalStepInput, this._context);
+                    inputs = automationUtils_1.default.cleanInputValues(inputs, step.schema.inputs);
                     try {
                         // appId is always passed
                         const outputs = yield stepFn({
@@ -426,7 +404,7 @@ function execute(job, callback) {
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
-    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+    doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(job);
         try {
             const response = yield automationOrchestrator.execute();
@@ -443,7 +421,7 @@ const removeStalled = (job) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
-    yield backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+    yield doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(job);
         yield automationOrchestrator.stopCron("stalled");
     }));

package/dist/threads/query.js

@@ -15,12 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
 const utils_1 = __importDefault(require("./utils"));
 utils_1.default.threadSetup();
-const scriptRunner_1 = __importDefault(require("../utilities/scriptRunner"));
-const integrations_1 = require("../integrations");
-const string_templates_1 = require("@budibase/string-templates");
-const backend_core_1 = require("@budibase/backend-core");
-const utils_2 = require("../db/utils");
-const fp_1 = require("lodash/fp");
+const ScriptRunner = require("../utilities/scriptRunner");
+const { getIntegration } = require("../integrations");
+const { processStringSync } = require("@budibase/string-templates");
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { refreshOAuthToken, updateUserOAuth, } = require("@budibase/backend-core/auth");
+const { user: userCache } = require("@budibase/backend-core/cache");
+const { getGlobalIDFromUserMetadataID } = require("../db/utils");
+const { cloneDeep } = require("lodash/fp");
 const { isSQL } = require("../integrations/utils");
 const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
 class QueryRunner {
@@ -48,9 +50,9 @@ class QueryRunner {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { datasource, fields, queryVerb, transformer } = this;
-            let datasourceClone = (0, fp_1.cloneDeep)(datasource);
-            let fieldsClone = (0, fp_1.cloneDeep)(fields);
-            const Integration = yield (0, integrations_1.getIntegration)(datasourceClone.source);
+            let datasourceClone = cloneDeep(datasource);
+            let fieldsClone = cloneDeep(fields);
+            const Integration = yield getIntegration(datasourceClone.source);
             if (!Integration) {
                 throw "Integration type does not exist.";
             }
@@ -93,7 +95,7 @@ class QueryRunner {
             }
             // transform as required
             if (transformer) {
-                const runner = new scriptRunner_1.default(transformer, {
+                const runner = new ScriptRunner(transformer, {
                     data: rows,
                     params: enrichedParameters,
                 });
@@ -136,7 +138,7 @@ class QueryRunner {
     }
     runAnotherQuery(queryId, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = backend_core_1.context.getAppDB();
+            const db = getAppDB();
             const query = yield db.get(queryId);
             const datasource = yield db.get(query.datasourceId);
             return new QueryRunner({
@@ -157,13 +159,13 @@ class QueryRunner {
             if (!providerType || !(oauth2 === null || oauth2 === void 0 ? void 0 : oauth2.refreshToken)) {
                 throw new Error("No refresh token found for authenticated user");
             }
-            const resp = yield backend_core_1.auth.refreshOAuthToken(oauth2.refreshToken, providerType, configId);
+            const resp = yield refreshOAuthToken(oauth2.refreshToken, providerType, configId);
             // Refresh session flow. Should be in same location as refreshOAuthToken
             // There are several other properties available in 'resp'
             if (!resp.err) {
-                const globalUserId = (0, utils_2.getGlobalIDFromUserMetadataID)(_id);
-                yield backend_core_1.auth.updateUserOAuth(globalUserId, resp);
-                this.ctx.user = yield backend_core_1.cache.user.getUser(globalUserId);
+                const globalUserId = getGlobalIDFromUserMetadataID(_id);
+                yield updateUserOAuth(globalUserId, resp);
+                this.ctx.user = yield userCache.getUser(globalUserId);
             }
             else {
                 // In this event the user may have oAuth issues that
@@ -222,7 +224,7 @@ class QueryRunner {
                 const responses = yield Promise.all(dynamics);
                 for (let i = 0; i < foundVars.length; i++) {
                     const variable = foundVars[i];
-                    parameters[variable.name] = (0, string_templates_1.processStringSync)(variable.value, {
+                    parameters[variable.name] = processStringSync(variable.value, {
                         data: responses[i].rows,
                         info: responses[i].extra,
                     }, {
@@ -237,7 +239,7 @@ class QueryRunner {
     }
 }
 function execute(input, callback) {
-    backend_core_1.context.doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
+    doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
         const Runner = new QueryRunner(input);
         try {
             const response = yield Runner.execute();

package/dist/threads/utils.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) {
@@ -31,20 +8,18 @@ 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.hasExtraData = exports.formatResponse = exports.storeDynamicVariable = exports.invalidateDynamicVariables = exports.checkCacheForDynamicVariable = exports.threadSetup = void 0;
-const environment_1 = __importDefault(require("../environment"));
-const db = __importStar(require("../db"));
-const backend_core_1 = require("@budibase/backend-core");
+const env = require("../environment");
+const db = require("../db");
+const redis = require("@budibase/backend-core/redis");
+const { SEPARATOR } = require("@budibase/backend-core/db");
 const VARIABLE_TTL_SECONDS = 3600;
 let client;
 function getClient() {
     return __awaiter(this, void 0, void 0, function* () {
         if (!client) {
-            client = yield new backend_core_1.redis.Client(backend_core_1.redis.utils.Databases.QUERY_VARS).init();
+            client = yield new redis.Client(redis.utils.Databases.QUERY_VARS).init();
         }
         return client;
     });
@@ -55,15 +30,15 @@ process.on("exit", () => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 function makeVariableKey(queryId, variable) {
-    return `${queryId}${backend_core_1.db.SEPARATOR}${variable}`;
+    return `${queryId}${SEPARATOR}${variable}`;
 }
 function threadSetup() {
     // don't run this if not threading
-    if (environment_1.default.isTest() || environment_1.default.DISABLE_THREADING) {
+    if (env.isTest() || env.DISABLE_THREADING) {
         return;
     }
     // when thread starts, make sure it is recorded
-    environment_1.default.setInThread();
+    env.setInThread();
     db.init();
 }
 exports.threadSetup = threadSetup;