@budibase/server 1.0.27-alpha.6 → 1.0.27-alpha.7

package/coverage/lcov.info

@@ -1955,19 +1955,22 @@ BRH:4
 end_of_record
 TN:
 SF:src/api/controllers/query/index.js
-FN:15,enrichQueries
-FN:26,(anonymous_1)
-FN:35,(anonymous_2)
-FN:38,(anonymous_3)
-FN:77,(anonymous_4)
-FN:92,(anonymous_5)
-FN:103,(anonymous_6)
-FN:134,execute
-FN:161,(anonymous_8)
-FN:165,(anonymous_9)
-FN:169,(anonymous_10)
-FNF:11
-FNH:9
+FN:16,enrichQueries
+FN:27,(anonymous_1)
+FN:36,(anonymous_2)
+FN:39,(anonymous_3)
+FN:78,(anonymous_4)
+FN:93,(anonymous_5)
+FN:104,(anonymous_6)
+FN:135,execute
+FN:162,(anonymous_8)
+FN:166,(anonymous_9)
+FN:170,(anonymous_10)
+FN:177,(anonymous_11)
+FN:183,(anonymous_12)
+FN:189,(anonymous_13)
+FNF:14
+FNH:10
 FNDA:5,enrichQueries
 FNDA:2,(anonymous_1)
 FNDA:1,(anonymous_2)
@@ -1979,102 +1982,120 @@ FNDA:2,execute
 FNDA:2,(anonymous_8)
 FNDA:0,(anonymous_9)
 FNDA:1,(anonymous_10)
+FNDA:0,(anonymous_11)
+FNDA:0,(anonymous_12)
+FNDA:1,(anonymous_13)
 DA:1,34
 DA:6,34
 DA:7,34
 DA:8,34
 DA:9,34
 DA:10,34
-DA:12,34
-DA:16,5
+DA:11,34
+DA:13,34
 DA:17,5
 DA:18,5
-DA:19,4
+DA:19,5
 DA:20,4
-DA:23,5
-DA:26,34
-DA:27,2
-DA:29,2
-DA:35,2
-DA:38,34
-DA:39,0
+DA:21,4
+DA:24,5
+DA:27,34
+DA:28,2
+DA:30,2
+DA:36,2
+DA:39,34
 DA:40,0
-DA:42,0
+DA:41,0
 DA:43,0
-DA:46,0
-DA:48,0
+DA:44,0
+DA:47,0
 DA:49,0
-DA:59,0
+DA:50,0
 DA:60,0
 DA:61,0
 DA:62,0
-DA:65,0
-DA:68,0
-DA:70,0
-DA:74,0
-DA:77,34
-DA:78,25
+DA:63,0
+DA:66,0
+DA:69,0
+DA:71,0
+DA:75,0
+DA:78,34
 DA:79,25
-DA:81,25
+DA:80,25
 DA:82,25
-DA:85,25
+DA:83,25
 DA:86,25
-DA:88,25
+DA:87,25
 DA:89,25
-DA:92,34
-DA:93,3
+DA:90,25
+DA:93,34
 DA:94,3
-DA:96,3
-DA:97,1
+DA:95,3
+DA:97,3
 DA:98,1
-DA:100,3
-DA:103,34
-DA:104,6
-DA:106,6
-DA:110,6
-DA:112,6
+DA:99,1
+DA:101,3
+DA:104,34
+DA:105,6
+DA:107,6
+DA:111,6
 DA:113,6
-DA:123,5
-DA:130,1
-DA:135,2
-DA:137,2
+DA:114,6
+DA:124,5
+DA:131,1
+DA:136,2
 DA:138,2
-DA:141,2
+DA:139,2
 DA:142,2
-DA:151,1
+DA:143,2
 DA:152,1
-DA:154,0
-DA:157,1
-DA:161,34
-DA:162,2
-DA:165,34
-DA:166,0
-DA:169,34
-DA:170,1
+DA:153,1
+DA:155,0
+DA:158,1
+DA:162,34
+DA:163,2
+DA:166,34
+DA:167,0
+DA:170,34
 DA:171,1
 DA:172,1
 DA:173,1
