From dbebe359e495844f078430a9de2b64d21656c21a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:25:10 -0500 Subject: [PATCH] Bump fast-xml-parser from 4.3.6 to 4.4.1 (#540) * Bump fast-xml-parser from 4.3.6 to 4.4.1 Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.3.6 to 4.4.1. - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.3.6...v4.4.1) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: direct:production ... Signed-off-by: dependabot[bot] * fix checks --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: HarithaVattikuti <73516759+HarithaVattikuti@users.noreply.github.com> --- .licenses/npm/fast-xml-parser.dep.yml | Bin 1439 -> 1439 bytes dist/setup/index.js | 29 ++++++++++++++++++++++---- externals/install-dotnet.sh | 4 ++++ package-lock.json | 8 +++---- package.json | 2 +- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.licenses/npm/fast-xml-parser.dep.yml b/.licenses/npm/fast-xml-parser.dep.yml index b8d9497a87ef0c9b8aea634f3122e1d87887ab69..b04a02eb87fa6fac141b20779189256933252fd0 100644 GIT binary patch delta 14 VcmbQwJ)e7mDzk~6;YN*eRsbL61N8s^ delta 14 VcmbQwJ)e7mDzmYk*+z|WRsbLO1Ni^| diff --git a/dist/setup/index.js b/dist/setup/index.js index 405862d..771ab51 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -51639,6 +51639,8 @@ exports.validate = function (xmlData, options) { return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' doesn't have proper closing.", getLineNumberForPosition(xmlData, i)); } else if (attrStr.trim().length > 0) { return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' can't have attributes or invalid starting.", getLineNumberForPosition(xmlData, tagStartPos)); + } else if (tags.length === 0) { + return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' has not been opened.", getLineNumberForPosition(xmlData, tagStartPos)); } else { const otg = tags.pop(); if (tagName !== otg.tagName) { @@ -52082,6 +52084,7 @@ Builder.prototype.j2x = function(jObj, level) { //repeated nodes const arrLen = jObj[key].length; let listTagVal = ""; + let listTagAttr = ""; for (let j = 0; j < arrLen; j++) { const item = jObj[key][j]; if (typeof item === 'undefined') { @@ -52091,17 +52094,27 @@ Builder.prototype.j2x = function(jObj, level) { else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar; // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar; } else if (typeof item === 'object') { - if(this.options.oneListGroup ){ - listTagVal += this.j2x(item, level + 1).val; + if(this.options.oneListGroup){ + const result = this.j2x(item, level + 1); + listTagVal += result.val; + if (this.options.attributesGroupName && item.hasOwnProperty(this.options.attributesGroupName)) { + listTagAttr += result.attrStr + } }else{ listTagVal += this.processTextOrObjNode(item, key, level) } } else { - listTagVal += this.buildTextValNode(item, key, '', level); + if (this.options.oneListGroup) { + let textValue = this.options.tagValueProcessor(key, item); + textValue = this.replaceEntitiesValue(textValue); + listTagVal += textValue; + } else { + listTagVal += this.buildTextValNode(item, key, '', level); + } } } if(this.options.oneListGroup){ - listTagVal = this.buildObjectNode(listTagVal, key, '', level); + listTagVal = this.buildObjectNode(listTagVal, key, listTagAttr, level); } val += listTagVal; } else { @@ -52911,10 +52924,18 @@ const parseXml = function(xmlData) { let tagContent = ""; //self-closing tag if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){ + if(tagName[tagName.length - 1] === "/"){ //remove trailing '/' + tagName = tagName.substr(0, tagName.length - 1); + jPath = jPath.substr(0, jPath.length - 1); + tagExp = tagName; + }else{ + tagExp = tagExp.substr(0, tagExp.length - 1); + } i = result.closeIndex; } //unpaired tag else if(this.options.unpairedTags.indexOf(tagName) !== -1){ + i = result.closeIndex; } //normal tag diff --git a/externals/install-dotnet.sh b/externals/install-dotnet.sh index 42c201a..caa3ea4 100755 --- a/externals/install-dotnet.sh +++ b/externals/install-dotnet.sh @@ -327,6 +327,10 @@ get_machine_architecture() { echo "loongarch64" return 0 ;; + riscv64) + echo "riscv64" + return 0 + ;; esac fi diff --git a/package-lock.json b/package-lock.json index 012464b..bda1ce2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@actions/glob": "^0.4.0", "@actions/http-client": "^2.2.1", "@actions/io": "^1.0.2", - "fast-xml-parser": "^4.3.6", + "fast-xml-parser": "^4.4.1", "json5": "^2.2.3", "semver": "^7.6.0" }, @@ -3490,9 +3490,9 @@ "dev": true }, "node_modules/fast-xml-parser": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz", - "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", + "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", "funding": [ { "type": "github", diff --git a/package.json b/package.json index 7d64336..5d4d198 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@actions/glob": "^0.4.0", "@actions/http-client": "^2.2.1", "@actions/io": "^1.0.2", - "fast-xml-parser": "^4.3.6", + "fast-xml-parser": "^4.4.1", "json5": "^2.2.3", "semver": "^7.6.0" },