From de8eb04c7291e2ac7db5d1e0cd3536c5b5ee39bf Mon Sep 17 00:00:00 2001 From: Mike Guida Date: Thu, 20 Mar 2025 12:27:09 -0600 Subject: [PATCH] build: run format in ci (#11342) * style: run format on existing files * build: run format in ci * build: add format:ci to check formatting in ci --- .github/workflows/test.yml | 5 +++-- package.json | 5 +++-- src/commands/CommandUtils.ts | 2 +- src/data-source/DataSource.ts | 2 +- src/entity-manager/EntityManager.ts | 2 +- src/query-builder/QueryBuilder.ts | 3 ++- src/repository/Repository.ts | 2 +- .../columns/virtual-columns/entity/Employee.ts | 7 +------ .../multi-database-basic-functionality.ts | 16 +++++++++++++--- 9 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61d9ef7b5..1ec7016b9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,10 +20,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: "18.x" + - uses: actions/checkout@v4 + - run: npm i - run: npm run lint - + - run: npm run format:ci # These tests run in standard node containers with their db attached as a service database-tests: @@ -36,7 +38,6 @@ jobs: with: node-container: ${{matrix.node-container}} - # These tests run with custom docker image attributes that can't be specified in a GHA service database-compose-tests: strategy: diff --git a/package.json b/package.json index 8f5d524cf..bfd413bf8 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "peerDependencies": { "@google-cloud/spanner": "^5.18.0", "@sap/hana-client": "^2.12.25", - "better-sqlite3": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0" , + "better-sqlite3": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0", "hdb-pool": "^0.1.6", "ioredis": "^5.0.4", "mongodb": "^5.8.0", @@ -244,6 +244,7 @@ "pack": "gulp pack", "lint": "eslint .", "format": "prettier --cache --write --end-of-line auto \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", + "format:ci": "prettier --check --end-of-line auto \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1" }, "bin": { @@ -257,4 +258,4 @@ "url": "https://opencollective.com/typeorm", "logo": "https://opencollective.com/opencollective/logo.txt" } -} +} \ No newline at end of file diff --git a/src/commands/CommandUtils.ts b/src/commands/CommandUtils.ts index f6d7af4fd..8faa11124 100644 --- a/src/commands/CommandUtils.ts +++ b/src/commands/CommandUtils.ts @@ -14,7 +14,7 @@ export class CommandUtils { ): Promise { let dataSourceFileExports try { - [dataSourceFileExports] = await importOrRequireFile( + ;[dataSourceFileExports] = await importOrRequireFile( dataSourceFilePath, ) } catch (err) { diff --git a/src/data-source/DataSource.ts b/src/data-source/DataSource.ts index a20c2d85e..ec93a05bf 100644 --- a/src/data-source/DataSource.ts +++ b/src/data-source/DataSource.ts @@ -520,7 +520,7 @@ export class DataSource { /** * Executes raw SQL query and returns raw database results. - * + * * @see [Official docs](https://typeorm.io/data-source-api) for examples. */ async query( diff --git a/src/entity-manager/EntityManager.ts b/src/entity-manager/EntityManager.ts index 7d7d81b04..b5cb7e784 100644 --- a/src/entity-manager/EntityManager.ts +++ b/src/entity-manager/EntityManager.ts @@ -169,7 +169,7 @@ export class EntityManager { /** * Executes raw SQL query and returns raw database results. - * + * * @see [Official docs](https://typeorm.io/entity-manager-api) for examples. */ async query(query: string, parameters?: any[]): Promise { diff --git a/src/query-builder/QueryBuilder.ts b/src/query-builder/QueryBuilder.ts index c9830e983..28b754cd9 100644 --- a/src/query-builder/QueryBuilder.ts +++ b/src/query-builder/QueryBuilder.ts @@ -1152,7 +1152,8 @@ export abstract class QueryBuilder { const cteStrings = this.expressionMap.commonTableExpressions.map( (cte) => { - let cteBodyExpression = typeof cte.queryBuilder === 'string' ? cte.queryBuilder : ''; + let cteBodyExpression = + typeof cte.queryBuilder === "string" ? cte.queryBuilder : "" if (typeof cte.queryBuilder !== "string") { if (cte.queryBuilder.hasCommonTableExpressions()) { throw new TypeORMError( diff --git a/src/repository/Repository.ts b/src/repository/Repository.ts index 5a2d75415..8fb68bbc7 100644 --- a/src/repository/Repository.ts +++ b/src/repository/Repository.ts @@ -644,7 +644,7 @@ export class Repository { /** * Executes a raw SQL query and returns a raw database results. * Raw query execution is supported only by relational databases (MongoDB is not supported). - * + * * @see [Official docs](https://typeorm.io/repository-api) for examples. */ query(query: string, parameters?: any[]): Promise { diff --git a/test/functional/columns/virtual-columns/entity/Employee.ts b/test/functional/columns/virtual-columns/entity/Employee.ts index 96053c0ea..36cf876df 100644 --- a/test/functional/columns/virtual-columns/entity/Employee.ts +++ b/test/functional/columns/virtual-columns/entity/Employee.ts @@ -1,9 +1,4 @@ -import { - Entity, - ManyToOne, - OneToMany, - PrimaryColumn -} from "../../../../../src" +import { Entity, ManyToOne, OneToMany, PrimaryColumn } from "../../../../../src" import { Company } from "./Company" import { TimeSheet } from "./TimeSheet" diff --git a/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts b/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts index 81cb577cd..1ebc04598 100644 --- a/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts +++ b/test/functional/multi-database/multi-database-basic-functionality/multi-database-basic-functionality.ts @@ -25,11 +25,21 @@ describe("multi-database > basic-functionality", () => { it(`[${platform}] produces deterministic, unique, and valid table names for relative paths; leaves absolute paths unchanged`, () => { const testMap = [ ["FILENAME.db", "filename.db"], - ["..\\FILENAME.db", platform === 'win32' ? "../filename.db" : "..\\filename.db"], - [".\\FILENAME.db", platform === 'win32' ? "./filename.db" : ".\\filename.db"], + [ + "..\\FILENAME.db", + platform === "win32" + ? "../filename.db" + : "..\\filename.db", + ], + [ + ".\\FILENAME.db", + platform === "win32" + ? "./filename.db" + : ".\\filename.db", + ], [ "..\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\FILENAME.db", - platform === 'win32' + platform === "win32" ? "../longpathdir/longpathdir/longpathdir/longpathdir/longpathdir/longpathdir/longpathdir/filename.db" : "..\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\longpathdir\\filename.db", ],