run prettier + lint over typescript files as well

5 years ago · 71f5b68d57
9 changed files with 38 additions and 27 deletions
--- a/package.json
+++ b/package.json
@ -36,10 +36,10 @@
    "dev:server": "lerna run --parallel dev:builder --concurrency 1 --scope @budibase/worker --scope @budibase/server",
    "test": "lerna run test",
    "lint:eslint": "eslint packages",
-    "lint:prettier": "prettier --check \"packages/**/*.{js,svelte}\"",
+    "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\"",
    "lint": "yarn run lint:eslint && yarn run lint:prettier",
    "lint:fix:eslint": "eslint --fix packages",
-    "lint:fix:prettier": "prettier --write \"packages/**/*.{js,svelte}\"",
+    "lint:fix:prettier": "prettier --write \"packages/**/*.{js,ts,svelte}\"",
    "lint:fix:ts": "lerna run lint:fix",
    "lint:fix": "yarn run lint:fix:ts && yarn run lint:fix:prettier && yarn run lint:fix:eslint",
    "test:e2e": "lerna run cy:test",
--- a/packages/server/mocks/arangojs.ts
+++ b/packages/server/mocks/arangojs.ts
@ -9,7 +9,7 @@ module ArangoMock {
    this.close = jest.fn()
  }

-// @ts-ignore
+  // @ts-ignore
  arangodb.aql = (strings, ...args) => {
    let str = strings.join("{}")

--- a/packages/server/mocks/aws-sdk.ts
+++ b/packages/server/mocks/aws-sdk.ts
@ -1,7 +1,7 @@
 module AwsMock {
  const aws: any = {}

-  const response = (body: any) => () => ({promise: () => body})
+  const response = (body: any) => () => ({ promise: () => body })

  function DocumentClient() {
    // @ts-ignore
@ -39,9 +39,9 @@ module AwsMock {
    )
  }

-  aws.DynamoDB = {DocumentClient}
+  aws.DynamoDB = { DocumentClient }
  aws.S3 = S3
-  aws.config = {update: jest.fn()}
+  aws.config = { update: jest.fn() }

  module.exports = aws
-}
+}
--- a/packages/server/mocks/mongodb.ts
+++ b/packages/server/mocks/mongodb.ts
@ -5,15 +5,14 @@ module MongoMock {
    this.connect = jest.fn()
    this.close = jest.fn()
    this.insertOne = jest.fn()
-    this.insertMany = jest.fn(() => ({toArray: () => []}))
-    this.find = jest.fn(() => ({toArray: () => []}))
+    this.insertMany = jest.fn(() => ({ toArray: () => [] }))
+    this.find = jest.fn(() => ({ toArray: () => [] }))
    this.findOne = jest.fn()
    this.count = jest.fn()
    this.deleteOne = jest.fn()
-    this.deleteMany = jest.fn(() => ({toArray: () => []}))
+    this.deleteMany = jest.fn(() => ({ toArray: () => [] }))
    this.updateOne = jest.fn()
-    this.updateMany = jest.fn(() => ({toArray: () => []}))
-
+    this.updateMany = jest.fn(() => ({ toArray: () => [] }))

    this.collection = jest.fn(() => ({
      insertOne: this.insertOne,
--- a/packages/server/mocks/mssql.ts
+++ b/packages/server/mocks/mssql.ts
@ -10,15 +10,15 @@ module MsSqlMock {
    ],
  }))

-// mssql.connect = jest.fn(() => ({ recordset: [] }))
+  // mssql.connect = jest.fn(() => ({ recordset: [] }))

  mssql.ConnectionPool = jest.fn(() => ({
    connect: jest.fn(() => ({
      request: jest.fn(() => ({
-        query: jest.fn(sql => ({ recordset: [ sql ] })),
+        query: jest.fn(sql => ({ recordset: [sql] })),
      })),
    })),
  }))

  module.exports = mssql
-}
+}
--- a/packages/server/mocks/node-fetch.ts
+++ b/packages/server/mocks/node-fetch.ts
@ -62,7 +62,8 @@ module FetchMock {
      return json({
        url,
        opts,
-        value: "<!doctype html><html itemscope=\"\" itemtype=\"http://schema.org/WebPage\" lang=\"en-GB\"></html>",
+        value:
+          '<!doctype html><html itemscope="" itemtype="http://schema.org/WebPage" lang="en-GB"></html>',
      })
    } else if (url.includes("failonce.com")) {
      failCount++
--- a/packages/server/mocks/pg.ts
+++ b/packages/server/mocks/pg.ts
@ -10,16 +10,14 @@ module PgMock {
    ],
  }))

-// constructor
-  function Client() {
-  }
+  // constructor
+  function Client() {}

  Client.prototype.query = query
  Client.prototype.connect = jest.fn()
  Client.prototype.release = jest.fn()

-  function Pool() {
-  }
+  function Pool() {}

  const on = jest.fn()
  Pool.prototype.query = query
--- a/packages/server/scripts/likeCypress.ts
+++ b/packages/server/scripts/likeCypress.ts
@ -30,4 +30,4 @@ process.env.ALLOW_DEV_AUTOMATIONS = "1"
 const server = require("../src/app")
 process.env.PORT = WORKER_PORT
 const worker = require("../../worker/src/index")
-process.env.PORT = MAIN_PORT
+process.env.PORT = MAIN_PORT
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@ -153,8 +153,15 @@ export function isIsoDateString(str: string) {
 * @param column The column to check, to see if it is a valid relationship.
 * @param tableIds The IDs of the tables which currently exist.
 */
-function shouldCopyRelationship(column: { type: string, tableId?: string }, tableIds: [string]) {
-  return column.type === FieldTypes.LINK && column.tableId && tableIds.includes(column.tableId)
+function shouldCopyRelationship(
+  column: { type: string; tableId?: string },
+  tableIds: [string]
+) {
+  return (
+    column.type === FieldTypes.LINK &&
+    column.tableId &&
+    tableIds.includes(column.tableId)
+  )
 }

 /**
@ -165,9 +172,15 @@ function shouldCopyRelationship(column: { type: string, tableId?: string }, tabl
 * @param column The column to check for options or boolean type.
 * @param fetchedColumn The fetched column to check for the type in the external database.
 */
-function shouldCopySpecialColumn(column: { type: string }, fetchedColumn: { type: string } | undefined) {
-  return column.type === FieldTypes.OPTIONS ||
-    ((!fetchedColumn || fetchedColumn.type === FieldTypes.NUMBER) && column.type === FieldTypes.BOOLEAN)
+function shouldCopySpecialColumn(
+  column: { type: string },
+  fetchedColumn: { type: string } | undefined
+) {
+  return (
+    column.type === FieldTypes.OPTIONS ||
+    ((!fetchedColumn || fetchedColumn.type === FieldTypes.NUMBER) &&
+      column.type === FieldTypes.BOOLEAN)
+  )
 }

 /**