@accordproject/concerto-core 4.0.0-alpha.2 → 4.0.0-beta.3

package/dist/introspect/property.d.ts

@@ -1,4 +1,4 @@
-export = Property;
+declare const Decorated: any;
 /**
  * Property representing an attribute of a class declaration,
  * either a Field or a Relationship.
@@ -13,45 +13,52 @@ declare class Property extends Decorated {
      * @param {Object} ast - The AST created by the parser
      * @throws {IllegalModelException}
      */
-    constructor(parent: ClassDeclaration, ast: Object);
-    parent: ClassDeclaration;
+    constructor(parent: any, ast: any);
+    /**
+     * Returns the ModelFile that defines this class.
+     *
+     * @public
+     * @return {ModelFile} the owning ModelFile
+     */
+    getModelFile(): any;
     /**
      * Returns the owner of this property
      * @return {ClassDeclaration} the parent class declaration
      */
-    getParent(): ClassDeclaration;
-    name: any;
-    decorator: any;
-    type: any;
-    array: boolean | undefined;
-    optional: boolean | undefined;
+    getParent(): any;
+    /**
+     * Process the AST and build the model
+     * @throws {IllegalModelException}
+     * @private
+     */
+    process(): void;
     /**
      * Validate the property
      * @param {ClassDeclaration} classDecl the class declaration of the property
      * @throws {IllegalModelException}
      * @protected
      */
-    protected validate(classDecl: ClassDeclaration): void;
+    validate(classDecl: any): void;
     /**
      * Returns the name of a property
      * @return {string} the name of this field
      */
-    getName(): string;
+    getName(): any;
     /**
      * Returns the type of a property
      * @return {string} the type of this field
      */
-    getType(): string;
+    getType(): any;
     /**
      * Returns true if the field is optional
      * @return {boolean} true if the field is optional
      */
-    isOptional(): boolean;
+    isOptional(): any;
     /**
      * Returns the fully qualified type name of a property
      * @return {string} the fully qualified type of this property
      */
-    getFullyQualifiedTypeName(): string;
+    getFullyQualifiedTypeName(): any;
     /**
      * Returns the fully name of a property (ns + class name + property name)
      * @return {string} the fully qualified name of this property
@@ -61,22 +68,21 @@ declare class Property extends Decorated {
      * Returns the namespace of the parent of this property
      * @return {string} the namespace of the parent of this property
      */
-    getNamespace(): string;
+    getNamespace(): any;
     /**
      * Returns true if the field is declared as an array type
      * @return {boolean} true if the property is an array type
      */
-    isArray(): boolean;
+    isArray(): any;
     /**
      * Returns true if the field is declared as an enumerated value
      * @return {boolean} true if the property is an enumerated value
      */
-    isTypeEnum(): boolean;
+    isTypeEnum(): any;
     /**
      * Returns true if this property is a primitive type.
      * @return {boolean} true if the property is a primitive type.
      */
-    isPrimitive(): boolean;
+    isPrimitive(): any;
 }
-import Decorated = require("./decorated");
-import ClassDeclaration = require("./classdeclaration");
+export = Property;

package/dist/introspect/property.js.map

