refactored metadata and metadata args namespaces

src/connection/Connection.ts

@@ -9,9 +9,9 @@ import {EntityListenerMetadata} from "../metadata/EntityListenerMetadata";
 import {EntityManager} from "../entity-manager/EntityManager";
 import {importClassesFromDirectories} from "../util/DirectoryExportedClassesLoader";
 import {getMetadataArgsStorage, getFromContainer} from "../index";
-import {EntityMetadataBuilder} from "../metadata-storage/EntityMetadataBuilder";
+import {EntityMetadataBuilder} from "../metadata-builder/EntityMetadataBuilder";
 import {DefaultNamingStrategy} from "../naming-strategy/DefaultNamingStrategy";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {NamingStrategyMetadata} from "../metadata/NamingStrategyMetadata";
 import {NoConnectionForRepositoryError} from "./error/NoConnectionForRepositoryError";
 import {CannotImportAlreadyConnectedError} from "./error/CannotImportAlreadyConnectedError";

src/decorator/NamingStrategy.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../index";
-import {NamingStrategyMetadataArgs} from "../metadata/args/NamingStrategyMetadataArgs";
+import {NamingStrategyMetadataArgs} from "../metadata-args/NamingStrategyMetadataArgs";
 
 /**
  * Decorator registers a new naming strategy to be used in naming things.

src/decorator/columns/Column.ts

@@ -1,9 +1,9 @@
-import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnOptions} from "../options/ColumnOptions";
 import {ColumnTypeUndefinedError} from "../error/ColumnTypeUndefinedError";
 import {AutoIncrementOnlyForPrimaryError} from "../error/AutoIncrementOnlyForPrimaryError";
 import {getMetadataArgsStorage} from "../../index";
 import {ColumnType, ColumnTypes} from "../../metadata/types/ColumnTypes";
-import {ColumnMetadataArgs} from "../../metadata/args/ColumnMetadataArgs";
+import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
 
 /**
  * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this 

src/decorator/columns/CreateDateColumn.ts

@@ -1,8 +1,8 @@
-import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnOptions} from "../options/ColumnOptions";
 import {ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {getMetadataArgsStorage} from "../../index";
 import {ColumnMetadata} from "../../metadata/ColumnMetadata";
-import {ColumnMetadataArgs} from "../../metadata/args/ColumnMetadataArgs";
+import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
 
 /**
  * This column will store a creation date of the inserted object. Creation date is generated and inserted only once,

src/decorator/columns/PrimaryColumn.ts

@@ -1,9 +1,9 @@
-import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnOptions} from "../options/ColumnOptions";
 import {ColumnType, ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {ColumnTypeUndefinedError} from "../error/ColumnTypeUndefinedError";
 import {getMetadataArgsStorage} from "../../index";
 import {PrimaryColumnCannotBeNullableError} from "../error/PrimaryColumnCannotBeNullableError";
-import {ColumnMetadataArgs} from "../../metadata/args/ColumnMetadataArgs";
+import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
 
 /**
  * Column decorator is used to mark a specific class property as a table column. Only properties decorated with this

src/decorator/columns/RelationsCountColumn.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../../index";
-import {RelationsCountMetadataArgs} from "../../metadata/args/RelationsCountMetadataArgs";
+import {RelationsCountMetadataArgs} from "../../metadata-args/RelationsCountMetadataArgs";
 
 /**
  * Holds a number of children in the closure table of the column.

src/decorator/columns/UpdateDateColumn.ts

@@ -1,7 +1,7 @@
-import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnOptions} from "../options/ColumnOptions";
 import {ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {getMetadataArgsStorage} from "../../index";
-import {ColumnMetadataArgs} from "../../metadata/args/ColumnMetadataArgs";
+import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
 
 /**
  * This column will store an update date of the updated object. This date is being updated each time you persist the

src/decorator/columns/VersionColumn.ts

@@ -1,7 +1,7 @@
-import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnOptions} from "../options/ColumnOptions";
 import {ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {getMetadataArgsStorage} from "../../index";
-import {ColumnMetadataArgs} from "../../metadata/args/ColumnMetadataArgs";
+import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
 
 /**
  * This column will store a number - version of the entity. Every time your entity will be persisted, this number will

src/decorator/indices/CompositeIndex.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
-import {CompositeIndexOptions} from "../../metadata/options/CompositeIndexOptions";
-import {IndexMetadataArgs} from "../../metadata/args/IndexMetadataArgs";
+import {CompositeIndexOptions} from "../options/CompositeIndexOptions";
+import {IndexMetadataArgs} from "../../metadata-args/IndexMetadataArgs";
 
 /**
  * Composite index must be set on entity classes and must specify entity's fields to be indexed.

src/decorator/indices/Index.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../../index";
-import {IndexMetadataArgs} from "../../metadata/args/IndexMetadataArgs";
+import {IndexMetadataArgs} from "../../metadata-args/IndexMetadataArgs";
 
 /**
  * Fields that needs to be indexed must be marked with this decorator.

src/decorator/listeners/AfterInsert.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied after this entity insertion.

src/decorator/listeners/AfterLoad.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied after entity is loaded.

src/decorator/listeners/AfterRemove.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied after this entity removal.

src/decorator/listeners/AfterUpdate.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied after this entity update.

src/decorator/listeners/BeforeInsert.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied before this entity insertion.

src/decorator/listeners/BeforeRemove.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied before this entity removal.

src/decorator/listeners/BeforeUpdate.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
 import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "../../metadata/args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * Calls a method on which this decorator is applied before this entity update.

src/decorator/listeners/EventSubscriber.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../../index";
-import {EventSubscriberMetadataArgs} from "../../metadata/args/EventSubscriberMetadataArgs";
+import {EventSubscriberMetadataArgs} from "../../metadata-args/EventSubscriberMetadataArgs";
 
 /**
  * Classes decorated with this decorator will listen to ORM events and their methods will be triggered when event

src/decorator/options/ColumnOptions.ts

@@ -1,4 +1,4 @@
-import {ColumnType} from "../types/ColumnTypes";
+import {ColumnType} from "../../metadata/types/ColumnTypes";
 
 /**
  * Describes all column's options.

src/decorator/relations/JoinColumn.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
-import {JoinColumnOptions} from "../../metadata/options/JoinColumnOptions";
-import {JoinColumnMetadataArgs} from "../../metadata/args/JoinColumnMetadataArgs";
+import {JoinColumnOptions} from "../options/JoinColumnOptions";
+import {JoinColumnMetadataArgs} from "../../metadata-args/JoinColumnMetadataArgs";
 
 /**
  */

