Merge pull request #60 from zahariev-oracle/new_diagram_layout

fix: changed auto layout using rappid's DirectedGraph layout, Resolves #41

dist/quick-sql.js

@@ -9259,7 +9259,7 @@ function Ee(h, d) {
   return new Y(h, d).getErrors();
 }
 function le() {
-  return "1.2.9";
+  return "1.2.10";
 }
 Y.version = le;
 Y.toDDL = Pe;

dist/quick-sql.umd.cjs

@@ -264,4 +264,4 @@ modify `+A+" generated always  as identity restart start with "+(this.cardinalit
  Non-default options:
 # settings = `+JSON.stringify(this.nonDefaultOptions())+`
 `,C+=`
-*/`,this.ddl=C,C},this.getErrors=function(){return this.errors!=null?this.errors:(this.errors=ke.findErrors(this,this.fullInput),this.errors)},this.version=ee}return w}();function pe(h,d){return Ie(h,d)}function ge(h,d){return new j(h,d).getERD()}function Ce(h,d){return new j(h,d).getDDL()}function ve(h,d){return new j(h,d).getErrors()}function ee(){return"1.2.9"}j.version=ee,j.toDDL=Ce,j.toERD=ge,j.toErrors=ve,j.fromJSON=pe,j.lexer=$,U.default=j,U.fromJSON=pe,U.qsql_version=ee,U.quicksql=j,U.toDDL=Ce,U.toERD=ge,U.toErrors=ve,Object.defineProperties(U,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+*/`,this.ddl=C,C},this.getErrors=function(){return this.errors!=null?this.errors:(this.errors=ke.findErrors(this,this.fullInput),this.errors)},this.version=ee}return w}();function pe(h,d){return Ie(h,d)}function ge(h,d){return new j(h,d).getERD()}function Ce(h,d){return new j(h,d).getDDL()}function ve(h,d){return new j(h,d).getErrors()}function ee(){return"1.2.10"}j.version=ee,j.toDDL=Ce,j.toERD=ge,j.toErrors=ve,j.fromJSON=pe,j.lexer=$,U.default=j,U.fromJSON=pe,U.qsql_version=ee,U.quicksql=j,U.toDDL=Ce,U.toERD=ge,U.toErrors=ve,Object.defineProperties(U,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

doc/user/quick-erd.md

@@ -20,6 +20,8 @@ You need to add the following dependencies to your HTML:
     - jQuery
     - lodash
     - Backbone JS
+    - graphlib
+    - dagre
 
 ## ERD Browser ESM Example
 
@@ -53,6 +55,8 @@ You need to add the following dependencies to your HTML:
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/backbone-min.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib.core.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dagre.core.min.js"></script>
 
         <!-- Assuming you put the rappid.min.js file in this path -->
         <script src="./examples/diagram-generator/libs/rappid.min.js"></script>
@@ -119,6 +123,8 @@ view emp_v departments employees
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/[email protected]/backbone-min.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib.core.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dagre.core.min.js"></script>
 
         <!-- Assuming you put the rappid.min.js file in this path -->
         <script src="./examples/diagram-generator/libs/rappid.min.js"></script>

examples/diagram-generator/index.html

@@ -13,6 +13,8 @@
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/backbone-min.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib.core.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dagre.core.min.js"></script>
 
     <!-- Assuming you put the rappid.min.js file in this path -->
     <script src="libs/rappid.min.js"></script>
@@ -66,7 +68,7 @@
         <div id="sql">
             <pre></pre>
         </div>
-        <div id="quickERD" style="width: 100%; height: 100%;"></div>
+        <div id="quickERD" style="width: 85%; height: 100%;"></div>
     </div>
 
     <script type="module">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oracle/quicksql",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "description": "Quick SQL to DDL and ERD translator",
   "main": "./dist/quick-sql.umd.cjs",
   "module": "./dist/quick-sql.js",