@@ -1 +1 @@
-{"version":3,"file":"property.js","sourceRoot":"","sources":["../../src/introspect/property.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"property.js","sourceRoot":"","sources":["../../src/introspect/property.ts"],"names":[],"mappings":"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"}

package/dist/introspect/relationshipdeclaration.d.ts

@@ -1,4 +1,4 @@
-export = RelationshipDeclaration;
+import Property = require('./property');
 /**
  * Class representing a relationship between model elements
  * @extends Property
@@ -8,6 +8,25 @@ export = RelationshipDeclaration;
  * @memberof module:concerto-core
  */
 declare class RelationshipDeclaration extends Property {
+    /**
+     * Create a Relationship.
+     * @param {ClassDeclaration} parent - The owner of this property
+     * @param {Object} ast - The AST created by the parser
+     * @throws {IllegalModelException}
+     */
+    constructor(parent: any, ast: any);
+    /**
+     * Validate the property
+     * @param {ClassDeclaration} classDecl the class declaration of the property
+     * @throws {IllegalModelException}
+     * @protected
+     */
+    validate(classDecl: any): void;
+    /**
+     * Returns a string representation of this property
+     * @return {String} the string version of the property.
+     */
+    toString(): string;
     /**
      * Returns true if this class is the definition of a relationship.
      *
@@ -15,4 +34,4 @@ declare class RelationshipDeclaration extends Property {
      */
     isRelationship(): boolean;
 }
-import Property = require("./property");
+export = RelationshipDeclaration;

package/dist/introspect/relationshipdeclaration.js

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 'use strict';
-const Property = require('./property');
+const Property = require("./property");
 const IllegalModelException = require('./illegalmodelexception');
 const ModelUtil = require('../modelutil');
 // Types needed for TypeScript generation.

package/dist/introspect/relationshipdeclaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"relationshipdeclaration.js","sourceRoot":"","sources":["../../src/introspect/relationshipdeclaration.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"relationshipdeclaration.js","sourceRoot":"","sources":["../../src/introspect/relationshipdeclaration.ts"],"names":[],"mappings":"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"}

package/dist/introspect/scalardeclaration.d.ts

@@ -1,4 +1,4 @@
-export = ScalarDeclaration;
+declare const Declaration: any;
 /**
  * ScalarDeclaration defines the structure (model/schema) of composite data.
  * It is composed of a set of Properties, may have an identifying field, and may
@@ -11,14 +11,13 @@ export = ScalarDeclaration;
  * @memberof module:concerto-core
  */
 declare class ScalarDeclaration extends Declaration {
-    superType: any;
-    superTypeDeclaration: any;
-    idField: any;
-    timestamped: boolean | undefined;
-    abstract: boolean | undefined;
-    validator: StringValidator | NumberValidator | null | undefined;
-    type: string | null | undefined;
-    defaultValue: any;
+    /**
+     * Process the AST and build the model
+     *
+     * @throws {IllegalModelException}
+     * @private
+     */
+    process(): void;
     /**
      * Semantic validation of the structure of this class. Subclasses should
      * override this method to impose additional semantic constraints on the
@@ -27,7 +26,32 @@ declare class ScalarDeclaration extends Declaration {
      * @throws {IllegalModelException}
      * @protected
      */
-    protected validate(): void;
+    validate(): void;
+    /**
+     * Returns false as scalars are never identified.
+     * @returns {Boolean} false as scalars are never identified
+     * @deprecated
+     */
+    isIdentified(): boolean;
+    /**
+     * Returns false as scalars are never identified.
+     * @returns {Boolean} false as scalars are never identified
+     * @deprecated
+     */
+    isSystemIdentified(): boolean;
+    /**
+     * Returns null as scalars are never identified.
+     * @return {string} as scalars are never identified
+     * @deprecated
+     */
+    getIdentifierFieldName(): null;
+    /**
+     * Returns the FQN of the super type for this class or null if this
+     * class does not have a super type.
+     *
+     * @return {string} the FQN name of the super type or null
+     */
+    getType(): any;
     /**
      * Returns the FQN of the super type for this class or null if this
      * class does not have a super type.
@@ -35,23 +59,28 @@ declare class ScalarDeclaration extends Declaration {
      * @return {string} the FQN name of the super type or null
      * @deprecated
      */
-    getSuperType(): string;
+    getSuperType(): null;
     /**
      * Get the super type class declaration for this class.
      * @return {ClassDeclaration} the super type declaration, or null if there is no super type.
      * @deprecated
      */
-    getSuperTypeDeclaration(): ClassDeclaration;
+    getSuperTypeDeclaration(): null;
     /**
      * Returns the validator string for this scalar definition
      * @return {Validator} the validator for the field or null
      */
-    getValidator(): Validator;
+    getValidator(): any;
     /**
      * Returns the default value for the field or null
      * @return {string | number | null} the default value for the field or null
      */
-    getDefaultValue(): string | number | null;
+    getDefaultValue(): any;
+    /**
+     * Returns the string representation of this class
+     * @return {String} the string representation of the class
+     */
+    toString(): string;
     /**
      * Returns true if this class is abstract.
      *
@@ -59,6 +88,12 @@ declare class ScalarDeclaration extends Declaration {
      * @deprecated
      */
     isAbstract(): boolean;
+    /**
+     * Returns true if this class is the definition of a scalar declaration.
+     *
+     * @return {boolean} true if the class is a scalar
+     */
+    isScalarDeclaration(): boolean;
     /**
      * Returns true if this class is the definition of an asset.
      *
@@ -95,8 +130,4 @@ declare class ScalarDeclaration extends Declaration {
      */
     isConcept(): boolean;
 }
-import Declaration = require("./declaration");
-import StringValidator = require("./stringvalidator");
-import NumberValidator = require("./numbervalidator");
-import ClassDeclaration = require("./classdeclaration");
-import Validator = require("./validator");
+export = ScalarDeclaration;

package/dist/introspect/scalardeclaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"scalardeclaration.js","sourceRoot":"","sources":["../../src/introspect/scalardeclaration.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"scalardeclaration.js","sourceRoot":"","sources":["../../src/introspect/scalardeclaration.ts"],"names":[],"mappings":"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"}

package/dist/introspect/stringvalidator.d.ts

@@ -1,4 +1,4 @@
-export = StringValidator;
+declare const Validator: any;
 /**
  * A Validator to enforce that a string matches a regex
  * @private
@@ -14,24 +14,38 @@ declare class StringValidator extends Validator {
      *
      * @throws {IllegalModelException}
      */
-    constructor(field: Object, validator: Object, lengthValidator: Object);
-    minLength: any;
-    maxLength: any;
-    regex: any;
+    constructor(field: any, validator: any, lengthValidator: any);
+    /**
+     * Validate the property
+     * @param {string} identifier the identifier of the instance being validated
+     * @param {Object} value the value to validate
+     * @throws {IllegalModelException}
+     * @private
+     */
+    validate(identifier: any, value: any): void;
     /**
      * Returns the minLength for this validator, or null if not specified
      * @returns {number} the min length or null
      */
-    getMinLength(): number;
+    getMinLength(): any;
     /**
      * Returns the maxLength for this validator, or null if not specified
      * @returns {number} the max length or null
      */
-    getMaxLength(): number;
+    getMaxLength(): any;
     /**
      * Returns the RegExp object associated with the string validator, or null if not specified
      * @returns {RegExp} the RegExp object
      */
-    getRegex(): RegExp;
+    getRegex(): any;
+    /**
+     * Determine if the validator is compatible with another validator. For the
+     * validators to be compatible, all values accepted by this validator must
+     * be accepted by the other validator.
+     * @param {Validator} other the other validator.
+     * @returns {boolean} True if this validator is compatible with the other
+     * validator, false otherwise.
+     */
+    compatibleWith(other: any): boolean;
 }
-import Validator = require("./validator");
+export = StringValidator;

package/dist/introspect/stringvalidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"stringvalidator.js","sourceRoot":"","sources":["../../src/introspect/stringvalidator.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"stringvalidator.js","sourceRoot":"","sources":["../../src/introspect/stringvalidator.ts"],"names":[],"mappings":"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"}

package/dist/introspect/transactiondeclaration.d.ts

@@ -1,4 +1,4 @@
-export = TransactionDeclaration;
+import IdentifiedDeclaration = require('./identifieddeclaration');
 /** Class representing the definition of an Transaction.
  * @extends ClassDeclaration
  * @see See  {@link ClassDeclaration}
@@ -6,14 +6,14 @@ export = TransactionDeclaration;
  * @class
  * @memberof module:concerto-core
  */
-declare class TransactionDeclaration {
+declare class TransactionDeclaration extends IdentifiedDeclaration {
     /**
      * Create an TransactionDeclaration.
      * @param {ModelFile} modelFile the ModelFile for this class
      * @param {Object} ast - The AST created by the parser
      * @throws {IllegalModelException}
      */
-    constructor(modelFile: ModelFile, ast: Object);
+    constructor(modelFile: any, ast: any);
     /**
      * Returns the kind of declaration
      *
@@ -21,4 +21,4 @@ declare class TransactionDeclaration {
      */
     declarationKind(): string;
 }
-import ModelFile = require("./modelfile");
+export = TransactionDeclaration;

package/dist/introspect/transactiondeclaration.js

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 'use strict';
-const IdentifiedDeclaration = require('./identifieddeclaration');
+const IdentifiedDeclaration = require("./identifieddeclaration");
 // Types needed for TypeScript generation.
 /* eslint-disable no-unused-vars */
 /* istanbul ignore next */

package/dist/introspect/transactiondeclaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"transactiondeclaration.js","sourceRoot":"","sources":["../../src/introspect/transactiondeclaration.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,qBAAqB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAEjE,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC7C,CAAC;AACD,kCAAkC;AAElC;;;;;;GAMG;AACH,MAAM,sBAAuB,SAAQ,qBAAqB;IACtD;;;;;OAKG;IACH,YAAY,SAAS,EAAE,GAAG;QACtB,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,eAAe;QACX,OAAO,wBAAwB,CAAC;IACpC,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"transactiondeclaration.js","sourceRoot":"","sources":["../../src/introspect/transactiondeclaration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,iEAAkE;AAElE,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC7C,CAAC;AACD,kCAAkC;AAElC;;;;;;GAMG;AACH,MAAM,sBAAuB,SAAQ,qBAAqB;IACtD;;;;;OAKG;IACH,YAAY,SAAS,EAAE,GAAG;QACtB,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,eAAe;QACX,OAAO,wBAAwB,CAAC;IACpC,CAAC;CACJ;AAED,iBAAS,sBAAsB,CAAC"}

package/dist/introspect/validator.d.ts

@@ -1,4 +1,3 @@
-export = Validator;
 /**
  * An Abstract field validator. Extend this class and override the
  * validate method.
@@ -8,34 +7,34 @@ export = Validator;
  * @memberof module:concerto-core
  */
 declare class Validator {
+    validator: any;
+    field: any;
     /**
      * Create a Property.
      * @param {Object} field - the field or scalar declaration this validator is attached to
      * @param {Object} validator - The validation string
      * @throws {IllegalModelException}
      */
-    constructor(field: Object, validator: Object);
-    validator: Object;
-    field: Object;
+    constructor(field: any, validator: any);
     /**
      * @param {string} id the identifier of the instance
      * @param {string} msg the exception message
      * @param {string} errorType the type of error
      * @throws {Error} throws an error to report the message
      */
-    reportError(id: string, msg: string, errorType?: string): void;
+    reportError(id: any, msg: any, errorType?: any): void;
     /**
      * Visitor design pattern
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
      */
-    accept(visitor: Object, parameters: Object): Object;
+    accept(visitor: any, parameters: any): any;
     /**
      * Returns the field or scalar declaration that this validator applies to
      * @return {Object} the field
      */
-    getFieldOrScalarDeclaration(): Object;
+    getFieldOrScalarDeclaration(): any;
     /**
      * Validate the property against a value
      * @param {string} identifier the identifier of the instance being validated
@@ -43,7 +42,7 @@ declare class Validator {
      * @throws {IllegalModelException}
      * @private
      */
-    private validate;
+    validate(identifier: any, value: any): void;
     /**
      * Determine if the validator is compatible with another validator. For the
      * validators to be compatible, all values accepted by this validator must
@@ -52,5 +51,6 @@ declare class Validator {
      * @returns {boolean} True if this validator is compatible with the other
      * validator, false otherwise.
      */
-    compatibleWith(other: Validator): boolean;
+    compatibleWith(other: any): boolean;
 }
+export = Validator;

package/dist/introspect/validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/introspect/validator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAC9E,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAC7D,CAAC;AACD,kCAAkC;AAElC;;;;;;;GAOG;AACH,MAAM,SAAS;IACX;;;;;OAKG;IACH,YAAY,KAAK,EAAE,SAAS;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,GAAC,UAAU,CAAC,2BAA2B;QACjE,MAAM,IAAI,aAAa,CAAC,6BAA6B,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC,qBAAqB,EAAE,GAAG,IAAI,GAAG,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACxK,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAO,EAAC,UAAU;QACrB,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,2BAA2B;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK;IAC1B,CAAC;IAED;;;;;;;OAOG;IACH,cAAc,CAAC,KAAK;QAChB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC"}
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/introspect/validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAC9E,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAC7D,CAAC;AACD,kCAAkC;AAElC;;;;;;;GAOG;AACH,MAAM,SAAS;IAGX;;;;;OAKG;IACH,YAAY,KAAK,EAAE,SAAS;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,GAAC,UAAU,CAAC,2BAA2B;QACjE,MAAM,IAAI,aAAa,CAAC,6BAA6B,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC,qBAAqB,EAAE,GAAG,IAAI,GAAG,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACxK,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAO,EAAC,UAAU;QACrB,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,2BAA2B;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK;IAC1B,CAAC;IAED;;;;;;;OAOG;IACH,cAAc,CAAC,KAAK;QAChB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAED,iBAAS,SAAS,CAAC"}

package/dist/messages/en.json

@@ -12,19 +12,23 @@
         "test-hello-object": "Hello, {first} {middle} {last}",
         "test-repeat-array": "{0} {0} {0}",
         "test-repeat-object": "{value} {value} {value}",
+
         "classdeclaration-constructor-modelastreq": "\"ModelFile\" and \"AST\" are required to create a \"ClassDecl\".",
         "classdeclaration-process-unrecmodelelem": "Unrecognised model element \"{type}\".",
         "classdeclaration-getfield-notfindsupertype": "Could not find supertype \"{type}\".",
         "classdeclaration-validate-identifiernotproperty": "Class \"{class}\" is identified by field \"{idField}\", but does not contain this property.",
         "classdeclaration-validate-identifiernotstring": "Class \"{class}\" is identified by field \"{idField}\", but the type of the field is not \"String\".",
         "classdeclaration-validate-duplicatefieldname": "Class \"{class}\" has more than one field named \"{fieldName}\".",
-        "classdeclaration-validate-missingidentifier": "Class \"{class}\" is not declared as \"abstract\". It must define an identifying field.",
+        "classdeclaration-validate-missingidentifier" : "Class \"{class}\" is not declared as \"abstract\". It must define an identifying field.",
         "classdeclaration-validate-selfextending": "Class \"{class}\" cannot extend itself.",
         "classdeclaration-validate-undefined-properties": "Properties of Class \"{class}\" has to be defined.",
+
         "modelfile-constructor-unrecmodelelem": "Unrecognised model element \"{type}\".",
         "modelfile-resolvetype-undecltype": "Undeclared type \"{type}\" in \"{context}\".",
         "modelfile-resolveimport-failfindimp": "Failed to find \"{type}\" in list of imports \"[{imports}]\" for namespace \"{namespace}\".",
+
         "transactiondeclaration-getidentifierfieldname-noidentifyingfield": "Transactions do not have an identifying field.",
+
         "composer-connect-noconopts": "\"connectOptions\" not specified.",
         "composer-connect-nokeyvalstore": "\"connectOptions.keyValStore\" not specified.",
         "composer-connect-nomembersrvcurl": "\"connectOptions.membershipServicesURL\" not specified.",
@@ -34,22 +38,30 @@
         "composer-login-noenrollmentid": "\"enrollmentID\" not specified.",
         "composer-login-noenrollmentsecret": "\"enrollmentSecret\" not specified.",
         "composer-deploy-nosecuritycontext": "\"securityContext\" not specified.",
+
         "factory-newinstance-missingidentifier": "Missing identifier for Type \"{type}\" in namespace \"{namespace}\".",
         "factory-newinstance-invalididentifier": "Invalid or missing identifier for Type \"{type}\" in namespace \"{namespace}\".",
         "factory-newinstance-abstracttype": "Cannot instantiate the abstract type \"{type}\" in the \"{namespace}\" namespace.",
-        "factory-newrelationship-notregisteredwithmm": "Cannot create relationship as namespace \"{namespace}\" is not known.",
-        "factory-newinstance-typenotdeclaredinns": "Cannot instantiate Type \"{type}\" in namespace \"{namespace}\".",
+        "factory-newrelationship-notregisteredwithmm" : "Cannot create relationship as namespace \"{namespace}\" is not known.",
+        "factory-newinstance-typenotdeclaredinns" : "Cannot instantiate Type \"{type}\" in namespace \"{namespace}\".",
+
         "instancegenerator-newinstance-noconcreteclass": "No concrete extending type for \"{type}\".",
+
         "modelmanager-resolvetype-nonsfortype": "No registered namespace for type \"{type}\" in \"{context}\".",
         "modelmanager-resolvetype-notypeinnsforcontext": "No type \"{type}\" in namespace \"{namespace}\" for \"{context}\".",
+
         "modelmanager-gettype-noregisteredns": "Namespace is not defined for type \"{type}\".",
         "modelmanager-gettype-duplicatensimport": "Importing types from different versions (\"{version1}\", \"{version2}\") of the same namespace \"{namespace}\" is not permitted.",
         "modelmanager-gettype-notypeinns": "Type \"{type}\" is not defined in namespace \"{namespace}\".",
+
         "serializer-constructor-factorynull": "\"Factory\" cannot be \"null\".",
         "serializer-constructor-modelmanagernull": "\"ModelManager\" cannot be \"null\".",
         "serializer-tojson-notcobject": "\"Serializer.toJSON\" only accepts \"Concept\", \"Event\", \"Asset\", \"Participant\" or \"Transaction\".",
+
         "util-securitycheck-novalidcontext": "A valid \"SecurityContext\" must be specified.",
+
         "modelutil-getnamespace-nofnq": "FQN is invalid.",
+
         "resourcevalidator-notresourceorconcept": "Model violation in the \"{resourceId}\" instance. Class \"{classFQN}\" has the value of \"{invalidValue}\". Expected a \"Resource\" or a \"Concept\".",
         "resourcevalidator-notrelationship": "Model violation in the \"{resourceId}\" instance. Class \"{classFQN}\" has a value of \"{invalidValue}\". Expected a \"Relationship\".",
         "resourcevalidator-fieldtypeviolation": "Model violation in the \"{resourceId}\" instance. The field \"{propertyName}\" has a value of \"{value}\" (type of value: \"{typeOfValue}\"). Expected type of value: \"{fieldType}\".",
@@ -60,11 +72,13 @@
         "resourcevalidator-invalidfieldassignment": "Instance \"{resourceId}\" has a property \"{propertyName}\" with type \"{objectType}\" that is not derived from \"{fieldType}\".",
         "resourcevalidator-emptyidentifier": "Instance \"{resourceId}\" has an empty identifier.",
         "resourcevalidator-invalidmap": "Model violation in the \"{resourceId}\" instance. Invalid Type for Map Key or Value - expected String type.",
+
         "typenotfounderror-defaultmessage": "Type \"{typeName}\" not found.",
+
         "whereastvalidator-propertytypeviolation": "Property \"{propertyName}\" cannot be compared with \"{value}\" (type of value: \"{typeOfValue}\"). Expected type: \"{fieldType}\".",
         "whereastvalidator-enum-propertytypeviolation": "Enum property \"{propertyName}\" cannot be compared with \"{value}\" (type of value: \"{typeOfValue}\"). Expected type: \"String\".",
         "whereastvalidator-relationship-propertytypeviolation": "Relationship \"{propertyName}\" cannot be compared with \"{value}\" (type of value: \"{typeOfValue}\"). Expected type: \"String\".",
-        "whereastvalidator-unsupportedtype": "Property \"{propertyName}\" of type \"{fieldType}\" cannot be compared with a literal value.",
+         "whereastvalidator-unsupportedtype": "Property \"{propertyName}\" of type \"{fieldType}\" cannot be compared with a literal value.",
         "whereastvalidator-invalidoperator": "Property \"{propertyName}\" cannot be compared using the \"{operator}\" operator."
     }
 }

package/dist/messages/pt.json

@@ -0,0 +1,5 @@
+{
+    "pt": {
+        "hello": "Olá"
+    }
+}

package/dist/metamodelexception.d.ts

@@ -1,5 +1,4 @@
-export = MetamodelException;
-declare const MetamodelException_base: any;
+declare const BaseException: any;
 /**
 * Class representing an invalid Metamodel instance (JSON AST)
 * @extends BaseException
@@ -7,11 +6,11 @@ declare const MetamodelException_base: any;
 * @class
 * @memberof module:concerto-core
 */
-declare class MetamodelException extends MetamodelException_base {
-    [x: string]: any;
+declare class MetamodelException extends BaseException {
     /**
      * Create the MetamodelException.
      * @param {string} message - The exception message.
      */
-    constructor(message: string);
+    constructor(message: any);
 }
+export = MetamodelException;

package/dist/metamodelexception.js.map

@@ -1 +1 @@
-{"version":3,"file":"metamodelexception.js","sourceRoot":"","sources":["../src/metamodelexception.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAElE;;;;;;EAME;AACF,MAAM,kBAAmB,SAAQ,aAAa;IAC1C;;;OAGG;IACH,YAAY,OAAO;QACf,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CAEJ;AAED,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAC"}
+{"version":3,"file":"metamodelexception.js","sourceRoot":"","sources":["../src/metamodelexception.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAElE;;;;;;EAME;AACF,MAAM,kBAAmB,SAAQ,aAAa;IAC1C;;;OAGG;IACH,YAAY,OAAO;QACf,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CAEJ;AAED,iBAAS,kBAAkB,CAAC"}