@accordproject/concerto-core 2.0.0-20220328144946 → 2.0.0-20220401130011

package/changelog.txt

@@ -24,7 +24,7 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
-Version 2.0.0-alpha.1 {e7d26b02e1d17a58a1154fac957681b2} 2021-11-24
+Version 2.0.0-alpha.1 {292b93fc879d3b0c3969711b24312ffd} 2022-03-30
 - Remove custom instanceof and add methods to check runtime type
 - Remove support for Node 12
 - Generate Typescript definitions from JSDoc

package/lib/decoratormanager.js

@@ -45,12 +45,13 @@ class DecoratorManager {
     }
 
     /**
-     * Compares two values
+     * Compares two values. If the first argument is falsy
+     * the function returns true.
      * @param {string | null} test the value to test (lhs)
      * @param {string} value the value to compare (rhs)
      * @returns {Boolean} true if the lhs is falsy or test === value
      */
-    static isMatch(test, value) {
+    static falsyOrEqual(test, value) {
         return test ? test === value : true;
     }
 
@@ -97,15 +98,15 @@ class DecoratorManager {
      */
     static executeCommand(namespace, declaration, command) {
         const { target, decorator, type } = command;
-        if (this.isMatch(target.namespace, namespace) &&
-            this.isMatch(target.declaration, declaration.name)) {
+        if (this.falsyOrEqual(target.namespace, namespace) &&
+            this.falsyOrEqual(target.declaration, declaration.name)) {
             if (!target.property && !target.type) {
                 this.applyDecorator(declaration, type, decorator);
             }
             else {
                 declaration.properties.forEach(property => {
-                    if (this.isMatch(target.property, property.name) &&
-                        this.isMatch(target.type, property.$class)) {
+                    if (this.falsyOrEqual(target.property, property.name) &&
+                        this.falsyOrEqual(target.type, property.$class)) {
                         this.applyDecorator(property, type, decorator);
                     }
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "2.0.0-20220328144946",
+  "version": "2.0.0-20220401130011",
   "description": "Core Implementation for the Concerto Modeling Language",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
@@ -65,9 +65,9 @@
     "yargs": "17.3.1"
   },
   "dependencies": {
-    "@accordproject/concerto-cto": "2.0.0-20220328144946",
-    "@accordproject/concerto-metamodel": "2.0.0-20220328144946",
-    "@accordproject/concerto-util": "2.0.0-20220328144946",
+    "@accordproject/concerto-cto": "2.0.0-20220401130011",
+    "@accordproject/concerto-metamodel": "2.0.0-20220401130011",
+    "@accordproject/concerto-util": "2.0.0-20220401130011",
     "dayjs": "1.10.8",
     "debug": "4.3.1",
     "lorem-ipsum": "2.0.3",

package/types/lib/decoratormanager.d.ts

@@ -14,12 +14,13 @@ declare class DecoratorManager {
      */
     static decorateModels(modelManager: ModelManager, decoratorCommandSet: any): ModelManager;
     /**
-     * Compares two values
+     * Compares two values. If the first argument is falsy
+     * the function returns true.
      * @param {string | null} test the value to test (lhs)
      * @param {string} value the value to compare (rhs)
      * @returns {Boolean} true if the lhs is falsy or test === value
      */
-    static isMatch(test: string | null, value: string): boolean;
+    static falsyOrEqual(test: string | null, value: string): boolean;
     /**
      * Applies a decorator to a decorated model element.
      * @param {*} decorated the type to apply the decorator to