@accordproject/concerto-core 3.14.2 → 3.14.3-20231107125331

package/dist/concerto-core.js.LICENSE.txt

@@ -1,5 +1,5 @@
 /*!
- * Concerto v3.14.2
+ * Concerto v3.14.3-20231107125331
  *         Licensed under the Apache License, Version 2.0 (the "License");
  *         you may not use this file except in compliance with the License.
  *         You may obtain a copy of the License at

package/lib/decoratormanager.js

@@ -439,7 +439,7 @@ class DecoratorManager {
                         this.applyDecorator(declaration.value, type, decorator);
                     }
                 }
-            } else if (!target.property && !target.type) {
+            } else if (!(target.property || target.properties || target.type)) {
                 this.applyDecorator(declaration, type, decorator);
             } else {
                 // scalars are declarations but do not have properties

package/lib/introspect/mapkeytype.js

@@ -71,7 +71,8 @@ class MapKeyType extends Decorated {
     validate() {
 
         if (!ModelUtil.isPrimitiveType(this.type)) {
-            const decl = ModelUtil.getTypeDeclaration(this.ast.type.name, this.modelFile);
+
+            const decl = this.modelFile.getType(this.ast.type.name);
 
             if  (!ModelUtil.isValidMapKeyScalar(decl)) {
                 throw new IllegalModelException(

package/lib/introspect/mapvaluetype.js

@@ -69,7 +69,8 @@ class MapValueType extends Decorated {
      */
     validate() {
         if (!ModelUtil.isPrimitiveType(this.type)) {
-            const decl = ModelUtil.getTypeDeclaration(this.ast.type.name, this.modelFile);
+
+            const decl = this.modelFile.getType(this.ast.type.name);
 
             // All declarations, with the exception of MapDeclarations, are valid Values.
             if(decl.isMapDeclaration?.()) {

package/lib/modelutil.js

@@ -338,21 +338,6 @@ class ModelUtil {
             `${MetaModelNamespace}.ObjectMapValueType`
         ].includes(value.$class);
     }
-
-    /**
-     * Returns the corresponding ClassDeclaration representation of the Map Type
-     * @param {string} type - the Type of the Map Value
-     * @param {ModelFile} modelFile - the ModelFile that owns the Property
-     * @return {Object} the corresponding ClassDeclaration representation
-     */
-    static getTypeDeclaration(type, modelFile) {
-        if (modelFile.isLocalType(type)) {
-            return modelFile.getAllDeclarations().find(d => d.name === type);
-        } else {
-            const fqn = modelFile.resolveImport(type);
-            return modelFile.getModelManager().getType(fqn);
-        }
-    }
 }
 
 module.exports = ModelUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "3.14.2",
+  "version": "3.14.3-20231107125331",
   "description": "Core Implementation for the Concerto Modeling Language",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
@@ -71,9 +71,9 @@
     "yargs": "17.3.1"
   },
   "dependencies": {
-    "@accordproject/concerto-cto": "3.14.2",
+    "@accordproject/concerto-cto": "3.14.3-20231107125331",
     "@accordproject/concerto-metamodel": "3.9.0",
-    "@accordproject/concerto-util": "3.14.2",
+    "@accordproject/concerto-util": "3.14.3-20231107125331",
     "dayjs": "1.11.10",
     "debug": "4.3.4",
     "lorem-ipsum": "2.0.8",

package/types/lib/modelutil.d.ts

@@ -162,12 +162,4 @@ declare class ModelUtil {
      * @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 {ModelFile} modelFile - the ModelFile that owns the Property
-     * @return {Object} the corresponding ClassDeclaration representation
-     */
-    static getTypeDeclaration(type: string, modelFile: ModelFile): any;
 }
-import ModelFile = require("../lib/introspect/modelfile");