@budibase/server 2.3.18-alpha.8 → 2.3.18

package/dist/utilities/redis.js

@@ -36,8 +36,6 @@ function shutdown() {
             yield debounceClient.finish();
         if (flagClient)
             yield flagClient.finish();
-        // shutdown core clients
-        yield backend_core_1.redis.clients.shutdown();
         console.log("Redis shutdown");
     });
 }

package/jest.config.ts

@@ -1,48 +1,36 @@
 import { Config } from "@jest/types"
-
 import * as fs from "fs"
-const preset = require("ts-jest/jest-preset")
 
-const baseConfig: Config.InitialProjectOptions = {
-  ...preset,
-  preset: "@trendyol/jest-testcontainers",
+const config: Config.InitialOptions = {
+  testEnvironment: "node",
   setupFiles: ["./src/tests/jestEnv.ts"],
   setupFilesAfterEnv: ["./src/tests/jestSetup.ts"],
-  transform: {
-    "^.+\\.ts?$": "@swc/jest",
-  },
-  moduleNameMapper: {
-    "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
-    "@budibase/backend-core": "<rootDir>/../backend-core/src",
-    "@budibase/types": "<rootDir>/../types/src",
-  },
-}
-
-// add pro sources if they exist
-if (fs.existsSync("../../../budibase-pro")) {
-  baseConfig.moduleNameMapper["@budibase/pro"] =
-    "<rootDir>/../../../budibase-pro/packages/pro/src"
-}
-
-const config: Config.InitialOptions = {
-  projects: [
-    {
-      ...baseConfig,
-      displayName: "sequential test",
-      testMatch: ["<rootDir>/**/*.seq.spec.[jt]s"],
-      runner: "jest-serial-runner",
-    },
-    {
-      ...baseConfig,
-      testMatch: ["<rootDir>/**/!(*.seq).spec.[jt]s"],
-    },
-  ],
   collectCoverageFrom: [
     "src/**/*.{js,ts}",
     // The use of coverage with couchdb view functions breaks tests
     "!src/db/views/staticViews.*",
   ],
   coverageReporters: ["lcov", "json", "clover"],
+  transform: {
+    "^.+\\.ts?$": "@swc/jest",
+  },
+}
+
+if (!process.env.CI) {
+  // use sources when not in CI
+  config.moduleNameMapper = {
+    "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
+    "@budibase/backend-core": "<rootDir>/../backend-core/src",
+    "@budibase/types": "<rootDir>/../types/src",
+    "^axios.*$": "<rootDir>/node_modules/axios/lib/axios.js",
+  }
+  // add pro sources if they exist
+  if (fs.existsSync("../../../budibase-pro")) {
+    config.moduleNameMapper["@budibase/pro"] =
+      "<rootDir>/../../../budibase-pro/packages/pro/src"
+  }
+} else {
+  console.log("Running tests with compiled dependency sources")
 }
 
 export default config

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -14,7 +14,7 @@
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-    "test": "bash scripts/test.sh",
+    "test": "jest --coverage --maxWorkers=2",
     "test:watch": "jest --watch",
     "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
     "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.8",
-    "@budibase/client": "2.3.18-alpha.8",
-    "@budibase/pro": "2.3.18-alpha.7",
-    "@budibase/string-templates": "2.3.18-alpha.8",
-    "@budibase/types": "2.3.18-alpha.8",
+    "@budibase/backend-core": "^2.3.18",
+    "@budibase/client": "^2.3.18",
+    "@budibase/pro": "2.3.17",
+    "@budibase/string-templates": "^2.3.18",
+    "@budibase/types": "^2.3.18",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -64,7 +64,6 @@
     "chokidar": "3.5.3",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
-    "dd-trace": "3.13.2",
     "dotenv": "8.2.0",
     "download": "8.0.0",
     "elastic-apm-node": "3.38.0",
@@ -126,7 +125,6 @@
     "@jest/test-sequencer": "24.9.0",
     "@swc/core": "^1.3.25",
     "@swc/jest": "^0.2.24",
-    "@trendyol/jest-testcontainers": "^2.1.1",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
     "@types/global-agent": "2.1.1",
@@ -142,7 +140,6 @@
     "@types/pouchdb": "6.4.0",
     "@types/redis": "4.0.11",
     "@types/server-destroy": "1.0.1",
-    "@types/supertest": "2.0.12",
     "@types/tar": "6.1.3",
     "@typescript-eslint/parser": "5.45.0",
     "apidoc": "0.50.4",
@@ -154,14 +151,13 @@
     "is-wsl": "2.2.0",
     "jest": "28.1.1",
     "jest-openapi": "0.14.2",
-    "jest-serial-runner": "^1.2.1",
     "nodemon": "2.0.15",
     "openapi-types": "9.3.1",
     "openapi-typescript": "5.2.0",
     "path-to-regexp": "6.2.0",
     "prettier": "2.5.1",
     "rimraf": "3.0.2",
-    "supertest": "6.2.2",
+    "supertest": "4.0.2",
     "swagger-jsdoc": "6.1.0",
     "timekeeper": "2.2.0",
     "ts-jest": "28.0.4",
@@ -173,5 +169,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "76d67319b05f0babeb4c26c40dafef7849233cf2"
+  "gitHead": "7a59ee813fc92b82f415225421ff10e5f53a6b81"
 }

