Merge pull request #10 from lastlink/dev

v 0.0.2
funktechno · Jun 23, 2024 · f6a30aa · f6a30aa
2 parents f6aae58 + afe4d3f
commit f6a30aa
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,22 @@
 plugins for sql tooling in drawio
 
 ## Getting Started
-* see https://github.com/ariel-bentu/tam-drawio for install options with vscode
+* see https://github.com/ariel-bentu/tam-drawio for multiple install options
+* download plugin file
+    * [sql.js](https://raw.githubusercontent.com/lastlink/sqltooling-drawio/main/dist/sql.js)
+    * or clone project `git clone --branch main git@github.com:lastlink/sqltooling-drawio.git` and check `dist folder`
+* vscode [Draw.io Integration](https://marketplace.visualstudio.com/items?itemName=hediet.vscode-drawio)
+    * settings.json
+    ```json
+    "hediet.vscode-drawio.plugins": [
+    {
+      "file": "xxx\\sqltooling-drawio\\dist\\sql.js"
+    },
+    ```
+
+## Examples
+* ![menu_from_sql](./assets/menu_from_sql.png)
+* ![menu_from_sql](./assets/menu_export_as_to_sql.png)
 
 ## Development
 * `npm install`

diff --git a/assets/menu_export_as_to_sql.png b/assets/menu_export_as_to_sql.png
diff --git a/assets/menu_from_sql.png b/assets/menu_from_sql.png
diff --git a/dist/sql.js b/dist/sql.js
@@ -896,11 +896,11 @@ const generate_sql_ddl_1 = require("@funktechno/little-mermaid-2-the-sql/lib/src
 const sqlsimpleparser_1 = require("@funktechno/sqlsimpleparser");
 /**
  * SQL Tools Plugin for importing diagrams from SQL DDL and exporting to SQL.
- * Version: 0.0.1
+ * Version: 0.0.2
  */
 Draw.loadPlugin(function (ui) {
     // export sql methods
-    const pluginVersion = "0.0.1";
+    const pluginVersion = "0.0.2";
     //Create Base div
     const divGenSQL = document.createElement("div");
     divGenSQL.style.userSelect = "none";
@@ -917,7 +917,7 @@ Draw.loadPlugin(function (ui) {
     const theMenuExportAs = ui.menus.get("exportAs");
     let buttonLabel = "tosql=To SQL";
     // vscode extension support
-    if (!(theMenuExportAs && theMenuExportAs.enabled)) {
+    if (!(theMenuExportAs && !window.VsCodeApi)) {
         buttonLabel = "tosql=Export As SQL";
     }
     // Extends Extras menu
@@ -1242,10 +1242,10 @@ Draw.loadPlugin(function (ui) {
     const sqlInputFromSQL = document.createElement("textarea");
     sqlInputFromSQL.style.height = "200px";
     sqlInputFromSQL.style.width = "100%";
-    const defaultReset = "/*\n\tDrawio default value\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\nCREATE TABLE Persons\n(\n    PersonID int NOT NULL,\n    LastName varchar(255),\n    " +
-        "FirstName varchar(255),\n    Address varchar(255),\n    City varchar(255),\n    Primary Key(PersonID)\n);\n\n" +
-        "CREATE TABLE Orders\n(\n    OrderID int NOT NULL PRIMARY KEY,\n    PersonID int NOT NULL,\n    FOREIGN KEY ([PersonID]) REFERENCES [Persons]([PersonID])" +
-        "\n);";
+    const defaultReset = `/*\n\tDrawio default value\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\nCREATE TABLE Persons\n(\n    PersonID int NOT NULL,\n    LastName varchar(255),\n    " +
+    "FirstName varchar(255),\n    Address varchar(255),\n    City varchar(255),\n    Primary Key(PersonID)\n);\n\n" + 
+    "CREATE TABLE Orders\n(\n    OrderID int NOT NULL PRIMARY KEY,\n    PersonID int NOT NULL,\n    FOREIGN KEY ([PersonID]) REFERENCES [Persons]([PersonID])" +
+    "\n);`;
     sqlInputFromSQL.value = defaultReset;
     mxUtils.br(divFromSQL);
     divFromSQL.appendChild(sqlInputFromSQL);
@@ -1445,7 +1445,7 @@ Draw.loadPlugin(function (ui) {
             ui.menus.addMenuItems(menu, ["fromSql"], parent);
         };
     }
-    if (theMenuExportAs && theMenuExportAs.enabled) {
+    if (theMenuExportAs && !window.VsCodeApi) {
         var oldMenuExportAs = theMenuExportAs.funct;
         theMenuExportAs.funct = function (...args) {
             const [menu, parent] = args;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sqltooling-drawio",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "plugins for sql tooling in drawio",
   "main": "index.js",
   "engines": {

diff --git a/src/sql.ts b/src/sql.ts
@@ -3,6 +3,7 @@ import { DbDefinition, DbRelationshipDefinition } from "@funktechno/little-merma
 import { ColumnQuantifiers, TableAttribute, TableEntity } from "./types/sql-plugin-types";
 import { SqlSimpleParser } from "@funktechno/sqlsimpleparser";
 import { ForeignKeyModel, PrimaryKeyModel, PropertyModel, TableModel } from "@funktechno/sqlsimpleparser/lib/types";
+declare const window: Customwindow;
 
 /**
  * SQL Tools Plugin for importing diagrams from SQL DDL and exporting to SQL.
@@ -30,7 +31,7 @@ Draw.loadPlugin(function(ui) {
     const theMenuExportAs = ui.menus.get("exportAs");
     let buttonLabel = "tosql=To SQL";
     // vscode extension support
-    if(!(theMenuExportAs && theMenuExportAs.enabled)) {
+    if(!(theMenuExportAs && !window.VsCodeApi)) {
         buttonLabel = "tosql=Export As SQL";
     }
     // Extends Extras menu
@@ -391,10 +392,10 @@ Draw.loadPlugin(function(ui) {
     const sqlInputFromSQL = document.createElement("textarea");
     sqlInputFromSQL.style.height = "200px";
     sqlInputFromSQL.style.width = "100%";
-    const defaultReset = "/*\n\tDrawio default value\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\nCREATE TABLE Persons\n(\n    PersonID int NOT NULL,\n    LastName varchar(255),\n    " +
+    const defaultReset = `/*\n\tDrawio default value\n\tPlugin: sql\n\tVersion: ${pluginVersion}\n*/\n\nCREATE TABLE Persons\n(\n    PersonID int NOT NULL,\n    LastName varchar(255),\n    " +
     "FirstName varchar(255),\n    Address varchar(255),\n    City varchar(255),\n    Primary Key(PersonID)\n);\n\n" + 
     "CREATE TABLE Orders\n(\n    OrderID int NOT NULL PRIMARY KEY,\n    PersonID int NOT NULL,\n    FOREIGN KEY ([PersonID]) REFERENCES [Persons]([PersonID])" +
-    "\n);";
+    "\n);`;
 
     sqlInputFromSQL.value = defaultReset;
     mxUtils.br(divFromSQL);
@@ -639,7 +640,7 @@ Draw.loadPlugin(function(ui) {
             ui.menus.addMenuItems(menu, ["fromSql"], parent);
         };
     }
-    if(theMenuExportAs && theMenuExportAs.enabled) {
+    if(theMenuExportAs && !window.VsCodeApi) {
         var oldMenuExportAs = theMenuExportAs.funct;
 
         theMenuExportAs.funct = function(...args) {

diff --git a/src/types/drawio-types.d.ts b/src/types/drawio-types.d.ts
@@ -3,6 +3,10 @@ declare const Draw: {
     loadPlugin(handler: (ui: DrawioUI) => void): void;
 };
 
+interface Customwindow extends Window {
+    VsCodeApi: any | undefined;
+}
+
 declare const log: any;
 declare class mxCellHighlight {
     constructor(graph: DrawioGraph, color: string, arg: number);