diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index b1c941619..f08118e17 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -15,7 +15,7 @@ "chalk": "^3.0.0", "commander": "^8.2.0", "fhir": "^4.9.0", - "fhir-package-loader": "^0.4.0", + "fhir-package-loader": "^0.5.0", "fs-extra": "^8.1.0", "html-minifier-terser": "5.1.1", "https-proxy-agent": "^5.0.0", @@ -3535,9 +3535,9 @@ } }, "node_modules/fhir-package-loader": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.4.0.tgz", - "integrity": "sha512-l7spvyZhSykRtcQkbmuZmsvqh+z31eyY1jVTW1dpE4gd6Ydk/0+rEt9imr2mvFPvRgneB0/GN2gOWfh0pxOoSQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.5.0.tgz", + "integrity": "sha512-Q+W+l0jNLkpC2lUCIbtJ76P7xUvU3Bady/dcHo6f45q/CpFtvE9DyfeSNIGJZwpI72IIVZe5lvZ+lA58CGoVuA==", "dependencies": { "axios": "^0.21.1", "chalk": "^4.1.2", @@ -3545,6 +3545,7 @@ "fs-extra": "^10.0.0", "https-proxy-agent": "^5.0.0", "lodash": "^4.17.21", + "semver": "^7.5.4", "tar": "^5.0.11", "temp": "^0.9.1", "winston": "^3.3.3" @@ -5611,7 +5612,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -6748,7 +6748,6 @@ "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -10580,9 +10579,9 @@ } }, "fhir-package-loader": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.4.0.tgz", - "integrity": "sha512-l7spvyZhSykRtcQkbmuZmsvqh+z31eyY1jVTW1dpE4gd6Ydk/0+rEt9imr2mvFPvRgneB0/GN2gOWfh0pxOoSQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/fhir-package-loader/-/fhir-package-loader-0.5.0.tgz", + "integrity": "sha512-Q+W+l0jNLkpC2lUCIbtJ76P7xUvU3Bady/dcHo6f45q/CpFtvE9DyfeSNIGJZwpI72IIVZe5lvZ+lA58CGoVuA==", "requires": { "axios": "^0.21.1", "chalk": "^4.1.2", @@ -10590,6 +10589,7 @@ "fs-extra": "^10.0.0", "https-proxy-agent": "^5.0.0", "lodash": "^4.17.21", + "semver": "^7.5.4", "tar": "^5.0.11", "temp": "^0.9.1", "winston": "^3.3.3" @@ -12071,7 +12071,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "requires": { "yallist": "^4.0.0" } @@ -12901,7 +12900,6 @@ "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, "requires": { "lru-cache": "^6.0.0" } diff --git a/package.json b/package.json index d28ea9d35..05ca143ff 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "chalk": "^3.0.0", "commander": "^8.2.0", "fhir": "^4.9.0", - "fhir-package-loader": "^0.4.0", + "fhir-package-loader": "^0.5.0", "fs-extra": "^8.1.0", "html-minifier-terser": "5.1.1", "https-proxy-agent": "^5.0.0", diff --git a/src/fhirdefs/load.ts b/src/fhirdefs/load.ts index a993c4171..55d7a97bb 100644 --- a/src/fhirdefs/load.ts +++ b/src/fhirdefs/load.ts @@ -68,6 +68,7 @@ export function loadCustomResources( resourceJSON = converter.xmlToObj(xml); } else { invalidFileCount++; + logger.debug(`File not processed by SUSHI: ${file}`); continue; } } catch (e) { @@ -98,8 +99,8 @@ export function loadCustomResources( if (invalidFileCount > 0) { logger.info( invalidFileCount > 1 - ? `Found ${invalidFileCount} files in input/* resource folders that were neither XML nor JSON. These files were not processed as resources by SUSHI.` - : `Found ${invalidFileCount} file in an input/* resource folder that was neither XML nor JSON. This file was not processed as a resource by SUSHI.` + ? `Found ${invalidFileCount} files in input/* resource folders that were neither XML nor JSON. These files were not processed as resources by SUSHI. To see the unprocessed files in the logs, run SUSHI with the "--log-level debug" flag.` + : `Found ${invalidFileCount} file in an input/* resource folder that was neither XML nor JSON. This file was not processed as a resource by SUSHI. To see the unprocessed file in the logs, run SUSHI with the "--log-level debug" flag.` ); } }