diff --git a/package.json b/package.json index bbd46b1..e5ac059 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": ">=10" }, "description": "SDMX REST API client for JavaScript", - "version": "2.15.2", + "version": "2.15.3", "main": "./lib/index.js", "scripts": { "prebuild": "rm -rf lib && mkdir lib", @@ -57,18 +57,18 @@ "devDependencies": { "chai": "4.2.0", "chai-as-promised": "7.1.1", - "codecov": "3.6.5", + "codecov": "3.7.2", "coffee-coverage": "3.0.1", "coffeeify": "3.0.1", "coffeelint": "2.1.0", "coffeescript": "2.4.1", - "commitizen": "4.0.3", - "cz-conventional-changelog": "3.1.0", - "husky": "4.2.3", + "commitizen": "4.1.2", + "cz-conventional-changelog": "3.2.0", + "husky": "4.2.5", "istanbul": "0.4.5", "mocha": "5.2.0", - "nock": "12.0.1", - "semantic-release": "17.0.4" + "nock": "13.0.4", + "semantic-release": "17.1.1" }, "config": { "commitizen": { diff --git a/src/data/data-format.coffee b/src/data/data-format.coffee index cd4dfff..fa5c479 100644 --- a/src/data/data-format.coffee +++ b/src/data/data-format.coffee @@ -25,7 +25,8 @@ formats = # The SDMX-JSON 1.0.0 data format. SDMX_JSON_1_0_0: 'application/vnd.sdmx.data+json;version=1.0.0' - # The SDMX-CSV 1.0.0 data format. + # The SDMX-CSV 1.0.0 data format, with default labels and + # non-normalized periods SDMX_CSV_1_0_0: 'application/vnd.sdmx.data+csv;version=1.0.0' # Shortcut for the latest version of SDMX-JSON @@ -34,6 +35,20 @@ formats = # Shortcut for the latest version of SDMX-CSV SDMX_CSV: 'application/vnd.sdmx.data+csv;version=1.0.0' + # The SDMX-CSV 1.0.0 data format, with ID and name as labels + SDMX_CSV_WITH_BOTH_LABELS: + 'application/vnd.sdmx.data+csv;version=1.0.0;labels=both' + + # The SDMX-CSV 1.0.0 data format, with normalized periods + SDMX_CSV_WITH_NORMALIZED_PERIODS: + 'application/vnd.sdmx.data+csv;version=1.0.0;timeFormat=normalized' + + # The SDMX-CSV 1.0.0 data format, with default ID and name as labels, + # as well as normalized periods + SDMX_CSV_WITH_BOTH_LABELS_AND_NORMALIZED_PERIODS: + 'application/vnd.sdmx.data+csv;version=1.0.0;\ + labels=both;timeFormat=normalized' + # Shortcut for the latest version of SDMX-ML Generic SDMX_ML_GENERIC: 'application/vnd.sdmx.genericdata+xml;version=2.1' diff --git a/test/data/data-format.test.coffee b/test/data/data-format.test.coffee index 71a6af5..dc09f21 100644 --- a/test/data/data-format.test.coffee +++ b/test/data/data-format.test.coffee @@ -13,6 +13,9 @@ describe 'Data formats', -> 'application/vnd.sdmx.data+json;version=1.0.0-cts' 'application/vnd.sdmx.data+json;version=1.0.0' 'application/vnd.sdmx.data+csv;version=1.0.0' + 'application/vnd.sdmx.data+csv;version=1.0.0;labels=both' + 'application/vnd.sdmx.data+csv;version=1.0.0;timeFormat=normalized' + 'application/vnd.sdmx.data+csv;version=1.0.0;labels=both;timeFormat=normalized' ] it 'contains all the expected formats and only those', ->