X-Git-Url: https://git.auder.net/rpsls.js?a=blobdiff_plain;f=parser.js;h=8fc65edc3330eedf29ac02c7d9a9e957ab217a3f;hb=c728aeca9ef83bb786ed0c886a2b3dc4faf3dc45;hp=8a4c52499f17df2fe92e28150b72e825b98c0f69;hpb=d6c9499e06c65780d5f4c95664c2cb851ff6f2de;p=erdiag.git diff --git a/parser.js b/parser.js index 8a4c524..8fc65ed 100644 --- a/parser.js +++ b/parser.js @@ -26,7 +26,9 @@ class ErDiags "*": "0,n", "+": "1,n", "?": "0,1", - "1": "1,1" + "1": "1,1", + "?R": "(0,1)", + "1R": "(1,1)", }; } @@ -67,7 +69,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 +81,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 +104,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) { @@ -136,7 +138,10 @@ class ErDiags return inheritance; } - // Association (parsed here): { entities: ArrayOf entity names + cardinality, [attributes: ArrayOf {name, [isKey], [type], [qualifiers]}] } + // Association (parsed here): { + // entities: ArrayOf entity names + cardinality, + // [attributes: ArrayOf {name, [isKey], [type], [qualifiers]}] + // } parseAssociation(lines, start, end) { let assoce = { }; @@ -177,6 +182,7 @@ class ErDiags } // "Modèle conceptuel des données". TODO: option for graph size + // NOTE: randomizing helps to obtain better graphs (sometimes) drawMcd(id, mcdStyle) //mcdStyle: bubble, or compact { let element = document.getElementById(id); @@ -188,11 +194,14 @@ class ErDiags } // Build dot graph input let mcdDot = 'graph {\n'; + mcdDot += 'rankdir="LR";\n'; // Nodes: - Object.keys(this.entities).forEach( name => { + if (mcdStyle == "compact") + mcdDot += 'node [shape=plaintext];\n'; + _.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'; @@ -200,14 +209,18 @@ class ErDiags { this.entities[name].attributes.forEach( a => { let label = (a.isKey ? '#' : '') + a.name; - mcdDot += name + '_' + a.name + '[shape=ellipse, label="' + label + '"];\n'; - mcdDot += name + '_' + a.name + ' -- ' + name + ';\n'; + let attrName = name + '_' + a.name; + mcdDot += '"' + attrName + '" [shape=ellipse, label="' + label + '"];\n'; + if (Math.random() < 0.5) + mcdDot += '"' + attrName + '" -- "' + name + '";\n'; + else + mcdDot += '"' + name + '" -- "' + attrName + '";\n'; }); } } else { - mcdDot += name + '[shape=plaintext, label=<'; + mcdDot += '"' + name + '" [label=<'; if (this.entities[name].weak) { mcdDot += '
) drawMld(id) { let element = document.getElementById(id); |