From 18699290e3941bcf8b40af27ee2ca3dd27342766 Mon Sep 17 00:00:00 2001 From: Iheanyi Ekechukwu Date: Thu, 28 Jul 2022 16:22:39 -0500 Subject: [PATCH 1/4] Add Prettier config. --- package-lock.json | 107 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 + 2 files changed, 109 insertions(+) diff --git a/package-lock.json b/package-lock.json index 7b2f4fe..31efec1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,8 @@ "@typescript-eslint/eslint-plugin": "^5.31.0", "@typescript-eslint/parser": "^5.31.0", "eslint": "^8.20.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", "ts-node": "^10.9.1", "typescript": "^4.7.4" @@ -2076,6 +2078,39 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", + "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -2345,6 +2380,12 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "node_modules/fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "node_modules/fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -3895,6 +3936,34 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "peer": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/pretty-format": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", @@ -6274,6 +6343,22 @@ } } }, + "eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "requires": {} + }, + "eslint-plugin-prettier": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", + "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -6412,6 +6497,12 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -7588,6 +7679,22 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "peer": true + }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "requires": { + "fast-diff": "^1.1.2" + } + }, "pretty-format": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", diff --git a/package.json b/package.json index 906857b..45adbbf 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ "@typescript-eslint/eslint-plugin": "^5.31.0", "@typescript-eslint/parser": "^5.31.0", "eslint": "^8.20.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", "ts-node": "^10.9.1", "typescript": "^4.7.4" From 74c2d28ba7fb9246728c779f39f1e4af20d0388c Mon Sep 17 00:00:00 2001 From: Iheanyi Ekechukwu Date: Thu, 28 Jul 2022 16:32:03 -0500 Subject: [PATCH 2/4] Add Prettier configs. --- .eslintrc.js | 7 +++++-- .prettierrc.js | 10 ++++++++++ package-lock.json | 5 ++--- package.json | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 .prettierrc.js diff --git a/.eslintrc.js b/.eslintrc.js index b4d7b0f..32be0e6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,13 +1,16 @@ module.exports = { - extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], + extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'], parser: '@typescript-eslint/parser', plugins: ['@typescript-eslint'], rules: { + 'prettier/prettier': ['error', {}, { usePrettierrc: true }], '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/ban-ts-comment': 'off' }, root: true, env: { browser: true, node: true } -}; +} diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 0000000..6d24377 --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,10 @@ +module.exports = { + semi: false, + trailingComma: 'none', + singleQuote: true, + printWidth: 120, + tabWidth: 2, + useTabs: false, + jsxSingleQuote: true, + bracketSpacing: true +} diff --git a/package-lock.json b/package-lock.json index 31efec1..6388f85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", + "prettier": "^2.7.1", "ts-node": "^10.9.1", "typescript": "^4.7.4" } @@ -3941,7 +3942,6 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "dev": true, - "peer": true, "bin": { "prettier": "bin-prettier.js" }, @@ -7683,8 +7683,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", - "dev": true, - "peer": true + "dev": true }, "prettier-linter-helpers": { "version": "1.0.0", diff --git a/package.json b/package.json index 45adbbf..c358538 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", + "prettier": "^2.7.1", "ts-node": "^10.9.1", "typescript": "^4.7.4" } From 67022bfbc0e1751847eb32aa9dc534da22580f33 Mon Sep 17 00:00:00 2001 From: Iheanyi Ekechukwu Date: Thu, 28 Jul 2022 16:33:21 -0500 Subject: [PATCH 3/4] Remove utils directory and add proper styling --- {utils => src}/api.ts | 1 - src/index.ts | 10 ++++------ {utils => src}/text.ts | 0 3 files changed, 4 insertions(+), 7 deletions(-) rename {utils => src}/api.ts (99%) rename {utils => src}/text.ts (100%) diff --git a/utils/api.ts b/src/api.ts similarity index 99% rename from utils/api.ts rename to src/api.ts index 58047a7..1c909ca 100644 --- a/utils/api.ts +++ b/src/api.ts @@ -1,4 +1,3 @@ - type Something = { some: T; none: false } type Nothing = { none: true } export type Option = Something | Nothing diff --git a/src/index.ts b/src/index.ts index a6c5469..69e0585 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,11 +1,10 @@ -import {Result, apiResult, unwrap, apiMessage, ClientError} from "../utils/api" -import {utf8Encode} from "../utils/text" +import { Result, apiResult, unwrap, apiMessage, ClientError } from './api' +import { utf8Encode } from './text' export interface Credentials { username: string password: string mysqlAddress: string - } export interface QueryResultRow { @@ -92,8 +91,7 @@ export default class Client { } } - -async createSession(): Promise { + async createSession(): Promise { const saved = await this.postJSON( `${this.credentials.mysqlAddress}/psdb.v1alpha1.Database/CreateSession`, {} @@ -135,7 +133,7 @@ async createSession(): Promise { rows, size: rows.length, statement: rawQuery, - time: elapsedTime, + time: elapsedTime } } else if (saved.ok && saved.ok.error) { return { diff --git a/utils/text.ts b/src/text.ts similarity index 100% rename from utils/text.ts rename to src/text.ts From a2c71c98f02c073b622bdd999883e95ccbd68d75 Mon Sep 17 00:00:00 2001 From: Iheanyi Ekechukwu Date: Thu, 28 Jul 2022 16:48:33 -0500 Subject: [PATCH 4/4] Move prettier config into package.json --- .prettierrc.js | 10 ---------- package.json | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 .prettierrc.js diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index 6d24377..0000000 --- a/.prettierrc.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - semi: false, - trailingComma: 'none', - singleQuote: true, - printWidth: 120, - tabWidth: 2, - useTabs: false, - jsxSingleQuote: true, - bracketSpacing: true -} diff --git a/package.json b/package.json index c358538..dfef21f 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,15 @@ "description": "A JavaScript client for communicating with PlanetScale Edge API.", "main": "dist/index.js", "types": "dist/index.d.js", + "prettier": { + "semi": false, + "trailingComma": "none", + "singleQuote": true, + "printWidth": 120, + "tabWidth": 2, + "useTabs": false, + "bracketSpacing": true + }, "scripts": { "build": "tsc", "lint": "eslint .",