Skip to content

Commit

Permalink
Merge branch 'master' into no-concept-error-valueset
Browse files Browse the repository at this point in the history
  • Loading branch information
cmoesel authored Dec 23, 2024
2 parents 0d3100a + 853a04e commit db6767f
Show file tree
Hide file tree
Showing 71 changed files with 2,612 additions and 2,530 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.18.0
nodejs 18.20.1
779 changes: 518 additions & 261 deletions npm-shrinkwrap.json

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fsh-sushi",
"version": "3.12.1",
"version": "3.13.1",
"description": "Sushi Unshortens Short Hand Inputs (FSH Compiler)",
"scripts": {
"build": "del-cli dist && tsc && copyfiles -u 3 \"src/utils/init-project/*\" dist/utils/init-project",
Expand Down Expand Up @@ -49,41 +49,42 @@
],
"license": "Apache-2.0",
"devDependencies": {
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.13.0",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.15.0",
"@types/diff": "^5.2.3",
"@types/fs-extra": "^11.0.4",
"@types/html-minifier-terser": "5.1.1",
"@types/ini": "^4.1.1",
"@types/jest": "^29.5.14",
"@types/json-diff": "^1.0.3",
"@types/lodash": "^4.17.12",
"@types/node": "^20.17.1",
"@types/lodash": "^4.17.13",
"@types/node": "^20.17.8",
"@types/opener": "^1.4.3",
"@types/readline-sync": "^1.4.8",
"@types/sax": "^1.2.7",
"@types/temp": "^0.9.4",
"@types/text-table": "^0.2.5",
"@types/valid-url": "^1.0.7",
"@typescript-eslint/eslint-plugin": "^8.12.0",
"@typescript-eslint/parser": "^8.12.0",
"@typescript-eslint/eslint-plugin": "^8.16.0",
"@typescript-eslint/parser": "^8.16.0",
"acorn": "^8.14.0",
"copyfiles": "^2.4.1",
"del-cli": "^6.0.0",
"diff": "^7.0.0",
"diff2html-cli": "^5.2.15",
"eslint": "^9.13.0",
"eslint": "^9.15.0",
"eslint-config-prettier": "^9.1.0",
"extract-zip": "^2.0.1",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"jest-mock-extended": "^4.0.0-beta1",
"json-diff": "^1.0.6",
"nock": "^13.5.5",
"nock": "^13.5.6",
"opener": "^1.5.2",
"prettier": "^3.3.3",
"prettier": "^3.4.1",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.6.3"
"typescript": "^5.7.2"
},
"dependencies": {
"ajv": "^8.17.1",
Expand All @@ -92,7 +93,7 @@
"chalk": "^4.1.2",
"commander": "^12.1.0",
"fhir": "^4.12.0",
"fhir-package-loader": "^1.0.0",
"fhir-package-loader": "^2.0.1",
"fs-extra": "^11.2.0",
"html-minifier-terser": "5.1.1",
"https-proxy-agent": "^7.0.5",
Expand Down
10 changes: 10 additions & 0 deletions regression/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ async function main() {
'The folder to write regression data to',
path.relative(process.cwd(), path.join(__dirname, 'output'))
)
.option(
'-d, --disableDependencyPrecaching',
'Disable IG dependency precaching. Note that disabling precaching may make the baseline version of SUSHI appear slower since it may need to download dependencies not yet in the cache.',
false
)
.action(runAction);

program
Expand Down Expand Up @@ -137,6 +142,11 @@ async function runAction(options: any) {
}
config.continued = false;
}

if (options.disableDependencyPrecaching) {
config.disablePrecaching = options.disableDependencyPrecaching;
}

const data = new RegressionData(config);
if (doContinue) {
dataJSON!.repos.forEach(r => {
Expand Down
Loading

0 comments on commit db6767f

Please sign in to comment.