src/decorator/relations/JoinTable.ts

@@ -1,6 +1,6 @@
 import {getMetadataArgsStorage} from "../../index";
-import {JoinTableOptions} from "../../metadata/options/JoinTableOptions";
-import {JoinTableMetadataArgs} from "../../metadata/args/JoinTableMetadataArgs";
+import {JoinTableOptions} from "../options/JoinTableOptions";
+import {JoinTableMetadataArgs} from "../../metadata-args/JoinTableMetadataArgs";
 
 /**
  */

src/decorator/relations/ManyToMany.ts

@@ -1,8 +1,8 @@
-import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationOptions} from "../options/RelationOptions";
 import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {getMetadataArgsStorage} from "../../index";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
-import {RelationMetadataArgs} from "../../metadata/args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
 
 /**
  * Many-to-many is a type of relationship when Entity1 can have multiple instances of Entity2, and Entity2 can have

src/decorator/relations/ManyToOne.ts

@@ -1,8 +1,8 @@
-import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationOptions} from "../options/RelationOptions";
 import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {getMetadataArgsStorage} from "../../index";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
-import {RelationMetadataArgs} from "../../metadata/args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
 
 /**
  * Many-to-one relation allows to create type of relation when Entity1 can have single instance of Entity2, but

src/decorator/relations/OneToMany.ts

@@ -1,8 +1,8 @@
-import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationOptions} from "../options/RelationOptions";
 import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {getMetadataArgsStorage} from "../../index";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
-import {RelationMetadataArgs} from "../../metadata/args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
 
 // todo: make decorators which use inverse side string separate
 

src/decorator/relations/OneToOne.ts

@@ -1,8 +1,8 @@
-import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationOptions} from "../options/RelationOptions";
 import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {getMetadataArgsStorage} from "../../index";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
-import {RelationMetadataArgs} from "../../metadata/args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
 
 /**
  * One-to-one relation allows to create direct relation between two entities. Entity1 have only one Entity2.

src/decorator/tables/AbstractTable.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../../index";
-import {TableMetadataArgs} from "../../metadata/args/TableMetadataArgs";
+import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
 
 /**
  * Allows to use columns and relations data from the inherited metadata.

src/decorator/tables/ClosureTable.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../../index";
-import {TableMetadataArgs} from "../../metadata/args/TableMetadataArgs";
+import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
 
 /**
  * This decorator is used to mark classes that will be a tables. Database schema will be created for all classes

src/decorator/tables/Table.ts

@@ -1,5 +1,5 @@
 import {getMetadataArgsStorage} from "../../index";
-import {TableMetadataArgs} from "../../metadata/args/TableMetadataArgs";
+import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
 
 /**
  * This decorator is used to mark classes that will be a tables. Database schema will be created for all classes

src/decorator/tree/TreeChildren.ts

@@ -1,7 +1,7 @@
 import {getMetadataArgsStorage} from "../../index";
-import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationOptions} from "../options/RelationOptions";
 import {RelationTypes} from "../../metadata/types/RelationTypes";
-import {RelationMetadataArgs} from "../../metadata/args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
 
 /**
  * Marks a specific property of the class as a children of the tree.

src/decorator/tree/TreeLevelColumn.ts

@@ -1,7 +1,7 @@
 import {getMetadataArgsStorage} from "../../index";
 import {ColumnTypes} from "../../metadata/types/ColumnTypes";
-import {ColumnOptions} from "../../metadata/options/ColumnOptions";
-import {ColumnMetadataArgs} from "../../metadata/args/ColumnMetadataArgs";
+import {ColumnOptions} from "../options/ColumnOptions";
+import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
 
 /**
  * Creates a "level"/"length" column to the table that holds a closure table.

src/decorator/tree/TreeParent.ts

@@ -1,7 +1,7 @@
 import {getMetadataArgsStorage} from "../../index";
-import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationOptions} from "../options/RelationOptions";
 import {RelationTypes} from "../../metadata/types/RelationTypes";
-import {RelationMetadataArgs} from "../../metadata/args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
 
 /**
  * Marks a specific property of the class as a parent of the tree.

src/index.ts

@@ -6,7 +6,7 @@ import {ConnectionOptions} from "./connection/ConnectionOptions";
 import {ConnectionManager} from "./connection-manager/ConnectionManager";
 import {Connection} from "./connection/Connection";
 import {MysqlDriver} from "./driver/MysqlDriver";
-import {MetadataArgsStorage} from "./metadata-storage/MetadataArgsStorage";
+import {MetadataArgsStorage} from "./metadata-args/MetadataArgsStorage";
 import {CreateConnectionOptions} from "./connection-manager/CreateConnectionOptions";
 
 // -------------------------------------------------------------------------

src/metadata-args/ColumnMetadataArgs.ts

@@ -1,5 +1,5 @@
-import {ColumnOptions} from "../options/ColumnOptions";
-import {ColumnMode} from "../ColumnMetadata";
+import {ColumnOptions} from "../decorator/options/ColumnOptions";
+import {ColumnMode} from "../metadata/ColumnMetadata";
 
 /**
  * Arguments for ColumnMetadata class.

src/metadata-args/EntityListenerMetadataArgs.ts

@@ -1,4 +1,4 @@
-import {EventListenerType} from "../types/EventListenerTypes";
+import {EventListenerType} from "../metadata/types/EventListenerTypes";
 
 /**
  * Arguments for EntityListenerMetadata class.

src/metadata-args/JoinTableMetadataArgs.ts

@@ -1,4 +1,4 @@
-import {JoinColumnOptions} from "../options/JoinColumnOptions";
+import {JoinColumnOptions} from "../decorator/options/JoinColumnOptions";
 
 /**
  * Arguments for JoinTableMetadata class.

src/metadata-args/MetadataArgsStorage.ts

@@ -1,16 +1,15 @@
-import {TargetMetadataArgsCollection} from "../metadata/collection/TargetMetadataArgsCollection";
-import {PropertyMetadataArgsCollection} from "../metadata/collection/PropertyMetadataArgsCollection";
-import {RelationMetadataArgs} from "../metadata/args/RelationMetadataArgs";
-import {ColumnMetadataArgs} from "../metadata/args/ColumnMetadataArgs";
-import {RelationsCountMetadataArgs} from "../metadata/args/RelationsCountMetadataArgs";
-import {IndexMetadataArgs} from "../metadata/args/IndexMetadataArgs";
-import {EntityListenerMetadataArgs} from "../metadata/args/EntityListenerMetadataArgs";
-import {TableMetadataArgs} from "../metadata/args/TableMetadataArgs";
-import {NamingStrategyMetadataArgs} from "../metadata/args/NamingStrategyMetadataArgs";
-import {EventSubscriberMetadataArgs} from "../metadata/args/EventSubscriberMetadataArgs";
-import {JoinTableMetadataArgs} from "../metadata/args/JoinTableMetadataArgs";
-import {JoinColumnMetadataArgs} from "../metadata/args/JoinColumnMetadataArgs";
-import {TargetMetadataArgs} from "../metadata/args/TargetMetadataArgs";
+import {TargetMetadataArgsCollection} from "./collection/TargetMetadataArgsCollection";
+import {PropertyMetadataArgsCollection} from "./collection/PropertyMetadataArgsCollection";
+import {RelationMetadataArgs} from "./RelationMetadataArgs";
+import {ColumnMetadataArgs} from "./ColumnMetadataArgs";
+import {RelationsCountMetadataArgs} from "./RelationsCountMetadataArgs";
+import {IndexMetadataArgs} from "./IndexMetadataArgs";
+import {EntityListenerMetadataArgs} from "./EntityListenerMetadataArgs";
+import {TableMetadataArgs} from "./TableMetadataArgs";
+import {NamingStrategyMetadataArgs} from "./NamingStrategyMetadataArgs";
+import {EventSubscriberMetadataArgs} from "./EventSubscriberMetadataArgs";
+import {JoinTableMetadataArgs} from "./JoinTableMetadataArgs";
+import {JoinColumnMetadataArgs} from "./JoinColumnMetadataArgs";
 
 /**
  * Storage all metadatas of all available types: tables, fields, subscribers, relations, etc.
@@ -74,7 +73,7 @@ export class MetadataArgsStorage {
         const relationCounts = this.relationCounts.filterByClass(tableMetadata.target);
 
         allTableMetadatas
-            .filter(metadata => this.isInherited(tableMetadata, metadata))
+            .filter(metadata => this.isInherited(tableMetadata.target, metadata.target))
             .forEach(parentMetadata => {
                 const metadatasFromAbstract = this.mergeWithAbstract(allTableMetadatas, parentMetadata);
 
@@ -118,13 +117,11 @@ export class MetadataArgsStorage {
     /**
      * Checks if this table is inherited from another table.
      */
