Skip to content

Commit

Permalink
style: backport style fixes in next to cut down on churn (typeorm#6715)
Browse files Browse the repository at this point in the history
the `next` branch has a number of style fixes for the project aroundnd
whitespaces - this pulls them into `master` to cut down on the files
changes between the two branches
  • Loading branch information
imnotjames committed Sep 15, 2020
1 parent 2b37808 commit 4baac71
Show file tree
Hide file tree
Showing 35 changed files with 76 additions and 75 deletions.
4 changes: 2 additions & 2 deletions src/commands/MigrationGenerateCommand.ts
Expand Up @@ -92,7 +92,7 @@ export class MigrationGenerateCommand implements yargs.CommandModule {
downQuery.query = MigrationGenerateCommand.prettifyQuery(downQuery.query);
});
}

const upSqls: string[] = [], downSqls: string[] = [];

// mysql is exceptional here because it uses ` character in to escape names in queries, that's why for mysql
Expand Down Expand Up @@ -178,7 +178,7 @@ ${downSqls.join(`
}

/**
*
*
*/
protected static prettifyQuery(query: string) {
const formattedQuery = format(query, { indent: " " });
Expand Down
6 changes: 3 additions & 3 deletions src/decorator/EntityRepository.ts
@@ -1,6 +1,6 @@
import { getMetadataArgsStorage } from "../";
import { EntityRepositoryMetadataArgs } from "../metadata-args/EntityRepositoryMetadataArgs";
import { EntitySchema } from "../entity-schema/EntitySchema";
import {getMetadataArgsStorage} from "../";
import {EntityRepositoryMetadataArgs} from "../metadata-args/EntityRepositoryMetadataArgs";
import {EntitySchema} from "../entity-schema/EntitySchema";

/**
* Used to declare a class as a custom repository.
Expand Down
10 changes: 7 additions & 3 deletions src/decorator/columns/Column.ts
@@ -1,7 +1,11 @@
import {ColumnOptions, getMetadataArgsStorage} from "../../";
import {
ColumnType, SimpleColumnType, SpatialColumnType, WithLengthColumnType,
WithPrecisionColumnType, WithWidthColumnType
ColumnType,
SimpleColumnType,
SpatialColumnType,
WithLengthColumnType,
WithPrecisionColumnType,
WithWidthColumnType
} from "../../driver/types/ColumnTypes";
import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
import {ColumnCommonOptions} from "../options/ColumnCommonOptions";
Expand All @@ -14,7 +18,7 @@ import {EmbeddedMetadataArgs} from "../../metadata-args/EmbeddedMetadataArgs";
import {ColumnTypeUndefinedError} from "../../error/ColumnTypeUndefinedError";
import {ColumnHstoreOptions} from "../options/ColumnHstoreOptions";
import {ColumnWithWidthOptions} from "../options/ColumnWithWidthOptions";
import { GeneratedMetadataArgs } from "../../metadata-args/GeneratedMetadataArgs";
import {GeneratedMetadataArgs} from "../../metadata-args/GeneratedMetadataArgs";

/**
* Column decorator is used to mark a specific class property as a table column. Only properties decorated with this
Expand Down
2 changes: 1 addition & 1 deletion src/decorator/columns/PrimaryColumn.ts
Expand Up @@ -2,7 +2,7 @@ import {ColumnOptions, ColumnType, getMetadataArgsStorage} from "../../";
import {ColumnTypeUndefinedError} from "../../error/ColumnTypeUndefinedError";
import {PrimaryColumnCannotBeNullableError} from "../../error/PrimaryColumnCannotBeNullableError";
import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
import { GeneratedMetadataArgs } from "../../metadata-args/GeneratedMetadataArgs";
import {GeneratedMetadataArgs} from "../../metadata-args/GeneratedMetadataArgs";

/**
* Column decorator is used to mark a specific class property as a table column.
Expand Down
2 changes: 1 addition & 1 deletion src/decorator/options/ColumnOptions.ts
@@ -1,6 +1,6 @@
import {ColumnType} from "../../driver/types/ColumnTypes";
import {ValueTransformer} from "./ValueTransformer";
import { ColumnCommonOptions } from "./ColumnCommonOptions";
import {ColumnCommonOptions} from "./ColumnCommonOptions";

/**
* Describes all column's options.
Expand Down
4 changes: 2 additions & 2 deletions src/decorator/options/TransactionOptions.ts
@@ -1,6 +1,6 @@
import { IsolationLevel } from "../../driver/types/IsolationLevel";
import {IsolationLevel} from "../../driver/types/IsolationLevel";

export interface TransactionOptions {
connectionName?: string;
isolation?: IsolationLevel;
}
}
4 changes: 2 additions & 2 deletions src/driver/DriverUtils.ts
@@ -1,7 +1,7 @@
import { Driver } from "./Driver";
import {Driver} from "./Driver";
import { hash } from "../util/StringUtils";

/**
/**
* Common driver utility functions.
*/
export class DriverUtils {
Expand Down
@@ -1,4 +1,4 @@
import { TlsOptions } from "tls";
import {TlsOptions} from "tls";

/**
* Cockroachdb specific connection credential options.
Expand Down
28 changes: 14 additions & 14 deletions src/driver/mongodb/MongoQueryRunner.ts
@@ -1,9 +1,9 @@
import { QueryRunner } from "../../query-runner/QueryRunner";
import { ObjectLiteral } from "../../common/ObjectLiteral";
import { TableColumn } from "../../schema-builder/table/TableColumn";
import { Table } from "../../schema-builder/table/Table";
import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
import { TableIndex } from "../../schema-builder/table/TableIndex";
import {QueryRunner} from "../../query-runner/QueryRunner";
import {ObjectLiteral} from "../../common/ObjectLiteral";
import {TableColumn} from "../../schema-builder/table/TableColumn";
import {Table} from "../../schema-builder/table/Table";
import {TableForeignKey} from "../../schema-builder/table/TableForeignKey";
import {TableIndex} from "../../schema-builder/table/TableIndex";
import {View} from "../../schema-builder/view/View";
import {
AggregationCursor,
Expand Down Expand Up @@ -38,14 +38,14 @@ import {
UnorderedBulkOperation,
UpdateWriteOpResult
} from "./typings";
import { Connection } from "../../connection/Connection";
import { ReadStream } from "../../platform/PlatformTools";
import { MongoEntityManager } from "../../entity-manager/MongoEntityManager";
import { SqlInMemory } from "../SqlInMemory";
import { TableUnique } from "../../schema-builder/table/TableUnique";
import { Broadcaster } from "../../subscriber/Broadcaster";
import { TableCheck } from "../../schema-builder/table/TableCheck";
import { TableExclusion } from "../../schema-builder/table/TableExclusion";
import {Connection} from "../../connection/Connection";
import {ReadStream} from "../../platform/PlatformTools";
import {MongoEntityManager} from "../../entity-manager/MongoEntityManager";
import {SqlInMemory} from "../SqlInMemory";
import {TableUnique} from "../../schema-builder/table/TableUnique";
import {Broadcaster} from "../../subscriber/Broadcaster";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {TableExclusion} from "../../schema-builder/table/TableExclusion";

/**
* Runs queries on a single MongoDB connection.
Expand Down
4 changes: 2 additions & 2 deletions src/driver/mongodb/typings.ts
@@ -1,4 +1,4 @@
import { EventEmitter, Readable, Writable } from "../../platform/PlatformTools";
import {EventEmitter, Readable, Writable} from "../../platform/PlatformTools";

/**
* Creates a new MongoClient instance.
Expand Down Expand Up @@ -5014,7 +5014,7 @@ export declare class Cursor<T> extends Readable {
* @see http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#forEach
*/
forEach(iterator: IteratorCallback<T>, callback: EndCallback): void;
forEach(iterator: IteratorCallback<T>): Promise<void>;
forEach(iterator: IteratorCallback<T>): Promise<void>;

/**
* Check if there is any document still available in the cursor.
Expand Down
2 changes: 1 addition & 1 deletion src/driver/mysql/MysqlQueryRunner.ts
Expand Up @@ -21,7 +21,7 @@ import {ColumnType, PromiseUtils} from "../../index";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {IsolationLevel} from "../types/IsolationLevel";
import {TableExclusion} from "../../schema-builder/table/TableExclusion";
import { VersionUtils } from "../../util/VersionUtils";
import {VersionUtils} from "../../util/VersionUtils";

/**
* Runs queries on a single mysql database connection.
Expand Down
2 changes: 1 addition & 1 deletion src/driver/oracle/OracleDriver.ts
Expand Up @@ -392,7 +392,7 @@ export class OracleDriver implements Driver {
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

if (columnMetadata.type === Boolean) {
value = value ? true : false;
value = !!value;

} else if (columnMetadata.type === "date") {
value = DateUtils.mixedDateToDateString(value);
Expand Down
@@ -1,4 +1,4 @@
import { TlsOptions } from "tls";
import {TlsOptions} from "tls";

/**
* Postgres specific connection credential options.
Expand Down
2 changes: 1 addition & 1 deletion src/entity-schema/EntitySchemaColumnOptions.ts
@@ -1,6 +1,6 @@
import {ColumnType} from "../driver/types/ColumnTypes";
import {ValueTransformer} from "../decorator/options/ValueTransformer";
import { SpatialColumnOptions } from "../decorator/options/SpatialColumnOptions";
import {SpatialColumnOptions} from "../decorator/options/SpatialColumnOptions";

export interface EntitySchemaColumnOptions extends SpatialColumnOptions {

Expand Down
4 changes: 2 additions & 2 deletions src/error/QueryFailedError.ts
@@ -1,4 +1,4 @@
import { ObjectUtils } from "../util/ObjectUtils";
import {ObjectUtils} from "../util/ObjectUtils";

/**
* Thrown when query execution has failed.
Expand All @@ -20,4 +20,4 @@ export class QueryFailedError extends Error {
});
}

}
}
1 change: 1 addition & 0 deletions src/metadata-args/RelationCountMetadataArgs.ts
@@ -1,4 +1,5 @@
import {SelectQueryBuilder} from "../query-builder/SelectQueryBuilder";

/**
* Arguments for RelationCountMetadata class.
*/
Expand Down
1 change: 1 addition & 0 deletions src/metadata-args/RelationIdMetadataArgs.ts
@@ -1,4 +1,5 @@
import {SelectQueryBuilder} from "../query-builder/SelectQueryBuilder";

/**
* Arguments for RelationIdMetadataArgs class.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/migration/MigrationExecutor.ts
Expand Up @@ -8,8 +8,8 @@ import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {MssqlParameter} from "../driver/sqlserver/MssqlParameter";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
import {PostgresConnectionOptions} from "../driver/postgres/PostgresConnectionOptions";
import { MongoDriver } from "../driver/mongodb/MongoDriver";
import { MongoQueryRunner } from "../driver/mongodb/MongoQueryRunner";
import {MongoDriver} from "../driver/mongodb/MongoDriver";
import {MongoQueryRunner} from "../driver/mongodb/MongoQueryRunner";

/**
* Executes migrations: runs pending and reverts previously executed migrations.
Expand Down
1 change: 1 addition & 0 deletions src/platform/PlatformTools.ts
Expand Up @@ -2,6 +2,7 @@ import * as path from "path";
import * as fs from "fs";
import chalk from "chalk";
import {highlight, Theme} from "cli-highlight";

export {ReadStream} from "fs";
export {EventEmitter} from "events";
export {Readable, Writable} from "stream";
Expand Down
4 changes: 2 additions & 2 deletions src/query-builder/Alias.ts
@@ -1,5 +1,5 @@
import {EntityMetadata} from "../metadata/EntityMetadata";
import { ObjectUtils } from "../util/ObjectUtils";
import {ObjectUtils} from "../util/ObjectUtils";

/**
*/
Expand Down Expand Up @@ -45,4 +45,4 @@ export class Alias {
return this._metadata;
}

}
}
Expand Up @@ -255,7 +255,6 @@ export class RawSqlResultsToEntityTransformer {
return idMap;
}).filter(result => result);


const properties = rawRelationIdResult.relationIdAttribute.mapToPropertyPropertyPath.split(".");
const mapToProperty = (properties: string[], map: ObjectLiteral, value: any): any => {

Expand Down
5 changes: 3 additions & 2 deletions src/repository/MongoRepository.ts
Expand Up @@ -24,7 +24,8 @@ import {
InsertWriteOpResult,
MapReduceOptions,
MongoCountPreferences,
MongodbIndexOptions, ObjectID,
MongodbIndexOptions,
ObjectID,
OrderedBulkOperation,
ParallelCollectionScanOptions,
ReadPreference,
Expand Down Expand Up @@ -357,4 +358,4 @@ export class MongoRepository<Entity extends ObjectLiteral> extends Repository<En
return this.manager.updateOne(this.metadata.tableName, query, update, options);
}

}
}
10 changes: 5 additions & 5 deletions src/schema-builder/MongoSchemaBuilder.ts
@@ -1,8 +1,8 @@
import { Connection } from "../connection/Connection";
import { SchemaBuilder } from "./SchemaBuilder";
import { MongoDriver } from "../driver/mongodb/MongoDriver";
import { SqlInMemory } from "../driver/SqlInMemory";
import { MongodbIndexOptions } from "../driver/mongodb/typings";
import {Connection} from "../connection/Connection";
import {SchemaBuilder} from "./SchemaBuilder";
import {MongoDriver} from "../driver/mongodb/MongoDriver";
import {SqlInMemory} from "../driver/SqlInMemory";
import {MongodbIndexOptions} from "../driver/mongodb/typings";

/**
* Creates complete tables schemas in the database based on the entity metadatas.
Expand Down
3 changes: 1 addition & 2 deletions src/schema-builder/view/View.ts
@@ -1,5 +1,4 @@
import {Connection, Driver, SelectQueryBuilder} from "../..";
import {EntityMetadata} from "../..";
import {Connection, Driver, EntityMetadata, SelectQueryBuilder} from "../..";
import {ViewOptions} from "../options/ViewOptions";

/**
Expand Down
4 changes: 2 additions & 2 deletions src/util/ApplyValueTransformers.ts
@@ -1,4 +1,4 @@
import { ValueTransformer } from "../decorator/options/ValueTransformer";
import {ValueTransformer} from "../decorator/options/ValueTransformer";

export class ApplyValueTransformers {
static transformFrom(transformer: ValueTransformer | ValueTransformer[], databaseValue: any) {
Expand All @@ -18,4 +18,4 @@ export class ApplyValueTransformers {
}
return transformer.to(entityValue);
}
}
}
2 changes: 1 addition & 1 deletion src/util/DateUtils.ts
@@ -1,4 +1,4 @@
import { ColumnMetadata } from "../metadata/ColumnMetadata";
import {ColumnMetadata} from "../metadata/ColumnMetadata";

/**
* Provides utilities to transform hydrated and persisted data.
Expand Down
2 changes: 1 addition & 1 deletion src/util/OrmUtils.ts
@@ -1,4 +1,4 @@
import { ObjectLiteral } from "../common/ObjectLiteral";
import {ObjectLiteral} from "../common/ObjectLiteral";

export class OrmUtils {

Expand Down
Expand Up @@ -14,7 +14,7 @@ export class Post {

@Column()
title: string;

@OneToOne(type => Category)
category: Category;

Expand All @@ -27,4 +27,4 @@ export class Post {
@RelationCount((post: Post) => post.category2)
categoryCount2: number;

}
}
2 changes: 1 addition & 1 deletion test/functional/query-builder/join/query-builder-joins.ts
Expand Up @@ -10,7 +10,7 @@ import {Image} from "./entity/Image";
import {User} from "./entity/User";

describe("query builder > joins", () => {

let connections: Connection[];
before(async () => connections = await createTestingConnections({
entities: [__dirname + "/entity/*{.js,.ts}"],
Expand Down
Expand Up @@ -43,7 +43,7 @@ describe("repository > basic methods", () => {
}));

});

describe("hasId", function() {

it("should return true if entity has an id", () => connections.forEach(connection => {
Expand Down Expand Up @@ -222,7 +222,7 @@ describe("repository > basic methods", () => {
blog.text = "Blog about good people";
blog.categories = [category];
await blogRepository.save(blog);

// and preload it
const plainBlogWithId = { id: 1 };
const preloadedBlog = await blogRepository.preload(plainBlogWithId);
Expand All @@ -247,7 +247,7 @@ describe("repository > basic methods", () => {
blog.text = "Blog about good people";
blog.categories = [category];
await blogRepository.save(blog);

// and preload it
const plainBlogWithId = { id: 1, categories: [{ id: 1 }] };
const preloadedBlog = await blogRepository.preload(plainBlogWithId);
Expand Down Expand Up @@ -348,7 +348,7 @@ describe("repository > basic methods", () => {
const saved = await postRepository.save(dbPost);

saved.should.be.instanceOf(Post);

saved.id!.should.be.equal(1);
saved.title.should.be.equal("New title");
saved.dateAdded.should.be.instanceof(Date);
Expand Down
8 changes: 4 additions & 4 deletions test/github-issues/1545/entity/DataModel.ts
@@ -1,6 +1,6 @@
import { Entity, ManyToOne, JoinColumn, Column } from "../../../../src/index";
import { MainModel } from "./MainModel";
import { ValidationModel } from "./ValidationModel";
import {Column, Entity, JoinColumn, ManyToOne} from "../../../../src/index";
import {MainModel} from "./MainModel";
import {ValidationModel} from "./ValidationModel";

@Entity()
export class DataModel {
Expand All @@ -27,4 +27,4 @@ export class DataModel {
default: false
})
active: boolean;
}
}
1 change: 0 additions & 1 deletion test/github-issues/1972/issue-1972.ts
Expand Up @@ -32,7 +32,6 @@ describe("github issues > #1972 STI problem - empty columns", () => {

// find user participant in the DB
const result = await connection.manager.findOne(TournamentUserParticipant);

if (result) {
assert(result.user instanceof User);
}
Expand Down

0 comments on commit 4baac71

Please sign in to comment.