From c1dd2294e1ac3fdda15536e995cf799d71d5b4f0 Mon Sep 17 00:00:00 2001 From: Ayman <76606666+Ayman161803@users.noreply.github.com> Date: Fri, 27 May 2022 16:00:12 +0530 Subject: [PATCH 1/2] fix(concerto-core): Improve error logs in datetimeutil.js (#430) Signed-off-by: Ayman161803 --- packages/concerto-core/lib/datetimeutil.js | 3 +++ packages/concerto-core/test/datetimeutil.js | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/concerto-core/lib/datetimeutil.js b/packages/concerto-core/lib/datetimeutil.js index 88333c65ed..6f3fb4c072 100644 --- a/packages/concerto-core/lib/datetimeutil.js +++ b/packages/concerto-core/lib/datetimeutil.js @@ -35,6 +35,9 @@ function setCurrentTime(currentTime, utcOffset) { // Default UTC offset to local time const utcOffsetResolved = typeof utcOffset === 'number' ? utcOffset : dayjs().utcOffset(); const currentTimeUTC = currentTime ? dayjs.utc(currentTime) : dayjs().utc(); + if (!currentTimeUTC.isValid()) { + throw new Error(`Current time '${currentTime}' is not in standard UTC format`); + } const currentTimeResolved = currentTimeUTC.utcOffset(utcOffsetResolved); if (!currentTimeResolved.isValid()) { throw new Error(`Cannot set current time to '${currentTime}' with UTC offset '${utcOffset}'`); diff --git a/packages/concerto-core/test/datetimeutil.js b/packages/concerto-core/test/datetimeutil.js index 0ebb47e170..458f369c0f 100644 --- a/packages/concerto-core/test/datetimeutil.js +++ b/packages/concerto-core/test/datetimeutil.js @@ -32,7 +32,10 @@ describe('Initialize current time', () => { return currentTime.format().should.equal('1970-01-01T00:00:00+05:00'); }); it('Should fail for a non-well-formed date/time', function () { - return (() => DateTimeUtil.setCurrentTime('foobar')).should.throw('Cannot set current time to \'foobar\' with UTC offset \'undefined\''); + return (() => DateTimeUtil.setCurrentTime('foobar')).should.throw('Current time \'foobar\' is not in standard UTC format'); + }); + it('Should fail for an invalid UTC offset', function () { + return (() => DateTimeUtil.setCurrentTime('1970-01-01T00:00:00+05:00',999999999999)).should.throw('Cannot set current time to \'1970-01-01T00:00:00+05:00\' with UTC offset \'999999999999\''); }); it('Should not fail when currentTime is null', function () { const { currentTime } = DateTimeUtil.setCurrentTime(null); From bea3ed65872af2b174e4e6562e305a1729699c97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 May 2022 11:35:13 +0100 Subject: [PATCH 2/2] chore(actions): publish v2.1.0 to npm (#428) Signed-off-by: GitHub --- lerna.json | 2 +- package-lock.json | 2 +- package.json | 2 +- packages/concerto-cli/package.json | 12 ++++++------ packages/concerto-core/package.json | 8 ++++---- packages/concerto-cto/package.json | 6 +++--- packages/concerto-metamodel/package.json | 4 ++-- packages/concerto-tools/package.json | 6 +++--- packages/concerto-util/package-lock.json | 2 +- packages/concerto-util/package.json | 2 +- packages/concerto-vocabulary/package-lock.json | 2 +- packages/concerto-vocabulary/package.json | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lerna.json b/lerna.json index 2495666e36..1a981318fb 100644 --- a/lerna.json +++ b/lerna.json @@ -2,6 +2,6 @@ "packages": [ "packages/*" ], - "version": "2.0.1", + "version": "2.1.0", "hoist": true } diff --git a/package-lock.json b/package-lock.json index 848510bd9a..5c2dfde7f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "concerto", - "version": "2.0.1", + "version": "2.1.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index d17de2462a..49ae486e90 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "name": "concerto", "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.", - "version": "2.0.1", + "version": "2.1.0", "private": true, "scripts": { "coverage": "node ./scripts/coverage.js \"packages/concerto-*\" && nyc report -t coverage --cwd . --report-dir coverage --reporter=lcov && cat ./coverage/lcov.info", diff --git a/packages/concerto-cli/package.json b/packages/concerto-cli/package.json index 752b66e376..cbfb8dd51e 100644 --- a/packages/concerto-cli/package.json +++ b/packages/concerto-cli/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-cli", - "version": "2.0.1", + "version": "2.1.0", "description": "Command-line utility for working with Concerto model files", "homepage": "https://github.com/accordproject/concerto", "license": "Apache-2.0", @@ -43,11 +43,11 @@ "tmp-promise": "3.0.2" }, "dependencies": { - "@accordproject/concerto-core": "2.0.1", - "@accordproject/concerto-cto": "2.0.1", - "@accordproject/concerto-metamodel": "2.0.1", - "@accordproject/concerto-tools": "2.0.1", - "@accordproject/concerto-util": "2.0.1", + "@accordproject/concerto-core": "2.1.0", + "@accordproject/concerto-cto": "2.1.0", + "@accordproject/concerto-metamodel": "2.1.0", + "@accordproject/concerto-tools": "2.1.0", + "@accordproject/concerto-util": "2.1.0", "mkdirp": "1.0.4", "yargs": "17.3.1" }, diff --git a/packages/concerto-core/package.json b/packages/concerto-core/package.json index 865a05e653..f79a179bee 100644 --- a/packages/concerto-core/package.json +++ b/packages/concerto-core/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-core", - "version": "2.0.1", + "version": "2.1.0", "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.1", - "@accordproject/concerto-metamodel": "2.0.1", - "@accordproject/concerto-util": "2.0.1", + "@accordproject/concerto-cto": "2.1.0", + "@accordproject/concerto-metamodel": "2.1.0", + "@accordproject/concerto-util": "2.1.0", "dayjs": "1.10.8", "debug": "4.3.1", "lorem-ipsum": "2.0.3", diff --git a/packages/concerto-cto/package.json b/packages/concerto-cto/package.json index b5936190b5..751c56b0ae 100644 --- a/packages/concerto-cto/package.json +++ b/packages/concerto-cto/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-cto", - "version": "2.0.1", + "version": "2.1.0", "description": "Parser for Concerto CTO files", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -51,8 +51,8 @@ "typescript": "4.6.3" }, "dependencies": { - "@accordproject/concerto-metamodel": "2.0.1", - "@accordproject/concerto-util": "2.0.1" + "@accordproject/concerto-metamodel": "2.1.0", + "@accordproject/concerto-util": "2.1.0" }, "browserslist": "> 0.25%, not dead", "license-check-and-add-config": { diff --git a/packages/concerto-metamodel/package.json b/packages/concerto-metamodel/package.json index 7f84085d12..f7aef903c1 100644 --- a/packages/concerto-metamodel/package.json +++ b/packages/concerto-metamodel/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-metamodel", - "version": "2.0.1", + "version": "2.1.0", "description": "Concerto metamodel utilities", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -50,7 +50,7 @@ "typescript": "4.6.3" }, "dependencies": { - "@accordproject/concerto-util": "2.0.1" + "@accordproject/concerto-util": "2.1.0" }, "browserslist": "> 0.25%, not dead", "license-check-and-add-config": { diff --git a/packages/concerto-tools/package.json b/packages/concerto-tools/package.json index 6b10f688f7..68655ca673 100644 --- a/packages/concerto-tools/package.json +++ b/packages/concerto-tools/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-tools", - "version": "2.0.1", + "version": "2.1.0", "description": "Tools for the Concerto Modeling Language", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -58,8 +58,8 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/concerto-core": "2.0.1", - "@accordproject/concerto-util": "2.0.1", + "@accordproject/concerto-core": "2.1.0", + "@accordproject/concerto-util": "2.1.0", "ajv": "8.10.0", "ajv-formats": "2.1.1", "debug": "4.3.1", diff --git a/packages/concerto-util/package-lock.json b/packages/concerto-util/package-lock.json index 94ef08506a..d100da4a3a 100644 --- a/packages/concerto-util/package-lock.json +++ b/packages/concerto-util/package-lock.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-util", - "version": "2.0.0", + "version": "2.1.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/concerto-util/package.json b/packages/concerto-util/package.json index 049156f90e..cce1bbae37 100644 --- a/packages/concerto-util/package.json +++ b/packages/concerto-util/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-util", - "version": "2.0.1", + "version": "2.1.0", "description": "Utilities for Concerto Modeling Language", "homepage": "https://github.com/accordproject/concerto", "engines": { diff --git a/packages/concerto-vocabulary/package-lock.json b/packages/concerto-vocabulary/package-lock.json index 83bb912aee..8fb1769980 100644 --- a/packages/concerto-vocabulary/package-lock.json +++ b/packages/concerto-vocabulary/package-lock.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-vocabulary", - "version": "2.0.1", + "version": "2.1.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/concerto-vocabulary/package.json b/packages/concerto-vocabulary/package.json index 88a8e19bec..71135f71b4 100644 --- a/packages/concerto-vocabulary/package.json +++ b/packages/concerto-vocabulary/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-vocabulary", - "version": "2.0.1", + "version": "2.1.0", "description": "Associate human-readable text to model declarations", "homepage": "https://github.com/accordproject/concerto", "engines": {