@budibase/server 1.0.90 → 1.0.91-alpha.2

package/coverage/lcov-report/utilities/usageQuota/index.js.html

@@ -343,7 +343,7 @@ exports.update = async (property, usage, opts = { dryRun: false }) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Mar 16 2022 11:37:01 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 09:56:39 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -289,7 +289,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Mar 16 2022 11:37:01 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 09:56:39 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -118,7 +118,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Mar 16 2022 11:37:01 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 09:56:39 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/users.js.html

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Mar 16 2022 11:37:01 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 09:56:39 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -481,7 +481,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Mar 16 2022 11:37:01 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 09:56:39 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -2193,14 +2193,14 @@ FN:28,(anonymous_1)
 FN:33,(anonymous_2)
 FNF:3
 FNH:3
-FNDA:29,(anonymous_0)
+FNDA:33,(anonymous_0)
 FNDA:24,(anonymous_1)
 FNDA:24,(anonymous_2)
 DA:1,41
 DA:2,41
 DA:4,41
 DA:6,41
-DA:7,29
+DA:7,33
 DA:28,41
 DA:30,24
 DA:33,41
@@ -6583,10 +6583,10 @@ SF:src/db/newid.js
 FN:3,(anonymous_0)
 FNF:1
 FNH:1
-FNDA:946,(anonymous_0)
+FNDA:996,(anonymous_0)
 DA:1,55
 DA:3,55
-DA:4,946
+DA:4,996
 LF:3
 LH:3
 BRF:0
@@ -6652,7 +6652,7 @@ FNDA:10,(anonymous_20)
 FNDA:2,(anonymous_21)
 FNDA:39,(anonymous_22)
 FNDA:4,(anonymous_23)
-FNDA:81,(anonymous_24)
+FNDA:131,(anonymous_24)
 FNDA:4,(anonymous_25)
 FNDA:0,(anonymous_26)
 FNDA:10,(anonymous_27)
@@ -6753,7 +6753,7 @@ DA:318,39
 DA:326,55
 DA:327,4
 DA:334,55
-DA:335,81
+DA:335,131
 DA:343,55
 DA:344,4
 DA:345,3

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

@@ -13,6 +13,7 @@ exports.RestImporter = void 0;
 const validation_1 = require("../validation");
 const utils_1 = require("../../../../db/utils");
 const openapi2_1 = require("./sources/openapi2");
+const openapi3_1 = require("./sources/openapi3");
 const curl_1 = require("./sources/curl");
 // @ts-ignore
 const context_1 = require("@budibase/backend-core/context");
@@ -71,7 +72,7 @@ class RestImporter {
             };
         });
         this.data = data;
-        this.sources = [new openapi2_1.OpenAPI2(), new curl_1.Curl()];
+        this.sources = [new openapi2_1.OpenAPI2(), new openapi3_1.OpenAPI3(), new curl_1.Curl()];
     }
 }
 exports.RestImporter = RestImporter;

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

@@ -17,7 +17,18 @@ class ImportSource {
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
-            path = `${url.origin}/${path}`;
+            if (url) {
+                if (typeof url === "string") {
+                    path = `${url}/${path}`;
+                }
+                else {
+                    let href = url.href;
+                    if (href.endsWith("/")) {
+                        href = href.slice(0, -1);
+                    }
+                    path = `${href}/${path}`;
+                }
+            }
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

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

@@ -79,7 +79,7 @@ class Curl extends base_1.ImportSource {
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
             const url = this.getUrl();
             const name = url.pathname;
-            const path = url.pathname;
+            const path = url.origin + url.pathname;
             const method = this.curl.method;
             const queryString = url.search;
             const headers = this.curl.headers;
@@ -88,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, undefined, queryString, headers, [], requestBody);
             return [query];
         });
     }

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