-LF:75
-LH:58
-BRDA:17,0,0,2
-BRDA:17,0,1,3
-BRDA:19,1,0,4
-BRDA:19,1,1,0
-BRDA:23,2,0,2
-BRDA:23,2,1,3
-BRDA:46,3,0,0
-BRDA:46,3,1,0
-BRDA:81,4,0,25
-BRDA:81,4,1,0
-BRDA:96,5,0,1
-BRDA:96,5,1,2
-BRDA:134,6,0,0
-BRDA:151,7,0,1
-BRDA:151,7,1,0
-BRDA:151,8,0,1
-BRDA:151,8,1,1
-BRF:17
-BRH:11
+DA:175,1
+DA:177,0
+DA:178,0
+DA:179,0
+DA:182,0
+DA:183,0
+DA:185,0
+DA:189,34
+DA:190,1
+DA:191,1
+DA:192,1
+DA:193,1
+DA:194,1
+LF:88
+LH:65
+BRDA:18,0,0,2
+BRDA:18,0,1,3
+BRDA:20,1,0,4
+BRDA:20,1,1,0
+BRDA:24,2,0,2
+BRDA:24,2,1,3
+BRDA:47,3,0,0
+BRDA:47,3,1,0
+BRDA:82,4,0,25
+BRDA:82,4,1,0
+BRDA:97,5,0,1
+BRDA:97,5,1,2
+BRDA:135,6,0,0
+BRDA:152,7,0,1
+BRDA:152,7,1,0
+BRDA:152,8,0,1
+BRDA:152,8,1,1
+BRDA:175,9,0,0
+BRDA:175,9,1,1
+BRF:19
+BRH:12
 end_of_record
 TN:
 SF:src/api/controllers/query/validation.js
@@ -7840,13 +7861,13 @@ FN:25,(anonymous_2)
 FN:35,makeVariableKey
 FN:39,(anonymous_4)
 FN:44,(anonymous_5)
-FN:54,(anonymous_6)
-FN:63,(anonymous_7)
-FN:74,(anonymous_8)
-FN:83,(anonymous_9)
+FN:55,(anonymous_6)
+FN:64,(anonymous_7)
+FN:75,(anonymous_8)
+FN:84,(anonymous_9)
 FNF:10
 FNH:9
-FNDA:8,getClient
+FNDA:9,getClient
 FNDA:0,(anonymous_1)
 FNDA:5,(anonymous_2)
 FNDA:9,makeVariableKey
@@ -7856,98 +7877,99 @@ FNDA:3,(anonymous_6)
 FNDA:10,(anonymous_7)
 FNDA:10,(anonymous_8)
 FNDA:12,(anonymous_9)
-DA:1,5
-DA:2,5
-DA:3,5
-DA:4,5
-DA:5,5
-DA:6,5
-DA:8,5
-DA:11,5
-DA:12,5
-DA:15,8
+DA:1,34
+DA:2,34
+DA:3,34
+DA:4,34
+DA:5,34
+DA:6,34
+DA:8,34
+DA:11,34
+DA:12,34
+DA:15,9
 DA:16,1
-DA:18,8
-DA:21,5
+DA:18,9
+DA:21,34
 DA:22,0
-DA:25,5
+DA:25,34
 DA:27,5
 DA:28,5
 DA:31,0
 DA:32,0
 DA:36,9
-DA:39,5
+DA:39,34
 DA:40,5
 DA:41,5
-DA:44,5
+DA:44,34
 DA:45,1
 DA:46,1
 DA:47,1
-DA:51,1
-DA:54,5
-DA:55,3
+DA:48,1
+DA:52,1
+DA:55,34
 DA:56,3
-DA:63,5
-DA:64,10
-DA:65,0
+DA:57,3
+DA:64,34
+DA:65,10
 DA:66,0
-DA:68,0
-DA:71,10
-DA:74,5
-DA:75,10
-DA:83,5
-DA:84,12
-DA:87,12
-DA:88,13
-DA:89,0
-DA:91,13
-DA:93,0
-DA:94,13
-DA:96,13
-DA:98,13
-DA:99,0
-DA:101,13
-DA:105,0
-DA:109,12
-DA:114,0
+DA:67,0
+DA:69,0
+DA:72,10
+DA:75,34
+DA:76,10
+DA:84,34
+DA:85,12
+DA:88,12
+DA:89,13
+DA:90,0
+DA:92,13
+DA:94,0
+DA:95,13
+DA:97,13
+DA:99,13
+DA:100,0
+DA:102,13
+DA:106,0
+DA:110,12
 DA:115,0
