Merge branch 'main' into jonathan/decorator_command_sets_map

accordproject · Oct 18, 2023 · 3fc4aec · 3fc4aec
2 parents c961db4 + aca5c3e
commit 3fc4aec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ Infer models from other formats:
 
 ## Getting Started
 
-- Install the [Command Line Tool](https://docs.accordproject.org/docs/ref-concerto-cli.html)
+- Install the [Command Line Tool](https://concerto.accordproject.org/docs/tools/ref-concerto-cli)
 - Read the [Concerto specification](https://docs.accordproject.org/docs/model-concerto.html)
 
 ```console

diff --git a/packages/concerto-core/api.txt b/packages/concerto-core/api.txt
@@ -323,7 +323,7 @@ class ModelLoader {
    + ModelManager[] loadModelManagerFromModelFiles(object[],string[],object,boolean?,boolean?,number?) 
 }
 class ModelManager extends BaseModelManager {
-   + void constructor(object?,boolean?,Object?) 
+   + void constructor(object?,boolean?,Object?,boolean?) 
    + ModelFile addCTOModel(string,string?,boolean?) throws IllegalModelException
 }
    + object getRootModel() 

diff --git a/packages/concerto-core/changelog.txt b/packages/concerto-core/changelog.txt
@@ -24,9 +24,12 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
-Version 3.13.1 {50cd09fa08a4fdc9ef30d72b483c808a} 2023-10-18
+Version 3.13.3 {50cd09fa08a4fdc9ef30d72b483c808a} 2023-10-18
 - Add migrate option to DecoratorManager options
 
+Version 3.13.2 {f435a20a00712e49c5cd32bc73ecb06a} 2023-10-03
+- Add JSDoc for enableMapType option on ModelManager
+
 Version 3.13.1 {6b09c1c58abcc77eecbb44e375c2efb8} 2023-10-03
 - Add enableMapType option to BaseModelManager options
 

diff --git a/packages/concerto-core/lib/modelmanager.js b/packages/concerto-core/lib/modelmanager.js
@@ -59,6 +59,7 @@ class ModelManager extends BaseModelManager {
      * @param {object} [options] - ModelManager options, also passed to Serializer
      * @param {boolean} [options.strict] - require versioned namespaces and imports
      * @param {Object} [options.regExp] - An alternative regular expression engine.
+     * @param {boolean} [options.enableMapType] - When true, the Concerto Map Type feature is enabled
      */
     constructor(options) {
         super(options, ctoProcessFile(options));

diff --git a/packages/concerto-core/types/lib/modelmanager.d.ts b/packages/concerto-core/types/lib/modelmanager.d.ts
@@ -19,10 +19,12 @@ declare class ModelManager extends BaseModelManager {
      * @param {object} [options] - ModelManager options, also passed to Serializer
      * @param {boolean} [options.strict] - require versioned namespaces and imports
      * @param {Object} [options.regExp] - An alternative regular expression engine.
+     * @param {boolean} [options.enableMapType] - When true, the Concerto Map Type feature is enabled
      */
     constructor(options?: {
         strict?: boolean;
         regExp?: any;
+        enableMapType?: boolean;
     });
     /**
      * Adds a model in CTO format to the ModelManager.