package/specs/openapi.json

@@ -817,6 +817,7 @@
                       "type": "string",
                       "enum": [
                         "string",
+                        "barcodeqr",
                         "longform",
                         "options",
                         "number",
@@ -828,8 +829,7 @@
                         "formula",
                         "auto",
                         "json",
-                        "internal",
-                        "barcodeqr"
+                        "internal"
                       ],
                       "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                     },
@@ -1021,6 +1021,7 @@
                           "type": "string",
                           "enum": [
                             "string",
+                            "barcodeqr",
                             "longform",
                             "options",
                             "number",
@@ -1032,8 +1033,7 @@
                             "formula",
                             "auto",
                             "json",
-                            "internal",
-                            "barcodeqr"
+                            "internal"
                           ],
                           "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                         },
@@ -1236,6 +1236,7 @@
                             "type": "string",
                             "enum": [
                               "string",
+                              "barcodeqr",
                               "longform",
                               "options",
                               "number",
@@ -1247,8 +1248,7 @@
                               "formula",
                               "auto",
                               "json",
-                              "internal",
-                              "barcodeqr"
+                              "internal"
                             ],
                             "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                           },

package/specs/openapi.yaml

@@ -603,6 +603,7 @@ components:
                     type: string
                     enum:
                       - string
+                      - barcodeqr
                       - longform
                       - options
                       - number
@@ -615,7 +616,6 @@ components:
                       - auto
                       - json
                       - internal
-                      - barcodeqr
                     description: Defines the type of the column, most explain themselves, a link
                       column is a relationship.
                   constraints:
@@ -766,6 +766,7 @@ components:
                         type: string
                         enum:
                           - string
+                          - barcodeqr
                           - longform
                           - options
                           - number
@@ -778,7 +779,6 @@ components:
                           - auto
                           - json
                           - internal
-                          - barcodeqr
                         description: Defines the type of the column, most explain themselves, a link
                           column is a relationship.
                       constraints:
@@ -936,6 +936,7 @@ components:
                           type: string
                           enum:
                             - string
+                            - barcodeqr
                             - longform
                             - options
                             - number
@@ -948,7 +949,6 @@ components:
                             - auto
                             - json
                             - internal
-                            - barcodeqr
                           description: Defines the type of the column, most explain themselves, a link
                             column is a relationship.
                         constraints:

package/specs/resources/query.js

@@ -1,6 +1,6 @@
 const Resource = require("./utils/Resource")
 const { object } = require("./utils")
-const { BaseQueryVerbs } = require("../../src/constants")
+const { BaseQueryVerbs } = require("../../dist/constants")
 
 const query = {
   _id: "query_datasource_plus_4d8be0c506b9465daf4bf84d890fdab6_454854487c574d45bc4029b1e153219e",

package/specs/resources/table.js

@@ -2,7 +2,7 @@ const {
   FieldTypes,
   RelationshipTypes,
   FormulaTypes,
-} = require("../../src/constants")
+} = require("../../dist/constants")
 const { object } = require("./utils")
 const Resource = require("./utils/Resource")
 

