Skip to content

Commit

Permalink
Set more precise names
Browse files Browse the repository at this point in the history
  • Loading branch information
robak86 committed Jan 2, 2018
1 parent 5a98684 commit 58483ec
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 16 deletions.
8 changes: 4 additions & 4 deletions lib/mappers/AttributesMapperFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {NodeMetadata} from "../metadata/NodeMetadata";
import {RelationsTypesRegistryEntry} from "../annotations/RelationsTypesRegistry";
import {RelationMetadata} from "../metadata/RelationMetadata";
import * as _ from 'lodash';
import {StripUnknownDataForWrite} from "./write/StripUnknownDataForWrite";
import {RemoveUnknownPropertiesTransform} from "./write/RemoveUnknownPropertiesTransform";
import {EntityIdExtension} from "./write/EntityIdExtension";
import {WriteInlineMappersRunner} from "./write/WriteInlineMappersRunner";
import {InlineMappersTransform} from "./write/InlineMappersTransform";
import {ReadInlineMappersRunner} from "./read/ReadInlineMappersRunner";
import {IExtension} from "../extensions/IExtension";
import {ReadIntegerTransformer} from "./read/ReadIntegerTransformer";
Expand All @@ -26,10 +26,10 @@ export class AttributesMapperFactory {
getMapper<T extends GraphEntity>(klass:Type<T>):AttributesMapper<T> {
//TODO: should be cached
let forWrites = [
new StripUnknownDataForWrite(),
new RemoveUnknownPropertiesTransform(),
new EntityIdExtension(this.genId),
...this.extensions.map(ext => ext.getWriteTransformer()),
new WriteInlineMappersRunner()
new InlineMappersTransform()
];

//TODO: should be cached
Expand Down
16 changes: 6 additions & 10 deletions lib/mappers/read/ReadIntegerTransformer.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import {IReadTransformer} from "../ITransformer";
import * as _ from "lodash";
import {inSafeRange, isInt} from "../../driver/Integer";
import {convertToNumber} from "../../driver/Integer";
import {AttributesMetadata} from "../../metadata/AttributesMetadata";
import {getLogger} from "../../utils/logger";


/**
* Convert unsafely all stored integer values. It can happen only for data written by other clients or for computed data
* Converts all Integer values to javascript number type. It can happen only for data written by other clients or for computed data.
* e.g. MATCH(n) return count(n) as count.
* In this case "count" will be automatically converted from Integer to javascript number.
* For integers greater than Number.MAX_SAFE_INTEGER original Integer type will be returned.
*/
export class ReadIntegerTransformer implements IReadTransformer {
transformInstance(prev, attributesMetadata:AttributesMetadata) {
return _.mapValues(prev, row => {
if (isInt(row) && !inSafeRange(row)) {
getLogger().warn(`UnsafeInteger for entity with id: ${prev.id} (or relation if id is missing)`)
}

return isInt(row) && inSafeRange(row) ? row.toNumber() : row;
});
return _.mapValues(prev, convertToNumber);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {IWriteTransformer, TransformContext} from "../ITransformer";
import {AttributesMetadata} from "../../metadata/AttributesMetadata";
import {isPresent} from "../../utils/core";

export class WriteInlineMappersRunner implements IWriteTransformer {
export class InlineMappersTransform implements IWriteTransformer {
transformRow(row, type:TransformContext, attributesMetadata:AttributesMetadata):Object {
if (attributesMetadata) {
attributesMetadata.forEachAttribute((attributeMetadata, prop) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {IWriteTransformer, TransformContext} from "../ITransformer";
import * as _ from "lodash";
import {AttributesMetadata} from "../../metadata/AttributesMetadata";

export class StripUnknownDataForWrite implements IWriteTransformer {
export class RemoveUnknownPropertiesTransform implements IWriteTransformer {
transformRow(nodeInstance, type:TransformContext, attributesMetadata:AttributesMetadata|null):Object {
let row = {};

Expand Down

0 comments on commit 58483ec

Please sign in to comment.