chore(actions): publish v3.18.1 to npm

lerna.json

@@ -2,6 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.18.0",
+  "version": "3.18.1",
   "hoist": true
 }

package.json

@@ -17,7 +17,7 @@
   },
   "name": "concerto",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "private": true,
   "scripts": {
     "coverage": "node ./scripts/coverage.js \"packages/concerto-*\" && nyc report -t coverage --cwd . --report-dir coverage --reporter=lcov && cat ./coverage/lcov.info",

packages/concerto-analysis/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@accordproject/concerto-analysis",
-    "version": "3.18.0",
+    "version": "3.18.1",
     "description": "Analysis of Concerto model files",
     "homepage": "https://github.com/accordproject/concerto",
     "engines": {
@@ -32,11 +32,11 @@
     "author": "accordproject.org",
     "license": "Apache-2.0",
     "dependencies": {
-        "@accordproject/concerto-core": "3.18.0",
+        "@accordproject/concerto-core": "3.18.1",
         "semver": "7.5.4"
     },
     "devDependencies": {
-        "@accordproject/concerto-cto": "3.18.0",
+        "@accordproject/concerto-cto": "3.18.1",
         "@types/jest": "28.1.1",
         "@types/semver": "7.3.10",
         "@typescript-eslint/eslint-plugin": "5.27.1",

packages/concerto-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-core",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "description": "Core Implementation for the Concerto Modeling Language",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
@@ -71,9 +71,9 @@
     "yargs": "17.3.1"
   },
   "dependencies": {
-    "@accordproject/concerto-cto": "3.18.0",
+    "@accordproject/concerto-cto": "3.18.1",
     "@accordproject/concerto-metamodel": "3.10.0",
-    "@accordproject/concerto-util": "3.18.0",
+    "@accordproject/concerto-util": "3.18.1",
     "dayjs": "1.11.10",
     "debug": "4.3.4",
     "lorem-ipsum": "2.0.8",

packages/concerto-core/types/lib/decoratorextractor.d.ts

@@ -3,23 +3,41 @@ export = DecoratorExtractor;
  * Utility functions to work with
  * [DecoratorCommandSet](https://models.accordproject.org/concerto/decorators.cto)
  * @memberof module:concerto-core
+ * @private
  */
 declare class DecoratorExtractor {
+    /**
+     * The action to be performed to extract all, only vocab or only non-vocab decorators
+     */
+    static Action: {
+        EXTRACT_ALL: number;
+        EXTRACT_VOCAB: number;
+        EXTRACT_NON_VOCAB: number;
+    };
     /**
      * Create the DecoratorExtractor.
      * @constructor
      * @param {boolean} removeDecoratorsFromModel - flag to determine whether to remove decorators from source model
      * @param {string} locale - locale for extracted vocabularies
      * @param {string} dcs_version - version string
      * @param {Object} sourceModelAst - the ast of source models
+     * @param {int} [action=DecoratorExtractor.Action.EXTRACT_ALL]  - the action to be performed
      */
-    constructor(removeDecoratorsFromModel: boolean, locale: string, dcs_version: string, sourceModelAst: any);
+    constructor(removeDecoratorsFromModel: boolean, locale: string, dcs_version: string, sourceModelAst: any, action?: int);
     extractionDictionary: {};
     removeDecoratorsFromModel: boolean;
     locale: string;
     dcs_version: string;
     sourceModelAst: any;
     updatedModelAst: any;
+    action: any;
+    /**
+     * Returns if the decorator is vocab or not
+     * @param {string} decoractorName - the name of decorator
+     * @returns {boolean} - returns true if the decorator is a vocabulary decorator else false
+     * @private
+     */
+    private isVocabDecorator;
     /**
     * Adds a key-value pair to a dictionary (object) if the key exists,
     * or creates a new key with the provided value.
@@ -84,6 +102,13 @@ declare class DecoratorExtractor {
     * @private
     */
     private transformDecoratorsAndVocabularies;
+    /**
+     * Filter vocab or non-vocab decorators
+     * @param {Object} decorators - the collection of decorators
+     * @returns {Object} - the collection of filtered decorators
+     * @private
+     */
+    private filterOutDecorators;
     /**
     * Process the map declarations to extract the decorators.
     *

packages/concerto-core/types/lib/decoratormanager.d.ts

@@ -91,15 +91,11 @@ declare class DecoratorManager {
         enableDcsNamespaceTarget?: boolean;
     }): ModelManager;
     /**
-     * @typedef decoratorCommandSet
-     * @type {object}
-     * @typedef vocabularies
-     * @type {string}
      * @typedef ExtractDecoratorsResult
      * @type {object}
      * @property {ModelManager} modelManager - A model manager containing models stripped without decorators
-     * @property {decoratorCommandSet} object[] - Stripped out decorators, formed into decorator command sets
-     * @property {vocabularies} object[] - Stripped out vocabularies, formed into vocabulary files
+     * @property {*} decoratorCommandSet - Stripped out decorators, formed into decorator command sets
+     * @property {string[]} vocabularies - Stripped out vocabularies, formed into vocabulary files
     */
     /**
      * Extracts all the decorator commands from all the models in modelManager
@@ -120,7 +116,61 @@ declare class DecoratorManager {
         /**
          * - Stripped out decorators, formed into decorator command sets
          */
-        object: {};
+        decoratorCommandSet: any;
+        /**
+         * - Stripped out vocabularies, formed into vocabulary files
+         */
+        vocabularies: string[];
+    };
+    /**
+     * Extracts all the vocab decorator commands from all the models in modelManager
+     * @param {ModelManager} modelManager the input model manager
+     * @param {object} options - decorator models options
+     * @param {boolean} options.removeDecoratorsFromModel - flag to strip out vocab decorators from models
+     * @param {string} options.locale - locale for extracted vocabulary set
+     * @returns {ExtractDecoratorsResult} - a new model manager with/without the decorators and vocab yamls
+     */
+    static extractVocabularies(modelManager: ModelManager, options: {
+        removeDecoratorsFromModel: boolean;
+        locale: string;
+    }): {
+        /**
+         * - A model manager containing models stripped without decorators
+         */
+        modelManager: ModelManager;
+        /**
+         * - Stripped out decorators, formed into decorator command sets
+         */
+        decoratorCommandSet: any;
+        /**
+         * - Stripped out vocabularies, formed into vocabulary files
+         */
+        vocabularies: string[];
+    };
+    /**
+     * Extracts all the non-vocab decorator commands from all the models in modelManager
+     * @param {ModelManager} modelManager the input model manager
+     * @param {object} options - decorator models options
+     * @param {boolean} options.removeDecoratorsFromModel - flag to strip out non-vocab decorators from models
+     * @param {string} options.locale - locale for extracted vocabulary set
+     * @returns {ExtractDecoratorsResult} - a new model manager with/without the decorators and a list of extracted decorator jsons
+     */
+    static extractNonVocabDecorators(modelManager: ModelManager, options: {
+        removeDecoratorsFromModel: boolean;
+        locale: string;
+    }): {
+        /**
+         * - A model manager containing models stripped without decorators
+         */
+        modelManager: ModelManager;
+        /**
+         * - Stripped out decorators, formed into decorator command sets
+         */
+        decoratorCommandSet: any;
+        /**
+         * - Stripped out vocabularies, formed into vocabulary files
+         */
+        vocabularies: string[];
     };
     /**
      * Throws an error if the decoractor command is invalid

packages/concerto-cto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-cto",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "description": "Parser for Concerto CTO files",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@accordproject/concerto-metamodel": "3.10.0",
-    "@accordproject/concerto-util": "3.18.0",
+    "@accordproject/concerto-util": "3.18.1",
     "path-browserify": "1.0.1"
   },
   "browserslist": "> 0.25%, not dead",

packages/concerto-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@accordproject/concerto-types",
-    "version": "3.18.0",
+    "version": "3.18.1",
     "description": "Types for the Concerto Modeling Language",
     "homepage": "https://github.com/accordproject/concerto",
     "engines": {
@@ -34,9 +34,9 @@
     "license": "Apache-2.0",
     "devDependencies": {
         "@accordproject/concerto-codegen": "3.22.1",
-        "@accordproject/concerto-core": "3.18.0",
+        "@accordproject/concerto-core": "3.18.1",
         "@accordproject/concerto-metamodel": "3.10.0",
-        "@accordproject/concerto-util": "3.18.0",
+        "@accordproject/concerto-util": "3.18.1",
         "@types/jest": "28.1.1",
         "ajv": "8.12.0",
         "eslint": "8.2.0",

packages/concerto-util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-util",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "description": "Utilities for Concerto Modeling Language",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {