@budibase/server 1.0.91-alpha.6 → 1.0.93

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.91-alpha.6",
+  "version": "1.0.93",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -71,13 +71,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.91-alpha.6",
-    "@budibase/client": "^1.0.91-alpha.6",
-    "@budibase/string-templates": "^1.0.91-alpha.6",
+    "@budibase/backend-core": "^1.0.93",
+    "@budibase/client": "^1.0.93",
+    "@budibase/string-templates": "^1.0.93",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
-    "@google-cloud/firestore": "^5.0.2",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
     "@sentry/node": "^6.0.0",
@@ -176,5 +175,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "fa77eb5dafa703703619c2b365b412e23c0fa44e"
+  "gitHead": "38f53a4148845f1aded8a72311363032c177d2c6"
 }

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,17 +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 {
-        let href = url.href
-        if (href.endsWith("/")) {
-          href = href.slice(0, -1)
-        }
-        path = `${href}/${path}`
-      }
-    }
+    path = `${url.origin}/${path}`
     queryString = this.processQuery(queryString)
     const requestBody = JSON.stringify(body, null, 2)
 

package/src/api/controllers/query/import/sources/curl.ts

@@ -74,7 +74,7 @@ export class Curl extends ImportSource {
   getQueries = async (datasourceId: string): Promise<Query[]> => {
     const url = this.getUrl()
     const name = url.pathname
-    const path = url.origin + url.pathname
+    const path = url.pathname
     const method = this.curl.method
     const queryString = url.search
     const headers = this.curl.headers
@@ -90,7 +90,7 @@ export class Curl extends ImportSource {
       name,
       method,
       path,
-      undefined,
+      url,
       queryString,
       headers,
       [],

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/src/api/controllers/row/internal.js

@@ -85,11 +85,7 @@ exports.patch = async ctx => {
   const isUserTable = tableId === InternalTables.USER_METADATA
   let oldRow
   try {
-    let dbTable = await db.get(tableId)
-    oldRow = await outputProcessing(
-      dbTable,
-      await findRow(ctx, tableId, inputs._id)
-    )
+    oldRow = await db.get(inputs._id)
   } catch (err) {
     if (isUserTable) {
       // don't include the rev, it'll be the global rev

package/src/automations/utils.js

@@ -22,6 +22,7 @@ exports.processEvent = async job => {
     console.error(
       `${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${err}`
     )
+    console.trace(err)
     return { err }
   }
 }

package/src/definitions/datasource.ts

@@ -48,7 +48,6 @@ export enum SourceNames {
   REST = "REST",
   ORACLE = "ORACLE",
   GOOGLE_SHEETS = "GOOGLE_SHEETS",
-  FIREBASE = "FIREBASE",
 }
 
 export enum IncludeRelationships {

package/src/integrations/base/sql.ts

@@ -27,8 +27,11 @@ function parse(input: any) {
   if (typeof input !== "string") {
     return input
   }
-  if (input === MAX_ISO_DATE || input === MIN_ISO_DATE) {
-    return null
+  if (input === MAX_ISO_DATE) {
+    return new Date(8640000000000000)
+  }
+  if (input === MIN_ISO_DATE) {
+    return new Date(-8640000000000000)
   }
   if (isIsoDateString(input)) {
     return new Date(input)
@@ -127,19 +130,11 @@ class InternalBuilder {
     }
     if (filters.range) {
       iterate(filters.range, (key, value) => {
-        if (value.low && value.high) {
-          // Use a between operator if we have 2 valid range values
-          const fnc = allOr ? "orWhereBetween" : "whereBetween"
-          query = query[fnc](key, [value.low, value.high])
-        } else if (value.low) {
-          // Use just a single greater than operator if we only have a low
-          const fnc = allOr ? "orWhere" : "where"
-          query = query[fnc](key, ">", value.low)
-        } else if (value.high) {
-          // Use just a single less than operator if we only have a high
-          const fnc = allOr ? "orWhere" : "where"
-          query = query[fnc](key, "<", value.high)
+        if (!value.high || !value.low) {
+          return
         }
+        const fnc = allOr ? "orWhereBetween" : "whereBetween"
+        query = query[fnc](key, [value.low, value.high])
       })
     }
     if (filters.equal) {

package/src/integrations/index.ts

@@ -10,7 +10,6 @@ const mysql = require("./mysql")
 const arangodb = require("./arangodb")
 const rest = require("./rest")
 const googlesheets = require("./googlesheets")
-const firebase = require("./firebase")
 const { SourceNames } = require("../definitions/datasource")
 const environment = require("../environment")
 
@@ -26,7 +25,6 @@ const DEFINITIONS = {
   [SourceNames.MYSQL]: mysql.schema,
   [SourceNames.ARANGODB]: arangodb.schema,
   [SourceNames.REST]: rest.schema,
-  [SourceNames.FIREBASE]: firebase.schema,
 }
 
 const INTEGRATIONS = {
@@ -41,7 +39,6 @@ const INTEGRATIONS = {
   [SourceNames.MYSQL]: mysql.integration,
   [SourceNames.ARANGODB]: arangodb.integration,
   [SourceNames.REST]: rest.integration,
-  [SourceNames.FIREBASE]: firebase.integration,
 }
 
 // optionally add oracle integration if the oracle binary can be installed

package/src/integrations/tests/sql.spec.js

@@ -187,55 +187,4 @@ describe("SQL query builder", () => {
       sql: `select * from (select * from \`${TABLE_NAME}\` limit ?) as \`${TABLE_NAME}\``
     })
   })
-
-  it("should use greater than when only low range specified", () => {
-    const date = new Date()
-    const query = sql._query(generateReadJson({
-      filters: {
-        range: {
-          property: {
-            low: date,
-          }
-        }
-      }
-    }))
-    expect(query).toEqual({
-      bindings: [date, limit],
-      sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."property" > $1 limit $2) as "${TABLE_NAME}"`
-    })
-  })
-
-  it("should use less than when only high range specified", () => {
-    const date = new Date()
-    const query = sql._query(generateReadJson({
-      filters: {
-        range: {
-          property: {
-            high: date,
-          }
-        }
-      }
-    }))
-    expect(query).toEqual({
-      bindings: [date, limit],
-      sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."property" < $1 limit $2) as "${TABLE_NAME}"`
-    })
-  })
-
-  it("should use greater than when only low range specified", () => {
-    const date = new Date()
-    const query = sql._query(generateReadJson({
-      filters: {
-        range: {
-          property: {
-            low: date,
-          }
-        }
-      }
-    }))
-    expect(query).toEqual({
-      bindings: [date, limit],
-      sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."property" > $1 limit $2) as "${TABLE_NAME}"`
-    })
-  })
 })

package/src/threads/automation.js

@@ -1,13 +1,11 @@
 require("./utils").threadSetup()
-const env = require("../environment")
 const actions = require("../automations/actions")
 const automationUtils = require("../automations/automationUtils")
 const AutomationEmitter = require("../events/AutomationEmitter")
 const { processObject } = require("@budibase/string-templates")
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants")
-const { DocumentTypes, isDevAppID } = require("../db/utils")
+const { DocumentTypes } = require("../db/utils")
 const { doInTenant } = require("@budibase/backend-core/tenancy")
-const usage = require("../utilities/usageQuota")
 const { definitions: triggerDefs } = require("../automations/triggerInfo")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 
@@ -120,11 +118,6 @@ class Orchestrator {
         return err
       }
     }
-
-    // Increment quota for automation runs
-    if (!env.SELF_HOSTED && !isDevAppID(this._appId)) {
-      await usage.update(usage.Properties.AUTOMATION, 1)
-    }
     return this.executionOutput
   }
 }

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;