Skip to content

Commit 2f42fa1

Browse files
authored
Merge pull request #31 from funktechno/f/split_nosql
F/split nosql for clean open api only
2 parents 9c251a3 + 4e11033 commit 2f42fa1

File tree

11 files changed

+203526
-197382
lines changed

11 files changed

+203526
-197382
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@ jobs:
1919
node-version: current
2020
- run: npm ci
2121
- run: npm test
22-
- run: npm run build:client
23-
- run: npm run build:client:nosql
24-
- run: npm run build:client:nosql:min
22+
- run: npm run build:client:all

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
* see https://github.com/ariel-bentu/tam-drawio for multiple install options
77
* download plugin file
88
* [sql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/sql.js) - import/export SQL DLLS
9-
* [nosql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.js) - import/export typescript interfaces and openapi jsons (NOT vscode compatible)
9+
* [nosql.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.js) - import/export openapi jsons
1010
* or [nosql.min.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql.min.js)
11+
* you can then use the openapi.json spec to generate classes/interfaces in the language of your choosing
12+
* [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)
13+
* or [nosql-ts.min.js](https://raw.githubusercontent.com/funktechno/sqltooling-drawio/main/dist/nosql-ts.min.js)
1114
* or clone project `git clone --branch main git@github.com:funktechno/sqltooling-drawio.git` and check `dist folder`
1215
* vscode [Draw.io Integration](https://marketplace.visualstudio.com/items?itemName=hediet.vscode-drawio)
1316
* settings.json
@@ -16,6 +19,9 @@
1619
{
1720
"file": "xxx\\sqltooling-drawio\\dist\\sql.js"
1821
},
22+
{
23+
"file": "xxx\\sqltooling-drawio\\dist\\nosql.js"
24+
},
1925
```
2026

2127
## Examples

dist/nosql-ts.js

Lines changed: 201688 additions & 0 deletions
Large diffs are not rendered by default.

dist/nosql-ts.min.js

Lines changed: 449 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/nosql.js

Lines changed: 423 additions & 196683 deletions
Large diffs are not rendered by default.

dist/nosql.min.js

Lines changed: 3 additions & 381 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/sql.js

Lines changed: 281 additions & 248 deletions
Large diffs are not rendered by default.

gulpfile.ts

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import gutil from "gulp-util";
99
import uglify from "gulp-uglify";
1010
import rename from "gulp-rename";
1111

12-
gulp.task("default", () => {
12+
gulp.task("nosql-min", () => {
1313
return browserify({
1414
basedir: ".",
1515
debug: true,
@@ -32,3 +32,27 @@ gulp.task("default", () => {
3232
// .pipe(sourcemaps.write("./", {}))
3333
.pipe(gulp.dest("dist")); // Output directory
3434
});
35+
36+
gulp.task("nosql-ts-min", () => {
37+
return browserify({
38+
basedir: ".",
39+
debug: true,
40+
entries: ["src/nosql-ts.ts"], // Your entry point(s)
41+
cache: {},
42+
packageCache: {}
43+
})
44+
.plugin("tsify", { target: "es2016"}) // TypeScript plugin
45+
.transform(babelify.configure({
46+
presets: ["es2015"]
47+
}))
48+
// .transform(babelify, { presets: ["@babel/preset-env"], extensions: [".ts"] }) // Babelify with ES6+ presets
49+
.bundle()
50+
.pipe(source("nosql-ts.js")) // Output filename
51+
.pipe(buffer())
52+
.pipe(sourcemaps.init({ loadMaps: true }))
53+
.pipe(uglify()) // Minify (optional)
54+
.pipe(rename({ suffix: ".min" })) // Add ".min" to the filename
55+
.on("error", gutil.log)
56+
// .pipe(sourcemaps.write("./", {}))
57+
.pipe(gulp.dest("dist")); // Output directory
58+
});

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sqltooling-drawio",
3-
"version": "0.0.3",
3+
"version": "0.0.4",
44
"description": "plugins for sql tooling in drawio",
55
"main": "index.js",
66
"engines": {
@@ -17,10 +17,13 @@
1717
"build": "tsc && npm run build:types",
1818
"build:types": "tsc -p tsconfig.json",
1919
"build:help": "tsc --help",
20-
"build:client": "npm run mkdir:dist && browserify src/sql.ts -p [ tsify --noImplicitAny ] > dist/sql.js && npm run updateVersion:dist",
21-
"build:client:nosql": "npm run mkdir:dist && browserify src/nosql.ts -p [ tsify --noImplicitAny ] > dist/nosql.js && npm run updateVersion:dist",
20+
"build:client:sql": "browserify src/sql.ts -p [ tsify --noImplicitAny ] > dist/sql.js",
21+
"build:client:nosql": "browserify src/nosql.ts -p [ tsify --noImplicitAny ] > dist/nosql.js",
2222
"build:client:nosql:manual": "browserify src/nosql.ts -p [ tsify --noImplicitAny ] > \"absolutePath\\drawio-desktop\\drawio\\src\\main\\webapp\\plugins\\sql.js\"",
23-
"build:client:nosql:min": "npm run mkdir:dist && gulp && npm run updateVersion:dist",
23+
"build:client:nosql:min": "gulp nosql-min",
24+
"build:client:nosql-ts": "browserify src/nosql-ts.ts -p [ tsify --noImplicitAny ] > dist/nosql-ts.js",
25+
"build:client:nosql-ts:min": "gulp nosql-ts-min",
26+
"build:client:all": "npm run mkdir:dist && npm run build:client:sql && npm run build:client:nosql && npm run build:client:nosql:min && npm run build:client:nosql-ts && npm run build:client:nosql-ts:min && npm run updateVersion:dist",
2427
"mkdir:dist": "node ./build/createDistFolder.js",
2528
"updateVersion:dist": "node ./build/updateVersion.js"
2629
},

0 commit comments

Comments
 (0)