Skip to content

Commit

Permalink
refactor: Rename ApplyValueTransformer methods
Browse files Browse the repository at this point in the history
  • Loading branch information
Sammy Teillet authored and Sammy Teillet committed Apr 23, 2019
1 parent 5a545c3 commit f380452
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions src/driver/cockroachdb/CockroachDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export class CockroachDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);

if (value === null || value === undefined)
return value;
Expand Down Expand Up @@ -332,7 +332,7 @@ export class CockroachDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (value === null || value === undefined)
return columnMetadata.transformer ? ApplyValueTransformers.innerTransform(columnMetadata.transformer, value) : value;
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

// unique_rowid() generates bigint value and should not be converted to number
if ((columnMetadata.type === Number && !columnMetadata.isArray) || columnMetadata.generationStrategy === "increment") {
Expand Down Expand Up @@ -364,7 +364,7 @@ export class CockroachDriver implements Driver {
}

if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);

return value;
}
Expand Down
4 changes: 2 additions & 2 deletions src/driver/mongodb/MongoDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export class MongoDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);
return value;
}

Expand All @@ -300,7 +300,7 @@ export class MongoDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
return value;
}

Expand Down
6 changes: 3 additions & 3 deletions src/driver/mysql/MysqlDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ export class MysqlDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);

if (value === null || value === undefined)
return value;
Expand Down Expand Up @@ -469,7 +469,7 @@ export class MysqlDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (value === null || value === undefined)
return columnMetadata.transformer ? ApplyValueTransformers.innerTransform(columnMetadata.transformer, value) : value;
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

if (columnMetadata.type === Boolean || columnMetadata.type === "bool" || columnMetadata.type === "boolean") {
value = value ? true : false;
Expand Down Expand Up @@ -501,7 +501,7 @@ export class MysqlDriver implements Driver {
}

if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);

return value;
}
Expand Down
6 changes: 3 additions & 3 deletions src/driver/oracle/OracleDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export class OracleDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);

if (value === null || value === undefined)
return value;
Expand Down Expand Up @@ -387,7 +387,7 @@ export class OracleDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (value === null || value === undefined)
return columnMetadata.transformer ? ApplyValueTransformers.innerTransform(columnMetadata.transformer, value) : value;
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

if (columnMetadata.type === Boolean) {
value = value ? true : false;
Expand Down Expand Up @@ -415,7 +415,7 @@ export class OracleDriver implements Driver {
}

if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);

return value;
}
Expand Down
6 changes: 3 additions & 3 deletions src/driver/postgres/PostgresDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ export class PostgresDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);

if (value === null || value === undefined)
return value;
Expand Down Expand Up @@ -443,7 +443,7 @@ export class PostgresDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (value === null || value === undefined)
return columnMetadata.transformer ? ApplyValueTransformers.innerTransform(columnMetadata.transformer, value) : value;
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

if (columnMetadata.type === Boolean) {
value = value ? true : false;
Expand Down Expand Up @@ -497,7 +497,7 @@ export class PostgresDriver implements Driver {
}

if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);

return value;
}
Expand Down
6 changes: 3 additions & 3 deletions src/driver/sqlite-abstract/AbstractSqliteDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export abstract class AbstractSqliteDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);

if (value === null || value === undefined)
return value;
Expand Down Expand Up @@ -271,7 +271,7 @@ export abstract class AbstractSqliteDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (value === null || value === undefined)
return columnMetadata.transformer ? ApplyValueTransformers.innerTransform(columnMetadata.transformer, value) : value;
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

if (columnMetadata.type === Boolean || columnMetadata.type === "boolean") {
value = value ? true : false;
Expand Down Expand Up @@ -310,7 +310,7 @@ export abstract class AbstractSqliteDriver implements Driver {
}

if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);

return value;
}
Expand Down
6 changes: 3 additions & 3 deletions src/driver/sqlserver/SqlServerDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export class SqlServerDriver implements Driver {
*/
preparePersistentValue(value: any, columnMetadata: ColumnMetadata): any {
if (columnMetadata.transformer)
value = ApplyValueTransformers.outerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);

if (value === null || value === undefined)
return value;
Expand Down Expand Up @@ -408,7 +408,7 @@ export class SqlServerDriver implements Driver {
*/
prepareHydratedValue(value: any, columnMetadata: ColumnMetadata): any {
if (value === null || value === undefined)
return columnMetadata.transformer ? ApplyValueTransformers.innerTransform(columnMetadata.transformer, value) : value;
return columnMetadata.transformer ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value) : value;

if (columnMetadata.type === Boolean) {
value = value ? true : false;
Expand Down Expand Up @@ -438,7 +438,7 @@ export class SqlServerDriver implements Driver {
}

if (columnMetadata.transformer)
value = ApplyValueTransformers.innerTransform(columnMetadata.transformer, value);
value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);

return value;
}
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/ColumnMetadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ export class ColumnMetadata {
}

if (transform && this.transformer)
value = ApplyValueTransformers.outerTransform(this.transformer, value);
value = ApplyValueTransformers.transformTo(this.transformer, value);

return value;
}
Expand Down
4 changes: 2 additions & 2 deletions src/util/ApplyValueTransformers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ValueTransformer } from "../decorator/options/ValueTransformer";

export class ApplyValueTransformers {
static innerTransform(transformer: ValueTransformer | ValueTransformer[], databaseValue: any) {
static transformFrom(transformer: ValueTransformer | ValueTransformer[], databaseValue: any) {
if (Array.isArray(transformer)) {
const reverseTransformers = transformer.slice().reverse();
return reverseTransformers.reduce((transformedValue, _transformer) => {
Expand All @@ -10,7 +10,7 @@ export class ApplyValueTransformers {
}
return transformer.from(databaseValue);
}
static outerTransform(transformer: ValueTransformer | ValueTransformer[], entityValue: any) {
static transformTo(transformer: ValueTransformer | ValueTransformer[], entityValue: any) {
if (Array.isArray(transformer)) {
return transformer.reduce((transformedValue, _transformer) => {
return _transformer.to(transformedValue);
Expand Down

0 comments on commit f380452

Please sign in to comment.