@gravitee/ui-components 3.24.3-migrate-codemirror-bed237b → 3.24.3-migrate-codemirror-b21f678

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravitee/ui-components",
-  "version": "3.24.3-migrate-codemirror-bed237b",
+  "version": "3.24.3-migrate-codemirror-b21f678",
   "description": "Gravitee.io UI Components library, based on Web Components",
   "repository": {
     "type": "git",
@@ -99,7 +99,6 @@
     "babel-plugin-template-html-minifier": "4.1.0",
     "bundle-phobia-cli": "0.14.13",
     "chromatic": "6.1.0",
-    "codemirror-asciidoc": "1.0.4",
     "danger": "10.7.1",
     "del": "6.0.0",
     "eslint": "8.4.0",
@@ -146,7 +145,6 @@
     "@highcharts/map-collection": "^1.0.0",
     "asciidoctor": "^2.2.4",
     "asciidoctor-highlight.js": "^0.3.0 || ^0.4.0",
-    "codemirror-asciidoc": "^1.0.4",
     "highcharts": "^8.0.0 || ^9.0.0",
     "highlight.js": "^10.7.0 || ^11.1.0"
   },
@@ -163,9 +161,6 @@
     "asciidoctor-highlight.js": {
       "optional": true
     },
-    "codemirror-asciidoc": {
-      "optional": true
-    },
     "highcharts": {
       "optional": true
     },

package/src/molecules/gv-code.js

@@ -15,17 +15,17 @@
  */
 import { css, LitElement, html } from 'lit';
 
-import { shapeClipboard, shapeCopied } from '../styles/shapes';
-import { dispatchCustomEvent } from '../lib/events';
-import { uuid } from '../lib/utils';
-import { classMap } from 'lit-html/directives/class-map';
-
 import { EditorView, basicSetup } from '@codemirror/basic-setup';
 import { EditorState, Compartment } from '@codemirror/state';
 import { autocompletion } from '@codemirror/autocomplete';
 import { json } from '@codemirror/lang-json';
 import { languages } from '@codemirror/language-data';
 import { placeholder } from '@codemirror/view';
+
+import { shapeClipboard, shapeCopied } from '../styles/shapes';
+import { dispatchCustomEvent } from '../lib/events';
+import { uuid } from '../lib/utils';
+import { classMap } from 'lit-html/directives/class-map';
 import { InputElement } from '../mixins/input-element';
 import { i18n } from '../lib/i18n';
 import { skeleton } from '../styles/skeleton';

package/src/molecules/gv-expression-language.js

@@ -78,7 +78,7 @@ export class GvExpressionLanguage extends GvCode {
   }
 
   buildMethods(type) {
-    const modelType = this._getModelType(type);
+    const modelType = this.getModelType(type);
     return modelType.methods.map(({ name, params = [], returnType }) => {
       const command = `${name}()`;
       const displayParams = params.map((p) => `${p.type} ${p.name}`);
@@ -134,7 +134,6 @@ export class GvExpressionLanguage extends GvCode {
     if (type) {
       const lowerType = type.toLowerCase();
       if (lowerType === 'string') {
-        // class, constant, enum, function, interface, keyword, method, namespace, property, text, type, and variable.
         return 'text';
       } else if (lowerType === 'httpheaders' || lowerType === 'multivaluemap') {
         return 'type';
@@ -159,7 +158,6 @@ export class GvExpressionLanguage extends GvCode {
             .filter((command) => !command.startsWith('_') && command.startsWith(prefix))
             .map((command) => {
               return {
-                // class, constant, enum, function, interface, keyword, method, namespace, property, text, type, and variable.
                 type: 'variable',
                 command,
                 apply: command,
@@ -176,11 +174,10 @@ export class GvExpressionLanguage extends GvCode {
           const tokens = match.text.split('.');
           const key = tokens[0].replaceAll('{#', '');
           const prefix = tokens[1];
-          const candidate = this.grammar[key][prefix];
+          let candidate = this.grammar[key][prefix];
           let options = [];
           let from = completionContext.pos;
           if (candidate) {
-            // const modelType = this._getModelType(candidate._type);
             if (this.isMap(candidate._type)) {
               options = this.getEnum(candidate._type).map((value) => {
                 const type = this.convertType(candidate._type);
@@ -195,7 +192,7 @@ export class GvExpressionLanguage extends GvCode {
             }
           } else {
             from -= prefix.length;
-            const candidate = this.grammar[key];
+            candidate = this.grammar[key];
             if (candidate._type) {
               options = this.buildMethods(candidate._type);
             } else {
@@ -224,16 +221,16 @@ export class GvExpressionLanguage extends GvCode {
           let options = [];
           let from = completionContext.pos;
           if (candidate) {
-            if (this._isMap(candidate._type)) {
-              options = this._getEnum(candidate._type)
+            if (this.isMap(candidate._type)) {
+              options = this.getEnum(candidate._type)
                 .filter((command) => !command.startsWith('_') && command.startsWith(prefix))
                 .map((label) => {
-                  const type = this._convertType(candidate._type);
+                  const type = this.convertType(candidate._type);
                   return {
                     type,
                     command: `['${label}'][0]`,
                     apply(view, completion, _from, to) {
-                      const from = _from - prefix.length - 1;
+                      from = _from - prefix.length - 1;
                       view.dispatch({
                         changes: { from, to, insert: completion.command },
                         selection: { anchor: from + completion.command.length },
@@ -246,14 +243,14 @@ export class GvExpressionLanguage extends GvCode {
                 });
             } else {
               if (candidate._type) {
-                options = this._buildMethods(candidate._type);
+                options = this.buildMethods(candidate._type);
               } else {
                 from -= prefix.length;
                 options = Object.keys(candidate)
                   .filter((command) => command.startsWith(prefix))
                   .map((command) => {
                     return {
-                      type: this._convertType(candidate[command]._type),
+                      type: this.convertType(candidate[command]._type),
                       command,
                       apply: command,
                       label: command,