@kusto/monaco-kusto - npm Package Compare versions

Comparing version 1.0.7 to 1.0.8

package.json

 {
   "name": "@kusto/monaco-kusto",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "CSL, KQL plugin for the Monaco Editor",
@@ -51,3 +51,3 @@ "author": {
   "dependencies": {
-    "@kusto/language-service": "^0.0.29-rc.1",
+    "@kusto/language-service": "0.0.23-alpha",
     "@kusto/language-service-next": "0.0.28-rc.1"
@@ -54,0 +54,0 @@ },

README.md

@@ -97,2 +97,5 @@ # Monaco Kusto
 ## Changelog
+### 1.0.8 (7/1/2019)
+#### Bug fix
+- don't kill web worker after 2 minutes of inactivity by default. Reason: In exterme cases where schema is very large, trying to stringify the schema in web worker causes an OOM. This is configurable though.
 ### 1.0.6 (6/6/2019)
@@ -99,0 +102,0 @@ #### Bug fix

release/dev/monaco.contribution.js

@@ -178,2 +178,9 @@
             this.setLanguageSettings(languageSettings);
+            // default to never kill worker when idle.
+            // reason: when killing worker - schema gets lost. We transmit the schema back to main process when killing
+            // the worker, but in some extreme cases web worker runs out of memory while stringifying the schema.
+            // This stems from the fact that web workers have much more limited memory that the main process.
+            // An alternative solution (not currently implemented) is to just save the schema in the main process whenever calling
+            // setSchema. That way we don't need to stringify the schema on the worker side when killing the web worker.
+            this._workerMaxIdleTime = 0;
         }
@@ -198,2 +205,10 @@ Object.defineProperty(LanguageServiceDefaultsImpl.prototype, "onDidChange", {
         };
+        LanguageServiceDefaultsImpl.prototype.setMaximumWorkerIdleTime = function (value) {
+            // doesn't fire an event since no
+            // worker restart is required here
+            this._workerMaxIdleTime = value;
+        };
+        LanguageServiceDefaultsImpl.prototype.getWorkerMaxIdleTime = function () {
+            return this._workerMaxIdleTime;
+        };
         return LanguageServiceDefaultsImpl;
@@ -200,0 +215,0 @@ }());

release/min/monaco.contribution.d.ts

@@ -5,2 +5,3 @@ import IEvent = monaco.IEvent;
     private _languageSettings;
+    private _workerMaxIdleTime;
     constructor(languageSettings: monaco.languages.kusto.LanguageSettings);
@@ -10,2 +11,4 @@ readonly onDidChange: IEvent<monaco.languages.kusto.LanguageServiceDefaults>;
     setLanguageSettings(options: monaco.languages.kusto.LanguageSettings): void;
+    setMaximumWorkerIdleTime(value: number): void;
+    getWorkerMaxIdleTime(): number;
 }

release/min/monaco.contribution.js

