From: Benjamin Auder Date: Wed, 31 Jan 2018 02:18:01 +0000 (+0100) Subject: Robustify against attributes,entities,relationships names with 'special' characters X-Git-Url: https://git.auder.net/%7B%7B%20asset%28%27mixstore/images/css/img/doc/%7B%7B%20targetUrl%20%7D%7D?a=commitdiff_plain;h=006d95a3942660083d2c957afea5338c2de8642d;p=erdiag.git Robustify against attributes,entities,relationships names with 'special' characters --- diff --git a/parser.js b/parser.js index 51a05e0..6caf0a9 100644 --- a/parser.js +++ b/parser.js @@ -67,7 +67,7 @@ class ErDiags { case '[': // Entity = { name: { attributes, [weak] } } - let name = lines[start].match(/[^\[\]\s]+/)[0]; + let name = lines[start].match(/[^\[\]"\s]+/)[0]; let entity = { attributes: this.parseAttributes(lines, start+1, end) }; if (lines[start].charAt(1) == '[') entity.weak = true; @@ -79,7 +79,7 @@ class ErDiags case '{': //association // Association = { [name], [attributes], [weak], entities: ArrayOf entity indices } let relationship = { }; - let nameRes = lines[start].match(/[^{}\s]+/); + let nameRes = lines[start].match(/[^{}"\s]+/); if (nameRes !== null) relationship.name = nameRes[0]; if (lines[start].charAt(1) == '{') @@ -102,7 +102,7 @@ class ErDiags field.isKey = true; line = line.slice(1); } - field.name = line.match(/[^()\s]+/)[0]; + field.name = line.match(/[^()"\s]+/)[0]; let parenthesis = line.match(/\((.+)\)/); if (parenthesis !== null) { @@ -196,7 +196,7 @@ class ErDiags _.shuffle(Object.keys(this.entities)).forEach( name => { if (mcdStyle == "bubble") { - mcdDot += name + '[shape=rectangle, label="' + name + '"'; + mcdDot += '"' + name + '" [shape=rectangle, label="' + name + '"'; if (this.entities[name].weak) mcdDot += ', peripheries=2'; mcdDot += '];\n'; @@ -205,17 +205,17 @@ class ErDiags _.shuffle(this.entities[name].attributes).forEach( a => { let label = (a.isKey ? '#' : '') + a.name; let attrName = name + '_' + a.name; - mcdDot += attrName + '[shape=ellipse, label="' + label + '"];\n'; + mcdDot += '"' + attrName + '" [shape=ellipse, label="' + label + '"];\n'; if (Math.random() < 0.5) - mcdDot += attrName + ' -- ' + name + ';\n'; + mcdDot += '"' + attrName + '" -- "' + name + '";\n'; else - mcdDot += name + ' -- ' + attrName + ';\n'; + mcdDot += '"' + name + '" -- "' + attrName + '";\n'; }); } } else { - mcdDot += name + '[label=<'; + mcdDot += '"' + name + '" [label=<'; if (this.entities[name].weak) { mcdDot += '' + @@ -226,7 +226,7 @@ class ErDiags mcdDot += '\n'; if (!!this.entities[name].attributes) { - this.entities[name].attributes.forEach( a => { + _.shuffle(this.entities[name].attributes).forEach( a => { let label = (a.isKey ? '' : '') + a.name + (a.isKey ? '' : ''); mcdDot += '\n'; }); @@ -238,13 +238,13 @@ class ErDiags } }); // Inheritances: - this.inheritances.forEach( i => { + _.shuffle(this.inheritances).forEach( i => { _.shuffle(i.children).forEach( c => { if (Math.random() < 0.5) - mcdDot += c + ':name -- ' + i.parent; + mcdDot += '"' + c + '":name -- "' + i.parent; else - mcdDot += i.parent + ':name -- ' + c; - mcdDot += ':name [dir="forward", arrowhead="vee", style="dashed"];\n'; + mcdDot += '"' + i.parent + '":name -- "' + c; + mcdDot += '":name [dir="forward", arrowhead="vee", style="dashed"];\n'; }); }); // Relationships: @@ -253,27 +253,27 @@ class ErDiags let name = !!a.name && a.name.length > 0 ? a.name : '_assoce' + assoceCounter++; - mcdDot += name + '[shape="diamond", style="filled", color="lightgrey", label="' + (!!a.name ? a.name : '') + '"'; + mcdDot += '"' + name + '" [shape="diamond", style="filled", color="lightgrey", label="' + name + '"'; if (a.weak) mcdDot += ', peripheries=2'; mcdDot += '];\n'; _.shuffle(a.entities).forEach( e => { if (Math.random() < 0.5) - mcdDot += e.name + ':name -- ' + name; + mcdDot += '"' + e.name + '":name -- "' + name + '"'; else - mcdDot += name + ' -- ' + e.name + ':name'; + mcdDot += '"' + name + '" -- "' + e.name + '":name'; mcdDot += '[label="' + ErDiags.CARDINAL[e.card] + '"];\n'; }); if (!!a.attributes) { _.shuffle(a.attributes).forEach( attr => { let label = (attr.isKey ? '#' : '') + attr.name; - mcdDot += name + '_' + attr.name + '[shape=ellipse, label="' + label + '"];\n'; + mcdDot += '"' + name + '_' + attr.name + '" [shape=ellipse, label="' + label + '"];\n'; let attrName = name + '_' + attr.name; if (Math.random() < 0.5) - mcdDot += attrName + ' -- ' + name + ';\n'; + mcdDot += '"' + attrName + '" -- "' + name + '";\n'; else - mcdDot += name + ' -- ' + attrName + ';\n'; + mcdDot += '"' + name + '" -- "' + attrName + '";\n'; }); } });
' + name + '
' + label + '