-    private isInherited(firstTargetMetadata: TargetMetadataArgs, secondTargetMetadata: TargetMetadataArgs) {
+    private isInherited(target1: Function, target2: Function) {
         // we cannot use instanceOf in this method, because we need order of inherited tables, to ensure that
         // properties get inherited in a right order. To achieve it we can only check a first parent of the class
         // return this.target.prototype instanceof anotherTable.target;
-        if (!firstTargetMetadata.target)
-            return false;
-        return Object.getPrototypeOf(firstTargetMetadata.target.prototype).constructor === secondTargetMetadata.target;
+        return Object.getPrototypeOf(target1.prototype).constructor === target2;
     }
 
 

src/metadata-args/NamingStrategyMetadataArgs.ts

@@ -1,5 +1,3 @@
-import {TargetMetadataArgs} from "./TargetMetadataArgs";
-
 /**
  * Arguments for NamingStrategyMetadata class.
  */

src/metadata-args/RelationMetadataArgs.ts

@@ -1,6 +1,6 @@
-import {RelationType} from "../types/RelationTypes";
-import {RelationOptions} from "../options/RelationOptions";
-import {PropertyTypeInFunction, RelationTypeInFunction} from "../RelationMetadata";
+import {RelationType} from "../metadata/types/RelationTypes";
+import {RelationOptions} from "../decorator/options/RelationOptions";
+import {PropertyTypeInFunction, RelationTypeInFunction} from "../metadata/RelationMetadata";
 
 /**
  * Arguments for RelationMetadata class.

src/metadata-args/TableMetadataArgs.ts

@@ -1,4 +1,4 @@
-import {TableType} from "../TableMetadata";
+import {TableType} from "../metadata/TableMetadata";
 
 /**
  * Arguments for TableMetadata class.

src/metadata-args/collection/EntityMetadataCollection.ts

@@ -1,4 +1,4 @@
-import {EntityMetadata} from "../EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 import {EntityMetadataNotFound} from "../error/EntityMetadataNotFound";
 
 /**

src/metadata-args/collection/TargetMetadataArgsCollection.ts

@@ -1,5 +1,4 @@
-import {MetadataAlreadyExistsError} from "../../metadata-storage/error/MetadataAlreadyExistsError";
-import {TargetMetadataArgs} from "../args/TargetMetadataArgs";
+import {MetadataAlreadyExistsError} from "../../metadata-builder/error/MetadataAlreadyExistsError";
 
 export class TargetMetadataArgsCollection<T extends { target?: Function }> extends Array<T> {
     

src/metadata-builder/EntityMetadataBuilder.ts

@@ -1,20 +1,20 @@
 import {EntityMetadata} from "../metadata/EntityMetadata";
 import {NamingStrategyInterface} from "../naming-strategy/NamingStrategyInterface";
 import {ColumnMetadata} from "../metadata/ColumnMetadata";
-import {ColumnOptions} from "../metadata/options/ColumnOptions";
+import {ColumnOptions} from "../decorator/options/ColumnOptions";
 import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
 import {EntityMetadataValidator} from "./EntityMetadataValidator";
 import {IndexMetadata} from "../metadata/IndexMetadata";
 import {JoinColumnMetadata} from "../metadata/JoinColumnMetadata";
-import {JoinColumnOptions} from "../metadata/options/JoinColumnOptions";
+import {JoinColumnOptions} from "../decorator/options/JoinColumnOptions";
 import {TableMetadata} from "../metadata/TableMetadata";
 import {ColumnTypes} from "../metadata/types/ColumnTypes";
 import {getMetadataArgsStorage} from "../index";
 import {RelationMetadata} from "../metadata/RelationMetadata";
 import {JoinTableMetadata} from "../metadata/JoinTableMetadata";
-import {JoinTableMetadataArgs} from "../metadata/args/JoinTableMetadataArgs";
-import {PropertyMetadataArgsCollection} from "../metadata/collection/PropertyMetadataArgsCollection";
-import {ColumnMetadataArgs} from "../metadata/args/ColumnMetadataArgs";
+import {JoinTableMetadataArgs} from "../metadata-args/JoinTableMetadataArgs";
+import {PropertyMetadataArgsCollection} from "../metadata-args/collection/PropertyMetadataArgsCollection";
+import {ColumnMetadataArgs} from "../metadata-args/ColumnMetadataArgs";
 
 /**
  * Aggregates all metadata: table, column, relation into one collection grouped by tables for a given set of classes.

src/metadata/ColumnMetadata.ts

@@ -1,5 +1,5 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {ColumnMetadataArgs} from "./args/ColumnMetadataArgs";
+import {ColumnMetadataArgs} from "../metadata-args/ColumnMetadataArgs";
 import {ColumnType} from "./types/ColumnTypes";
 import {EntityMetadata} from "./EntityMetadata";
 

src/metadata/EntityListenerMetadata.ts

@@ -1,6 +1,6 @@
 import {PropertyMetadata} from "./PropertyMetadata";
 import {EventListenerType} from "./types/EventListenerTypes";
-import {EntityListenerMetadataArgs} from "./args/EntityListenerMetadataArgs";
+import {EntityListenerMetadataArgs} from "../metadata-args/EntityListenerMetadataArgs";
 
 /**
  * This metadata contains all information about entity's listeners.

src/metadata/EventSubscriberMetadata.ts

@@ -1,5 +1,5 @@
 import {TargetMetadata} from "./TargetMetadata";
-import {EventSubscriberMetadataArgs} from "./args/EventSubscriberMetadataArgs";
+import {EventSubscriberMetadataArgs} from "../metadata-args/EventSubscriberMetadataArgs";
 
 /**
  * Contains metadata information about ORM event subscribers.

src/metadata/IndexMetadata.ts

@@ -1,6 +1,6 @@
 import {TargetMetadata} from "./TargetMetadata";
 import {EntityMetadata} from "./EntityMetadata";
-import {IndexMetadataArgs} from "./args/IndexMetadataArgs";
+import {IndexMetadataArgs} from "../metadata-args/IndexMetadataArgs";
 
 /**
  * Index metadata contains all information about table's index.

src/metadata/JoinColumnMetadata.ts

@@ -1,7 +1,7 @@
 import {PropertyMetadata} from "./PropertyMetadata";
 import {RelationMetadata} from "./RelationMetadata";
 import {ColumnMetadata} from "./ColumnMetadata";
-import {JoinColumnMetadataArgs} from "./args/JoinColumnMetadataArgs";
+import {JoinColumnMetadataArgs} from "../metadata-args/JoinColumnMetadataArgs";
 
 /**
  * JoinColumnMetadata contains all information about relation's join column.

src/metadata/JoinTableMetadata.ts

@@ -1,7 +1,7 @@
 import {PropertyMetadata} from "./PropertyMetadata";
 import {RelationMetadata} from "./RelationMetadata";
 import {ColumnMetadata} from "./ColumnMetadata";
-import {JoinTableMetadataArgs} from "./args/JoinTableMetadataArgs";
+import {JoinTableMetadataArgs} from "../metadata-args/JoinTableMetadataArgs";
 
 /**
  * JoinTableMetadata contains all information about relation's join table.

src/metadata/NamingStrategyMetadata.ts

@@ -1,5 +1,5 @@
 import {TargetMetadata} from "./TargetMetadata";
-import {NamingStrategyMetadataArgs} from "./args/NamingStrategyMetadataArgs";
+import {NamingStrategyMetadataArgs} from "../metadata-args/NamingStrategyMetadataArgs";
 
 /**
  * This metadata interface contains all information about naming strategy.

src/metadata/RelationMetadata.ts

@@ -4,7 +4,7 @@ import {EntityMetadata} from "./EntityMetadata";
 import {OnDeleteType} from "./ForeignKeyMetadata";
 import {JoinTableMetadata} from "./JoinTableMetadata";
 import {JoinColumnMetadata} from "./JoinColumnMetadata";
-import {RelationMetadataArgs} from "./args/RelationMetadataArgs";
+import {RelationMetadataArgs} from "../metadata-args/RelationMetadataArgs";
 
 /**
  * Function that returns a type of the field. Returned value must be a class used on the relation.

src/metadata/RelationsCountMetadata.ts

@@ -1,5 +1,5 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {RelationsCountMetadataArgs} from "./args/RelationsCountMetadataArgs";
+import {RelationsCountMetadataArgs} from "../metadata-args/RelationsCountMetadataArgs";
 
 /**
  * Contains all information about entity's relation count.

src/metadata/TableMetadata.ts

@@ -1,6 +1,6 @@
 import {TargetMetadata} from "./TargetMetadata";
 import {EntityMetadata} from "./EntityMetadata";
-import {TableMetadataArgs} from "./args/TableMetadataArgs";
+import {TableMetadataArgs} from "../metadata-args/TableMetadataArgs";
 
 /**
  * Table type.

src/metadata/args/TargetMetadataArgs.ts

@@ -1,11 +0,0 @@
-/**
- * Constructor arguments for ColumnMetadata class.
- */
-export interface TargetMetadataArgs {
-
-    /**
-     * Class to which this arguments is applied.
-     */
-    readonly target?: Function;
-    
-}

src/persistment/EntityPersistOperationsBuilder.ts

@@ -7,7 +7,7 @@ import {JunctionInsertOperation} from "./operation/JunctionInsertOperation";
 import {UpdateOperation} from "./operation/UpdateOperation";
 import {CascadesNotAllowedError} from "./error/CascadesNotAllowedError";
 import {RemoveOperation} from "./operation/RemoveOperation";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {UpdateByInverseSideOperation} from "./operation/UpdateByInverseSideOperation";
 
 /**

src/persistment/PersistOperationExecutor.ts

@@ -6,7 +6,7 @@ import {InsertOperation} from "./operation/InsertOperation";
 import {JunctionRemoveOperation} from "./operation/JunctionRemoveOperation";
 import {UpdateByRelationOperation} from "./operation/UpdateByRelationOperation";
 import {Broadcaster} from "../subscriber/Broadcaster";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {Driver} from "../driver/Driver";
 import {UpdateByInverseSideOperation} from "./operation/UpdateByInverseSideOperation";
 

src/query-builder/QueryBuilder.ts

@@ -2,7 +2,7 @@ import {Alias} from "./alias/Alias";
 import {AliasMap} from "./alias/AliasMap";
 import {RawSqlResultsToEntityTransformer} from "./transformer/RawSqlResultsToEntityTransformer";
 import {Broadcaster} from "../subscriber/Broadcaster";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {Driver} from "../driver/Driver";
 
 /**

src/repository/Repository.ts

@@ -7,7 +7,7 @@ import {EntityPersistOperationBuilder} from "../persistment/EntityPersistOperati
 import {PersistOperationExecutor} from "../persistment/PersistOperationExecutor";
 import {EntityWithId} from "../persistment/operation/PersistOperation";
 import {FindOptions, FindOptionsUtils} from "./FindOptions";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {Broadcaster} from "../subscriber/Broadcaster";
 import {Driver} from "../driver/Driver";
 

src/repository/RepositoryFactory.ts

@@ -1,6 +1,6 @@
 import {TreeRepository} from "./TreeRepository";
 import {EntityMetadata} from "../metadata/EntityMetadata";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {Connection} from "../connection/Connection";
 import {Repository} from "./Repository";
 import {ReactiveRepository} from "./ReactiveRepository";

src/schema-creator/SchemaCreator.ts

@@ -3,7 +3,7 @@ import {ColumnMetadata} from "../metadata/ColumnMetadata";
 import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
 import {EntityMetadata} from "../metadata/EntityMetadata";
 import {SchemaBuilder} from "../schema-builder/SchemaBuilder";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 import {IndexMetadata} from "../metadata/IndexMetadata";
 
 /**

src/schema-creator/SchemaCreatorFactory.ts

@@ -1,6 +1,6 @@
 import {SchemaBuilder} from "../schema-builder/SchemaBuilder";
 import {SchemaCreator} from "./SchemaCreator";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 
 /**
  */

src/subscriber/Broadcaster.ts

@@ -2,7 +2,7 @@ import {EventSubscriberInterface} from "./EventSubscriberInterface";
 import {ColumnMetadata} from "../metadata/ColumnMetadata";
 import {EventListenerTypes} from "../metadata/types/EventListenerTypes";
 import {EntityListenerMetadata} from "../metadata/EntityListenerMetadata";
-import {EntityMetadataCollection} from "../metadata/collection/EntityMetadataCollection";
+import {EntityMetadataCollection} from "../metadata-args/collection/EntityMetadataCollection";
 
 /**
  * Broadcaster provides a helper methods to broadcast events to the subscribers.