@@ -1,1 +0,1 @@
-!function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/commandHighlighter",["require","exports"],e)}(function(e,o){Object.defineProperty(o,"__esModule",{value:!0});var n=function(){function e(e){var o=this;this.editor=e,this.disposables=[],this.decorations=[],this.editor.onDidChangeCursorSelection(function(e){o.highlightCommandUnderCursor(e)})}return e.prototype.getId=function(){return e.ID},e.prototype.dispose=function(){this.disposables.forEach(function(e){return e.dispose()})},e.prototype.highlightCommandUnderCursor=function(o){if(!o.selection.isEmpty())return void(this.decorations=this.editor.deltaDecorations(this.decorations,[]));var n=this.editor.getCurrentCommandRange(o.selection.getStartPosition()),t=[{range:n,options:e.CURRENT_COMMAND_HIGHLIGHT}];this.decorations=this.editor.deltaDecorations(this.decorations,t)},e.ID="editor.contrib.kustoCommandHighliter",e.CURRENT_COMMAND_HIGHLIGHT={className:"selectionHighlight"},e}();o["default"]=n}),function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/commandFormatter",["require","exports"],e)}(function(e,o){Object.defineProperty(o,"__esModule",{value:!0});var n=function(){function e(e){var o=this;this.editor=e,this.actionAdded=!1,e.onDidChangeCursorSelection(function(n){o.cursorPosition=n.selection.getStartPosition(),o.actionAdded||(e.addAction({id:"editor.action.kusto.formatCurrentCommand",label:"Format Command Under Cursor",keybindings:[monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd|monaco.KeyCode.KEY_K,monaco.KeyMod.CtrlCmd|monaco.KeyCode.KEY_F)],run:function(n){e.getSelection();e.setSelection(o.editor.getCurrentCommandRange(o.cursorPosition)),e.trigger("KustoCommandFormatter","editor.action.formatSelection",null)},contextMenuGroupId:"1_modification"}),o.actionAdded=!0)})}return e}();o["default"]=n}),function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/extendedEditor",["require","exports"],e)}(function(e,o){function n(e){var o=Object.getPrototypeOf(e);o.getCurrentCommandRange=function(e){for(var o=e.lineNumber-1,n=this.getModel().getLinesContent(),t=0,r=[],i=0;i<n.length;i++){var d=""===n[i].trim();if(d?r.push({commandOrdinal:t++,lineNumber:i}):r.push({commandOrdinal:t,lineNumber:i}),i>o&&t>r[o].commandOrdinal)break}var a=r[o].commandOrdinal,u=r.filter(function(e){return e.commandOrdinal===a}),s=u[0].lineNumber+1,c=u[u.length-1].lineNumber+1,g=n[c-1].length+1;return new monaco.Range(s,1,c,g)}}Object.defineProperty(o,"__esModule",{value:!0}),o.extend=n}),function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/monaco.contribution",["require","exports","./commandHighlighter","./commandFormatter","./extendedEditor"],e)}(function(e,o){function n(){return new monaco.Promise(function(e,o){r(function(n){n.getKustoWorker().then(e,o)})})}function t(){return{kustoDefaults:l,getKustoWorker:n}}function r(o){e(["vs/language/kusto/kustoMode"],o)}function i(e){e.onDidChangeCursorSelection(function(o){if(l&&l.languageSettings&&l.languageSettings.openSuggestionDialogAfterPreviousSuggestionAccepted){var n="modelChange"===o.source&&o.reason===monaco.editor.CursorChangeReason.RecoverFromMarkers;if(!n)return;o.selection;var t=e.getModel().getValueInRange(o.selection);" "===t[t.length-1]&&setTimeout(function(){return e.trigger("monaco-kusto","editor.action.triggerSuggest",{})},10)}})}function d(e){return void 0!==e.addAction}Object.defineProperty(o,"__esModule",{value:!0});var a=monaco.Emitter,u=e("./commandHighlighter"),s=e("./commandFormatter"),c=e("./extendedEditor"),g=function(){function e(e){this._onDidChange=new a,this.setLanguageSettings(e)}return Object.defineProperty(e.prototype,"onDidChange",{get:function(){return this._onDidChange.event},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"languageSettings",{get:function(){return this._languageSettings},enumerable:!0,configurable:!0}),e.prototype.setLanguageSettings=function(e){this._languageSettings=e||Object.create(null),this._onDidChange.fire(this)},e}();o.LanguageServiceDefaultsImpl=g;var f={includeControlCommands:!0,newlineAfterPipe:!0,openSuggestionDialogAfterPreviousSuggestionAccepted:!0,useIntellisenseV2:!1,useSemanticColorization:!0,useTokenColorization:!0},l=new g(f);monaco.languages.kusto=t(),monaco.languages.onLanguage("kusto",function(){r(function(e){return e.setupMode(l)})}),monaco.languages.register({id:"kusto",extensions:[".csl",".kql"]});var m,p;monaco.editor.defineTheme("kusto-light",{base:"vs",inherit:!0,rules:[{token:"comment",foreground:"008000"},{token:"variable.predefined",foreground:"800080"},{token:"function",foreground:"0000FF"},{token:"operator.sql",foreground:"CC3700"},{token:"string",foreground:"B22222"},{token:"operator.scss",foreground:"0000FF"},{token:"variable",foreground:"C71585"},{token:"variable.parameter",foreground:"9932CC"},{token:"",foreground:"000000"},{token:"type",foreground:"0000FF"},{token:"tag",foreground:"0000FF"},{token:"annotation",foreground:"2B91AF"},{token:"keyword",foreground:"0000FF"},{token:"number",foreground:"191970"},{token:"annotation",foreground:"9400D3"},{token:"invalid",background:"cd3131"}],colors:{}}),monaco.editor.defineTheme("kusto-dark",{base:"vs-dark",inherit:!0,rules:[{token:"comment",foreground:"608B4E"},{token:"variable.predefined",foreground:"4ec9b0"},{token:"function",foreground:"dcdcaa"},{token:"operator.sql",foreground:"9cdcfe"},{token:"string",foreground:"ce9178"},{token:"operator.scss",foreground:"569cd6"},{token:"variable",foreground:"4ec9b0"},{token:"variable.parameter",foreground:"c586c0"},{token:"",foreground:"d4d4d4"},{token:"type",foreground:"569cd6"},{token:"tag",foreground:"569cd6"},{token:"annotation",foreground:"9cdcfe"},{token:"keyword",foreground:"569cd6"},{token:"number",foreground:"d7ba7d"},{token:"annotation",foreground:"b5cea8"},{token:"invalid",background:"cd3131"}],colors:{}}),monaco.editor.onDidCreateEditor(function(e){c.extend(e),m=new u["default"](e),d(e)&&(p=new s["default"](e)),i(e)})});
+!function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/commandHighlighter",["require","exports"],e)}(function(e,o){Object.defineProperty(o,"__esModule",{value:!0});var n=function(){function e(e){var o=this;this.editor=e,this.disposables=[],this.decorations=[],this.editor.onDidChangeCursorSelection(function(e){o.highlightCommandUnderCursor(e)})}return e.prototype.getId=function(){return e.ID},e.prototype.dispose=function(){this.disposables.forEach(function(e){return e.dispose()})},e.prototype.highlightCommandUnderCursor=function(o){if(!o.selection.isEmpty())return void(this.decorations=this.editor.deltaDecorations(this.decorations,[]));var n=this.editor.getCurrentCommandRange(o.selection.getStartPosition()),t=[{range:n,options:e.CURRENT_COMMAND_HIGHLIGHT}];this.decorations=this.editor.deltaDecorations(this.decorations,t)},e.ID="editor.contrib.kustoCommandHighliter",e.CURRENT_COMMAND_HIGHLIGHT={className:"selectionHighlight"},e}();o["default"]=n}),function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/commandFormatter",["require","exports"],e)}(function(e,o){Object.defineProperty(o,"__esModule",{value:!0});var n=function(){function e(e){var o=this;this.editor=e,this.actionAdded=!1,e.onDidChangeCursorSelection(function(n){o.cursorPosition=n.selection.getStartPosition(),o.actionAdded||(e.addAction({id:"editor.action.kusto.formatCurrentCommand",label:"Format Command Under Cursor",keybindings:[monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd|monaco.KeyCode.KEY_K,monaco.KeyMod.CtrlCmd|monaco.KeyCode.KEY_F)],run:function(n){e.getSelection();e.setSelection(o.editor.getCurrentCommandRange(o.cursorPosition)),e.trigger("KustoCommandFormatter","editor.action.formatSelection",null)},contextMenuGroupId:"1_modification"}),o.actionAdded=!0)})}return e}();o["default"]=n}),function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/extendedEditor",["require","exports"],e)}(function(e,o){function n(e){var o=Object.getPrototypeOf(e);o.getCurrentCommandRange=function(e){for(var o=e.lineNumber-1,n=this.getModel().getLinesContent(),t=0,r=[],i=0;i<n.length;i++){var d=""===n[i].trim();if(d?r.push({commandOrdinal:t++,lineNumber:i}):r.push({commandOrdinal:t,lineNumber:i}),i>o&&t>r[o].commandOrdinal)break}var a=r[o].commandOrdinal,u=r.filter(function(e){return e.commandOrdinal===a}),s=u[0].lineNumber+1,c=u[u.length-1].lineNumber+1,g=n[c-1].length+1;return new monaco.Range(s,1,c,g)}}Object.defineProperty(o,"__esModule",{value:!0}),o.extend=n}),function(e){if("object"==typeof module&&"object"==typeof module.exports){var o=e(require,exports);void 0!==o&&(module.exports=o)}else"function"==typeof define&&define.amd&&define("vs/language/kusto/monaco.contribution",["require","exports","./commandHighlighter","./commandFormatter","./extendedEditor"],e)}(function(e,o){function n(){return new monaco.Promise(function(e,o){r(function(n){n.getKustoWorker().then(e,o)})})}function t(){return{kustoDefaults:l,getKustoWorker:n}}function r(o){e(["vs/language/kusto/kustoMode"],o)}function i(e){e.onDidChangeCursorSelection(function(o){if(l&&l.languageSettings&&l.languageSettings.openSuggestionDialogAfterPreviousSuggestionAccepted){var n="modelChange"===o.source&&o.reason===monaco.editor.CursorChangeReason.RecoverFromMarkers;if(!n)return;o.selection;var t=e.getModel().getValueInRange(o.selection);" "===t[t.length-1]&&setTimeout(function(){return e.trigger("monaco-kusto","editor.action.triggerSuggest",{})},10)}})}function d(e){return void 0!==e.addAction}Object.defineProperty(o,"__esModule",{value:!0});var a=monaco.Emitter,u=e("./commandHighlighter"),s=e("./commandFormatter"),c=e("./extendedEditor"),g=function(){function e(e){this._onDidChange=new a,this.setLanguageSettings(e),this._workerMaxIdleTime=0}return Object.defineProperty(e.prototype,"onDidChange",{get:function(){return this._onDidChange.event},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"languageSettings",{get:function(){return this._languageSettings},enumerable:!0,configurable:!0}),e.prototype.setLanguageSettings=function(e){this._languageSettings=e||Object.create(null),this._onDidChange.fire(this)},e.prototype.setMaximumWorkerIdleTime=function(e){this._workerMaxIdleTime=e},e.prototype.getWorkerMaxIdleTime=function(){return this._workerMaxIdleTime},e}();o.LanguageServiceDefaultsImpl=g;var f={includeControlCommands:!0,newlineAfterPipe:!0,openSuggestionDialogAfterPreviousSuggestionAccepted:!0,useIntellisenseV2:!1,useSemanticColorization:!0,useTokenColorization:!0},l=new g(f);monaco.languages.kusto=t(),monaco.languages.onLanguage("kusto",function(){r(function(e){return e.setupMode(l)})}),monaco.languages.register({id:"kusto",extensions:[".csl",".kql"]});var m,p;monaco.editor.defineTheme("kusto-light",{base:"vs",inherit:!0,rules:[{token:"comment",foreground:"008000"},{token:"variable.predefined",foreground:"800080"},{token:"function",foreground:"0000FF"},{token:"operator.sql",foreground:"CC3700"},{token:"string",foreground:"B22222"},{token:"operator.scss",foreground:"0000FF"},{token:"variable",foreground:"C71585"},{token:"variable.parameter",foreground:"9932CC"},{token:"",foreground:"000000"},{token:"type",foreground:"0000FF"},{token:"tag",foreground:"0000FF"},{token:"annotation",foreground:"2B91AF"},{token:"keyword",foreground:"0000FF"},{token:"number",foreground:"191970"},{token:"annotation",foreground:"9400D3"},{token:"invalid",background:"cd3131"}],colors:{}}),monaco.editor.defineTheme("kusto-dark",{base:"vs-dark",inherit:!0,rules:[{token:"comment",foreground:"608B4E"},{token:"variable.predefined",foreground:"4ec9b0"},{token:"function",foreground:"dcdcaa"},{token:"operator.sql",foreground:"9cdcfe"},{token:"string",foreground:"ce9178"},{token:"operator.scss",foreground:"569cd6"},{token:"variable",foreground:"4ec9b0"},{token:"variable.parameter",foreground:"c586c0"},{token:"",foreground:"d4d4d4"},{token:"type",foreground:"569cd6"},{token:"tag",foreground:"569cd6"},{token:"annotation",foreground:"9cdcfe"},{token:"keyword",foreground:"569cd6"},{token:"number",foreground:"d7ba7d"},{token:"annotation",foreground:"b5cea8"},{token:"invalid",background:"cd3131"}],colors:{}}),monaco.editor.onDidCreateEditor(function(e){c.extend(e),m=new u["default"](e),d(e)&&(p=new s["default"](e)),i(e)})});

release/min/monaco.d.ts

@@ -31,2 +31,10 @@ // This file gets bundled as is with monaco-kusto.
 		setLanguageSettings(options: LanguageSettings): void;
+
+        /**
+         * Configure when the worker shuts down. By default that is 2mins.
+         *
+         * @param value The maximum idle time in milliseconds. Values less than one
+         * mean never shut down.
+         */
+        setMaximumWorkerIdleTime(value: number): void;
 	}
@@ -33,0 +41,0 @@

No alert changes

Improved metrics

Lines of code

33202

increased by0.08%

Number of lines in readme file

311

increased by0.97%

Worsened metrics

Total package byte prevSize

5262373

decreased by-0.27%

Dependency changes

• + Added@kusto/language-service@0.0.23-alpha(transitive)

• - Removed@kusto/language-service@0.0.29-rc.1(transitive)

• Updated@kusto/language-service@0.0.23-alpha