@hpcc-js/codemirror 2.64.0 → 3.2.0

package/package.json

@@ -1,49 +1,47 @@
 {
     "name": "@hpcc-js/codemirror",
-    "version": "2.64.0",
+    "version": "3.2.0",
     "description": "hpcc-js - Viz Code Mirror",
-    "main": "dist/index.js",
-    "module": "dist/index.es6",
-    "unpkg": "dist/index.min.js",
-    "jsdelivr": "dist/index.min.js",
-    "types": "types/index.d.ts",
-    "typesVersions": {
-        "<3.8": {
-            "*": [
-                "types-3.4/index.d.ts"
-            ]
-        }
+    "type": "module",
+    "main": "./dist/index.umd.cjs",
+    "module": "./dist/index.js",
+    "exports": {
+        ".": {
+            "types": "./types/index.d.ts",
+            "import": "./dist/index.js",
+            "require": "./dist/index.umd.cjs"
+        },
+        "./dist/*": "./dist/*"
     },
+    "browser": "./dist/index.umd.cjs",
+    "types": "./types/index.d.ts",
     "files": [
         "dist/*",
-        "types/*",
-        "types-3.4/*",
-        "src/*"
+        "src/*",
+        "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo",
-        "compile-es6": "tsc --module es6 --outDir ./lib-es6",
-        "compile-es6-watch": "npm run compile-es6 -- -w",
-        "compile-umd": "tsc --module umd --outDir ./lib-umd",
-        "compile-umd-watch": "npm run compile-umd -- -w",
-        "bundle": "rollup -c",
-        "bundle-watch": "npm run bundle -- -w",
-        "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js",
-        "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
-        "build": "npm run compile-es6 && npm run bundle",
-        "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
+        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "bundle": "vite build",
+        "bundle-watch": "vite --port 5501",
+        "gen-types": "tsc --project tsconfig.json",
+        "gen-types-watch": "npm run gen-types -- --watch",
+        "build": "run-p gen-types bundle",
         "lint": "eslint ./src",
+        "lint-fix": "eslint --fix src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
-        "update": "npx --yes npm-check-updates -u -t minor"
+        "test-browser": "vitest run --project browser",
+        "test": "vitest run",
+        "coverage": "vitest run --coverage",
+        "update": "npx --yes npm-check-updates -u -t minor",
+        "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/common": "^2.73.0"
+        "@hpcc-js/common": "^3.3.0"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.12.0",
-        "@hpcc-js/codemirror-shim": "^2.37.0",
-        "tslib": "2.7.0"
+        "@hpcc-js/esbuild-plugins": "^1.4.0",
+        "codemirror": "5.65.18"
     },
     "repository": {
         "type": "git",
@@ -56,5 +54,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "fbbef050700b0e9d76ef99714856383d95155149"
+    "gitHead": "145a4d4c8189c70f08e9804e63959d6dd398bd9f"
 }

package/src/CSSEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class CSSEditor extends Editor {
     options(): any {

package/src/DOTEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class DOTEditor extends Editor {
     options(): any {
@@ -17,4 +17,4 @@ export class DOTEditor extends Editor {
     }
 
 }
-DOTEditor.prototype._class += " codemirror_JSEditor";
+DOTEditor.prototype._class += " codemirror_DOTEditor";

package/src/ECLEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 import "../src/ECLEditor.css";
 

package/src/Editor.css

@@ -3,23 +3,28 @@
     border-width: 1px;
     border-color: lightgray;
 }
-.codemirror_Editor .cm-marked-text{
+
+.codemirror_Editor .cm-marked-text {
     background-color: yellow;
 }
+
 .codemirror_Editor .cm-marked-info,
 .codemirror_Editor .cm-marked-error,
-.codemirror_Editor .cm-marked-warning{
+.codemirror_Editor .cm-marked-warning {
     display: inline-block;
     position: relative;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
+
 .codemirror_Editor .cm-marked-info {
     background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHElEQVQYV2NkgIP//xkYGBkZIXwIB0SDCQgHAgDEXAgCKU2DPwAAAABJRU5ErkJggg==");
 }
-.codemirror_Editor .cm-marked-error{
+
+.codemirror_Editor .cm-marked-error {
     background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHUlEQVQYV2NkgIL/DAz/GRkYGBlBfBgHTMM4MJUAzFoIAuwf4BEAAAAASUVORK5CYII=");
 }
+
 .codemirror_Editor .cm-marked-warning {
     background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAHUlEQVQYV2NkgIL/Sxn+M0YzMDKC+DAOmIZxYCoBKQkLp8ga+UwAAAAASUVORK5CYII=");
 }

package/src/Editor.ts

@@ -1,4 +1,4 @@
-import { CodeMirror } from "@hpcc-js/codemirror-shim";
+import { CodeMirror } from "./codemirror-shim.ts";
 import { HTMLWidget, Palette } from "@hpcc-js/common";
 
 import "../src/Editor.css";

package/src/HTMLEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class HTMLEditor extends Editor {
     options(): any {

package/src/JSEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class JSEditor extends Editor {
     options(): any {

package/src/JSONEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class JSONEditor extends Editor {
     options(): any {

package/src/MarkdownEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class MarkdownEditor extends Editor {
     options(): any {

package/src/ObservableMarkdownEditor.ts

@@ -1,4 +1,4 @@
-import { MarkdownEditor } from "./MarkdownEditor";
+import { MarkdownEditor } from "./MarkdownEditor.ts";
 
 export class ObservableMarkdownEditor extends MarkdownEditor {
     options(): any {

package/src/SQLEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class SQLEditor extends Editor {
     options(): any {

package/src/XMLEditor.ts

@@ -1,4 +1,4 @@
-import { Editor } from "./Editor";
+import { Editor } from "./Editor.ts";
 
 export class XMLEditor extends Editor {
     options(): any {

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/codemirror";
-export const PKG_VERSION = "2.64.0";
-export const BUILD_VERSION = "2.107.0";
+export const PKG_VERSION = "3.1.0";
+export const BUILD_VERSION = "3.2.1";

package/src/codemirror-shim.ts

@@ -0,0 +1,32 @@
+import "codemirror/mode/css/css.js";
+import "codemirror/mode/ecl/ecl.js";
+import "codemirror/mode/gfm/gfm.js";
+import "codemirror/mode/htmlmixed/htmlmixed.js";
+import "codemirror/mode/javascript/javascript.js";
+import "codemirror/mode/xml/xml.js";
+import "codemirror/mode/sql/sql.js";
+import "./mode/dot/dot.ts";
+import "./mode/markdown/markdown.ts";
+
+import "codemirror/lib/codemirror.css";
+
+import "codemirror/addon/fold/brace-fold.js";
+import "codemirror/addon/fold/comment-fold.js";
+import "codemirror/addon/fold/foldcode.js";
+import "codemirror/addon/fold/foldgutter.js";
+import "codemirror/addon/fold/indent-fold.js";
+import "codemirror/addon/fold/xml-fold.js";
+
+import "codemirror/addon/fold/foldgutter.css";
+
+import "codemirror/addon/dialog/dialog.js";
+import "codemirror/addon/search/jump-to-line.js";
+import "codemirror/addon/search/search.js";
+import "codemirror/addon/search/searchcursor.js";
+import "codemirror/addon/hint/show-hint.js";
+
+import "codemirror/addon/dialog/dialog.css";
+import "codemirror/addon/hint/show-hint.css";
+
+import CodeMirror from "codemirror";
+export { CodeMirror };

package/src/index.ts

@@ -1,12 +1,13 @@
-export * from "./__package__";
-export * from "./CSSEditor";
-export * from "./DOTEditor";
-export * from "./ECLEditor";
-export * from "./Editor";
-export * from "./HTMLEditor";
-export * from "./JSEditor";
-export * from "./JSONEditor";
-export * from "./MarkdownEditor";
-export * from "./ObservableMarkdownEditor";
-export * from "./XMLEditor";
-export * from "./SQLEditor";
+export * from "./__package__.ts";
+
+export * from "./CSSEditor.ts";
+export * from "./DOTEditor.ts";
+export * from "./ECLEditor.ts";
+export * from "./Editor.ts";
+export * from "./HTMLEditor.ts";
+export * from "./JSEditor.ts";
+export * from "./JSONEditor.ts";
+export * from "./MarkdownEditor.ts";
+export * from "./ObservableMarkdownEditor.ts";
+export * from "./XMLEditor.ts";
+export * from "./SQLEditor.ts";

package/src/mode/dot/dot.ts

@@ -0,0 +1,94 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Orig source from:  https://raw.githubusercontent.com/inaimathi/CodeMirror/dot-mode/mode/dot/dot.js
+
+/* eslint-disable */
+
+import CodeMirror from "codemirror";
+
+CodeMirror.defineMode("dot", function (config) {
+    const ops = /--|->|=|;/;
+    const brackets = /[\[\]{}]/;
+    return {
+        startState() {
+            return { indent_level: 0 };
+        },
+
+        token(stream, state) {
+            stream.eatSpace();
+
+            switch (state.looking_for) {
+                case "multiline-comment":
+                    if (stream.match(/.*\*\//)) {
+                        state.looking_for = null;
+                    } else {
+                        stream.skipToEnd();
+                    }
+                    return "comment";
+                case "property":
+                    if (stream.match("=")) {
+                        return "variable-3";
+                    } else {
+                        stream.match(/\w+/);
+                        state.looking_for = null;
+                        return "string-2";
+                    }
+                case "graphname":
+                    state.looking_for = null;
+                    if (stream.match(/{\W*$/)) {
+                        state.indent_level += 1;
+                        return "bracket";
+                    } else if (stream.match("{")) {
+                        return "bracket";
+                    } else if (stream.match(/[^\W]+/)) {
+                        return "variable-2";
+                    }
+                default:
+                    if (stream.match(/{\W*$/)) {
+                        state.indent_level += 1;
+                        return "bracket";
+                    } else if (stream.match(/}\W*$/)) {
+                        state.indent_level -= 1;
+                        return "bracket";
+                    } else if (stream.match(brackets)) {
+                        return "bracket";
+                    } else if (stream.match(/".*"/)) {
+                        return "string";
+                    } else if (stream.match(/\w+=[\"\w]+/, false)) {
+                        state.looking_for = "property";
+                        stream.match(/[^=]+/);
+                        return "attribute";
+                    } else if (stream.match(ops)) {
+                        return "variable-3";
+                    } else if (stream.match(/(di)?graph[^{\w]+/)) {
+                        state.looking_for = "graphname";
+                        return "keyword";
+                    } else if (stream.match(/\/\/|#/)) {
+                        stream.skipToEnd();
+                        return "comment";
+                    } else if (stream.match(/\/\*.*\*\//)) {
+                        return "comment";
+                    } else if (stream.match("/*")) {
+                        state.looking_for = "multiline-comment";
+                        return "comment";
+                    } else if (stream.match(/\w+/)) {
+                        return "variable";
+                    } else {
+                        stream.skipToEnd();
+                        return "variable";
+                    }
+            }
+        },
+
+        indent(state, _textAfter) {
+            return state.indent_level * (config.indentUnit || 2);
+        },
+
+        closeBrackets: { pairs: "[]{}\"\"" },
+        lineComment: /(\/\/|#)/,
+        blockCommentStart: "/*",
+        blockCommentEnd: "*/"
+    };
+});
+
+CodeMirror.defineMIME("text/x-dot", "dot");