Ma/ueblueprint
1
0
Fork 0
mirror of https://github.com/barsdeveloper/ueblueprint.git synced 2026-05-13 15:27:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix string escape single qupte

Browse Source
This commit is contained in:
barsdeveloper
2023-04-03 20:02:58 +02:00
parent 62b3968af3
commit 2380d61bb6
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cypress/e2e/utility.cy.js
View File

@@ -148,9 +148,18 @@ describe("Utility class", () => {
expect(Utility.escapeString("")).to.be.equal("") expect(Utility.escapeString("")).to.be.equal("")
expect(Utility.unescapeString("")).to.be.equal("") expect(Utility.unescapeString("")).to.be.equal("")
expect(Utility.escapeString('"')).to.be.equal('\\"')
expect(Utility.unescapeString('\\"')).to.be.equal('"')
expect(Utility.escapeString("'")).to.be.equal("\\'")
expect(Utility.unescapeString("\\'")).to.be.equal("'")
expect(Utility.escapeString(String.raw`\"`)).to.be.equal(String.raw`\\\"`) expect(Utility.escapeString(String.raw`\"`)).to.be.equal(String.raw`\\\"`)
expect(Utility.unescapeString(String.raw`\"`)).to.be.equal('"') expect(Utility.unescapeString(String.raw`\"`)).to.be.equal('"')
expect(Utility.escapeString(String.raw`\'`)).to.be.equal(String.raw`\\\'`)
expect(Utility.unescapeString(String.raw`\'`)).to.be.equal("'")
expect(Utility.escapeString(String.raw`Hello \"World\"`)).to.be.equal(String.raw`Hello \\\"World\\\"`) expect(Utility.escapeString(String.raw`Hello \"World\"`)).to.be.equal(String.raw`Hello \\\"World\\\"`)
expect(Utility.unescapeString(String.raw`Hello \"World\"`)).to.be.equal('Hello "World"') expect(Utility.unescapeString(String.raw`Hello \"World\"`)).to.be.equal('Hello "World"')

7
dist/ueblueprint.js vendored
View File

@@ -193,6 +193,7 @@ class Configuration {
} }
static selectAllKeyboardKey = "(bCtrl=True,Key=A)" static selectAllKeyboardKey = "(bCtrl=True,Key=A)"
static smoothScrollTime = 1000 // ms static smoothScrollTime = 1000 // ms
static stringEscapedCharacters = /['"\\]/g
static trackingMouseEventName = { static trackingMouseEventName = {
begin: "ueb-tracking-mouse-begin", begin: "ueb-tracking-mouse-begin",
end: "ueb-tracking-mouse-end", end: "ueb-tracking-mouse-end",
@@ -740,8 +741,7 @@ class Utility {
/** @param {String} value */ /** @param {String} value */
static escapeString(value) { static escapeString(value) {
return value return value
.replaceAll('\\', '\\\\') // Escape \ .replaceAll(new RegExp(`(${Configuration.stringEscapedCharacters.source})`, "g"), '\\$1')
.replaceAll('"', '\\"') // Escape "
.replaceAll("\n", "\\n") // Replace newline with \n .replaceAll("\n", "\\n") // Replace newline with \n
.replaceAll("\t", "\\t") // Replace tab with \t .replaceAll("\t", "\\t") // Replace tab with \t
} }
@@ -751,8 +751,7 @@ class Utility {
return value return value
.replaceAll("\\t", "\t") // Replace tab with \t .replaceAll("\\t", "\t") // Replace tab with \t
.replaceAll("\\n", "\n") // Replace newline with \n .replaceAll("\\n", "\n") // Replace newline with \n
.replaceAll('\\"', '"') // Escape " .replaceAll(new RegExp(`\\\\(${Configuration.stringEscapedCharacters.source})`, "g"), "$1")
.replaceAll('\\\\', '\\') // Escape \
} }
/** @param {String} value */ /** @param {String} value */

2
dist/ueblueprint.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
js/Configuration.js
View File

@@ -169,6 +169,7 @@ export default class Configuration {
} }
static selectAllKeyboardKey = "(bCtrl=True,Key=A)" static selectAllKeyboardKey = "(bCtrl=True,Key=A)"
static smoothScrollTime = 1000 // ms static smoothScrollTime = 1000 // ms
static stringEscapedCharacters = /['"\\]/g
static trackingMouseEventName = { static trackingMouseEventName = {
begin: "ueb-tracking-mouse-begin", begin: "ueb-tracking-mouse-begin",
end: "ueb-tracking-mouse-end", end: "ueb-tracking-mouse-end",

6
js/Utility.js
View File

@@ -299,8 +299,7 @@ export default class Utility {
/** @param {String} value */ /** @param {String} value */
static escapeString(value) { static escapeString(value) {
return value return value
.replaceAll('\\', '\\\\') // Escape \ .replaceAll(new RegExp(`(${Configuration.stringEscapedCharacters.source})`, "g"), '\\$1')
.replaceAll('"', '\\"') // Escape "
.replaceAll("\n", "\\n") // Replace newline with \n .replaceAll("\n", "\\n") // Replace newline with \n
.replaceAll("\t", "\\t") // Replace tab with \t .replaceAll("\t", "\\t") // Replace tab with \t
} }
@@ -310,8 +309,7 @@ export default class Utility {
return value return value
.replaceAll("\\t", "\t") // Replace tab with \t .replaceAll("\\t", "\t") // Replace tab with \t
.replaceAll("\\n", "\n") // Replace newline with \n .replaceAll("\\n", "\n") // Replace newline with \n
.replaceAll('\\"', '"') // Escape " .replaceAll(new RegExp(`\\\\(${Configuration.stringEscapedCharacters.source})`, "g"), "$1")
.replaceAll('\\\\', '\\') // Escape \
} }
/** @param {String} value */ /** @param {String} value */