@accordproject/concerto-core 3.7.0 → 3.7.1-20230413115306

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

@@ -1,5 +1,5 @@
 /*!
- * Concerto v3.7.0
+ * Concerto v3.7.1-20230413115306
  *         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/factory.js

@@ -119,6 +119,17 @@ class Factory {
                     type: type
                 }));
             }
+
+            if (id) {
+                let idFullField = classDecl.getProperty(idField);
+                if (idFullField?.isTypeScalar?.()){
+                    idFullField = idFullField.getScalarField();
+                }
+                // if regex on identifier field & provided id does not match regex, throw error
+                if(idFullField?.validator?.regex && (idFullField.validator?.regex.test(id) === false)) {
+                    throw new Error('Provided id does not match regex: ' + idFullField?.validator?.regex);
+                }
+            }
         } else if(id) {
             throw new Error('Type is not identifiable ' + classDecl.getFullyQualifiedName());
         }

package/lib/serializer/instancegenerator.js

@@ -160,7 +160,16 @@ class InstanceGenerator {
 
         let id = null;
         if (classDeclaration.isIdentified()) {
-            id = this.generateRandomId(classDeclaration);
+            let idFieldName = classDeclaration.getIdentifierFieldName();
+            let idField = classDeclaration.getProperty(idFieldName);
+            if (idField?.isTypeScalar?.()){
+                idField = idField.getScalarField();
+            }
+            if(idField?.validator?.regex){
+                id = parameters.valueGenerator.getRegex(fieldOrScalarDeclaration.validator.regex);
+            } else {
+                id = this.generateRandomId(classDeclaration);
+            }
         }
         let resource = parameters.factory.newResource(classDeclaration.getNamespace(), classDeclaration.getName(), id);
         parameters.stack.push(resource);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "3.7.0",
+  "version": "3.7.1-20230413115306",
   "description": "Core Implementation for the Concerto Modeling Language",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
@@ -65,15 +65,15 @@
     "sinon-chai": "3.7.0",
     "tmp-promise": "3.0.2",
     "typescript": "4.6.3",
-    "webpack": "5.75.0",
+    "webpack": "5.76.0",
     "webpack-cli": "4.9.1",
     "xregexp": "5.1.1",
     "yargs": "17.3.1"
   },
   "dependencies": {
-    "@accordproject/concerto-cto": "3.7.0",
-    "@accordproject/concerto-metamodel": "3.7.0",
-    "@accordproject/concerto-util": "3.7.0",
+    "@accordproject/concerto-cto": "3.7.1-20230413115306",
+    "@accordproject/concerto-metamodel": "3.7.1-20230413115306",
+    "@accordproject/concerto-util": "3.7.1-20230413115306",
     "dayjs": "1.10.8",
     "debug": "4.3.1",
     "lorem-ipsum": "2.0.3",