Merge pull request #25 from strictd/master

removed cyclic dependancy of MetadataStorage from index.js into storage.js, updated tests

Author: Umed Khudoiberdiev

src/TransformOperationExecutor.ts

@@ -1,5 +1,5 @@
 import {ClassTransformOptions} from "./ClassTransformOptions";
-import {defaultMetadataStorage} from "./index";
+import {defaultMetadataStorage} from "./storage";
 import {TypeOptions} from "./metadata/ExposeExcludeOptions";
 import {ExposeMetadata} from "./metadata/ExposeMetadata";
 

src/decorators.ts

@@ -1,4 +1,4 @@
-import {defaultMetadataStorage} from "./index";
+import {defaultMetadataStorage} from "./storage";
 import {TypeMetadata} from "./metadata/TypeMetadata";
 import {ExposeMetadata} from "./metadata/ExposeMetadata";
 import {ExposeOptions, ExcludeOptions, TypeOptions, TransformOptions} from "./metadata/ExposeExcludeOptions";

src/index.ts

@@ -1,5 +1,4 @@
 import {ClassTransformer, ClassType} from "./ClassTransformer";
-import {MetadataStorage} from "./metadata/MetadataStorage";
 import {ClassTransformOptions} from "./ClassTransformOptions";
 
 export {ClassTransformer} from "./ClassTransformer";
@@ -91,8 +90,3 @@ export function deserialize<T>(cls: ClassType<T>, json: string, options?: ClassT
 export function deserializeArray<T>(cls: ClassType<T>, json: string, options?: ClassTransformOptions): T[] {
     return classTransformer.deserializeArray(cls, json, options);
 }
-
-/**
- * Default metadata storage is used as singleton and can be used to storage all metadatas.
- */
-export const defaultMetadataStorage = new MetadataStorage();

src/storage.ts

@@ -0,0 +1,6 @@
+import {MetadataStorage} from "./metadata/MetadataStorage";
+
+/**
+ * Default metadata storage is used as singleton and can be used to storage all metadatas.
+ */
+export const defaultMetadataStorage = new MetadataStorage();

test/functional/basic-functionality.spec.ts

@@ -1,12 +1,12 @@
 import "reflect-metadata";
 import {
-    defaultMetadataStorage,
     classToPlain,
     classToPlainFromExist,
     plainToClass,
     plainToClassFromExist,
     classToClass, classToClassFromExist
 } from "../../src/index";
+import {defaultMetadataStorage} from "../../src/storage";
 import {Exclude, Expose, Type} from "../../src/decorators";
 import {expect} from "chai";
 

test/functional/circular-reference-problem.spec.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
-import {defaultMetadataStorage, classToPlain, classToClass} from "../../src/index";
+import {classToPlain, classToClass} from "../../src/index";
+import {defaultMetadataStorage} from "../../src/storage";
 
 describe("circular reference problem", () => {
 

test/functional/custom-transform.spec.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
-import {defaultMetadataStorage, classToPlain, plainToClass} from "../../src/index";
+import {classToPlain, plainToClass} from "../../src/index";
+import {defaultMetadataStorage} from "../../src/storage";
 import {Exclude, Expose, Transform, Type} from "../../src/decorators";
 import * as moment from "moment";
 

test/functional/es6-data-types.spec.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
-import {defaultMetadataStorage, classToPlain, plainToClass} from "../../src/index";
+import {classToPlain, plainToClass} from "../../src/index";
+import {defaultMetadataStorage} from "../../src/storage";
 import {Type} from "../../src/decorators";
 
 describe("es6 data types", () => {

test/functional/ignore-decorators.spec.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
-import {defaultMetadataStorage, classToPlain} from "../../src/index";
+import {classToPlain} from "../../src/index";
+import {defaultMetadataStorage} from "../../src/storage";
 import {Exclude, Expose} from "../../src/decorators";
 
 describe("ignoring specific decorators", () => {

test/functional/serialization-deserialization.spec.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
-import {defaultMetadataStorage, serialize, deserialize, deserializeArray} from "../../src/index";
+import {serialize, deserialize, deserializeArray} from "../../src/index";
+import {defaultMetadataStorage} from "../../src/storage";
 import {Exclude} from "../../src/decorators";
 
 describe("serialization and deserialization objects", () => {