diff --git a/package-lock.json b/package-lock.json index 31d317af..1866252d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gofsh", - "version": "2.1.1", + "version": "2.1.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gofsh", - "version": "2.1.1", + "version": "2.1.2", "license": "Apache-2.0", "dependencies": { "antlr4": "~4.8.0", @@ -18,7 +18,7 @@ "fhir-package-loader": "^0.5.0", "flat": "^5.0.2", "fs-extra": "^9.0.1", - "fsh-sushi": "^3.3.3", + "fsh-sushi": "^3.4.0", "ini": "^1.3.8", "lodash": "^4.17.21", "readline-sync": "^1.4.10", @@ -3223,9 +3223,9 @@ } }, "node_modules/fsh-sushi": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.3.3.tgz", - "integrity": "sha512-lavdcdiUHgapdU+aA7PQ+0TQ+GbiKLef80/i2GGe3f1jPNhZHL96/L9Ielr+HfstKyLk9kkQn52nwHRIHhfL8w==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.4.0.tgz", + "integrity": "sha512-F07kXHydr1FM2elL7RT9lY7xRkGH9LXD6Qzl19ZRS15gXuPid/0xkRF5qn4h4skQIkZQqdZtQxgW0dTwn6pXdg==", "hasInstallScript": true, "dependencies": { "ajv": "^8.12.0", @@ -9429,9 +9429,9 @@ "optional": true }, "fsh-sushi": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.3.3.tgz", - "integrity": "sha512-lavdcdiUHgapdU+aA7PQ+0TQ+GbiKLef80/i2GGe3f1jPNhZHL96/L9Ielr+HfstKyLk9kkQn52nwHRIHhfL8w==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-3.4.0.tgz", + "integrity": "sha512-F07kXHydr1FM2elL7RT9lY7xRkGH9LXD6Qzl19ZRS15gXuPid/0xkRF5qn4h4skQIkZQqdZtQxgW0dTwn6pXdg==", "requires": { "ajv": "^8.12.0", "antlr4": "~4.13.0", diff --git a/package.json b/package.json index a5e3d16d..c8858a8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gofsh", - "version": "2.1.1", + "version": "2.1.2", "description": "GoFSH is a FHIR Shorthand (FSH) decompiler, able to convert formal FHIR definitions from JSON to FSH.", "main": "dist/index.js", "scripts": { @@ -76,7 +76,7 @@ "fhir-package-loader": "^0.5.0", "flat": "^5.0.2", "fs-extra": "^9.0.1", - "fsh-sushi": "^3.3.3", + "fsh-sushi": "^3.4.0", "ini": "^1.3.8", "lodash": "^4.17.21", "readline-sync": "^1.4.10", diff --git a/src/processor/AliasProcessor.ts b/src/processor/AliasProcessor.ts index bed294a1..2968dec4 100644 --- a/src/processor/AliasProcessor.ts +++ b/src/processor/AliasProcessor.ts @@ -49,8 +49,8 @@ export class AliasProcessor { const ctx = parser.doc() as sushiImport.DocContext; ctx.entity().forEach(entity => { if (entity.alias()) { - const name = entity.alias().SEQUENCE()[0].getText(); - let value = entity.alias().SEQUENCE()[1]?.getText(); + const name = entity.alias().name().getText(); + let value = entity.alias().SEQUENCE()?.getText(); // When the url contains a fragment (http://example.org#fragment), the grammar will read it as a // CODE, so we also accept that for the value here if (!value && entity.alias().CODE()) {