@accordproject/concerto-core 3.25.7 → 3.26.0

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

@@ -1,5 +1,5 @@
 /*!
- * Concerto v3.25.7
+ * Concerto v3.26.0
  *         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

@@ -307,7 +307,7 @@ class DecoratorManager {
     /**
      * Migrate or validate the DecoratorCommandSet object if the options are set as true
      * @param {ModelManager} modelManager the input model manager
-     * @param {*} decoratorCommandSet the DecoratorCommandSet object
+     * @param {*} decoratorCommandSet a DecoratorCommandSet object, or an array of DecoratorCommandSet objects
      * @param {boolean} shouldMigrate migrate the decoratorCommandSet $class to match the dcs model version
      * @param {boolean} shouldValidate validate that decorator command set is valid
      * with respect to to decorator command set model
@@ -316,8 +316,13 @@ class DecoratorManager {
      * @private
      */
     static migrateAndValidate(modelManager, decoratorCommandSet, shouldMigrate, shouldValidate, shouldValidateCommands) {
-        if (shouldMigrate && this.canMigrate(decoratorCommandSet, DCS_VERSION)) {
-            decoratorCommandSet = this.migrateTo(decoratorCommandSet, DCS_VERSION);
+        const decoratorCommandSets = Array.isArray(decoratorCommandSet) ? decoratorCommandSet : [decoratorCommandSet];
+        if (shouldMigrate) {
+            decoratorCommandSets.forEach((commandSet, index) => {
+                if (this.canMigrate(commandSet, DCS_VERSION)) {
+                    decoratorCommandSets[index] = this.migrateTo(commandSet, DCS_VERSION);
+                }
+            });
         }
 
         if (shouldValidate) {
@@ -336,15 +341,17 @@ class DecoratorManager {
             );
             const factory = new Factory(validationModelManager);
             const serializer = new Serializer(factory, validationModelManager);
-            serializer.fromJSON(decoratorCommandSet);
-            if (shouldValidateCommands) {
-                decoratorCommandSet.commands.forEach((command) => {
-                    DecoratorManager.validateCommand(
-                        validationModelManager,
-                        command
-                    );
-                });
-            }
+            decoratorCommandSets.forEach((commandSet) => {
+                serializer.fromJSON(commandSet);
+                if (shouldValidateCommands) {
+                    commandSet.commands.forEach((command) => {
+                        DecoratorManager.validateCommand(
+                            validationModelManager,
+                            command
+                        );
+                    });
+                }
+            });
         }
     }
 
@@ -364,7 +371,7 @@ class DecoratorManager {
     /**
      * Applies all the decorator commands from the DecoratorCommandSet to the ModelManager
      * @param {ModelManager} modelManager the input model manager
-     * @param {*} decoratorCommandSet the DecoratorCommandSet object
+     * @param {*} decoratorCommandSet the DecoratorCommandSet object, or an array of DecoratorCommandSet objects
      * @param {object} [options] - decorator models options
      * @param {boolean} [options.validate] - validate that decorator command set is valid
      * with respect to to decorator command set model
@@ -379,20 +386,31 @@ class DecoratorManager {
      * @returns {ModelManager} a new model manager with the decorations applied
      */
     static decorateModels(modelManager, decoratorCommandSet, options) {
+        if (!decoratorCommandSet || decoratorCommandSet?.length === 0) {
+            return modelManager;
+        }
+        const decoratorCommandSets = Array.isArray(decoratorCommandSet)
+            ? decoratorCommandSet
+            : [decoratorCommandSet];
 
         if (options?.skipValidationAndResolution) {
-            if (options?.disableMetamodelResolution === false || !options?.disableMetamodelValidation === false) {
+            if (options?.disableMetamodelResolution === false || options?.disableMetamodelValidation === false) {
                 throw new Error('skipValidationAndResolution cannot be used with disableMetamodelResolution or disableMetamodelValidation options as false');
             }
             options.disableMetamodelResolution = true;
             options.disableMetamodelValidation = true;
         }
 
-        this.migrateAndValidate(modelManager, decoratorCommandSet, options?.migrate, options?.validate, options?.validateCommands);
+        this.migrateAndValidate(modelManager, decoratorCommandSets, options?.migrate, options?.validate, options?.validateCommands);
+
+        // Flatten commands across all command sets so decorators can be applied in a single AST scan.
+        const combinedDecoratorCommandSet = {
+            commands: decoratorCommandSets.flatMap(commandSet => commandSet.commands)
+        };
 
         // we create synthetic imports for all decorator declarations
         // along with any of their type reference arguments
-        const decoratorImports = decoratorCommandSet.commands.flatMap(command => {
+        const decoratorImports = combinedDecoratorCommandSet.commands.flatMap(command => {
             return [{
                 $class: `${MetaModelNamespace}.ImportType`,
                 name: command.decorator.name,
@@ -407,7 +425,7 @@ class DecoratorManager {
                 })
                 : []);
         }).filter(i => i.namespace);
-        const { namespaceCommandsMap, declarationCommandsMap, propertyCommandsMap, mapElementCommandsMap, typeCommandsMap }  = this.getDecoratorMaps(decoratorCommandSet);
+        const { namespaceCommandsMap, declarationCommandsMap, propertyCommandsMap, mapElementCommandsMap, typeCommandsMap }  = this.getDecoratorMaps(combinedDecoratorCommandSet);
         const ast = options?.disableMetamodelResolution ? modelManager.getAst(false, true) : modelManager.getAst(true, true);
         const decoratedAst = rfdc(ast);
         decoratedAst.models.forEach((model) => {

package/lib/introspect/modelfile.js

@@ -244,7 +244,7 @@ class ModelFile extends Decorated {
             const unseenNamespace = existingNamespaceVersion === undefined;
 
             // This check is needed because we automatically add both versioned and unversioned versions of
-            // the root namespace for backwards compatibillity unless we're running in strict mode
+            // the root namespace for backwards compatibility unless we're running in strict mode
             const isGlobalModel = name === 'concerto';
 
             const differentVersionsOfSameNamespace = !unseenNamespace && existingNamespaceVersion !== importVersion;
@@ -754,10 +754,10 @@ class ModelFile extends Decorated {
             switch(imp.$class) {
             case `${MetaModelNamespace}.ImportAll`:
                 if (this.getModelManager().isStrict()){
-                    throw new Error('Wilcard Imports are not permitted in strict mode.');
+                    throw new Error('Wildcard Imports are not permitted in strict mode.');
                 }
                 Warning.printDeprecationWarning(
-                    'Wilcard Imports are deprecated in this version of Concerto and will be removed in a future version.',
+                    'Wildcard Imports are deprecated in this version of Concerto and will be removed in a future version.',
                     ErrorCodes.DEPRECATION_WARNING,
                     ErrorCodes.CONCERTO_DEPRECATION_002,
                     'Please refer to https://concerto.accordproject.org/deprecation/002'

package/lib/model/relationship.js

@@ -79,11 +79,11 @@ class Relationship extends Identifiable {
     }
 
     /**
-     * Contructs a Relationship instance from a URI representation (created using toURI).
+     * Constructs a Relationship instance from a URI representation (created using toURI).
      * @param {ModelManager} modelManager - the model manager to bind the relationship to
      * @param {String} uriAsString - the URI as a string, generated using Identifiable.toURI()
-     * @param {String} [defaultNamespace] - default namespace to use for backwards compatability
-     * @param {String} [defaultType] - default type to use for backwards compatability
+     * @param {String} [defaultNamespace] - default namespace to use for backwards compatibility
+     * @param {String} [defaultType] - default type to use for backwards compatibility
      * @return {Relationship} the relationship
      */
     static fromURI(modelManager, uriAsString, defaultNamespace, defaultType) {

package/lib/model/typed.js

@@ -189,7 +189,7 @@ class Typed {
         if (classDeclaration.getFullyQualifiedName() === fqt) {
             return true;
         }
-        // Now walk the class hierachy looking to see if it's an instance of the specified type.
+        // Now walk the class hierarchy looking to see if it's an instance of the specified type.
         let superTypeDeclaration = classDeclaration.getSuperTypeDeclaration();
         while (superTypeDeclaration) {
             if (superTypeDeclaration.getFullyQualifiedName() === fqt) {
@@ -201,7 +201,7 @@ class Typed {
     }
 
     /**
-     * Overriden to prevent people accidentally converting a resource to JSON
+     * Overridden to prevent people accidentally converting a resource to JSON
      * without using the Serializer.
      * @protected
      */

package/lib/serializer/instancegenerator.js

@@ -96,7 +96,7 @@ class InstanceGenerator {
                 throw new Error('Model is recursive.');
             }
             parameters.seen.push(fqn);
-        } else { parameters.seen.push('Primitve');
+        } else { parameters.seen.push('Primitive');
         }
         let result;
         if (field.isArray()) {

package/lib/serializer/jsonpopulator.js

@@ -233,7 +233,7 @@ class JSONPopulator {
             parameters.resourceStack.push(subResource);
             return decl.accept(this, parameters);
         }
-        // otherwise its a scalar value, we only need to return the primitve value of the scalar.
+        // otherwise its a scalar value, we only need to return the primitive value of the scalar.
         return value;
     }
 

package/lib/serializer/objectvalidator.js

@@ -510,7 +510,7 @@ class ObjectValidator {
 
     /**
      * Throw a validation exception for an abstract class
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propertyName - the name of the property that is not declared
      * @param {string} fullyQualifiedTypeName - the fully qualified type being validated
      * @throws {ValidationException} the validation exception
@@ -527,7 +527,7 @@ class ObjectValidator {
 
     /**
      * Throw a validation exception for an invalid field assignment
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propName - the name of the property that is being assigned
      * @param {*} obj - the Field
      * @param {Field} field - the Field

package/lib/serializer/resourcevalidator.js

@@ -205,7 +205,7 @@ class ResourceValidator {
 
         const obj = parameters.stack.pop();
 
-        // are we dealing with a Resouce?
+        // are we dealing with a Resource?
         if(!((obj instanceof Resource))) {
             ResourceValidator.reportNotResouceViolation(parameters.rootResourceIdentifier, classDeclaration, obj );
         }
@@ -233,7 +233,7 @@ class ResourceValidator {
                 const field = toBeAssignedClassDeclaration.getProperty(propName);
                 if (!field) {
                     if(classDeclaration.isIdentified() &&
-                        // Allow shadowing of the $identifer field to normalize lookup of the identifying field.
+                        // Allow shadowing of the $identifier field to normalize lookup of the identifying field.
                         propName !== '$identifier'
                     ){
                         ResourceValidator.reportUndeclaredField(obj.getIdentifier(), propName, toBeAssignedClassDecName);
@@ -273,7 +273,7 @@ class ResourceValidator {
             }
             else {
                 if(!property.isOptional()) {
-                    // Allow shadowing of the $identifer field to normalize lookup of the identifying field.
+                    // Allow shadowing of the $identifier field to normalize lookup of the identifying field.
                     if (property.getName() === '$identifier' && identifierFieldName !== '$identifier'
                     ) {
                         continue;
@@ -631,7 +631,7 @@ class ResourceValidator {
 
     /**
      * Throw a validation exception for an abstract class
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propertyName - the name of the property that is not declared
      * @param {string} fullyQualifiedTypeName - the fully qualified type being validated
      * @throws {ValidationException} the validation exception
@@ -648,7 +648,7 @@ class ResourceValidator {
 
     /**
      * Throw a validation exception for an invalid field assignment
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propName - the name of the property that is being assigned
      * @param {*} obj - the Field
      * @param {Field} field - the Field

package/lib/serializer.js

@@ -128,7 +128,7 @@ class Serializer {
         parameters.stack.clear();
         parameters.stack.push(resource);
 
-        // this performs the conversion of the resouce into a standard JSON object
+        // this performs the conversion of the resource into a standard JSON object
         let result = classDeclaration.accept(generator, parameters);
         return result;
     }

package/package.json

@@ -1,42 +1,24 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "3.25.7",
   "description": "Core Implementation for the Concerto Modeling Language",
-  "homepage": "https://github.com/accordproject/concerto",
-  "engines": {
-    "node": ">=18",
-    "npm": ">=10"
-  },
-  "main": "index.js",
+  "version": "3.26.0",
+  "author": "accordproject.org",
   "browser": "dist/concerto-core.js",
-  "typings": "types/index.d.ts",
-  "scripts": {
-    "prepublishOnly": "npm run webpack",
-    "pretest": "npm run lint",
-    "lint": "eslint .",
-    "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.json",
-    "test": "node ./scripts/api-changelog.js && cross-env TZ=UTC nyc mocha --recursive -t 10000",
-    "test:watch": "cross-env TZ=UTC nyc mocha --watch --recursive -t 10000",
-    "mocha": "mocha --recursive -t 10000",
-    "nyc": "nyc mocha --recursive -t 10000",
-    "build": "npm run build:types",
-    "postbuild": "npm run webpack",
-    "webpack": "webpack --config webpack.config.js --mode production",
-    "build:types": "tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/accordproject/concerto.git",
-    "directory": "packages/concerto-cto"
+  "browserslist": "> 0.25%, not dead",
+  "dependencies": {
+    "@accordproject/concerto-cto": "3.26.0",
+    "@accordproject/concerto-metamodel": "3.12.6",
+    "@accordproject/concerto-util": "3.26.0",
+    "dayjs": "1.11.13",
+    "debug": "4.3.7",
+    "lorem-ipsum": "2.0.8",
+    "randexp": "0.5.3",
+    "rfdc": "1.4.1",
+    "semver": "7.6.3",
+    "urijs": "1.19.11",
+    "uuid": "11.0.3",
+    "yaml": "2.8.0"
   },
-  "keywords": [
-    "schema",
-    "data model",
-    "verification"
-  ],
-  "author": "accordproject.org",
-  "license": "Apache-2.0",
   "devDependencies": {
     "@babel/preset-env": "7.26.0",
     "acorn": "8.14.0",
@@ -63,21 +45,18 @@
     "xregexp": "5.1.1",
     "yargs": "17.7.2"
   },
-  "dependencies": {
-    "@accordproject/concerto-cto": "3.25.7",
-    "@accordproject/concerto-metamodel": "3.12.6",
-    "@accordproject/concerto-util": "3.25.7",
-    "dayjs": "1.11.13",
-    "debug": "4.3.7",
-    "lorem-ipsum": "2.0.8",
-    "randexp": "0.5.3",
-    "rfdc": "1.4.1",
-    "semver": "7.6.3",
-    "urijs": "1.19.11",
-    "uuid": "11.0.3",
-    "yaml": "2.8.0"
+  "engines": {
+    "node": ">=18",
+    "npm": ">=10"
   },
-  "browserslist": "> 0.25%, not dead",
+  "homepage": "https://github.com/accordproject/concerto",
+  "keywords": [
+    "data model",
+    "schema",
+    "verification"
+  ],
+  "license": "Apache-2.0",
+  "main": "index.js",
   "nyc": {
     "produce-source-map": "true",
     "sourceMap": "inline",
@@ -97,5 +76,26 @@
     "branches": 97,
     "functions": 98,
     "lines": 99
-  }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/accordproject/concerto.git",
+    "directory": "packages/concerto-cto"
+  },
+  "scripts": {
+    "build": "npm run build:types",
+    "build:types": "tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.json",
+    "lint": "eslint .",
+    "mocha": "mocha --recursive -t 10000",
+    "nyc": "nyc mocha --recursive -t 10000",
+    "postbuild": "npm run webpack",
+    "postlicchk": "npm run doc",
+    "prepublishOnly": "npm run webpack",
+    "pretest": "npm run lint",
+    "test": "node ./scripts/api-changelog.js && cross-env TZ=UTC nyc mocha --recursive -t 10000",
+    "test:watch": "cross-env TZ=UTC nyc mocha --watch --recursive -t 10000",
+    "webpack": "webpack --config webpack.config.js --mode production"
+  },
+  "typings": "types/index.d.ts"
 }

package/types/lib/decoratormanager.d.ts

@@ -52,7 +52,7 @@ declare class DecoratorManager {
     /**
      * Migrate or validate the DecoratorCommandSet object if the options are set as true
      * @param {ModelManager} modelManager the input model manager
-     * @param {*} decoratorCommandSet the DecoratorCommandSet object
+     * @param {*} decoratorCommandSet a DecoratorCommandSet object, or an array of DecoratorCommandSet objects
      * @param {boolean} shouldMigrate migrate the decoratorCommandSet $class to match the dcs model version
      * @param {boolean} shouldValidate validate that decorator command set is valid
      * with respect to to decorator command set model
@@ -72,7 +72,7 @@ declare class DecoratorManager {
     /**
      * Applies all the decorator commands from the DecoratorCommandSet to the ModelManager
      * @param {ModelManager} modelManager the input model manager
-     * @param {*} decoratorCommandSet the DecoratorCommandSet object
+     * @param {*} decoratorCommandSet the DecoratorCommandSet object, or an array of DecoratorCommandSet objects
      * @param {object} [options] - decorator models options
      * @param {boolean} [options.validate] - validate that decorator command set is valid
      * with respect to to decorator command set model

package/types/lib/model/relationship.d.ts

@@ -14,11 +14,11 @@ export = Relationship;
  */
 declare class Relationship extends Identifiable {
     /**
-     * Contructs a Relationship instance from a URI representation (created using toURI).
+     * Constructs a Relationship instance from a URI representation (created using toURI).
      * @param {ModelManager} modelManager - the model manager to bind the relationship to
      * @param {String} uriAsString - the URI as a string, generated using Identifiable.toURI()
-     * @param {String} [defaultNamespace] - default namespace to use for backwards compatability
-     * @param {String} [defaultType] - default type to use for backwards compatability
+     * @param {String} [defaultNamespace] - default namespace to use for backwards compatibility
+     * @param {String} [defaultType] - default type to use for backwards compatibility
      * @return {Relationship} the relationship
      */
     static fromURI(modelManager: ModelManager, uriAsString: string, defaultNamespace?: string, defaultType?: string): Relationship;

package/types/lib/model/typed.d.ts

@@ -88,7 +88,7 @@ declare class Typed {
      */
     instanceOf(fqt: string): boolean;
     /**
-     * Overriden to prevent people accidentally converting a resource to JSON
+     * Overridden to prevent people accidentally converting a resource to JSON
      * without using the Serializer.
      * @protected
      */

package/types/lib/serializer/objectvalidator.d.ts

@@ -68,7 +68,7 @@ declare class ObjectValidator {
     private static reportAbstractClass;
     /**
      * Throw a validation exception for an abstract class
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propertyName - the name of the property that is not declared
      * @param {string} fullyQualifiedTypeName - the fully qualified type being validated
      * @throws {ValidationException} the validation exception
@@ -77,7 +77,7 @@ declare class ObjectValidator {
     private static reportUndeclaredField;
     /**
      * Throw a validation exception for an invalid field assignment
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propName - the name of the property that is being assigned
      * @param {*} obj - the Field
      * @param {Field} field - the Field

package/types/lib/serializer/resourcevalidator.d.ts

@@ -75,7 +75,7 @@ declare class ResourceValidator {
     private static reportAbstractClass;
     /**
      * Throw a validation exception for an abstract class
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propertyName - the name of the property that is not declared
      * @param {string} fullyQualifiedTypeName - the fully qualified type being validated
      * @throws {ValidationException} the validation exception
@@ -84,7 +84,7 @@ declare class ResourceValidator {
     private static reportUndeclaredField;
     /**
      * Throw a validation exception for an invalid field assignment
-     * @param {string} resourceId - the id of the resouce being validated
+     * @param {string} resourceId - the id of the resource being validated
      * @param {string} propName - the name of the property that is being assigned
      * @param {*} obj - the Field
      * @param {Field} field - the Field