@budibase/server 1.0.91-alpha.1 → 1.0.91

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.91-alpha.1",
+  "version": "1.0.91",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -71,9 +71,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.91-alpha.1",
-    "@budibase/client": "^1.0.91-alpha.1",
-    "@budibase/string-templates": "^1.0.91-alpha.1",
+    "@budibase/backend-core": "^1.0.91",
+    "@budibase/client": "^1.0.91",
+    "@budibase/string-templates": "^1.0.91",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -175,5 +175,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "9d9c995f874da8c4ad441a7d72629ff9b3268c21"
+  "gitHead": "a9154e1c313ccc5df4b9561b273a65061a1158d3"
 }

package/src/api/controllers/query/import/index.ts

@@ -2,7 +2,6 @@ import { queryValidation } from "../validation"
 import { generateQueryID } from "../../../../db/utils"
 import { ImportInfo, ImportSource } from "./sources/base"
 import { OpenAPI2 } from "./sources/openapi2"
-import { OpenAPI3 } from "./sources/openapi3"
 import { Query } from "./../../../../definitions/common"
 import { Curl } from "./sources/curl"
 // @ts-ignore
@@ -19,7 +18,7 @@ export class RestImporter {
 
   constructor(data: string) {
     this.data = data
-    this.sources = [new OpenAPI2(), new OpenAPI3(), new Curl()]
+    this.sources = [new OpenAPI2(), new Curl()]
   }
 
   init = async () => {

package/src/api/controllers/query/import/sources/base/index.ts

@@ -23,7 +23,7 @@ export abstract class ImportSource {
     name: string,
     method: string,
     path: string,
-    url: URL | string | undefined,
+    url: URL,
     queryString: string,
     headers: object = {},
     parameters: QueryParameter[] = [],
@@ -34,13 +34,7 @@ export abstract class ImportSource {
     const transformer = "return data"
     const schema = {}
     path = this.processPath(path)
-    if (url) {
-      if (typeof url === "string") {
-        path = `${url}/${path}`
-      } else {
-        path = `${url.origin}/${path}`
-      }
-    }
+    path = `${url.origin}/${path}`
     queryString = this.processQuery(queryString)
     const requestBody = JSON.stringify(body, null, 2)
 

package/src/api/controllers/query/import/tests/index.spec.js

@@ -23,27 +23,14 @@ const oapi2CrudYaml = getData("openapi2/data/crud/crud.json")
 const oapi2PetstoreJson = getData("openapi2/data/petstore/petstore.json")
 const oapi2PetstoreYaml = getData("openapi2/data/petstore/petstore.json")
 
-// openapi3 
-const oapi3CrudJson = getData("openapi3/data/crud/crud.json")
-const oapi3CrudYaml = getData("openapi3/data/crud/crud.json")
-const oapi3PetstoreJson = getData("openapi3/data/petstore/petstore.json")
-const oapi3PetstoreYaml = getData("openapi3/data/petstore/petstore.json")
-
 // curl
 const curl = getData("curl/data/post.txt")
 
 const datasets = {
-  // openapi2 (swagger)
   oapi2CrudJson,
   oapi2CrudYaml,
   oapi2PetstoreJson,
   oapi2PetstoreYaml,
-  // openapi3
-  oapi3CrudJson,
-  oapi3CrudYaml,
-  oapi3PetstoreJson,
-  oapi3PetstoreYaml,
-  // curl
   curl
 }
 
@@ -69,7 +56,6 @@ describe("Rest Importer", () => {
 
   it("gets info", async () => {
     const assertions = {
-      // openapi2 (swagger)
       "oapi2CrudJson" : {
         name: "CRUD",
       },
@@ -82,20 +68,6 @@ describe("Rest Importer", () => {
       "oapi2PetstoreYaml" :{
         name: "Swagger Petstore",
       },
-      // openapi3
-      "oapi3CrudJson" : {
-        name: "CRUD",
-      },
-      "oapi3CrudYaml" : {
-        name: "CRUD",
-      },
-      "oapi3PetstoreJson" : {
-        name: "Swagger Petstore - OpenAPI 3.0",
-      },
-      "oapi3PetstoreYaml" :{
-        name: "Swagger Petstore - OpenAPI 3.0",
-      },
-      // curl
       "curl": {
         name: "example.com",
       }
@@ -117,7 +89,6 @@ describe("Rest Importer", () => {
     // simple sanity assertions that the whole dataset 
     // makes it through the importer
     const assertions = {
-      // openapi2 (swagger)
       "oapi2CrudJson" : {
         count: 6,
       },
@@ -130,20 +101,6 @@ describe("Rest Importer", () => {
       "oapi2PetstoreYaml" :{
         count: 20,
       },
-      // openapi3
-      "oapi3CrudJson" : {
-        count: 6,
-      },
-      "oapi3CrudYaml" :{
-        count: 6,
-      },
-      "oapi3PetstoreJson" : {
-        count: 19,
-      },
-      "oapi3PetstoreYaml" :{
-        count: 19,
-      },
-      // curl
       "curl": {
         count: 1
       }

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

@@ -1,174 +0,0 @@
-"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

@@ -1,253 +0,0 @@
-{
-  "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"
-        }
-      }
-      }
-  }
-}