More tests and string fixes

This commit is contained in:
barsdeveloper
2024-04-25 21:54:03 +02:00
parent 279163cd54
commit 08e2e8edd8
6 changed files with 92 additions and 28 deletions

View File

@@ -256,7 +256,7 @@ export default class Configuration {
7: 2,
}
static smoothScrollTime = 1000 // ms
static stringEscapedCharacters = /['"\\]/g
static stringEscapedCharacters = /["\\]/g
static subObjectAttributeNamePrefix = "#SubObject"
/** @param {ObjectEntity} objectEntity */
static subObjectAttributeNameFromEntity = (objectEntity, nameOnly = false) =>

View File

@@ -7,6 +7,11 @@ import IEntity from "./IEntity.js"
export default class ObjectReferenceEntity extends IEntity {
static #quoteSymbols = [
[`'"`, Grammar.Regex.InsideString.source],
[`'`, Grammar.Regex.InsideSingleQuotedString.source],
[`"`, Grammar.Regex.InsideString.source]
]
static attributes = {
...super.attributes,
type: new AttributeInfo({
@@ -17,11 +22,13 @@ export default class ObjectReferenceEntity extends IEntity {
default: "",
serialized: true,
}),
delim: new AttributeInfo({
ignored: true,
}),
}
static quoted = Parsernostrum.regArray(new RegExp(
`'"(` + Grammar.Regex.InsideString.source + `)"'`
+ `|'(` + Grammar.Regex.InsideSingleQuotedString.source + `)'`
+ `|"(` + Grammar.Regex.InsideString.source + `)"`
this.#quoteSymbols.map(([delim, parser]) =>
delim + "(" + parser + ")" + delim.split("").reverse().join("")).join("|")
)).map(([_0, a, b, c]) => a ?? b ?? c)
static path = this.quoted.getParser().parser.regexp.source + "|" + Grammar.Regex.Path.source
static typeReference = Parsernostrum.reg(
@@ -33,14 +40,22 @@ export default class ObjectReferenceEntity extends IEntity {
+ /\s*/.source
+ "(?:" + this.quoted.getParser().parser.regexp.source + ")"
)
).map(([_0, type, ...path]) => new this({ type, path: path.find(v => v) }))
).map(([_0, type, ...path]) => new this({
type,
path: path.find(v => v),
delim: this.#quoteSymbols[path.findIndex(v => v)]?.[0] ?? "",
}))
static fullReferenceSerializedGrammar = Parsernostrum.regArray(
new RegExp(
"(" + this.typeReference.getParser().regexp.source + ")"
+ /\s*/.source
+ `'(` + Grammar.Regex.InsideSingleQuotedString.source + `)'`
)
).map(([_0, type, ...path]) => new this({ type, path: path.find(v => v) }))
).map(([_0, type, ...path]) => new this({
type,
path: path.find(v => v),
delim: "'",
}))
static typeReferenceGrammar = this.typeReference.map(v => new this({ type: v, path: "" }))
static grammar = this.createGrammar()
@@ -68,6 +83,7 @@ export default class ObjectReferenceEntity extends IEntity {
super(values)
/** @type {String} */ this.type
/** @type {String} */ this.path
/** @type {String} */ this.delim
}
static createNoneInstance() {
@@ -79,6 +95,6 @@ export default class ObjectReferenceEntity extends IEntity {
}
toString() {
return this.type + (this.path ? `'${this.path}'` : "")
return this.type + (this.path ? (this.delim + this.path + this.delim.split("").reverse().join("")) : "")
}
}

View File

@@ -216,11 +216,12 @@ export default function initializeSerializerFactory() {
new CustomSerializer(
objectReference => {
let type = objectReference.type ?? ""
let name = objectReference.path ?? ""
if (type && name && Utility.isSerialized(objectReference, "path")) {
name = `'${name}'`
let path = objectReference.path ?? ""
let delim = objectReference.delim ?? ""
if (type && path && Utility.isSerialized(objectReference, "path")) {
path = delim + path + delim.split("").reverse().join("")
}
let result = type + name
let result = type + path
if (Utility.isSerialized(objectReference, "type")) {
result = `"${result}"`
}
@@ -237,7 +238,7 @@ export default function initializeSerializerFactory() {
SerializerFactory.registerSerializer(
PinEntity,
new Serializer(PinEntity, (entity, v) => `${entity.getLookbehind()} (${v})`, ",", true)
new Serializer(PinEntity, (entity, v) => `${entity.getLookbehind()} (${v})`, ",", false)
)
SerializerFactory.registerSerializer(