-DA:123,0
-DA:126,12
-LF:57
-LH:44
+DA:116,0
+DA:124,0
+DA:127,12
+LF:58
+LH:45
 BRDA:15,0,0,1
-BRDA:15,0,1,7
+BRDA:15,0,1,8
 BRDA:22,1,0,0
 BRDA:22,1,1,0
 BRDA:27,2,0,5
 BRDA:27,2,1,0
 BRDA:27,3,0,5
 BRDA:27,3,1,0
-BRDA:64,4,0,0
-BRDA:64,4,1,10
-BRDA:76,5,0,10
-BRDA:76,5,1,10
-BRDA:76,5,2,8
-BRDA:76,5,3,8
-BRDA:83,6,0,0
-BRDA:88,7,0,0
-BRDA:88,7,1,13
-BRDA:91,8,0,0
-BRDA:91,8,1,13
-BRDA:94,9,0,13
-BRDA:94,9,1,0
-BRDA:98,10,0,0
-BRDA:98,10,1,13
-BRDA:98,11,0,13
-BRDA:98,11,1,0
-BRDA:109,12,0,0
-BRDA:109,12,1,12
-BRDA:110,13,0,12
-BRDA:110,13,1,12
-BRDA:110,13,2,12
-BRDA:116,14,0,0
-BRDA:116,14,1,0
-BRDA:116,14,2,0
+BRDA:65,4,0,0
+BRDA:65,4,1,10
+BRDA:77,5,0,10
+BRDA:77,5,1,10
+BRDA:77,5,2,8
+BRDA:77,5,3,8
+BRDA:84,6,0,0
+BRDA:89,7,0,0
+BRDA:89,7,1,13
+BRDA:92,8,0,0
+BRDA:92,8,1,13
+BRDA:95,9,0,13
+BRDA:95,9,1,0
+BRDA:99,10,0,0
+BRDA:99,10,1,13
+BRDA:99,11,0,13
+BRDA:99,11,1,0
+BRDA:110,12,0,0
+BRDA:110,12,1,12
+BRDA:111,13,0,12
+BRDA:111,13,1,12
+BRDA:111,13,2,12
+BRDA:117,14,0,0
+BRDA:117,14,1,0
+BRDA:117,14,2,0
 BRF:33
 BRH:18
 end_of_record

package/dist/api/controllers/query/import/sources/base/index.js

@@ -11,12 +11,13 @@ var MethodToVerb;
 })(MethodToVerb || (MethodToVerb = {}));
 class ImportSource {
     constructor() {
-        this.constructQuery = (datasourceId, name, method, path, queryString, headers = {}, parameters = [], body = undefined) => {
+        this.constructQuery = (datasourceId, name, method, path, url, queryString, headers = {}, parameters = [], body = undefined) => {
             const readable = true;
             const queryVerb = this.verbFromMethod(method);
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
+            path = `${url.origin}/${path}`;
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

package/dist/api/controllers/query/import/sources/curl.js

@@ -67,15 +67,17 @@ class Curl extends base_1.ImportSource {
             }
             return true;
         });
+        this.getUrl = () => {
+            return new url_1.URL(this.curl.raw_url);
+        };
         this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
-            const url = new url_1.URL(this.curl.url);
+            const url = this.getUrl();
             return {
-                url: url.origin,
                 name: url.hostname,
             };
         });
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
-            const url = new url_1.URL(this.curl.raw_url);
+            const url = this.getUrl();
             const name = url.pathname;
             const path = url.pathname;
             const method = this.curl.method;
@@ -86,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
             return [query];
         });
     }

package/dist/api/controllers/query/import/sources/openapi2.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAPI2 = void 0;
 const openapi_types_1 = require("openapi-types");
 const openapi_1 = require("./base/openapi");
+const url_1 = require("url");
 const parameterNotRef = (param) => {
     // all refs are deferenced by parser library
     return true;
@@ -53,19 +54,21 @@ class OpenAPI2 extends openapi_1.OpenAPISource {
                 return false;
             }
         });