package/src/api/controllers/automation.ts

@@ -65,14 +65,10 @@ export async function create(ctx: BBContext) {
 
   // call through to update if already exists
   if (automation._id && automation._rev) {
-    await update(ctx)
-    return
+    return update(ctx)
   }
 
-  // Respect existing IDs if recreating a deleted automation
-  if (!automation._id) {
-    automation._id = generateAutomationID()
-  }
+  automation._id = generateAutomationID()
 
   automation.type = "automation"
   automation = cleanAutomationInputs(automation)
@@ -130,13 +126,6 @@ export async function update(ctx: BBContext) {
   const db = context.getAppDB()
   let automation = ctx.request.body
   automation.appId = ctx.appId
-
-  // Call through to create if it doesn't exist
-  if (!automation._id || !automation._rev) {
-    await create(ctx)
-    return
-  }
-
   const oldAutomation = await db.get(automation._id)
   automation = cleanAutomationInputs(automation)
   automation = await checkForWebhooks({

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

@@ -41,7 +41,7 @@ const datasets = {
 describe("Rest Importer", () => {
   const config = new TestConfig(false)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

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

@@ -186,8 +186,6 @@ export async function preview(ctx: any) {
         schemaFields[key] = fieldType
       }
     }
-    // remove configuration before sending event
-    delete datasource.config
     await events.query.previewed(datasource, query)
     ctx.body = {
       rows,

package/src/api/controllers/row/ExternalRequest.ts

@@ -10,7 +10,6 @@ import {
   FieldSchema,
   Row,
   Table,
-  RelationshipTypes,
 } from "@budibase/types"
 import {
   breakRowIdField,
@@ -19,7 +18,7 @@ import {
   convertRowId,
 } from "../../../integrations/utils"
 import { getDatasourceAndQuery } from "./utils"
-import { FieldTypes } from "../../../constants"
+import { FieldTypes, RelationshipTypes } from "../../../constants"
 import { breakExternalTableId, isSQL } from "../../../integrations/utils"
 import { processObjectSync } from "@budibase/string-templates"
 import { cloneDeep } from "lodash/fp"
@@ -45,7 +44,6 @@ export interface RunConfig {
   row?: Row
   rows?: Row[]
   tables?: Record<string, Table>
-  includeSqlRelationships?: IncludeRelationship
 }
 
 function buildFilters(
@@ -708,9 +706,7 @@ export class ExternalRequest {
       },
       resource: {
         // have to specify the fields to avoid column overlap (for SQL)
-        fields: isSql
-          ? this.buildFields(table, config.includeSqlRelationships)
-          : [],
+        fields: isSql ? this.buildFields(table) : [],
       },
       filters,
       sort,

package/src/api/controllers/row/external.ts

@@ -18,7 +18,6 @@ import {
   PaginationJson,
   Table,
   Datasource,
-  IncludeRelationship,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 
@@ -58,7 +57,6 @@ export async function patch(ctx: BBContext) {
   return handleRequest(Operation.UPDATE, tableId, {
     id: breakRowIdField(id),
     row: inputs,
-    includeSqlRelationships: IncludeRelationship.EXCLUDE,
   })
 }
 
@@ -67,7 +65,6 @@ export async function save(ctx: BBContext) {
   const tableId = ctx.params.tableId
   return handleRequest(Operation.CREATE, tableId, {
     row: inputs,
-    includeSqlRelationships: IncludeRelationship.EXCLUDE,
   })
 }
 
@@ -81,9 +78,7 @@ export async function fetchView(ctx: BBContext) {
 
 export async function fetch(ctx: BBContext) {
   const tableId = ctx.params.tableId
-  return handleRequest(Operation.READ, tableId, {
-    includeSqlRelationships: IncludeRelationship.INCLUDE,
-  })
+  return handleRequest(Operation.READ, tableId)
 }
 
 export async function find(ctx: BBContext) {
@@ -91,7 +86,6 @@ export async function find(ctx: BBContext) {
   const tableId = ctx.params.tableId
   const response = (await handleRequest(Operation.READ, tableId, {
     id: breakRowIdField(id),
-    includeSqlRelationships: IncludeRelationship.EXCLUDE,
   })) as Row[]
   return response ? response[0] : response
 }
@@ -101,7 +95,6 @@ export async function destroy(ctx: BBContext) {
   const id = ctx.request.body._id
   const { row } = (await handleRequest(Operation.DELETE, tableId, {
     id: breakRowIdField(id),
-    includeSqlRelationships: IncludeRelationship.EXCLUDE,
   })) as { row: Row }
   return { response: { ok: true }, row }
 }
@@ -114,7 +107,6 @@ export async function bulkDestroy(ctx: BBContext) {
     promises.push(
       handleRequest(Operation.DELETE, tableId, {
         id: breakRowIdField(row._id),
-        includeSqlRelationships: IncludeRelationship.EXCLUDE,
       })
     )
   }
@@ -157,7 +149,6 @@ export async function search(ctx: BBContext) {
       filters: query,
       sort,
       paginate: paginateObj as PaginationJson,
-      includeSqlRelationships: IncludeRelationship.INCLUDE,
     })) as Row[]
     let hasNextPage = false
     if (paginate && rows.length === limit) {
@@ -168,7 +159,6 @@ export async function search(ctx: BBContext) {
           limit: 1,
           page: bookmark * limit + 1,
         },
-        includeSqlRelationships: IncludeRelationship.INCLUDE,
       })) as Row[]
       hasNextPage = nextRows.length > 0
     }
@@ -259,7 +249,6 @@ export async function fetchEnrichedRow(ctx: BBContext) {
   const response = (await handleRequest(Operation.READ, tableId, {
     id,
     datasource,
-    includeSqlRelationships: IncludeRelationship.INCLUDE,
   })) as Row[]
   const table: Table = tables[tableName]
   const row = response[0]
@@ -287,7 +276,6 @@ export async function fetchEnrichedRow(ctx: BBContext) {
           [primaryLink]: linkedIds,
         },
       },
-      includeSqlRelationships: IncludeRelationship.INCLUDE,
     })
   }
   return row

package/src/api/controllers/table/external.ts

@@ -8,7 +8,7 @@ import {
   foreignKeyStructure,
   hasTypeChanged,
 } from "./utils"
-import { FieldTypes } from "../../../constants"
+import { FieldTypes, RelationshipTypes } from "../../../constants"
 import { makeExternalQuery } from "../../../integrations/base/query"
 import { handleRequest } from "../row/external"
 import { events, context } from "@budibase/backend-core"
@@ -22,7 +22,6 @@ import {
   FieldSchema,
   BBContext,
   TableRequest,
-  RelationshipTypes,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 const { cloneDeep } = require("lodash/fp")
@@ -147,7 +146,7 @@ function generateLinkSchema(
   column: FieldSchema,
   table: Table,
   relatedTable: Table,
-  type: RelationshipTypes
+  type: string
 ) {
   if (!table.primary || !relatedTable.primary) {
     throw new Error("Unable to generate link schema, no primary keys")

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import Router from "@koa/router"
-import { auth, middleware } from "@budibase/backend-core"
+import { errors, auth } from "@budibase/backend-core"
 import currentApp from "../middleware/currentapp"
 import zlib from "zlib"
 import { mainRoutes, staticRoutes, publicRoutes } from "./routes"
@@ -14,8 +14,6 @@ export const router: Router = new Router()
 router.get("/health", ctx => (ctx.status = 200))
 router.get("/version", ctx => (ctx.body = pkg.version))
 
-router.use(middleware.errorHandling)
-
 router
   .use(
     compress({
@@ -56,6 +54,27 @@ router
   .use(currentApp)
   .use(auth.auditLog)
 
+// error handling middleware
+router.use(async (ctx, next) => {
+  try {
+    await next()
+  } catch (err: any) {
+    ctx.status = err.status || err.statusCode || 500
+    const error = errors.getPublicError(err)
+    ctx.body = {
+      message: err.message,
+      status: ctx.status,
+      validationErrors: err.validation,
+      error,
+    }
+    ctx.log.error(err)
+    // unauthorised errors don't provide a useful trace
+    if (!env.isTest()) {
+      console.trace(err)
+    }
+  }
+})
+
 // authenticated routes
 for (let route of mainRoutes) {
   router.use(route.routes())

package/src/api/routes/automation.ts

@@ -38,7 +38,7 @@ router
     "/api/automations",
     bodyResource("_id"),
     authorized(permissions.BUILDER),
-    automationValidator(false),
+    automationValidator(true),
     controller.update
   )
   .post(

package/src/api/routes/public/applications.ts

@@ -1,6 +1,7 @@
 import controller from "../../controllers/public/applications"
 import Endpoint from "./utils/Endpoint"
 const { nameValidator, applicationValidator } = require("../utils/validators")
+import { db } from "@budibase/backend-core"
 
 const read = [],
   write = []

package/src/api/routes/public/tests/compare.spec.js

@@ -13,7 +13,7 @@ beforeAll(async () => {
   app = await config.init()
   table = await config.updateTable()
   apiKey = await config.generateApiKey()
-  makeRequest = generateMakeRequest(apiKey)
+  makeRequest = generateMakeRequest(apiKey, setup)
 })
 
 afterAll(setup.afterAll)

package/src/api/routes/public/tests/users.spec.js

@@ -10,7 +10,7 @@ beforeAll(async () => {
   await config.init()
   globalUser = await config.globalUser()
   apiKey = await config.generateApiKey(globalUser._id)
-  makeRequest = generateMakeRequest(apiKey)
+  makeRequest = generateMakeRequest(apiKey, setup)
   workerRequests.readGlobalUser.mockReturnValue(globalUser)
 })
 

package/src/api/routes/public/tests/utils.ts

@@ -1,27 +1,13 @@
-import * as setup from "../../tests/utilities"
 import { checkSlashesInUrl } from "../../../../utilities"
-import supertest from "supertest"
 
-export type HttpMethod = "post" | "get" | "put" | "delete" | "patch"
-
-export type MakeRequestResponse = (
-  method: HttpMethod,
-  endpoint: string,
-  body?: any,
-  intAppId?: string
-) => Promise<supertest.Response>
-
-export function generateMakeRequest(
-  apiKey: string,
-  isInternal = false
-): MakeRequestResponse {
-  const request = setup.getRequest()!
-  const config = setup.getConfig()!
+export function generateMakeRequest(apiKey: string, setup: any) {
+  const request = setup.getRequest()
+  const config = setup.getConfig()
   return async (
-    method: HttpMethod,
+    method: string,
     endpoint: string,
     body?: any,
-    intAppId: string | null = config.getAppId()
+    intAppId: string = config.getAppId()
   ) => {
     const extraHeaders: any = {
       "x-budibase-api-key": apiKey,
@@ -29,12 +15,9 @@ export function generateMakeRequest(
     if (intAppId) {
       extraHeaders["x-budibase-app-id"] = intAppId
     }
-
-    const url = isInternal
-      ? endpoint
-      : checkSlashesInUrl(`/api/public/v1/${endpoint}`)
-
-    const req = request[method](url).set(config.defaultHeaders(extraHeaders))
+    const req = request[method](
+      checkSlashesInUrl(`/api/public/v1/${endpoint}`)
+    ).set(config.defaultHeaders(extraHeaders))
     if (body) {
       req.send(body)
     }

package/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap

@@ -7,7 +7,7 @@ Array [
     "entities": Array [
       Object {
         "_id": "ta_users",
-        "_rev": "1-2375e1bc58aeec664dc1b1f04ad43e44",
+        "_rev": "1-6f4013e796887f1771bf7837598d87e7",
         "createdAt": "2020-01-01T00:00:00.000Z",
         "name": "Users",
         "primaryDisplay": "email",

package/src/api/routes/tests/analytics.spec.js

@@ -10,11 +10,8 @@ describe("/static", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     app = await config.init()
-  })
-  
-  beforeEach(()=>{
     jest.clearAllMocks()
   })
 

package/src/api/routes/tests/apikeys.spec.js

@@ -7,7 +7,7 @@ describe("/api/keys", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })