@accordproject/concerto-core 4.0.3 → 4.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/.eslintrc.deps.yml +23 -0
  2. package/dist/basemodelmanager.d.ts +12 -11
  3. package/dist/basemodelmanager.js +12 -11
  4. package/dist/basemodelmanager.js.map +1 -1
  5. package/dist/concerto-core.js +1 -1
  6. package/dist/concerto-core.js.LICENSE.txt +1 -1
  7. package/dist/decoratorextractor.d.ts +10 -0
  8. package/dist/decoratorextractor.js +38 -13
  9. package/dist/decoratorextractor.js.map +1 -1
  10. package/dist/introspect/declaration.d.ts +8 -0
  11. package/dist/introspect/declaration.js +28 -1
  12. package/dist/introspect/declaration.js.map +1 -1
  13. package/dist/modelmanager.d.ts +1 -0
  14. package/dist/modelmanager.js +1 -0
  15. package/dist/modelmanager.js.map +1 -1
  16. package/dist/types.d.ts +1 -0
  17. package/package.json +7 -4
package/dist/concerto-core.js.LICENSE.txt CHANGED
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Concerto v4.0.3
2
+ * Concerto v4.1.2
3
3
  * Licensed under the Apache License, Version 2.0 (the "License");
4
4
  * you may not use this file except in compliance with the License.
5
5
  * You may obtain a copy of the License at
package/dist/decoratorextractor.d.ts CHANGED
@@ -38,6 +38,16 @@ declare class DecoratorExtractor {
38
38
  * @private
39
39
  */
40
40
  isVocabDecorator(decoractorName: any): any;
41
+ /**
42
+ * Returns a value safe for embedding in a YAML scalar.
43
+ * String values containing YAML-special characters are wrapped in double quotes.
44
+ * Non-string decorator types (Number, Boolean) are returned as-is.
45
+ * @param {any} value - the value to emit
46
+ * @param {string} [type] - the $class of the decorator argument
47
+ * @returns {string|number|boolean|null} - double-quoted string for string args, raw value for non-string args
48
+ * @private
49
+ */
50
+ quoteStringValue(value: any, type?: string): string | number | boolean | null;
41
51
  /**
42
52
  * Adds a key-value pair to a dictionary (object) if the key exists,
43
53
  * or creates a new key with the provided value.
package/dist/decoratorextractor.js CHANGED
@@ -14,7 +14,10 @@
14
14
  'use strict';
15
15
  const ModelManager = require('./modelmanager');
16
16
  const ModelUtil = require('./modelutil');
17
+ const yaml = require('yaml');
17
18
  const { MetaModelNamespace } = require('@accordproject/concerto-metamodel');
19
+ // $class value for decorator arguments that carry a string value
20
+ const DECORATOR_STRING_TYPE = `${MetaModelNamespace}.DecoratorString`;
18
21
  /**
19
22
  * Utility functions to work with
20
23
  * [DecoratorCommandSet](https://models.accordproject.org/concerto/decorators.cto)
@@ -50,6 +53,22 @@ class DecoratorExtractor {
50
53
  isVocabDecorator(decoractorName) {
51
54
  return decoractorName === 'Term' || decoractorName.startsWith('Term_');
52
55
  }
56
+ /**
57
+ * Returns a value safe for embedding in a YAML scalar.
58
+ * String values containing YAML-special characters are wrapped in double quotes.
59
+ * Non-string decorator types (Number, Boolean) are returned as-is.
60
+ * @param {any} value - the value to emit
61
+ * @param {string} [type] - the $class of the decorator argument
62
+ * @returns {string|number|boolean|null} - double-quoted string for string args, raw value for non-string args
63
+ * @private
64
+ */
65
+ quoteStringValue(value, type) {
66
+ if (type !== DECORATOR_STRING_TYPE)
67
+ return value;
68
+ const str = String(value);
69
+ const serialized = yaml.stringify(str).trimEnd();
70
+ return serialized === str ? str : JSON.stringify(str);
71
+ }
53
72
  /**
54
73
  * Adds a key-value pair to a dictionary (object) if the key exists,
55
74
  * or creates a new key with the provided value.
@@ -113,7 +132,7 @@ class DecoratorExtractor {
113
132
  strVoc = strVoc + `locale: ${this.locale}\n`;
114
133
  strVoc = strVoc + `namespace: ${namespace}\n`;
115
134
  if (vocabObject.namespace && Object.keys(vocabObject.namespace).length > 0) {
116
- if (vocabObject.namespace.term) {
135
+ if ('term' in vocabObject.namespace) {
117
136
  strVoc += `term: ${vocabObject.namespace.term}\n`;
118
137
  }
119
138
  let otherProps = Object.keys(vocabObject.namespace).filter((str) => str !== 'term');
@@ -124,13 +143,13 @@ class DecoratorExtractor {
124
143
  if (vocabObject.declarations && Object.keys(vocabObject.declarations).length > 0) {
125
144
  strVoc = strVoc + 'declarations:\n';
126
145
  Object.keys(vocabObject.declarations).forEach(decl => {
127
- if (vocabObject.declarations[decl].term) {
146
+ if ('term' in vocabObject.declarations[decl]) {
128
147
  strVoc += ` - ${decl}: ${vocabObject.declarations[decl].term}\n`;
129
148
  }
130
149
  const otherProps = Object.keys(vocabObject.declarations[decl]).filter((str) => str !== 'term' && str !== 'propertyVocabs');
131
150
  //If a declaration does not have any Term decorator, then add Term_ decorators to yaml
132
151
  if (otherProps.length > 0) {
133
- if (!vocabObject.declarations[decl].term) {
152
+ if (!('term' in vocabObject.declarations[decl])) {
134
153
  strVoc += ` - ${decl}: ${decl}\n`;
135
154
  }
136
155
  otherProps.forEach(key => {
@@ -138,12 +157,14 @@ class DecoratorExtractor {
138
157
  });
139
158
  }
140
159
  if (vocabObject.declarations[decl].propertyVocabs && Object.keys(vocabObject.declarations[decl].propertyVocabs).length > 0) {
141
- if (!vocabObject.declarations[decl].term && otherProps.length === 0) {
160
+ if (!('term' in vocabObject.declarations[decl]) && otherProps.length === 0) {
142
161
  strVoc += ` - ${decl}: ${decl}\n`;
143
162
  }
144
163
  strVoc += ' properties:\n';
145
164
  Object.keys(vocabObject.declarations[decl].propertyVocabs).forEach(prop => {
146
- strVoc += ` - ${prop}: ${vocabObject.declarations[decl].propertyVocabs[prop].term || ''}\n`;
165
+ const propVocab = vocabObject.declarations[decl].propertyVocabs[prop];
166
+ const termVal = 'term' in propVocab ? propVocab.term : prop;
167
+ strVoc += ` - ${prop}: ${termVal}\n`;
147
168
  const otherProps = Object.keys(vocabObject.declarations[decl].propertyVocabs[prop]).filter((str) => str !== 'term');
148
169
  otherProps.forEach(key => {
149
170
  strVoc += ` ${key}: ${vocabObject.declarations[decl].propertyVocabs[prop][key]}\n`;
@@ -226,14 +247,14 @@ class DecoratorExtractor {
226
247
  if (vocabTarget.declaration === '') {
227
248
  vocabObject.namespace = vocabObject.namespace || {};
228
249
  if (dcs.name === 'Term') {
229
- vocabObject.namespace.term = dcs.arguments[0].value;
250
+ vocabObject.namespace.term = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
230
251
  }
231
252
  else {
232
253
  const extensionKey = dcs.name.split('Term_')[1];
233
254
  if (extensionKey === 'namespace' || extensionKey === 'locale' || extensionKey === 'declarations') {
234
255
  throw new Error(`Invalid vocabulary key: ${extensionKey}. The key should not be one of the reserved keys: namespace, locale, declarations`);
235
256
  }
236
- vocabObject.namespace[extensionKey] = dcs.arguments[0].value;
257
+ vocabObject.namespace[extensionKey] = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
237
258
  }
238
259
  return vocabObject;
239
260
  }
@@ -244,14 +265,16 @@ class DecoratorExtractor {
244
265
  vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.property] = {};
245
266
  }
246
267
  if (dcs.name === 'Term') {
247
- vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.property].term = dcs.arguments[0].value;
268
+ const propVocab = vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.property];
269
+ propVocab.term = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
248
270
  }
249
271
  else {
250
272
  const extensionKey = dcs.name.split('Term_')[1];
251
273
  if (extensionKey === vocabTarget.property) {
252
274
  throw new Error(`Invalid vocabulary key: "${extensionKey}". The key should not be the name of the current property.`);
253
275
  }
254
- vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.property][extensionKey] = dcs.arguments[0].value;
276
+ const propVocab = vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.property];
277
+ propVocab[extensionKey] = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
255
278
  }
256
279
  }
257
280
  else if (vocabTarget.mapElement !== '') {
@@ -259,26 +282,28 @@ class DecoratorExtractor {
259
282
  vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.mapElement] = {};
260
283
  }
261
284
  if (dcs.name === 'Term') {
262
- vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.mapElement].term = dcs.arguments[0].value;
285
+ const mapVocab = vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.mapElement];
286
+ mapVocab.term = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
263
287
  }
264
288
  else {
265
289
  const extensionKey = dcs.name.split('Term_')[1];
266
290
  if (extensionKey === vocabTarget.mapElement) {
267
291
  throw new Error(`Invalid vocabulary key: "${extensionKey}". The key should not be the name of the current property.`);
268
292
  }
269
- vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.mapElement][extensionKey] = dcs.arguments[0].value;
293
+ const mapVocab = vocabObject.declarations[vocabTarget.declaration].propertyVocabs[vocabTarget.mapElement];
294
+ mapVocab[extensionKey] = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
270
295
  }
271
296
  }
272
297
  else {
273
298
  if (dcs.name === 'Term') {
274
- vocabObject.declarations[vocabTarget.declaration].term = dcs.arguments[0].value;
299
+ vocabObject.declarations[vocabTarget.declaration].term = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
275
300
  }
276
301
  else {
277
302
  const extensionKey = dcs.name.split('Term_')[1];
278
303
  if (extensionKey === 'properties' || extensionKey === vocabTarget.declaration) {
279
304
  throw new Error(`Invalid vocabulary key: "${extensionKey}". The key cannot be a reserved word such as "properties" or the name of the current declaration.`);
280
305
  }
281
- vocabObject.declarations[vocabTarget.declaration][extensionKey] = dcs.arguments[0].value;
306
+ vocabObject.declarations[vocabTarget.declaration][extensionKey] = this.quoteStringValue(dcs.arguments[0].value, dcs.arguments[0].$class);
282
307
  }
283
308
  }
284
309
  return vocabObject;
package/dist/decoratorextractor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"decoratorextractor.js","sourceRoot":"","sources":["../src/decoratorextractor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"decoratorextractor.js","sourceRoot":"","sources":["../src/decoratorextractor.ts"],"names":[],"mappings":"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"}
package/dist/introspect/declaration.d.ts CHANGED
@@ -37,6 +37,14 @@ declare class Declaration extends Decorated {
37
37
  * @protected
38
38
  */
39
39
  validate(...args: any[]): void;
40
+ /**
41
+ * Determines whether a type name resolves to a reserved type in the Concerto
42
+ * system namespace.
43
+ * @param {ModelFile} modelFile - the current model file
44
+ * @param {string} typeName - local/imported type name
45
+ * @returns {boolean} true if the resolved import is a reserved system type
46
+ */
47
+ private isReservedSystemTypeImport;
40
48
  /**
41
49
  * Returns the ModelFile that defines this class.
42
50
  *
package/dist/introspect/declaration.js CHANGED
@@ -72,11 +72,38 @@ class Declaration extends Decorated {
72
72
  */
73
73
  validate(...args) {
74
74
  super.validate(...args);
75
+ const modelFile = this.getModelFile();
75
76
  // #648 - check for clashes against imported types
76
- if (this.getModelFile().isImportedType(this.getName())) {
77
+ if (modelFile.isImportedType(this.getName())) {
78
+ const dangerouslyAllowReservedSystemTypeNamesInUserModels = Boolean(modelFile.getModelManager()?.options?.dangerouslyAllowReservedSystemTypeNamesInUserModels);
79
+ if (dangerouslyAllowReservedSystemTypeNamesInUserModels && this.isReservedSystemTypeImport(modelFile, this.getName())) {
80
+ return;
81
+ }
77
82
  throw new IllegalModelException(`Type '${this.getName()}' clashes with an imported type with the same name.`, this.modelFile, this.ast.location);
78
83
  }
79
84
  }
85
+ /**
86
+ * Determines whether a type name resolves to a reserved type in the Concerto
87
+ * system namespace.
88
+ * @param {ModelFile} modelFile - the current model file
89
+ * @param {string} typeName - local/imported type name
90
+ * @returns {boolean} true if the resolved import is a reserved system type
91
+ */
92
+ isReservedSystemTypeImport(modelFile, typeName) {
93
+ const importedType = modelFile.getType(typeName);
94
+ if (!importedType || typeof importedType === 'string') {
95
+ return false;
96
+ }
97
+ const importedModelFile = importedType.getModelFile();
98
+ if (!importedModelFile || !importedModelFile.isSystemModelFile()) {
99
+ return false;
100
+ }
101
+ return importedType.isConcept()
102
+ || importedType.isAsset()
103
+ || importedType.isTransaction()
104
+ || importedType.isParticipant()
105
+ || importedType.isEvent();
106
+ }
80
107
  /**
81
108
  * Returns the ModelFile that defines this class.
82
109
  *
package/dist/introspect/declaration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/introspect/declaration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/introspect/declaration.ts"],"names":[],"mappings":"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"}
package/dist/modelmanager.d.ts CHANGED
@@ -19,6 +19,7 @@ declare class ModelManager extends BaseModelManager {
19
19
  * @constructor
20
20
  * @param {object} [options] - ModelManager options, also passed to Serializer
21
21
  * @param {Object} [options.regExp] - An alternative regular expression engine.
22
+ * @param {boolean} [options.dangerouslyAllowReservedSystemTypeNamesInUserModels] - Transitional escape hatch; when true, declarations may use reserved system type names
22
23
  */
23
24
  constructor(options?: ModelManagerOptions);
24
25
  /**
package/dist/modelmanager.js CHANGED
@@ -53,6 +53,7 @@ class ModelManager extends BaseModelManager {
53
53
  * @constructor
54
54
  * @param {object} [options] - ModelManager options, also passed to Serializer
55
55
  * @param {Object} [options.regExp] - An alternative regular expression engine.
56
+ * @param {boolean} [options.dangerouslyAllowReservedSystemTypeNamesInUserModels] - Transitional escape hatch; when true, declarations may use reserved system type names
56
57
  */
57
58
  constructor(options = {}) {
58
59
  super(options, ctoProcessFile(options));
package/dist/modelmanager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"modelmanager.js","sourceRoot":"","sources":["../src/modelmanager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,MAAM,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,MAAM,CAAC;AAE7D,uDAAwD;AAGxD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,2BAA2B,CAAC,CAAC;AAE5D,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACxD,CAAC;AACD,kCAAkC;AAElC,4CAA4C;AAC5C,MAAM,cAAc,GAAG,CAAC,UAA+B,EAAE,EAA6D,EAAE,CAAC,CAAC,IAAmB,EAAE,IAAa,EAAE,EAAE;IAC5J,mEAAmE;IACnE,MAAM,aAAa,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;IACxE,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,IAAI,SAAS,CAAC;IACnC,OAAO;QACH,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC;QACnD,WAAW,EAAE,OAAO;QACpB,QAAQ;KACX,CAAC;AACN,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,YAAa,SAAQ,gBAAgB;IACvC;;;;;OAKG;IACH,YAAY,UAA+B,EAAE;QACzC,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAW,EAAE,QAAiB,EAAE,iBAA2B;QACnE,MAAM,IAAI,GAAG,aAAa,CAAC;QAC3B,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAE1C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAChE,CAAC;CAEJ;AACD,iBAAS,YAAY,CAAC"}
1
+ {"version":3,"file":"modelmanager.js","sourceRoot":"","sources":["../src/modelmanager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,MAAM,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,MAAM,CAAC;AAE7D,uDAAwD;AAGxD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,2BAA2B,CAAC,CAAC;AAE5D,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACxD,CAAC;AACD,kCAAkC;AAElC,4CAA4C;AAC5C,MAAM,cAAc,GAAG,CAAC,UAA+B,EAAE,EAA6D,EAAE,CAAC,CAAC,IAAmB,EAAE,IAAa,EAAE,EAAE;IAC5J,mEAAmE;IACnE,MAAM,aAAa,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;IACxE,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,IAAI,SAAS,CAAC;IACnC,OAAO;QACH,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC;QACnD,WAAW,EAAE,OAAO;QACpB,QAAQ;KACX,CAAC;AACN,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,YAAa,SAAQ,gBAAgB;IACvC;;;;;;OAMG;IACH,YAAY,UAA+B,EAAE;QACzC,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAW,EAAE,QAAiB,EAAE,iBAA2B;QACnE,MAAM,IAAI,GAAG,aAAa,CAAC;QAC3B,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAE1C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAChE,CAAC;CAEJ;AACD,iBAAS,YAAY,CAAC"}
package/dist/types.d.ts CHANGED
@@ -2,6 +2,7 @@ export interface ModelManagerOptions {
2
2
  regExp?: RegExp;
3
3
  metamodelValidation?: boolean;
4
4
  addMetamodel?: boolean;
5
+ dangerouslyAllowReservedSystemTypeNamesInUserModels?: boolean;
5
6
  decoratorValidation?: {
6
7
  missingDecorator?: string;
7
8
  invalidDecorator?: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@accordproject/concerto-core",
3
- "version": "4.0.3",
3
+ "version": "4.1.2",
4
4
  "description": "Core Implementation for the Concerto Modeling Language",
5
5
  "homepage": "https://github.com/accordproject/concerto",
6
6
  "engines": {
@@ -15,7 +15,8 @@
15
15
  "prebuild": "npm-run-all clean",
16
16
  "prepublishOnly": "npm run webpack",
17
17
  "pretest": "npm run lint",
18
- "lint": "eslint .",
18
+ "lint": "eslint . && npm run lint:deps",
19
+ "lint:deps": "eslint --no-eslintrc --resolve-plugins-relative-to . --config .eslintrc.deps.yml --ext .js,.ts src",
19
20
  "postlint": "npm run licchk",
20
21
  "licchk": "license-check-and-add",
21
22
  "postlicchk": "npm run doc",
@@ -57,6 +58,7 @@
57
58
  "cross-env": "7.0.3",
58
59
  "doctrine": "3.0.0",
59
60
  "eslint": "8.57.1",
61
+ "eslint-plugin-import": "^2.31.0",
60
62
  "fs-extra": "9.1.0",
61
63
  "jsdoc": "^4.0.2",
62
64
  "klaw": "3.0.0",
@@ -79,9 +81,10 @@
79
81
  "yargs": "17.3.1"
80
82
  },
81
83
  "dependencies": {
82
- "@accordproject/concerto-cto": "4.0.3",
84
+ "@accordproject/concerto-cto": "4.1.2",
83
85
  "@accordproject/concerto-metamodel": "^3.13.0",
84
- "@accordproject/concerto-util": "4.0.3",
86
+ "@accordproject/concerto-util": "4.1.2",
87
+ "dayjs": "1.11.13",
85
88
  "debug": "4.3.7",
86
89
  "lorem-ipsum": "2.0.8",
87
90
  "randexp": "0.5.3",