From b2a65b7a30af2ef75b5009897fb2a89d318c9889 Mon Sep 17 00:00:00 2001
From: madgaksha <sensenmann5@gmail.com>
Date: Sat, 11 May 2019 22:13:39 +0200
Subject: [PATCH] update for monaco editor 0.17

---
 CHANGELOG.md                                  |   9 +-
 README.md                                     |   6 +-
 demo/package-lock.json                        |  21 ++
 demo/src/main/java/TestBean.java              |   9 +-
 demo/src/main/webapp/test.xhtml               |   7 +
 .../primefaces-blutorange/monacoEditor.html   |  10 +-
 pom.xml                                       |   2 +-
 src/main/js/widget.js                         |  26 ++-
 src/npm/descriptor/create.js                  |   6 +-
 src/npm/descriptor/util.js                    | 123 +++++++---
 src/npm/package-lock.json                     | 220 ++++++++++--------
 src/npm/package.json                          |   6 +-
 src/npm/primefaces-monaco.d.ts                |  12 +-
 13 files changed, 297 insertions(+), 160 deletions(-)
 create mode 100644 demo/package-lock.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27b5852..5e7ed4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,22 @@
 See also [the changelog of monaco-editor](https://github.com/Microsoft/monaco-editor/blob/master/CHANGELOG.md).
 
-# 0.17.0 (work in progress)
+# 0.17.0
 
-- update to PrimeFaces 7.0
-- update to monaco editor 0.16.2
+- update to PrimeFaces 7.0 (no guarantees it will work with PrimeFaces 6)
+- update to monaco editor 0.17.0
 - no more uses of `eval`.
 - due to the above: the property `extender` of the `monacoEditor` component, if given,
   must now be a valid JavaScript expression evaluating to an extender object. Loading the extender
   from an URL is not supported anymore. The recommended way is to define a factory function in
   an external file and call that.
 - client-side script `widget.js` now gets minified
+- add method `whenReady` to client-side widget
+- update npm and maven dependencies
 
 # 0.16.2
 
 - reuse model (`ITextModel`) if it exists already
 
-
 # 0.16.1
 
 - update to monaco editor 0.16.1 (solves an issue with IE)
diff --git a/README.md b/README.md
index 82206d4..3f8f0c1 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Make sure you're running at least PrimeFaces 7.0. Include this as a dependency:
         <dependency>
             <groupId>com.github.blutorange</groupId>
             <artifactId>primefaces.monaco</artifactId>
-            <version>0.16.2</version>
+            <version>0.17.0</version>
         </dependency>
     </dependencies>
 
@@ -385,8 +385,8 @@ is for this project.
 # Release
 
 * `mvn versions:display-dependency-updates`
-* Check for `TODO`s. (currently: `widget.js`)
-* Check `src/npm/descriptor/create.js` whether it reflects the current Monaco Editor API correctly.
+* Check for `TODO`s.
+* Check `src/npm/descriptor/create.js` whether it reflects the current Monaco Editor API.
 * Update version in `README.md` (installing)
 * Update version in `src/main/java/com/github/blutorange/primefaces/util/Constants.java`
 * Update version in `pom.xml`
diff --git a/demo/package-lock.json b/demo/package-lock.json
new file mode 100644
index 0000000..96be7cd
--- /dev/null
+++ b/demo/package-lock.json
@@ -0,0 +1,21 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@types/jquery": {
+      "version": "3.3.29",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz",
+      "integrity": "sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==",
+      "dev": true,
+      "requires": {
+        "@types/sizzle": "*"
+      }
+    },
+    "@types/sizzle": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
+      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
+      "dev": true
+    }
+  }
+}
diff --git a/demo/src/main/java/TestBean.java b/demo/src/main/java/TestBean.java
index 0fd6b46..db716f5 100644
--- a/demo/src/main/java/TestBean.java
+++ b/demo/src/main/java/TestBean.java
@@ -7,6 +7,9 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.stream.Collectors;
 
 @ManagedBean(name="testBean")
 @ViewScoped
