@accordproject/concerto-core 3.0.0-beta.1 → 3.0.0-beta.3

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

@@ -1,5 +1,5 @@
 /*!
- * Concerto v3.0.0-beta.1
+ * Concerto v3.0.0-beta.3
  *         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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.3",
   "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-beta.1",
-    "@accordproject/concerto-metamodel": "3.0.0-beta.1",
-    "@accordproject/concerto-util": "3.0.0-beta.1",
+    "@accordproject/concerto-cto": "3.0.0-beta.3",
+    "@accordproject/concerto-metamodel": "3.0.0-beta.3",
+    "@accordproject/concerto-util": "3.0.0-beta.3",
     "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;
 }