diff --git a/packages/concerto-core/types/lib/decoratormanager.d.ts b/packages/concerto-core/types/lib/decoratormanager.d.ts index a6b644280..4fa7ce2f1 100644 --- a/packages/concerto-core/types/lib/decoratormanager.d.ts +++ b/packages/concerto-core/types/lib/decoratormanager.d.ts @@ -27,6 +27,15 @@ declare class DecoratorManager { * @returns {object} the migrated DecoratorCommandSet object */ private static migrateTo; + /** + * Checks if the supplied decoratorCommandSet can be migrated. + * Migrations should only take place across minor versions of the same major version. + * @private + * @param {*} decoratorCommandSet the DecoratorCommandSet object + * @param {*} DCS_VERSION the DecoratorCommandSet version + * @returns {boolean} returns true if major versions are equal + */ + private static canMigrate; /** * Applies all the decorator commands from the DecoratorCommandSet * to the ModelManager. diff --git a/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts b/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts index e1461945f..7599252b2 100644 --- a/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts +++ b/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts @@ -17,6 +17,7 @@ declare class MapKeyType extends Decorated { */ constructor(parent: MapDeclaration, ast: any); parent: MapDeclaration; + modelFile: ModelFile; /** * Semantic validation of the structure of this class. * @@ -60,3 +61,4 @@ declare class MapKeyType extends Decorated { } import Decorated = require("./decorated"); import MapDeclaration = require("./mapdeclaration"); +import ModelFile = require("./modelfile"); diff --git a/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts b/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts index 70818d901..d2bce3b76 100644 --- a/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts +++ b/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts @@ -57,14 +57,6 @@ declare class MapValueType extends Decorated { * @return {boolean} true if the class is a Map Value */ isValue(): boolean; - /** - * Returns the corresponding ClassDeclaration representation of the Type - * - * @param {string} type - the Type of the Map Value - * @return {Object} the corresponding ClassDeclaration representation - * @private - */ - private getTypeDeclaration; } import Decorated = require("./decorated"); import MapDeclaration = require("./mapdeclaration"); diff --git a/packages/concerto-core/types/lib/modelutil.d.ts b/packages/concerto-core/types/lib/modelutil.d.ts index 473d2c255..62515449c 100644 --- a/packages/concerto-core/types/lib/modelutil.d.ts +++ b/packages/concerto-core/types/lib/modelutil.d.ts @@ -156,10 +156,17 @@ declare class ModelUtil { */ static isValidMapKeyScalar(decl: any): boolean; /** - * Returns true if this Value is a valid Map Value. - * - * @param {Object} value - the Value of the Map Declaration - * @return {boolean} true if the Value is a valid Map Value - */ + * Returns true if this Value is a valid Map Value. + * + * @param {Object} value - the Value of the Map Declaration + * @return {boolean} true if the Value is a valid Map Value + */ static isValidMapValue(value: any): boolean; + /** + * Returns the corresponding ClassDeclaration representation of the Map Type + * @param {string} type - the Type of the Map Value + * @param {Object} modelFile - the ModelFile that owns the Property + * @return {Object} the corresponding ClassDeclaration representation + */ + static getTypeDeclaration(type: string, modelFile: any): any; }