@@ -21,12 +24,16 @@ public class TestBean implements Serializable {
     private void init() {
         uiLanguage = "en";
         theEnum = TheEnum.Foo;
-        code = "/**\n" + " * @param {number} x The first number.\n" + " * @param {number} y The second number.\n" + " * @return {number} The sum of the numbers\n" + " */\n" + "function testbar(x, y) {\n" + "\treturn x + y;\n" + "}\n" + "const z1 = testbar(5, 3);\n" + "const z2 = testbar(5, 3);\n" + "const z3 = testbar(5, 3);";
+        code = "/**\n" + " * @param {number} x The first number.\n" + " * @param {number} y The second number.\n" + " * @return {number} The sum of the numbers\n" + " */\n" + "function testbar(x, y) {\n" + "\treturn x + y;\n" + "}\n" + "const z1 = testbar(5, 3);\n" + "const z2 = testbar(5, 3);\n" + "const z3 = testbar(5, 3);\n\n$(\".acc\").accordion(\"refresh\");";
         editorOptions = new EditorOptions()
                 .setLanguage(ELanguage.JAVASCRIPT)
                 .setTheme(ETheme.VS)
+                .setSuggest(new EditorSuggestOptions()
+                    .addFilteredType("keyword", false)
+                )
                 .setLineNumbers(ELineNumbers.ON)
                 .setWordWrap(EWordWrap.ON)
+                .addRuler(60, 100)
                 .setFontSize(20);
     }
 
diff --git a/demo/src/main/webapp/test.xhtml b/demo/src/main/webapp/test.xhtml
index 3198e70..67f3ea6 100644
--- a/demo/src/main/webapp/test.xhtml
+++ b/demo/src/main/webapp/test.xhtml
@@ -44,5 +44,12 @@ http://primefaces.org/ui/extensions ">
             This is the east.
         </pe:layoutPane>
     </pe:layout>
+    <script>
+        $(() => {
+            const m = PF("monaco");
+            console.log("editor initialized: ", m.jq.data("initialized"));
+            m.whenReady().then(() => console.log("editor is ready", m.jq.data("initialized")));
+        });
+    </script>
 </h:body>
 </html>
diff --git a/docs/vdldoc/primefaces-blutorange/monacoEditor.html b/docs/vdldoc/primefaces-blutorange/monacoEditor.html
index 5a8f7e4..24a3d38 100644
--- a/docs/vdldoc/primefaces-blutorange/monacoEditor.html
+++ b/docs/vdldoc/primefaces-blutorange/monacoEditor.html
@@ -323,15 +323,9 @@ <h2 class="title">
                 <p>An extender object to further customize the monaco editor via JavaScript. This can be either:</p>
                 <ul>
                   <li>unset, in which case no further customization is performed</li>
-                  <li>a JavaScript expression that evaluates to an extender object</li>
-                  <li>a resource whose content evaluates to an extender object. The resource name is prefixed with
-                  the appropriate base URL (eg. <code>http://.../java.faces.resources/</code>). You need to append
-                  the <code>.xhtml</code> suffix yourself. If the resource is inside a resource library, specify the
-                  URL parameter <code>ln</code>, eg. <code>myextender.js.xhtml?ln=mylib</code>.</li>
+                  <li>or a JavaScript expression that evaluates to an extender object</li>
                 </ul>
-                <p>The given extender string is first evaluated as a JavaScript expression; and if that fails, interpreted
-                as a resource file.</p>
-                The extender object may one or more several properties:
+                The extender object may have one or more several properties:
                 <ul>
                 <li>beforeCreate(editorWidget, options). Called before the monaco editor is created. It is passed
                 the current options object that would be used to initialize the monaco editor. If this callback
diff --git a/pom.xml b/pom.xml
index a65c18e..eb9f75a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
         <vdldoc.maven.plugin.version>1.0</vdldoc.maven.plugin.version>
-        <frontend-maven-plugin-version>1.7.5</frontend-maven-plugin-version>
+        <frontend-maven-plugin-version>1.7.6</frontend-maven-plugin-version>
         <closure.compiler.maven.plugin.version>2.3.0</closure.compiler.maven.plugin.version>
         <primefaces.version>7.0</primefaces.version>
         <nexus.staging.version>1.6.8</nexus.staging.version>
diff --git a/src/main/js/widget.js b/src/main/js/widget.js
index 05081c7..78e8a0a 100644
--- a/src/main/js/widget.js
+++ b/src/main/js/widget.js
@@ -273,6 +273,10 @@ class ExtMonacoEditor extends PrimeFaces.widget.BaseWidget {
         // Set defaults.
         this.options = jQuery.extend({}, EditorDefaults, this.cfg);
 
+        /** @type {{resolve: (widget: ExtMonacoEditor) => void, reject: (reason: any) => void}[]} */
+        this._onDone = [];
+        this.jq.data("initialized", false);
+
         // Get elements
         this._input = this.jq.find(".ui-helper-hidden-accessible textarea");
         this._editorContainer = this.jq.children(".ui-monaco-editor-ed");
@@ -299,9 +303,17 @@ class ExtMonacoEditor extends PrimeFaces.widget.BaseWidget {
         // Begin loading the editor
         this._setup().then(() => {
             this._fireEvent("initialized");
-            this.jq.data("initialized", true);    
+            this.jq.data("initialized", true);
+            for (const {resolve} of this._onDone) {
+                resolve(this);
+            }
+            this._onDone = [];
         }).catch(error => {
             console.error("Failed to initialize monaco editor", error);
+            for (const {reject} of this._onDone) {
+                reject(error);
+            }
+            this._onDone = [];
         });
     }
 
@@ -343,6 +355,18 @@ class ExtMonacoEditor extends PrimeFaces.widget.BaseWidget {
         return this._editorContainer;
     }
 
+    /**
+     * @return {Promise<ExtMonacoEditor>} A promise that is resolved once the editor has finished loading.
+     */
+    whenReady() {
+        if (this.jq.data("initialized")) {
+            return Promise.resolve(this);
+        }
+        return new Promise((resolve, reject) => {
+            this._onDone.push({resolve, reject});
+        });
+    }
+
     async _setup() {
         const extender = loadExtender(this.options);
         this._extenderInstance = extender;
diff --git a/src/npm/descriptor/create.js b/src/npm/descriptor/create.js
index f7e5943..01b7bb9 100644
--- a/src/npm/descriptor/create.js
+++ b/src/npm/descriptor/create.js
@@ -51,6 +51,11 @@ clean(err => {
 
     const EditorSuggestOptions = Class("EditorSuggestOptions", {
         filterGraceful: Boolean(),
+        filteredTypes: Map(String(), Boolean()),
+        localityBonus: Boolean(),
+        maxVisibleSuggestions: Boolean(),
+        shareSuggestSelections: Boolean(),
+        showIcons: Boolean(),
         snippetsPreventQuickSuggestions: Boolean(),
     });
 
@@ -114,7 +119,6 @@ clean(err => {
         glyphMargin: Boolean(),
         hideCursorInOverviewRuler: Boolean(),
         highlightActiveIndentGuide: Boolean(),
-        iconsInSuggestions: Boolean(),
         links: Boolean(),
         matchBrackets: Boolean(),
         mouseWheelZoom: Boolean(),
diff --git a/src/npm/descriptor/util.js b/src/npm/descriptor/util.js
index 19646b9..a2834c9 100644
--- a/src/npm/descriptor/util.js
+++ b/src/npm/descriptor/util.js
@@ -67,28 +67,28 @@ function createSimpleGetter(asField, name, type) {
         const lines = [];
         lines.push(`    private ${type.value} ${name};`);
         lines.push("");
-        lines.push(`    public ${type.value} ${type.value.toLowerCase() === "boolean" ? "is" : "get"}${capitalize(name)}() {
+        lines.push(`    public ${type.value} ${getterName(name, type)}() {
         return ${name};
     }`);
         return lines.join("\n");
     }
     else {
-        return `    public ${type.value} ${type.value.toLowerCase() === "boolean" ? "is" : "get"}${capitalize(name)}() {
-        return (${type.value}) obj.get("${name}");
+        return `    public ${type.value} ${getterName(name, type)}() {
+        return (${type.value}) (has("${name}") ? get("${name}") : null);
     }`;
     }
 }
 
 function createSimpleSetter(asField, clazz, name, type, converter) {
     if (asField) {
-        return `    public ${clazz} set${capitalize(name)}(final ${type.value} ${name}) {
+        return `    public ${clazz} ${setterName(name)}(final ${type.value} ${name}) {
         this.${name} = ${converter ? converter(name) : name};
         return this;
     }`;    
     }
     else {
-        return `    public ${clazz} set${capitalize(name)}(final ${type.value} ${name}) {
-        obj.put("${name}", ${converter ? converter(name) : name});
+        return `    public ${clazz} ${setterName(name)}(final ${type.value} ${name}) {
+        put("${name}", ${converter ? converter(name) : name});
         return this;
     }`;
     }
@@ -107,27 +107,24 @@ function createEnumSetter(asField, clazz, name, type) {
 }
 
 function createHead(clazz) {
-    return `package com.github.blutorange.primefaces.config.monacoeditor;
-
-import org.primefaces.json.JSONObject;
-import java.io.Serializable;
-
-@SuppressWarnings("serial")
-public class ${clazz} implements Serializable {
-    private JSONObject obj = new JSONObject();`;
+    return [
+        `package com.github.blutorange.primefaces.config.monacoeditor;`,
+        ``,
+        `import org.primefaces.json.*;`,
+        `import java.io.Serializable;`,
+        ``,
+        `@SuppressWarnings("serial")`,
+        `public class ${clazz} extends JSONObject implements Serializable {`,
+    ].join("\n");
 }
 
 function createFooter() {
-    return `
-    JSONObject getJSONObject() {
-        return obj;
-    }
-    
-    @Override
-    public String toString() {
-        return getJSONObject().toString();
-    }
-}`;
+    return [
+        `    JSONObject getJSONObject() {`,
+        `        return this;`,
+        `    }`,
+        `}`,
+    ].join("\n");
 }
 
 function createClass(clazz, fields) {
@@ -139,7 +136,14 @@ function createClass(clazz, fields) {
         lines.push(type.getter(name, type));
         lines.push("");
         lines.push(type.setter(clazz, name, type));
+        if (type.methods) {
+            for (const [_, method] of Object.entries(type.methods)) {
+                lines.push("");
+                lines.push(method(clazz, name, type));
+            }
+        }
     }
+    lines.push("");
     lines.push(createFooter());
     return lines.join("\n");
 }
@@ -165,30 +169,75 @@ ${constants.map(constant => `    ${enumCase(constant)}("${constant}")`).join(",\
 `.trim();
 }
 
-function Array(type, asField = false) {
-    return {
-        type: "array",
-        value: `java.util.List<${type.value}>`,
-        getter: createSimpleGetter.bind(null, asField),
-        setter: createSimpleSetter.bind(null, asField),
-    };
+function getterName(name, type) {
+    return `${type.value.toLowerCase() === "boolean" ? "is" : "get"}${capitalize(name)}`;
 }
 
-function Map(keyType, valueType, asField = false) {
+function setterName(name) {
+    return `set${capitalize(name)}`;
+}
+
+function stripPlural(name) {
+    if (name.endsWith("s")) return name.substring(0, name.length - 1);
+    return name;
+}
+
+function Array(itemType, asField = false) {
     return {
-        type: "map",
-        value: `java.util.Map<${keyType.value},${valueType.value}>`,
+        type: "JSONArray",
+        value: `java.util.List<${itemType.value}>`,
+        value: `JSONArray`,
         getter: createSimpleGetter.bind(null, asField),
         setter: createSimpleSetter.bind(null, asField),
+        generics: [itemType],
+        methods: {
+            add(clazz, name, type) {
+                return [
+                    `    public ${clazz} add${stripPlural(capitalize(name))}(final ${type.generics[0].value} ...items) {`,
+                    `        ${type.value} x = ${getterName(name, type)}();`,
+                    `        if (x == null) ${setterName(name)}(x = new JSONArray());`,
+                    `        for (${type.generics[0].value} item : items) x.put(item);`,
+                    `        return this;`,
+                    `    }`,
+                ].join("\n");
+            },
+            set(clazz, name, type) {
+                return [
+                    `    public ${clazz} set${capitalize(name)}(java.util.List<${type.generics[0].value}> ${name}) {`,
+                    `        return set${capitalize(name)}(new JSONArray(${name}));`,
+                    `    }`,
+                ].join("\n");
+            },
+        },
     };
 }
 
-function Set(type, asField = false) {
+function Map(keyType, valueType, asField = false) {
     return {
-        type: "set",
-        value: `java.util.Set<${type.value}>`,
+        type: "JSONObject",
+        value: `JSONObject`,
         getter: createSimpleGetter.bind(null, asField),
         setter: createSimpleSetter.bind(null, asField),
+        generics: [keyType, valueType],
+        methods: {
+            add(clazz, name, type) {
+                return [
+                    `    public ${clazz} add${stripPlural(capitalize(name))}(final ${type.generics[0].value} key, final ${type.generics[1].value} value) {`,
+                    `        ${type.value} x = ${getterName(name, type)}();`,
+                    `        if (x == null) ${setterName(name)}(x = new JSONObject());`,
+                    `        x.put(key, value);`,
+                    `        return this;`,
+                    `    }`,
+                ].join("\n");
+            },
+            set(clazz, name, type) {
+                return [
+                    `    public ${clazz} set${capitalize(name)}(java.util.Map<${type.generics[0].value},${type.generics[1].value}> ${name}) {`,
+                    `        return set${capitalize(name)}(new JSONObject(${name}));`,
+                    `    }`,
+                ].join("\n");
+            }
+        },
     };
 }
 
diff --git a/src/npm/package-lock.json b/src/npm/package-lock.json
index aac781d..d0ab779 100644
--- a/src/npm/package-lock.json
+++ b/src/npm/package-lock.json
@@ -314,10 +314,11 @@
       }
     },
     "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "requires": {
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
@@ -347,9 +348,9 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -493,9 +494,9 @@
       "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
     "binary-extensions": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz",
-      "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
     "block-stream": {
       "version": "0.0.9",
@@ -506,9 +507,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
     },
     "bn.js": {
       "version": "4.11.8",
@@ -676,9 +677,9 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -732,9 +733,9 @@
       }
     },
     "chokidar": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
-      "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+      "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -747,7 +748,7 @@
         "normalize-path": "^3.0.0",
         "path-is-absolute": "^1.0.0",
         "readdirp": "^2.2.1",
-        "upath": "^1.1.0"
+        "upath": "^1.1.1"
       }
     },
     "chownr": {
@@ -853,9 +854,9 @@
       }
     },
     "commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
     },
     "commondir": {
       "version": "1.0.1",
@@ -863,9 +864,9 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -1288,9 +1289,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint-scope": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz",
-      "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
@@ -1517,12 +1518,12 @@
       }
     },
     "find-cache-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-      "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
+        "make-dir": "^2.0.0",
         "pkg-dir": "^3.0.0"
       }
     },
@@ -1631,13 +1632,13 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
-      "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
         "abbrev": {
@@ -1665,11 +1666,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1682,15 +1685,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1698,11 +1704,11 @@
           "optional": true
         },
         "debug": {
-          "version": "2.6.9",
+          "version": "4.1.1",
           "bundled": true,
           "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
@@ -1793,7 +1799,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1803,6 +1810,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1815,6 +1823,7 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1847,22 +1856,28 @@
           }
         },
         "ms": {
-          "version": "2.0.0",
+          "version": "2.1.1",
           "bundled": true,
           "optional": true
         },
+        "nan": {
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
+          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==",
+          "optional": true
+        },
         "needle": {
-          "version": "2.2.4",
+          "version": "2.3.0",
           "bundled": true,
           "optional": true,
           "requires": {
-            "debug": "^2.1.2",
+            "debug": "^4.1.0",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.10.3",
+          "version": "0.12.0",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -1888,12 +1903,12 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.5",
+          "version": "1.0.6",
           "bundled": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.2.0",
+          "version": "1.4.1",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -1914,7 +1929,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1924,6 +1940,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2012,7 +2029,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.6.0",
+          "version": "5.7.0",
           "bundled": true,
           "optional": true
         },
@@ -2029,6 +2046,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2458,9 +2476,9 @@
       }
     },
     "ieee754": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -2597,9 +2615,9 @@
       "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
     },
     "is-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -2834,11 +2852,19 @@
       }
     },
     "make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
       }
     },
     "mamacro": {
@@ -3011,9 +3037,9 @@
       }
     },
     "monaco-editor": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
