Skip to content

Updating luxon and json5 dependencies and fixing broken tests. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwwinters merged 1 commit into from
Apr 11, 2023
Merged

Updating luxon and json5 dependencies and fixing broken tests. #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@
},
"peerDependencies": {
"cql-execution": ">=1.3.0 || ^3.0.0-beta"
},
"resolutions": {
Comment thread
mgramigna marked this conversation as resolved.
"json5": "^2.2.2"
}
}
4 changes: 2 additions & 2 deletions test/dstu2_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ describe('#DSTU2', () => {
const pt = patientSource.currentPatient();
// cql-execution v1.3.2 currently doesn't export the new Date class, so we need to use the .getDate() workaround
expect(compact(pt.get('birthDate'))).to.deep.equal({
value: new cql.DateTime.parse('1975-02-25').getDate()
value: cql.DateTime.parse('1975-02-25').getDate()
});
expect(pt.get('birthDate.value')).to.deep.equal(new cql.DateTime.parse('1975-02-25').getDate());
expect(pt.get('birthDate.value')).to.deep.equal(cql.DateTime.parse('1975-02-25').getDate());
});

it('should find patient extensions', () => {
Expand Down
4 changes: 2 additions & 2 deletions test/r401_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ describe('#R4 v4.0.1', () => {
const pt = patientSource.currentPatient();
// cql-execution v1.3.2 currently doesn't export the new Date class, so we need to use the .getDate() workaround
expect(compact(pt.get('birthDate'))).to.deep.equal({
value: new cql.DateTime.parse('2008-11-06').getDate()
value: cql.DateTime.parse('2008-11-06').getDate()
});
expect(pt.get('birthDate.value')).to.deep.equal(new cql.DateTime.parse('2008-11-06').getDate());
expect(pt.get('birthDate.value')).to.deep.equal(cql.DateTime.parse('2008-11-06').getDate());
});

it('should find patient extensions', () => {
Expand Down
4 changes: 2 additions & 2 deletions test/r4_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ describe('#R4 v4.0.0', () => {
const pt = patientSource.currentPatient();
// cql-execution v1.3.2 currently doesn't export the new Date class, so we need to use the .getDate() workaround
expect(compact(pt.get('birthDate'))).to.deep.equal({
value: new cql.DateTime.parse('2008-11-06').getDate()
value: cql.DateTime.parse('2008-11-06').getDate()
});
expect(pt.get('birthDate.value')).to.deep.equal(new cql.DateTime.parse('2008-11-06').getDate());
expect(pt.get('birthDate.value')).to.deep.equal(cql.DateTime.parse('2008-11-06').getDate());
});

it('should find patient extensions', () => {
Expand Down
4 changes: 2 additions & 2 deletions test/stu3_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ describe('#STU3', () => {
const pt = patientSource.currentPatient();
// cql-execution v1.3.2 currently doesn't export the new Date class, so we need to use the .getDate() workaround
expect(compact(pt.get('birthDate'))).to.deep.equal({
value: new cql.DateTime.parse('1975-02-25').getDate()
value: cql.DateTime.parse('1975-02-25').getDate()
});
expect(pt.get('birthDate.value')).to.deep.equal(new cql.DateTime.parse('1975-02-25').getDate());
expect(pt.get('birthDate.value')).to.deep.equal(cql.DateTime.parse('1975-02-25').getDate());
});

it('should find patient extensions', () => {
Expand Down
79 changes: 39 additions & 40 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,10 +960,11 @@
"@jridgewell/sourcemap-codec" "^1.4.10"

"@lhncbc/ucum-lhc@^4.1.3":
version "4.1.4"
resolved "https://registry.yarnpkg.com/@lhncbc/ucum-lhc/-/ucum-lhc-4.1.4.tgz#763d26a1e2d58b204fc645ae5128262c8cdc56bc"
integrity sha512-ErlXJv6lrerZbthxc33SWTKrZv4KjMIaCN2lNxsNrGZW4PqyVFEKDie6lok//SvC6QeEoAC1mWN8xD87r72qPQ==
version "4.1.7"
resolved "https://registry.yarnpkg.com/@lhncbc/ucum-lhc/-/ucum-lhc-4.1.7.tgz#8004b6820b3b41dac5466be694a8d8e2713045c4"
integrity sha512-KU6agJSPq/ZEy3t1XitVuyKfI18MBO4QFuZ3zUxqzK502p6akc9GfNOmJRWx7qmhSIBrqq7eq8x0p8qYoaro/A==
dependencies:
coffeescript "^2.7.0"
csv-parse "^4.4.6"
csv-stringify "^1.0.4"
escape-html "^1.0.3"
Expand Down Expand Up @@ -1199,6 +1200,11 @@ cliui@^7.0.2:
strip-ansi "^6.0.0"
wrap-ansi "^7.0.0"

coffeescript@^2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.7.0.tgz#a43ec03be6885d6d1454850ea70b9409c391279c"
integrity sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==

color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
Expand Down Expand Up @@ -1254,12 +1260,12 @@ core-util-is@~1.0.0:
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==

cql-execution@>=1.3.0:
version "2.3.3"
resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-2.3.3.tgz#52a70f3117b1e42ad7727f07fd954d753b2d0114"
integrity sha512-64ditb9OcWPvPhLeWkL/7hKrp/jUO67eRwO8pf9OIPJryPfYKR51M4HqJxlP2/Kq54ieDmCGCGHSpTrcetvAuw==
version "2.4.4"
resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-2.4.4.tgz#5a82ebde41ca78e034dd190479bba90329f7fc94"
integrity sha512-0v719J1KZcK8bwPicvWQgO8nx5/Vlc0+ou4L4DQ/H2F5pY3Ws3OFgo7QMGEK6xOT5LWpKZvhtRoRG1bbMeGH/w==
dependencies:
"@lhncbc/ucum-lhc" "^4.1.3"
luxon "^1.25.0"
luxon "^1.28.1"

cross-spawn@^7.0.2:
version "7.0.3"
Expand All @@ -1278,7 +1284,7 @@ csv-parse@^4.4.6:
csv-stringify@^1.0.4:
version "1.1.2"
resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-1.1.2.tgz#77a41526581bce3380f12b00d7c5bbac70c82b58"
integrity sha1-d6QVJlgbzjOA8SsA18W7rHDIK1g=
integrity sha512-3NmNhhd+AkYs5YtM1GEh01VR6PKj6qch2ayfQaltx5xpcAdThjnbbI5eT8CzRVpXfGKAxnmrSYLsNl/4f3eWiw==
dependencies:
lodash.get "~4.4.2"

Expand Down Expand Up @@ -1333,7 +1339,7 @@ electron-to-chromium@^1.4.17:
emitter-component@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY=
integrity sha512-G+mpdiAySMuB7kesVRLuyvYRqDmshB7ReKEVuyBPkzQlmiDiLrt7hHHIy4Aff552bgknVN7B2/d3lzhGO5dvpQ==

emoji-regex@^8.0.0:
version "8.0.0"
Expand All @@ -1355,7 +1361,7 @@ escalade@^3.1.1:
escape-html@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==

escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
version "4.0.0"
Expand Down Expand Up @@ -1617,9 +1623,9 @@ globals@^13.6.0, globals@^13.9.0:
type-fest "^0.20.2"

graceful-fs@^4.1.6:
version "4.2.8"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
version "4.2.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==

growl@1.10.5:
version "1.10.5"
Expand Down Expand Up @@ -1723,7 +1729,7 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
is-integer@^1.0.6:
version "1.0.7"
resolved "https://registry.yarnpkg.com/is-integer/-/is-integer-1.0.7.tgz#6bde81aacddf78b659b6629d629cadc51a886d5c"
integrity sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=
integrity sha512-RPQc/s9yBHSvpi+hs9dYiJ2cuFeU6x3TyyIp8O2H6SKEltIvJOzRj9ToyvcStDvPR/pS4rxgr1oBFajQjZ2Szg==
dependencies:
is-finite "^1.0.0"

Expand All @@ -1745,7 +1751,7 @@ is-unicode-supported@^0.1.0:
isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==

isexe@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -1784,17 +1790,15 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=

json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
dependencies:
minimist "^1.2.5"
json5@^2.1.2, json5@^2.2.2:
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==

jsonfile@^2.2.3:
version "2.4.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==
optionalDependencies:
graceful-fs "^4.1.6"

Expand All @@ -1821,7 +1825,7 @@ lodash.debounce@^4.0.8:
lodash.get@~4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==

lodash.merge@^4.6.2:
version "4.6.2"
Expand All @@ -1843,10 +1847,10 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"

luxon@^1.25.0:
version "1.28.0"
resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.0.tgz#e7f96daad3938c06a62de0fb027115d251251fbf"
integrity sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ==
luxon@^1.28.1:
version "1.28.1"
resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.1.tgz#528cdf3624a54506d710290a2341aa8e6e6c61b0"
integrity sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw==

make-dir@^2.1.0:
version "2.1.0"
Expand All @@ -1870,11 +1874,6 @@ minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"

minimist@^1.2.5:
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

mocha@9.2.2:
version "9.2.2"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
Expand Down Expand Up @@ -2063,9 +2062,9 @@ randombytes@^2.1.0:
safe-buffer "^5.1.0"

readable-stream@^2.1.0:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
version "2.3.8"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.3"
Expand Down Expand Up @@ -2179,7 +2178,7 @@ sax@>=0.6.0:
sax@~1.1.1:
version "1.1.6"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240"
integrity sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA=
integrity sha512-8zci48uUQyfqynGDSkUMD7FCJB96hwLnlZOXlgs1l3TX+LW27t3psSWKUxC0fxVgA86i8tL4NwGcY1h/6t3ESg==

semver@7.0.0:
version "7.0.0"
Expand Down Expand Up @@ -2235,12 +2234,12 @@ source-map@^0.5.0:
stream-transform@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-0.1.2.tgz#7d8e6b4e03ac4781778f8c79517501bfb0762a9f"
integrity sha1-fY5rTgOsR4F3j4x5UXUBv7B2Kp8=
integrity sha512-3HXId/0W8sktQnQM6rOZf2LuDDMbakMgAjpViLk758/h0br+iGqZFFfUxxJSqEvGvT742PyFr4v/TBXUtowdCg==

stream@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
integrity sha1-f1Nj8Ff2WSxVlfALyAon9c7B8O8=
integrity sha512-gCq3NDI2P35B2n6t76YJuOp7d6cN/C7Rt0577l91wllh0sY9ZBuw9KaSGqH/b0hzn3CWWJbpbW0W0WvQ1H/Q7g==
dependencies:
emitter-component "^1.1.1"

Expand Down Expand Up @@ -2373,7 +2372,7 @@ uri-js@^4.2.2:
util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==

v8-compile-cache@^2.0.3:
version "2.3.0"
Expand Down Expand Up @@ -2427,7 +2426,7 @@ xmlbuilder@~11.0.0:
xmldoc@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-0.4.0.tgz#d257224be8393eaacbf837ef227fd8ec25b36888"
integrity sha1-0lciS+g5PqrL+DfvIn/Y7CWzaIg=
integrity sha512-rJ/+/UzYCSlFNuAzGuRyYgkH2G5agdX1UQn4+5siYw9pkNC3Hu/grYNDx/dqYLreeSjnY5oKg74CMBKxJHSg6Q==
dependencies:
sax "~1.1.1"

Expand Down