mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-01-14 06:43:25 +08:00
Merge pull request #3405 from aloisklink/other/3339_forbid-console-in-src-code
style: forbid using `console` in mermaid src code
This commit is contained in:
Sidharth Vinod
GitHub
commit
2611a430b9
@ -22,6 +22,7 @@
|
|||||||
],
|
],
|
||||||
"plugins": ["@typescript-eslint", "html", "jest", "jsdoc", "json"],
|
"plugins": ["@typescript-eslint", "html", "jest", "jsdoc", "json"],
|
||||||
"rules": {
|
"rules": {
|
||||||
|
"no-console": "error",
|
||||||
"no-prototype-builtins": "off",
|
"no-prototype-builtins": "off",
|
||||||
"no-unused-vars": "off",
|
"no-unused-vars": "off",
|
||||||
"jsdoc/check-indentation": "off",
|
"jsdoc/check-indentation": "off",
|
||||||
@ -45,6 +46,12 @@
|
|||||||
"no-undef": "off",
|
"no-undef": "off",
|
||||||
"jsdoc/require-jsdoc": "off"
|
"jsdoc/require-jsdoc": "off"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"files": ["./cypress/**", "./demos/**"],
|
||||||
|
"rules": {
|
||||||
|
"no-console": "off"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
15
.github/workflows/lint.yml
vendored
15
.github/workflows/lint.yml
vendored
@ -40,3 +40,18 @@ jobs:
|
|||||||
|
|
||||||
- name: Verify Docs
|
- name: Verify Docs
|
||||||
run: yarn docs:verify
|
run: yarn docs:verify
|
||||||
|
|
||||||
|
- name: Check no `console.log()` in .jison files
|
||||||
|
# ESLint can't parse .jison files directly
|
||||||
|
# In the future, it might be worth making a `eslint-plugin-jison`, so
|
||||||
|
# that this will be built into the `yarn lint` command.
|
||||||
|
run: |
|
||||||
|
shopt -s globstar
|
||||||
|
mkdir -p tmp/
|
||||||
|
for jison_file in src/**/*.jison; do
|
||||||
|
outfile="tmp/$(basename -- "$jison_file" .jison)-jison.js"
|
||||||
|
echo "Converting $jison_file to $outfile"
|
||||||
|
# default module-type (CJS) always adds a console.log()
|
||||||
|
yarn jison "$jison_file" --outfile "$outfile" --module-type "amd"
|
||||||
|
done
|
||||||
|
yarn eslint --no-eslintrc --rule no-console:error --parser "@babel/eslint-parser" "./tmp/*-jison.js"
|
||||||
|
|||||||
@ -115,80 +115,80 @@ accDescr\s*"{"\s* { this.begin("acc_descr_multiline");}
|
|||||||
"C4Dynamic" return 'C4_DYNAMIC';
|
"C4Dynamic" return 'C4_DYNAMIC';
|
||||||
"C4Deployment" return 'C4_DEPLOYMENT';
|
"C4Deployment" return 'C4_DEPLOYMENT';
|
||||||
|
|
||||||
"Person_Ext" { this.begin("person_ext"); console.log('begin person_ext'); return 'PERSON_EXT';}
|
"Person_Ext" { this.begin("person_ext"); return 'PERSON_EXT';}
|
||||||
"Person" { this.begin("person"); console.log('begin person'); return 'PERSON';}
|
"Person" { this.begin("person"); return 'PERSON';}
|
||||||
"SystemQueue_Ext" { this.begin("system_ext_queue"); console.log('begin system_ext_queue'); return 'SYSTEM_EXT_QUEUE';}
|
"SystemQueue_Ext" { this.begin("system_ext_queue"); return 'SYSTEM_EXT_QUEUE';}
|
||||||
"SystemDb_Ext" { this.begin("system_ext_db"); console.log('begin system_ext_db'); return 'SYSTEM_EXT_DB';}
|
"SystemDb_Ext" { this.begin("system_ext_db"); return 'SYSTEM_EXT_DB';}
|
||||||
"System_Ext" { this.begin("system_ext"); console.log('begin system_ext'); return 'SYSTEM_EXT';}
|
"System_Ext" { this.begin("system_ext"); return 'SYSTEM_EXT';}
|
||||||
"SystemQueue" { this.begin("system_queue"); console.log('begin system_queue'); return 'SYSTEM_QUEUE';}
|
"SystemQueue" { this.begin("system_queue"); return 'SYSTEM_QUEUE';}
|
||||||
"SystemDb" { this.begin("system_db"); console.log('begin system_db'); return 'SYSTEM_DB';}
|
"SystemDb" { this.begin("system_db"); return 'SYSTEM_DB';}
|
||||||
"System" { this.begin("system"); console.log('begin system'); return 'SYSTEM';}
|
"System" { this.begin("system"); return 'SYSTEM';}
|
||||||
|
|
||||||
"Boundary" { this.begin("boundary"); console.log('begin boundary'); return 'BOUNDARY';}
|
"Boundary" { this.begin("boundary"); return 'BOUNDARY';}
|
||||||
"Enterprise_Boundary" { this.begin("enterprise_boundary"); console.log('begin enterprise_boundary'); return 'ENTERPRISE_BOUNDARY';}
|
"Enterprise_Boundary" { this.begin("enterprise_boundary"); return 'ENTERPRISE_BOUNDARY';}
|
||||||
"System_Boundary" { this.begin("system_boundary"); console.log('begin system_boundary'); return 'SYSTEM_BOUNDARY';}
|
"System_Boundary" { this.begin("system_boundary"); return 'SYSTEM_BOUNDARY';}
|
||||||
|
|
||||||
"ContainerQueue_Ext" { this.begin("container_ext_queue"); console.log('begin container_ext_queue'); return 'CONTAINER_EXT_QUEUE';}
|
"ContainerQueue_Ext" { this.begin("container_ext_queue"); return 'CONTAINER_EXT_QUEUE';}
|
||||||
"ContainerDb_Ext" { this.begin("container_ext_db"); console.log('begin container_ext_db'); return 'CONTAINER_EXT_DB';}
|
"ContainerDb_Ext" { this.begin("container_ext_db"); return 'CONTAINER_EXT_DB';}
|
||||||
"Container_Ext" { this.begin("container_ext"); console.log('begin container_ext'); return 'CONTAINER_EXT';}
|
"Container_Ext" { this.begin("container_ext"); return 'CONTAINER_EXT';}
|
||||||
"ContainerQueue" { this.begin("container_queue"); console.log('begin container_queue'); return 'CONTAINER_QUEUE';}
|
"ContainerQueue" { this.begin("container_queue"); return 'CONTAINER_QUEUE';}
|
||||||
"ContainerDb" { this.begin("container_db"); console.log('begin container_db'); return 'CONTAINER_DB';}
|
"ContainerDb" { this.begin("container_db"); return 'CONTAINER_DB';}
|
||||||
"Container" { this.begin("container"); console.log('begin container'); return 'CONTAINER';}
|
"Container" { this.begin("container"); return 'CONTAINER';}
|
||||||
|
|
||||||
"Container_Boundary" { this.begin("container_boundary"); console.log('begin container_boundary'); return 'CONTAINER_BOUNDARY';}
|
"Container_Boundary" { this.begin("container_boundary"); return 'CONTAINER_BOUNDARY';}
|
||||||
|
|
||||||
"ComponentQueue_Ext" { this.begin("component_ext_queue"); console.log('begin component_ext_queue'); return 'COMPONENT_EXT_QUEUE';}
|
"ComponentQueue_Ext" { this.begin("component_ext_queue"); return 'COMPONENT_EXT_QUEUE';}
|
||||||
"ComponentDb_Ext" { this.begin("component_ext_db"); console.log('begin component_ext_db'); return 'COMPONENT_EXT_DB';}
|
"ComponentDb_Ext" { this.begin("component_ext_db"); return 'COMPONENT_EXT_DB';}
|
||||||
"Component_Ext" { this.begin("component_ext"); console.log('begin component_ext'); return 'COMPONENT_EXT';}
|
"Component_Ext" { this.begin("component_ext"); return 'COMPONENT_EXT';}
|
||||||
"ComponentQueue" { this.begin("component_queue"); console.log('begin component_queue'); return 'COMPONENT_QUEUE';}
|
"ComponentQueue" { this.begin("component_queue"); return 'COMPONENT_QUEUE';}
|
||||||
"ComponentDb" { this.begin("component_db"); console.log('begin component_db'); return 'COMPONENT_DB';}
|
"ComponentDb" { this.begin("component_db"); return 'COMPONENT_DB';}
|
||||||
"Component" { this.begin("component"); console.log('begin component'); return 'COMPONENT';}
|
"Component" { this.begin("component"); return 'COMPONENT';}
|
||||||
|
|
||||||
"Deployment_Node" { this.begin("node"); console.log('begin node'); return 'NODE';}
|
"Deployment_Node" { this.begin("node"); return 'NODE';}
|
||||||
"Node" { this.begin("node"); console.log('begin node'); return 'NODE';}
|
"Node" { this.begin("node"); return 'NODE';}
|
||||||
"Node_L" { this.begin("node_l"); console.log('begin node_l'); return 'NODE_L';}
|
"Node_L" { this.begin("node_l"); return 'NODE_L';}
|
||||||
"Node_R" { this.begin("node_r"); console.log('begin node_r'); return 'NODE_R';}
|
"Node_R" { this.begin("node_r"); return 'NODE_R';}
|
||||||
|
|
||||||
|
|
||||||
"Rel" { this.begin("rel"); console.log('begin rel'); return 'REL';}
|
"Rel" { this.begin("rel"); return 'REL';}
|
||||||
"BiRel" { this.begin("birel"); console.log('begin birel'); return 'BIREL';}
|
"BiRel" { this.begin("birel"); return 'BIREL';}
|
||||||
"Rel_Up" { this.begin("rel_u"); console.log('begin rel_u'); return 'REL_U';}
|
"Rel_Up" { this.begin("rel_u"); return 'REL_U';}
|
||||||
"Rel_U" { this.begin("rel_u"); console.log('begin rel_u'); return 'REL_U';}
|
"Rel_U" { this.begin("rel_u"); return 'REL_U';}
|
||||||
"Rel_Down" { this.begin("rel_d"); console.log('begin rel_d'); return 'REL_D';}
|
"Rel_Down" { this.begin("rel_d"); return 'REL_D';}
|
||||||
"Rel_D" { this.begin("rel_d"); console.log('begin rel_d'); return 'REL_D';}
|
"Rel_D" { this.begin("rel_d"); return 'REL_D';}
|
||||||
"Rel_Left" { this.begin("rel_l"); console.log('begin rel_l'); return 'REL_L';}
|
"Rel_Left" { this.begin("rel_l"); return 'REL_L';}
|
||||||
"Rel_L" { this.begin("rel_l"); console.log('begin rel_l'); return 'REL_L';}
|
"Rel_L" { this.begin("rel_l"); return 'REL_L';}
|
||||||
"Rel_Right" { this.begin("rel_r"); console.log('begin rel_r'); return 'REL_R';}
|
"Rel_Right" { this.begin("rel_r"); return 'REL_R';}
|
||||||
"Rel_R" { this.begin("rel_r"); console.log('begin rel_r'); return 'REL_R';}
|
"Rel_R" { this.begin("rel_r"); return 'REL_R';}
|
||||||
"Rel_Back" { this.begin("rel_b"); console.log('begin rel_b'); return 'REL_B';}
|
"Rel_Back" { this.begin("rel_b"); return 'REL_B';}
|
||||||
"RelIndex" { this.begin("rel_index"); console.log('begin rel_index'); return 'REL_INDEX';}
|
"RelIndex" { this.begin("rel_index"); return 'REL_INDEX';}
|
||||||
|
|
||||||
"UpdateElementStyle" { this.begin("update_el_style"); console.log('begin update_el_style'); return 'UPDATE_EL_STYLE';}
|
"UpdateElementStyle" { this.begin("update_el_style"); return 'UPDATE_EL_STYLE';}
|
||||||
"UpdateRelStyle" { this.begin("update_rel_style"); console.log('begin update_rel_style'); return 'UPDATE_REL_STYLE';}
|
"UpdateRelStyle" { this.begin("update_rel_style"); return 'UPDATE_REL_STYLE';}
|
||||||
"UpdateLayoutConfig" { this.begin("update_layout_config"); console.log('begin update_layout_config'); return 'UPDATE_LAYOUT_CONFIG';}
|
"UpdateLayoutConfig" { this.begin("update_layout_config"); return 'UPDATE_LAYOUT_CONFIG';}
|
||||||
|
|
||||||
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config><<EOF>> return "EOF_IN_STRUCT";
|
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config><<EOF>> return "EOF_IN_STRUCT";
|
||||||
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config>[(][ ]*[,] { console.log('begin attribute with ATTRIBUTE_EMPTY'); this.begin("attribute"); return "ATTRIBUTE_EMPTY";}
|
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config>[(][ ]*[,] { this.begin("attribute"); return "ATTRIBUTE_EMPTY";}
|
||||||
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config>[(] { console.log('begin attribute'); this.begin("attribute"); }
|
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config>[(] { this.begin("attribute"); }
|
||||||
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config,attribute>[)] { console.log('STOP attribute'); this.popState();console.log('STOP diagram'); this.popState();}
|
<person,person_ext,system_ext_queue,system_ext_db,system_ext,system_queue,system_db,system,boundary,enterprise_boundary,system_boundary,container_ext_db,container_ext,container_queue,container_db,container,container_boundary,component_ext_db,component_ext,component_queue,component_db,component,node,node_l,node_r,rel,birel,rel_u,rel_d,rel_l,rel_r,rel_b,rel_index,update_el_style,update_rel_style,update_layout_config,attribute>[)] { this.popState();this.popState();}
|
||||||
|
|
||||||
<attribute>",," { console.log(',,'); return 'ATTRIBUTE_EMPTY';}
|
<attribute>",," { return 'ATTRIBUTE_EMPTY';}
|
||||||
<attribute>"," { console.log(','); }
|
<attribute>"," { }
|
||||||
<attribute>[ ]*["]["] { console.log('ATTRIBUTE_EMPTY'); return 'ATTRIBUTE_EMPTY';}
|
<attribute>[ ]*["]["] { return 'ATTRIBUTE_EMPTY';}
|
||||||
<attribute>[ ]*["] { console.log('begin string'); this.begin("string");}
|
<attribute>[ ]*["] { this.begin("string");}
|
||||||
<string>["] { console.log('STOP string'); this.popState(); }
|
<string>["] { this.popState(); }
|
||||||
<string>[^"]* { console.log('STR'); return "STR";}
|
<string>[^"]* { return "STR";}
|
||||||
|
|
||||||
<attribute>[ ]*[\$] { console.log('begin string_kv'); this.begin("string_kv");}
|
<attribute>[ ]*[\$] { this.begin("string_kv");}
|
||||||
<string_kv>[^=]* { console.log('STR_KEY'); this.begin("string_kv_key"); return "STR_KEY";}
|
<string_kv>[^=]* { this.begin("string_kv_key"); return "STR_KEY";}
|
||||||
<string_kv_key>[=][ ]*["] { console.log('begin string_kv_value'); this.popState(); this.begin("string_kv_value"); }
|
<string_kv_key>[=][ ]*["] { this.popState(); this.begin("string_kv_value"); }
|
||||||
<string_kv_value>[^"]+ { console.log('STR_VALUE'); return "STR_VALUE";}
|
<string_kv_value>[^"]+ { return "STR_VALUE";}
|
||||||
<string_kv_value>["] { console.log('STOP string_kv_value'); this.popState(); this.popState(); }
|
<string_kv_value>["] { this.popState(); this.popState(); }
|
||||||
|
|
||||||
<attribute>[^,]+ { console.log('not STR'); return "STR";}
|
<attribute>[^,]+ { return "STR";}
|
||||||
|
|
||||||
'{' { /* this.begin("lbrace"); */ console.log('begin boundary block'); return "LBRACE";}
|
'{' { /* this.begin("lbrace"); */ return "LBRACE";}
|
||||||
'}' { /* this.popState(); */ console.log('STOP boundary block'); return "RBRACE";}
|
'}' { /* this.popState(); */ return "RBRACE";}
|
||||||
|
|
||||||
[\s]+ return 'SPACE';
|
[\s]+ return 'SPACE';
|
||||||
[\n\r]+ return 'EOL';
|
[\n\r]+ return 'EOL';
|
||||||
@ -231,7 +231,7 @@ directive
|
|||||||
;
|
;
|
||||||
|
|
||||||
openDirective
|
openDirective
|
||||||
: open_directive { console.log("open_directive: ", $1); yy.parseDirective('%%{', 'open_directive'); }
|
: open_directive { yy.parseDirective('%%{', 'open_directive'); }
|
||||||
;
|
;
|
||||||
|
|
||||||
typeDirective
|
typeDirective
|
||||||
@ -239,11 +239,11 @@ typeDirective
|
|||||||
;
|
;
|
||||||
|
|
||||||
argDirective
|
argDirective
|
||||||
: arg_directive { $1 = $1.trim().replace(/'/g, '"'); console.log("arg_directive: ", $1); yy.parseDirective($1, 'arg_directive'); }
|
: arg_directive { $1 = $1.trim().replace(/'/g, '"'); yy.parseDirective($1, 'arg_directive'); }
|
||||||
;
|
;
|
||||||
|
|
||||||
closeDirective
|
closeDirective
|
||||||
: close_directive { console.log("close_directive: ", $1); yy.parseDirective('}%%', 'close_directive', 'c4Context'); }
|
: close_directive { yy.parseDirective('}%%', 'close_directive', 'c4Context'); }
|
||||||
;
|
;
|
||||||
|
|
||||||
graphConfig
|
graphConfig
|
||||||
@ -285,13 +285,13 @@ boundaryStartStatement
|
|||||||
;
|
;
|
||||||
|
|
||||||
boundaryStart
|
boundaryStart
|
||||||
: ENTERPRISE_BOUNDARY attributes {console.log($1,JSON.stringify($2)); $2.splice(2, 0, 'ENTERPRISE'); yy.addPersonOrSystemBoundary(...$2); $$=$2;}
|
: ENTERPRISE_BOUNDARY attributes {$2.splice(2, 0, 'ENTERPRISE'); yy.addPersonOrSystemBoundary(...$2); $$=$2;}
|
||||||
| SYSTEM_BOUNDARY attributes {console.log($1,JSON.stringify($2)); $2.splice(2, 0, 'ENTERPRISE'); yy.addPersonOrSystemBoundary(...$2); $$=$2;}
|
| SYSTEM_BOUNDARY attributes {$2.splice(2, 0, 'ENTERPRISE'); yy.addPersonOrSystemBoundary(...$2); $$=$2;}
|
||||||
| BOUNDARY attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystemBoundary(...$2); $$=$2;}
|
| BOUNDARY attributes {yy.addPersonOrSystemBoundary(...$2); $$=$2;}
|
||||||
| CONTAINER_BOUNDARY attributes {console.log($1,JSON.stringify($2)); $2.splice(2, 0, 'CONTAINER'); yy.addContainerBoundary(...$2); $$=$2;}
|
| CONTAINER_BOUNDARY attributes {$2.splice(2, 0, 'CONTAINER'); yy.addContainerBoundary(...$2); $$=$2;}
|
||||||
| NODE attributes {console.log($1,JSON.stringify($2)); yy.addDeploymentNode('node', ...$2); $$=$2;}
|
| NODE attributes {yy.addDeploymentNode('node', ...$2); $$=$2;}
|
||||||
| NODE_L attributes {console.log($1,JSON.stringify($2)); yy.addDeploymentNode('nodeL', ...$2); $$=$2;}
|
| NODE_L attributes {yy.addDeploymentNode('nodeL', ...$2); $$=$2;}
|
||||||
| NODE_R attributes {console.log($1,JSON.stringify($2)); yy.addDeploymentNode('nodeR', ...$2); $$=$2;}
|
| NODE_R attributes {yy.addDeploymentNode('nodeR', ...$2); $$=$2;}
|
||||||
;
|
;
|
||||||
|
|
||||||
boundaryStopStatement
|
boundaryStopStatement
|
||||||
@ -305,48 +305,48 @@ diagramStatements
|
|||||||
;
|
;
|
||||||
|
|
||||||
diagramStatement
|
diagramStatement
|
||||||
: PERSON attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('person', ...$2); $$=$2;}
|
: PERSON attributes {yy.addPersonOrSystem('person', ...$2); $$=$2;}
|
||||||
| PERSON_EXT attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('external_person', ...$2); $$=$2;}
|
| PERSON_EXT attributes {yy.addPersonOrSystem('external_person', ...$2); $$=$2;}
|
||||||
| SYSTEM attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('system', ...$2); $$=$2;}
|
| SYSTEM attributes {yy.addPersonOrSystem('system', ...$2); $$=$2;}
|
||||||
| SYSTEM_DB attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('system_db', ...$2); $$=$2;}
|
| SYSTEM_DB attributes {yy.addPersonOrSystem('system_db', ...$2); $$=$2;}
|
||||||
| SYSTEM_QUEUE attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('system_queue', ...$2); $$=$2;}
|
| SYSTEM_QUEUE attributes {yy.addPersonOrSystem('system_queue', ...$2); $$=$2;}
|
||||||
| SYSTEM_EXT attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('external_system', ...$2); $$=$2;}
|
| SYSTEM_EXT attributes {yy.addPersonOrSystem('external_system', ...$2); $$=$2;}
|
||||||
| SYSTEM_EXT_DB attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('external_system_db', ...$2); $$=$2;}
|
| SYSTEM_EXT_DB attributes {yy.addPersonOrSystem('external_system_db', ...$2); $$=$2;}
|
||||||
| SYSTEM_EXT_QUEUE attributes {console.log($1,JSON.stringify($2)); yy.addPersonOrSystem('external_system_queue', ...$2); $$=$2;}
|
| SYSTEM_EXT_QUEUE attributes {yy.addPersonOrSystem('external_system_queue', ...$2); $$=$2;}
|
||||||
| CONTAINER attributes {console.log($1,JSON.stringify($2)); yy.addContainer('container', ...$2); $$=$2;}
|
| CONTAINER attributes {yy.addContainer('container', ...$2); $$=$2;}
|
||||||
| CONTAINER_DB attributes {console.log($1,JSON.stringify($2)); yy.addContainer('container_db', ...$2); $$=$2;}
|
| CONTAINER_DB attributes {yy.addContainer('container_db', ...$2); $$=$2;}
|
||||||
| CONTAINER_QUEUE attributes {console.log($1,JSON.stringify($2)); yy.addContainer('container_queue', ...$2); $$=$2;}
|
| CONTAINER_QUEUE attributes {yy.addContainer('container_queue', ...$2); $$=$2;}
|
||||||
| CONTAINER_EXT attributes {console.log($1,JSON.stringify($2)); yy.addContainer('external_container', ...$2); $$=$2;}
|
| CONTAINER_EXT attributes {yy.addContainer('external_container', ...$2); $$=$2;}
|
||||||
| CONTAINER_EXT_DB attributes {console.log($1,JSON.stringify($2)); yy.addContainer('external_container_db', ...$2); $$=$2;}
|
| CONTAINER_EXT_DB attributes {yy.addContainer('external_container_db', ...$2); $$=$2;}
|
||||||
| CONTAINER_EXT_QUEUE attributes {console.log($1,JSON.stringify($2)); yy.addContainer('external_container_queue', ...$2); $$=$2;}
|
| CONTAINER_EXT_QUEUE attributes {yy.addContainer('external_container_queue', ...$2); $$=$2;}
|
||||||
| COMPONENT attributes {console.log($1,JSON.stringify($2)); yy.addComponent('component', ...$2); $$=$2;}
|
| COMPONENT attributes {yy.addComponent('component', ...$2); $$=$2;}
|
||||||
| COMPONENT_DB attributes {console.log($1,JSON.stringify($2)); yy.addComponent('component_db', ...$2); $$=$2;}
|
| COMPONENT_DB attributes {yy.addComponent('component_db', ...$2); $$=$2;}
|
||||||
| COMPONENT_QUEUE attributes {console.log($1,JSON.stringify($2)); yy.addComponent('component_queue', ...$2); $$=$2;}
|
| COMPONENT_QUEUE attributes {yy.addComponent('component_queue', ...$2); $$=$2;}
|
||||||
| COMPONENT_EXT attributes {console.log($1,JSON.stringify($2)); yy.addComponent('external_component', ...$2); $$=$2;}
|
| COMPONENT_EXT attributes {yy.addComponent('external_component', ...$2); $$=$2;}
|
||||||
| COMPONENT_EXT_DB attributes {console.log($1,JSON.stringify($2)); yy.addComponent('external_component_db', ...$2); $$=$2;}
|
| COMPONENT_EXT_DB attributes {yy.addComponent('external_component_db', ...$2); $$=$2;}
|
||||||
| COMPONENT_EXT_QUEUE attributes {console.log($1,JSON.stringify($2)); yy.addComponent('external_component_queue', ...$2); $$=$2;}
|
| COMPONENT_EXT_QUEUE attributes {yy.addComponent('external_component_queue', ...$2); $$=$2;}
|
||||||
| boundaryStatement
|
| boundaryStatement
|
||||||
| REL attributes {console.log($1,JSON.stringify($2)); yy.addRel('rel', ...$2); $$=$2;}
|
| REL attributes {yy.addRel('rel', ...$2); $$=$2;}
|
||||||
| BIREL attributes {console.log($1,JSON.stringify($2)); yy.addRel('birel', ...$2); $$=$2;}
|
| BIREL attributes {yy.addRel('birel', ...$2); $$=$2;}
|
||||||
| REL_U attributes {console.log($1,JSON.stringify($2)); yy.addRel('rel_u', ...$2); $$=$2;}
|
| REL_U attributes {yy.addRel('rel_u', ...$2); $$=$2;}
|
||||||
| REL_D attributes {console.log($1,JSON.stringify($2)); yy.addRel('rel_d', ...$2); $$=$2;}
|
| REL_D attributes {yy.addRel('rel_d', ...$2); $$=$2;}
|
||||||
| REL_L attributes {console.log($1,JSON.stringify($2)); yy.addRel('rel_l', ...$2); $$=$2;}
|
| REL_L attributes {yy.addRel('rel_l', ...$2); $$=$2;}
|
||||||
| REL_R attributes {console.log($1,JSON.stringify($2)); yy.addRel('rel_r', ...$2); $$=$2;}
|
| REL_R attributes {yy.addRel('rel_r', ...$2); $$=$2;}
|
||||||
| REL_B attributes {console.log($1,JSON.stringify($2)); yy.addRel('rel_b', ...$2); $$=$2;}
|
| REL_B attributes {yy.addRel('rel_b', ...$2); $$=$2;}
|
||||||
| REL_INDEX attributes {console.log($1,JSON.stringify($2)); $2.splice(0, 1); yy.addRel('rel', ...$2); $$=$2;}
|
| REL_INDEX attributes {$2.splice(0, 1); yy.addRel('rel', ...$2); $$=$2;}
|
||||||
| UPDATE_EL_STYLE attributes {console.log($1,JSON.stringify($2)); yy.updateElStyle('update_el_style', ...$2); $$=$2;}
|
| UPDATE_EL_STYLE attributes {yy.updateElStyle('update_el_style', ...$2); $$=$2;}
|
||||||
| UPDATE_REL_STYLE attributes {console.log($1,JSON.stringify($2)); yy.updateRelStyle('update_rel_style', ...$2); $$=$2;}
|
| UPDATE_REL_STYLE attributes {yy.updateRelStyle('update_rel_style', ...$2); $$=$2;}
|
||||||
| UPDATE_LAYOUT_CONFIG attributes {console.log($1,JSON.stringify($2)); yy.updateLayoutConfig('update_layout_config', ...$2); $$=$2;}
|
| UPDATE_LAYOUT_CONFIG attributes {yy.updateLayoutConfig('update_layout_config', ...$2); $$=$2;}
|
||||||
;
|
;
|
||||||
|
|
||||||
attributes
|
attributes
|
||||||
: attribute { console.log('PUSH ATTRIBUTE: ', $1); $$ = [$1]; }
|
: attribute { $$ = [$1]; }
|
||||||
| attribute attributes { console.log('PUSH ATTRIBUTE: ', $1); $2.unshift($1); $$=$2;}
|
| attribute attributes { $2.unshift($1); $$=$2;}
|
||||||
;
|
;
|
||||||
|
|
||||||
attribute
|
attribute
|
||||||
: STR { $$ = $1.trim(); }
|
: STR { $$ = $1.trim(); }
|
||||||
| STR_KEY STR_VALUE { console.log('kv: ', $1, $2); let kv={}; kv[$1.trim()]=$2.trim(); $$=kv; }
|
| STR_KEY STR_VALUE { let kv={}; kv[$1.trim()]=$2.trim(); $$=kv; }
|
||||||
| ATTRIBUTE { $$ = $1.trim(); }
|
| ATTRIBUTE { $$ = $1.trim(); }
|
||||||
| ATTRIBUTE_EMPTY { $$ = ""; }
|
| ATTRIBUTE_EMPTY { $$ = ""; }
|
||||||
;
|
;
|
||||||
|
|||||||
@ -550,8 +550,6 @@ describe('when parsing a gitGraph', function () {
|
|||||||
testBranch3Merge,
|
testBranch3Merge,
|
||||||
] = Object.values(commits);
|
] = Object.values(commits);
|
||||||
|
|
||||||
console.log(Object.keys(commits));
|
|
||||||
|
|
||||||
expect(mainCommit.branch).toBe('main');
|
expect(mainCommit.branch).toBe('main');
|
||||||
expect(mainCommit.parents).toStrictEqual([]);
|
expect(mainCommit.parents).toStrictEqual([]);
|
||||||
|
|
||||||
|
|||||||
@ -49,7 +49,6 @@ export const draw = (text, id, version, diagObj) => {
|
|||||||
svg.attr('width', 400);
|
svg.attr('width', 400);
|
||||||
// svg.attr('viewBox', '0 0 300 150');
|
// svg.attr('viewBox', '0 0 300 150');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e);
|
|
||||||
log.error('Error while rendering info diagram');
|
log.error('Error while rendering info diagram');
|
||||||
log.error(e.message);
|
log.error(e.message);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,6 +38,11 @@ import { evaluate } from './diagrams/common/common';
|
|||||||
|
|
||||||
let hasLoadedDiagrams = false;
|
let hasLoadedDiagrams = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param text
|
||||||
|
* @param parseError
|
||||||
|
*/
|
||||||
function parse(text: string, parseError?: Function): boolean {
|
function parse(text: string, parseError?: Function): boolean {
|
||||||
if (!hasLoadedDiagrams) {
|
if (!hasLoadedDiagrams) {
|
||||||
addDiagrams();
|
addDiagrams();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user