-      "integrity": "sha512-NtGrFzf54jADe7qsWh3lazhS7Kj0XHkJUGBq9fA/Jbwc+sgVcyfsYF6z2AQ7hPqDC+JmdOt/OwFjBnRwqXtx6w==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.17.0.tgz",
+      "integrity": "sha512-8BQQHCFxy3DF0GYFOy5BmcCWlwm/XaTMPbPbN4gwItFGctZErSfX82uQSBpojJSlPNyudB5Q5qnukoorD3/UuA==",
       "dev": true
     },
     "move-concurrently": {
@@ -3443,9 +3469,9 @@
       "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
     },
     "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
     },
     "pkg-dir": {
       "version": "3.0.0",
@@ -3970,9 +3996,9 @@
       "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "serialize-javascript": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
-      "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -4173,9 +4199,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -4357,9 +4383,9 @@
       }
     },
     "tapable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
-      "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "tar": {
       "version": "2.2.1",
@@ -4399,13 +4425,13 @@
       }
     },
     "terser": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
-      "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
       "requires": {
-        "commander": "~2.17.1",
+        "commander": "^2.19.0",
         "source-map": "~0.6.1",
-        "source-map-support": "~0.5.9"
+        "source-map-support": "~0.5.10"
       },
       "dependencies": {
         "source-map": {
@@ -4632,9 +4658,9 @@
       }
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
     },
     "uri-js": {
       "version": "4.2.2",
@@ -4689,9 +4715,9 @@
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "v8-compile-cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
-      "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="
     },
     "verror": {
       "version": "1.10.0",
@@ -4729,9 +4755,9 @@
       }
     },
     "webpack": {
-      "version": "4.29.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
-      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz",
+      "integrity": "sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA==",
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-module-context": "1.8.5",
@@ -4760,9 +4786,9 @@
       }
     },
     "webpack-cli": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.0.tgz",