-        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
+        this.getUrl = () => {
             var _a;
             const scheme = ((_a = this.document.schemes) === null || _a === void 0 ? void 0 : _a.includes("https")) ? "https" : "http";
             const basePath = this.document.basePath || "";
             const host = this.document.host || "<host>";
-            const url = `${scheme}://${host}${basePath}`;
+            return new url_1.URL(`${scheme}://${host}${basePath}`);
+        };
+        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
             const name = this.document.info.title || "Swagger Import";
             return {
-                url: url,
-                name: name,
+                name,
             };
         });
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
+            const url = this.getUrl();
             const queries = [];
             for (let [path, pathItem] of Object.entries(this.document.paths)) {
                 // parameters that apply to every operation in the path
@@ -128,7 +131,7 @@ class OpenAPI2 extends openapi_1.OpenAPISource {
                             }
                         }
                     }
-                    const query = this.constructQuery(datasourceId, name, methodName, path, queryString, headers, parameters, requestBody);
+                    const query = this.constructQuery(datasourceId, name, methodName, path, url, queryString, headers, parameters, requestBody);
                     queries.push(query);
                 }
             }

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

@@ -14,6 +14,7 @@ const { BaseQueryVerbs } = require("../../../constants");
 const { Thread, ThreadType } = require("../../../threads");
 const { save: saveDatasource } = require("../datasource");
 const { RestImporter } = require("./import");
+const { invalidateDynamicVariables } = require("../../../threads/utils");
 const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
@@ -159,9 +160,24 @@ exports.executeV2 = function (ctx) {
         return execute(ctx, { rowsOnly: false });
     });
 };
+const removeDynamicVariables = (db, queryId) => __awaiter(void 0, void 0, void 0, function* () {
+    const query = yield db.get(queryId);
+    const datasource = yield db.get(query.datasourceId);
+    const dynamicVariables = datasource.config.dynamicVariables;
+    if (dynamicVariables) {
+        // delete dynamic variables from the datasource
+        const newVariables = dynamicVariables.filter(dv => dv.queryId !== queryId);
+        datasource.config.dynamicVariables = newVariables;
+        yield db.put(datasource);
+        // invalidate the deleted variables
+        const variablesToDelete = dynamicVariables.filter(dv => dv.queryId === queryId);
+        yield invalidateDynamicVariables(variablesToDelete);
+    }
+});
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
+        yield removeDynamicVariables(db, ctx.params.queryId);
         yield db.remove(ctx.params.queryId, ctx.params.revId);
         ctx.message = `Query deleted.`;
         ctx.status = 200;

package/dist/integrations/rest.js

@@ -159,7 +159,7 @@ var RestModule;
         getUrl(path, queryString) {
             const main = `${path}?${queryString}`;
             let complete = main;
-            if (this.config.url && !main.startsWith(this.config.url)) {
+            if (this.config.url && !main.startsWith("http")) {
                 complete = !this.config.url ? main : `${this.config.url}/${main}`;
             }
             if (!complete.startsWith("http")) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.27-alpha.5",
+    "version": "1.0.27-alpha.6",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/auth": "^1.0.27-alpha.5",
-        "@budibase/client": "^1.0.27-alpha.5",
-        "@budibase/string-templates": "^1.0.27-alpha.5",
+        "@budibase/auth": "^1.0.27-alpha.6",
+        "@budibase/client": "^1.0.27-alpha.6",
+        "@budibase/string-templates": "^1.0.27-alpha.6",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/utils.js

@@ -47,9 +47,10 @@ exports.checkCacheForDynamicVariable = (queryId, variable) => __awaiter(void 0,
     return cache.get(makeVariableKey(queryId, variable));
 });
 exports.invalidateDynamicVariables = (cachedVars) => __awaiter(void 0, void 0, void 0, function* () {
+    const cache = yield getClient();
     let promises = [];
     for (let variable of cachedVars) {
-        promises.push(client.delete(makeVariableKey(variable.queryId, variable.name)));
+        promises.push(cache.delete(makeVariableKey(variable.queryId, variable.name)));
     }
     yield Promise.all(promises);
 });