@accordproject/concerto-core 3.0.0-alpha.5 → 3.0.0-beta.2

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

@@ -1,5 +1,5 @@
 /*!
- * Concerto v3.0.0-alpha.5
+ * Concerto v3.0.0-beta.2
  *         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/concerto.js

@@ -84,13 +84,7 @@ class Concerto {
             throw new Error('Input object does not have a $class attribute.');
         }
 
-        const typeDeclaration = this.modelManager.getType(obj.$class);
-
-        if (!typeDeclaration) {
-            throw new Error(`Type ${obj.$class} is not declared in the model manager`);
-        }
-
-        return typeDeclaration;
+        return this.modelManager.getType(obj.$class);
     }
 
     /**

package/lib/introspect/field.js

@@ -90,7 +90,7 @@ class Field extends Property {
 
     /**
      * Returns the default value for the field or null
-     * @return {string} the default value for the field or null
+     * @return {string | number} the default value for the field or null
      */
     getDefaultValue() {
         if(this.defaultValue) {

package/lib/modelutil.js

@@ -185,6 +185,22 @@ class ModelUtil {
             return type;
         }
     }
+
+    /**
+     * Converts a fully qualified type name to a FQN without a namespace version.
+     * If the FQN is a primitive type it is returned unchanged.
+     * @param {string} fqn fully qualified name of a type
+     * @returns {string} the fully qualified name minus the namespace version
+     */
+    static removeNamespaceVersionFromFullyQualifiedName(fqn) {
+        if(ModelUtil.isPrimitiveType(fqn)) {
+            return fqn;
+        }
+        const ns = ModelUtil.getNamespace(fqn);
+        const { name: namespace } = ModelUtil.parseNamespace(ns);
+        const typeName = ModelUtil.getShortName(fqn);
+        return ModelUtil.getFullyQualifiedName(namespace, typeName);
+    }
 }
 
 module.exports = ModelUtil;

package/lib/serializer/jsonpopulator.js

@@ -338,11 +338,6 @@ class JSONPopulator {
 
         if(relationshipDeclaration.isArray()) {
             result = [];
-            if (this.ergo) {
-                if (Object.prototype.hasOwnProperty.call(jsonObj,'$coll')) {
-                    jsonObj = jsonObj.$coll.slice(0,jsonObj.$length);
-                }
-            }
             for(let n=0; n < jsonObj.length; n++) {
                 let jsonItem = jsonObj[n];
                 if (typeof jsonItem === 'string') {
@@ -358,9 +353,9 @@ class JSONPopulator {
                     }
 
                     if (this.ergo) {
-                        const theClass = jsonObj.$class.$coll[0];
-                        jsonObj = jsonObj.$data;
-                        jsonObj.$class = theClass;
+                        const theClass = jsonItem.$class.$coll[0];
+                        jsonItem = jsonItem.$data;
+                        jsonItem.$class = theClass;
                     }
                     const classDeclaration = parameters.modelManager.getType(jsonItem.$class);
 
@@ -386,7 +381,6 @@ class JSONPopulator {
                 if(!jsonObj.$class) {
                     throw new Error('Invalid JSON data. Does not contain a $class type identifier: ' + jsonObj + ' for relationship ' + relationshipDeclaration );
                 }
-
                 if (this.ergo) {
                     const theClass = jsonObj.$class.$coll[0];
                     jsonObj = jsonObj.$data;

package/lib/serializer/objectvalidator.js

@@ -410,8 +410,8 @@ class ObjectValidator {
         let typeOfValue = typeof value;
 
         if( concerto.isObject(value) && concerto.isIdentifiable(value)) {
-            typeOfValue = value.getFullyQualifiedType();
-            value = value.getFullyQualifiedIdentifier();
+            typeOfValue = concerto.getType(value);
+            value = concerto.getIdentifier(value);
         }
         else {
             if(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-beta.2",
   "description": "Core Implementation for the Concerto Modeling Language",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
@@ -68,9 +68,9 @@
     "yargs": "17.3.1"
   },
   "dependencies": {
-    "@accordproject/concerto-cto": "3.0.0-alpha.5",
-    "@accordproject/concerto-metamodel": "3.0.0-alpha.5",
-    "@accordproject/concerto-util": "3.0.0-alpha.5",
+    "@accordproject/concerto-cto": "3.0.0-beta.2",
+    "@accordproject/concerto-metamodel": "3.0.0-beta.2",
+    "@accordproject/concerto-util": "3.0.0-beta.2",
     "dayjs": "1.10.8",
     "debug": "4.3.1",
     "lorem-ipsum": "2.0.3",
@@ -139,9 +139,9 @@
     "exclude": [],
     "all": true,
     "check-coverage": true,
-    "statements": 98,
-    "branches": 97,
-    "functions": 97,
-    "lines": 98
+    "statements": 99,
+    "branches": 98,
+    "functions": 98,
+    "lines": 99
   }
 }

package/types/lib/introspect/field.d.ts

@@ -19,9 +19,9 @@ declare class Field extends Property {
     getValidator(): Validator;
     /**
      * Returns the default value for the field or null
-     * @return {string} the default value for the field or null
+     * @return {string | number} the default value for the field or null
      */
-    getDefaultValue(): string;
+    getDefaultValue(): string | number;
     /**
      * Returns true if this class is the definition of a field.
      *

package/types/lib/modelutil.d.ts

@@ -98,4 +98,11 @@ declare class ModelUtil {
      * @returns {string} the fully qualified type name.
      */
     static getFullyQualifiedName(namespace: string, type: string): string;
+    /**
+     * Converts a fully qualified type name to a FQN without a namespace version.
+     * If the FQN is a primitive type it is returned unchanged.
+     * @param {string} fqn fully qualified name of a type
+     * @returns {string} the fully qualified name minus the namespace version
+     */
+    static removeNamespaceVersionFromFullyQualifiedName(fqn: string): string;
 }