-      "integrity": "sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz",
+      "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
       "requires": {
         "chalk": "^2.4.1",
         "cross-spawn": "^6.0.5",
@@ -4825,9 +4851,9 @@
       }
     },
     "worker-farm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
       "requires": {
         "errno": "~0.1.7"
       }
diff --git a/src/npm/package.json b/src/npm/package.json
index 41b56a2..4644890 100644
--- a/src/npm/package.json
+++ b/src/npm/package.json
@@ -23,11 +23,11 @@
     "replace-in-file": "^3.4.4",
     "rimraf": "^2.6.3",
     "style-loader": "^0.23.1",
-    "webpack": "^4.29.6",
-    "webpack-cli": "^3.3.0"
+    "webpack": "^4.31.0",
+    "webpack-cli": "^3.3.2"
   },
   "devDependencies": {
     "@types/jquery": "^3.3.29",
-    "monaco-editor": "^0.16.2"
+    "monaco-editor": "^0.17.0"
   }
 }
diff --git a/src/npm/primefaces-monaco.d.ts b/src/npm/primefaces-monaco.d.ts
index 4445eec..7677d5d 100644
--- a/src/npm/primefaces-monaco.d.ts
+++ b/src/npm/primefaces-monaco.d.ts
@@ -234,15 +234,19 @@ declare namespace PrimeFaces {
              */
             getMonaco(): monaco.editor.IStandaloneCodeEditor;
             /**
-             * @returns {jQuery} The HTML container element holding the editor. It exists even
+             * @returns The HTML container element holding the editor. It exists even
              * if the editor was not created yet.
              */
-            getEditorContainer();
+            getEditorContainer(): JQuery;
             /**
-             * @returns {jQuery} The hidden textarea holding the value (eg. what the value sent when
+             * @returns The hidden textarea holding the value (eg. what the value sent when
              * the form is submitted).
              */
-            getInput();
+            getInput(): JQuery;
+            /**
+             * @return A promise that is resolved once the editor has finished loading.
+             */
+            whenReady(): Promise<ExtMonacoEditor>;
         }
     }
 }
\ No newline at end of file