Merge pull request #67 from funktechno/dev

update main for release v0.0.7

Author: lastlink

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,6 +10,9 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
+**Notify authors**
+* @lastlink
+
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,6 +7,9 @@ assignees: ''
 
 ---
 
+**Notify authors**
+* @lastlink
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v3
         with:
-          node-version: current
+          node-version: 22
       - run: npm ci
       - run: npm run lint
       - run: npm test

README.md

@@ -1,34 +1,134 @@
-# sqltooling-drawio
-* 3rd party plugins for sql tooling in drawio
-* contributions welcome
-
-## Getting Started
-* see https://github.com/ariel-bentu/tam-drawio for multiple install options
-* download plugin file
-    * [sql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/sql.js) - import/export SQL DLLS
-    * [nosql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.js) - import/export openapi jsons
-      * or [nosql.min.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.min.js)
-      * you can then use the openapi.json spec to generate classes/interfaces in the language of your choosing
-    * [nosql-ts.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql-ts.js) - import/export typescript interfaces and openapi jsons (NOT vscode compatible)
-      * or [nosql-ts.min.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql-ts.min.js)
-    * or clone project `git clone --branch main git@github.com:funktechno/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": [
+# SQL Tooling for Draw.io
+
+Third-party plugins for SQL tooling in Draw.io. Contributions are welcome!
+
+## Overview
+
+This project provides plugins that extend Draw.io with SQL and NoSQL capabilities, allowing you to:
+- Import/export SQL DDLs
+- Import/export OpenAPI JSONs
+- Generate TypeScript interfaces
+- Work with various database schemas
+
+## Download
+
+### Option 1: Direct Download
+
+Download the plugin files directly from the [releases page](https://github.com/funktechno/sqltooling-drawio/releases) or use the direct links below:
+
+- **[sql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/sql.js)** - Import/export SQL DDLs
+- **[nosql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.js)** - Import/export OpenAPI JSONs
+  - Alternative: [nosql.min.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.min.js) (minified version)
+- **[nosql-ts.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql-ts.js)** - Import/export TypeScript interfaces and OpenAPI JSONs
+  - Alternative: [nosql-ts.min.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql-ts.min.js) (minified version)
+  - ⚠️ **Note**: Not VSCode compatible
+
+### Option 2: Clone Repository
+
+```bash
+git clone --branch main git@github.com:funktechno/sqltooling-drawio.git
+```
+
+Then use the files from the `dist` folder.
+
+## Installation
+
+### VSCode Integration
+
+For VSCode users with the [Draw.io Integration](https://marketplace.visualstudio.com/items?itemName=hediet.vscode-drawio) extension:
+
+1. Download the plugin files from the [Download](#download) section above
+2. Add to your `settings.json`:
+
+```json
+{
+  "hediet.vscode-drawio.plugins": [
     {
-      "file": "xxx\\sqltooling-drawio\\dist\\sql.js"
+      "file": "path\\to\\sqltooling-drawio\\dist\\sql.js"
     },
     {
-      "file": "xxx\\sqltooling-drawio\\dist\\nosql.js"
-    },
-    ```
+      "file": "path\\to\\sqltooling-drawio\\dist\\nosql.js"
+    }
+  ]
+}
+```
+
+### Desktop App Integration
+
+It's easiest to setup in the Draw.io Desktop to use the plugin. Follow these steps:
+
+#### Prerequisites
+- Download and install [Node.js](https://nodejs.org/)
+
+#### Setup Steps
+
+1. **Clone or Download Draw.io Desktop**
+   - **Option A (Git Clone)**: `git clone --recursive https://github.com/jgraph/drawio-desktop.git` (1 GB clone)
+   - **Option B (Download ZIP)**: Download from [dev.zip](https://github.com/jgraph/drawio-desktop/archive/refs/heads/dev.zip) and unzip
+   - ⚠️ **Note**: Don't download precompiled from Releases as you can't modify the plugins
+
+2. **Install Dependencies**
+   - Open command line (PowerShell, Command Prompt, Bash, Terminal)
+   - Navigate to the drawio-desktop folder: `cd <path>/drawio-desktop`
+   - Run: `npm install`
+
+3. **Update SQL Plugin**
+   - Update `drawio/src/main/webapp/plugins/sql.js` with changes from [this branch](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/sql.js)
+
+4. **Run Application**
+   - Execute: `npm start`
+
+5. **Add Plugin**
+   - In the running application, go to **Extras** → **Plugins** → **Add**
+   - Select `sql` plugin
+   - Close application and reopen
+   - Plugin is now installed and ready to use
+
+## Features
+
+### SQL Plugin (`sql.js`)
+- Import SQL DDLs into Draw.io diagrams
+- Export diagrams as SQL DDLs
+- Database schema visualization
+
+### NoSQL Plugin (`nosql.js`)
+- Import/export OpenAPI JSON specifications
+- Generate classes/interfaces in your preferred language using OpenAPI specs
+- API documentation visualization
+
+### TypeScript Plugin (`nosql-ts.js`)
+- Import/export TypeScript interfaces
+- Import/export OpenAPI JSONs
+- Type-safe development workflows
 
 ## Examples
-* ![menu_from_sql](./assets/menu_from_sql.png)
-* ![menu_from_sql](./assets/menu_export_as_to_sql.png)
+
+### SQL Import/Export
+![SQL Import Menu](./assets/menu_from_sql.png)
+
+### Export Options
+![Export Menu](./assets/menu_export_as_to_sql.png)
 
 ## Development
-* `npm install`
-* `npm build:client` to update `dist/sql.js`
-* `npm build:client:nosql` to update `dist/nosql.js`
+
+### Prerequisites
+- Node.js
+- npm
+
+### Setup
+```bash
+npm install
+```
+
+### Build Commands
+- `npm run build:client:sql` - Update `dist/sql.js`
+- `npm run build:client:nosql` - Update `dist/nosql.js`
+- `npm run build:client:all` - Update all files in `dist/*`
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit issues and pull requests.
+
+## License
+
+See [LICENSE](LICENSE) file for details.

build/updateVersion.js

@@ -6,21 +6,37 @@ const files = fs.readdirSync(directoryPath);
 console.log("Files in the directory:", files);
 
 const oldText = "<VERSION>";
-const newText = package.VERSION;
+const version = package.version;
 
-console.log("Updating to version " + package.version);
+console.log("Updating to version " + version);
+
+// Get current daytime in ISO format 2025-10-24
+const timestamp = new Date().toISOString().split('T')[0];
 
 files.forEach((file) => {
     const filePath = `${directoryPath}/${file}`;
     let content = fs.readFileSync(filePath, "utf8");
     let updated = false;
     while(content.includes(oldText)) {
         updated = true
-        content = content.replace(oldText, package.version);
+        content = content.replace(oldText, version);
     }
     if(updated) {
         // content = content.replace(new RegExp(oldText, "g"), newText);
         fs.writeFileSync(filePath, content, "utf8");
         console.log(`Replaced text in ${file}`);
+    } 
+    // Minified files won't have the placeholder in a readable format, so we them to first line
+    // also check that the version is not already there
+    const banner = `/**\n` +
+                ` * File: ${file}\n` +
+                ` * Version: ${version}\n` +
+                ` * Generated: ${timestamp}\n` +
+                ` */\n`;
+    if(content.startsWith(banner)) {
+        return;
     }
+    content = banner + content
+    fs.writeFileSync(filePath, content, "utf8");
+    console.log(`Added banner to ${file}`);
 });

dist/nosql-ts.js

@@ -1,3 +1,8 @@
+/**
+ * File: nosql-ts.js
+ * Version: 0.0.7
+ * Generated: 2025-10-24
+ */
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 
 },{}],2:[function(require,module,exports){
@@ -8300,7 +8305,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = "5.5.2";
+var version = "5.5.3";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -58746,7 +58751,7 @@ function createTypeChecker(host) {
         }
         if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
-          const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
+          const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l) || isJSDocImportTag(l));
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !hasResolutionModeOverride(overrideHost)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error2(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -129534,7 +129539,7 @@ function getModeForUsageLocation(file, usage, compilerOptions) {
 }
 function getModeForUsageLocationWorker(file, usage, compilerOptions) {
   var _a;
-  if (isImportDeclaration(usage.parent) || isExportDeclaration(usage.parent)) {
+  if (isImportDeclaration(usage.parent) || isExportDeclaration(usage.parent) || isJSDocImportTag(usage.parent)) {
     const isTypeOnly = isExclusivelyTypeOnlyImportOrExport(usage.parent);
     if (isTypeOnly) {
       const override = getResolutionModeOverride(usage.parent.attributes);
@@ -200856,7 +200861,7 @@ const nosqlUtils_1 = require("./utils/nosqlUtils");
 const constants_nosql_1 = require("./utils/constants-nosql");
 /**
  * SQL Tools Plugin for importing and exporting typescript interfaces.
- * Version: 0.0.6
+ * Version: 0.0.7
  */
 Draw.loadPlugin(function (ui) {
     //Create Base div
@@ -201187,7 +201192,7 @@ exports.validJSONSchemaTypes = JSONSchemaTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectKeyword = exports.arrayKeyword = exports.nullableKeyword = exports.enumKeyword = exports.formatKeyword = exports.commentColumnQuantifiers = exports.pluginVersion = void 0;
 // export sql methods
-exports.pluginVersion = "0.0.6";
+exports.pluginVersion = "0.0.7";
 exports.commentColumnQuantifiers = {
     Start: "/**",
     End: "*/",
@@ -201675,7 +201680,7 @@ function dbTypeEnds(label) {
  * @returns
  */
 function RemoveNameQuantifiers(name) {
-    return name.replace(/\[|\]|\(|\"|\'|\`/g, "").trim();
+    return name.replace(/\[|\]|\(|\)|\"|\'|\`/g, "").trim();
 }
 /**
  * extract row column attributes
@@ -201691,11 +201696,18 @@ function getDbLabel(label, columnQuantifiers) {
         result.indexOf(columnQuantifiers.End + " ") !== -1
         ? result.indexOf(columnQuantifiers.End + " ")
         : result.indexOf(" ");
-    const attributeType = result.substring(firstSpaceIndex + 1).trim();
+    let attributeType = result.substring(firstSpaceIndex + 1).trim();
     const attributeName = RemoveNameQuantifiers(result.substring(0, firstSpaceIndex + 1));
+    const attributesTypes = attributeType.split(" ");
+    let attributeComment = null;
+    if (attributesTypes.length > 1) {
+        attributeComment = attributesTypes.slice(1).join(' ');
+        attributeType = attributesTypes[0];
+    }
     const attribute = {
         attributeName,
         attributeType,
+        attributeComment,
     };
     return attribute;
 }
@@ -202099,18 +202111,18 @@ function CreateTableUI(ui, wndFromInput, tableList, cells, rowCell, tableCell, f
         // add foreign key edges
         const model = graph.getModel();
         const columnQuantifiers = GetColumnQuantifiers(type);
+        const insertEdge = mxUtils.bind(this, function (targetCell, sourceCell, edge) {
+            const label = "";
+            const edgeStyle = "edgeStyle=entityRelationEdgeStyle;html=1;endArrow=ERzeroToMany;startArrow=ERzeroToOne;labelBackgroundColor=none;fontFamily=Verdana;fontSize=14;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=-0.018;entryY=0.608;entryDx=0;entryDy=0;entryPerimeter=0;";
+            const edgeCell = graph.insertEdge(null, null, label || "", edge.invert ? sourceCell : targetCell, edge.invert ? targetCell : sourceCell, edgeStyle);
+        });
         // const pt = graph.getFreeInsertPoint();
         foreignKeyList.forEach(function (fk) {
             if (fk.IsDestination &&
                 fk.PrimaryKeyName &&
                 fk.ReferencesPropertyName &&
                 fk.PrimaryKeyTableName &&
                 fk.ReferencesTableName) {
-                const insertEdge = mxUtils.bind(this, function (targetCell, sourceCell, edge) {
-                    const label = "";
-                    const edgeStyle = "edgeStyle=entityRelationEdgeStyle;html=1;endArrow=ERzeroToMany;startArrow=ERzeroToOne;labelBackgroundColor=none;fontFamily=Verdana;fontSize=14;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=-0.018;entryY=0.608;entryDx=0;entryDy=0;entryPerimeter=0;";
-                    const edgeCell = graph.insertEdge(null, null, label || "", edge.invert ? sourceCell : targetCell, edge.invert ? targetCell : sourceCell, edgeStyle);
-                });
                 const edge = {
                     invert: true,
                 };
@@ -202139,13 +202151,13 @@ function CreateTableUI(ui, wndFromInput, tableList, cells, rowCell, tableCell, f
                                             col.style.trim().startsWith("shape=partialRectangle")) {
                                             const attribute = getDbLabel(col.value, columnQuantifiers);
                                             if (isPrimaryTable &&
-                                                dbTypeEnds(attribute.attributeName) == fk.PrimaryKeyName) {
+                                                RemoveNameQuantifiers(attribute.attributeName) == RemoveNameQuantifiers(fk.PrimaryKeyName)) {
                                                 targetCell = col;
                                                 // allow recursion
                                             }
                                             if (isForeignTable &&
-                                                dbTypeEnds(attribute.attributeName) ==
-                                                    fk.ReferencesPropertyName) {
+                                                RemoveNameQuantifiers(attribute.attributeName) ==
+                                                    RemoveNameQuantifiers(fk.ReferencesPropertyName)) {
                                                 sourceCell = col;
                                             }
                                             if (targetCell && sourceCell)