@@ -0,0 +1,174 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenAPI3 = 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;
+};
+const requestBodyNotRef = (param) => {
+    // all refs are deferenced by parser library
+    return param !== undefined;
+};
+const schemaNotRef = (param) => {
+    // all refs are deferenced by parser library
+    return param !== undefined;
+};
+const isOpenAPI3 = (document) => {
+    return document.openapi.includes("3.0");
+};
+const methods = Object.values(openapi_types_1.OpenAPIV3.HttpMethods);
+const isOperation = (key, pathItem) => {
+    return methods.includes(key);
+};
+const isParameter = (key, pathItem) => {
+    return !isOperation(key, pathItem);
+};
+const getRequestBody = (operation) => {
+    if (requestBodyNotRef(operation.requestBody)) {
+        const request = operation.requestBody;
+        const supportedMimeTypes = getMimeTypes(operation);
+        if (supportedMimeTypes.length > 0) {
+            const mimeType = supportedMimeTypes[0];
+            // try get example from request
+            const content = request.content[mimeType];
+            if (content.example) {
+                return content.example;
+            }
+            // try get example from schema
+            if (schemaNotRef(content.schema)) {
+                const schema = content.schema;
+                if (schema.example) {
+                    return schema.example;
+                }
+            }
+        }
+    }
+    return undefined;
+};
+const getMimeTypes = (operation) => {
+    if (requestBodyNotRef(operation.requestBody)) {
+        const request = operation.requestBody;
+        return Object.keys(request.content);
+    }
+    return [];
+};
+/**
+ * OpenAPI Version 3.0
+ * https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.0.md
+ */
+class OpenAPI3 extends openapi_1.OpenAPISource {
+    constructor() {
+        super(...arguments);
+        this.isSupported = (data) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const document = yield this.parseData(data);
+                if (isOpenAPI3(document)) {
+                    this.document = document;
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            catch (err) {
+                return false;
+            }
+        });
+        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
+            const name = this.document.info.title || "OpenAPI Import";
+            return {
+                name,
+            };
+        });
+        this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let url;
+            if ((_a = this.document.servers) === null || _a === void 0 ? void 0 : _a.length) {
+                url = this.document.servers[0].url;
+                try {
+                    url = new url_1.URL(url);
+                }
+                catch (err) {
+                    // unable to construct url, e.g. with variables
+                    // proceed with string form of url
+                }
+            }
+            const queries = [];
+            for (let [path, pathItemObject] of Object.entries(this.document.paths)) {
+                // parameters that apply to every operation in the path
+                let pathParams = [];
+                // pathItemObject can be undefined
+                if (!pathItemObject) {
+                    continue;
+                }
+                for (let [key, opOrParams] of Object.entries(pathItemObject)) {
+                    if (isParameter(key, opOrParams)) {
+                        const pathParameters = opOrParams;
+                        pathParams.push(...pathParameters);
+                        continue;
+                    }
+                    // can not be a parameter, must be an operation
+                    const operation = opOrParams;
+                    const methodName = key;
+                    const name = operation.operationId || path;
+                    let queryString = "";
+                    const headers = {};
+                    let requestBody = getRequestBody(operation);
+                    const parameters = [];
+                    const mimeTypes = getMimeTypes(operation);
+                    if (mimeTypes.length > 0) {
+                        headers["Content-Type"] = mimeTypes[0];
+                    }
+                    // combine the path parameters with the operation parameters
+                    const operationParams = operation.parameters || [];
+                    const allParams = [...pathParams, ...operationParams];
+                    for (let param of allParams) {
+                        if (parameterNotRef(param)) {
+                            switch (param.in) {
+                                case "query":
+                                    let prefix = "";
+                                    if (queryString) {
+                                        prefix = "&";
+                                    }
+                                    queryString = `${queryString}${prefix}${param.name}={{${param.name}}}`;
+                                    break;
+                                case "header":
+                                    headers[param.name] = `{{${param.name}}}`;
+                                    break;
+                                case "path":
+                                    // do nothing: param is already in the path
+                                    break;
+                                case "formData":
+                                    // future enhancement
+                                    break;
+                            }
+                            // add the parameter if it can be bound in our config
+                            if (["query", "header", "path"].includes(param.in)) {
+                                parameters.push({
+                                    name: param.name,
+                                    default: "",
+                                });
+                            }
+                        }
+                    }
+                    const query = this.constructQuery(datasourceId, name, methodName, path, url, queryString, headers, parameters, requestBody);
+                    queries.push(query);
+                }
+            }
+            return queries;
+        });
+    }
+}
+exports.OpenAPI3 = OpenAPI3;

package/dist/api/controllers/query/import/sources/tests/openapi3/data/crud/crud.json

@@ -0,0 +1,253 @@
+{
+  "openapi": "3.0.2",
+  "info": {
+    "description": "A basic swagger file",
+    "version": "1.0.0",
+    "title": "CRUD"
+  },
+  "servers": [
+    {
+      "url": "http://example.com"
+    }
+  ],
+  "tags": [
+    {
+      "name": "entity"
+    }
+  ],
+  "paths": {
+    "/entities": {
+      "post": {
+        "tags": [
+          "entity"
+        ],
+        "operationId": "createEntity",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateEntity"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Entity"
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "entity"
+        ],
+        "operationId": "getEntities",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/PageParameter"
+          },
+          {
+            "$ref": "#/components/parameters/SizeParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Entities"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/entities/{entityId}": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/EntityIdParameter"
+        }
+      ],
+      "get": {
+        "tags": [
+          "entity"
+        ],
+        "operationId": "getEntity",
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Entity"
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "entity"
+        ],
+        "operationId": "updateEntity",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Entity"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Entity"
+                }
+              }
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "entity"
+        ],
+        "operationId": "patchEntity",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Entity"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Entity"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "entity"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/APIKeyParameter"
+          }
+        ],
+        "operationId": "deleteEntity",
+        "responses": {
+          "204": {
+            "description": "successful operation"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "parameters": {
+      "EntityIdParameter": {
+        "schema": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": "entityId",
+        "in": "path",
+        "required": true
+      },
+     "PageParameter": {
+       "schema": {
+         "type": "integer",
+         "format": "int32"
+        },
+        "name": "page",
+        "in": "query",
+        "required": false
+      },
+      "SizeParameter": {
+        "schema": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "name": "size",
+        "in": "query",
+        "required": false
+      },
+      "APIKeyParameter": {
+        "schema": {
+          "type": "string"
+        },
+        "name": "x-api-key",
+        "in": "header",
+        "required": false
+      }
+    },
+    "schemas": {
+      "CreateEntity": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          }
+        },
+        "example": {
+          "name": "name",
+          "type": "type"
+        }
+      },
+      "Entity": {
+        "allOf": [
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "integer",
+                "format": "int64"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/CreateEntity"
+          }
+        ],
+        "example": {
+          "id": 1,
+          "name": "name",
+          "type": "type"
+        }
+      },
+      "Entities" : {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/Entity"
+        }
+      }
+      }
+  }
+}