Convert Console to typescript

packages/console/src/Console.tsx

@@ -122,7 +122,7 @@ export class Console extends PureComponent<ConsoleProps, ConsoleState> {
   /**
    * Check if the provided log level is an error type
    * @param logLevel The LogLevel being checked
-   * @returns= true if the log level is an error level log
+   * @returns true if the log level is an error level log
    */
   static isErrorLevel(
     logLevel: typeof LogLevel[keyof typeof LogLevel]
@@ -136,7 +136,7 @@ export class Console extends PureComponent<ConsoleProps, ConsoleState> {
 
   /**
    * Check if the provided log level is output level
-   * @para logLevel The LogLevel being checked
+   * @param logLevel The LogLevel being checked
    * @return true if the log level should be output to the console
    */
   static isOutputLevel(logLevel: string): boolean {
@@ -513,13 +513,13 @@ export class Console extends PureComponent<ConsoleProps, ConsoleState> {
         const oldIndex = objectHistoryMap.get(title);
         // oldIndex can be -1 if a object is active but doesn't have a command in consoleHistory
         // this can happen after clearing the console using 'clear' or 'cls' command
-        assertNotNull(oldIndex);
-        if (oldIndex >= 0) {
+
+        if (oldIndex != null && oldIndex >= 0) {
           // disable outdated object variable in the old consoleHistory item
-          history[oldIndex].disabledObjects = history[
-            oldIndex
-          ].disabledObjects?.concat(title);
-          history[oldIndex] = { ...history[oldIndex] };
+          history[oldIndex].disabledObjects = [
+            ...(history[oldIndex].disabledObjects ?? []),
+            title,
+          ];
         }
         objectHistoryMap.set(title, itemIndex);
         if (isRemoved) {

packages/console/src/monaco/MonacoUtils.ts

@@ -190,13 +190,7 @@ class MonacoUtils {
     log.debug2('monaco theme: ', MonacoTheme);
     monaco.editor.setTheme('dh-dark');
 
-    registerLanguages([
-      DbLang,
-      PyLang,
-      GroovyLang,
-      LogLang,
-      ScalaLang,
-    ] as Language[]);
+    registerLanguages([DbLang, PyLang, GroovyLang, LogLang, ScalaLang]);
 
     log.debug('Monaco initialized.');
   }

packages/console/src/monaco/lang/db.ts

@@ -1,7 +1,10 @@
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import { Language } from './Language';
+
 /* eslint no-useless-escape: "off" */
 const id = 'deephavenDb';
 
-const conf = {
+const conf: monaco.languages.LanguageConfiguration = {
   comments: {
     lineComment: '#',
     blockComment: ["'''", "'''"],
@@ -42,7 +45,9 @@ const conf = {
   },
 };
 
-const language = {
+const language:
+  | monaco.languages.IMonarchLanguage
+  | monaco.Thenable<monaco.languages.IMonarchLanguage> = {
   tokenPostfix: '.js',
 
   keywords: [
@@ -150,9 +155,9 @@ const language = {
 
   // define our own brackets as '<' and '>' do not match in javascript
   brackets: [
-    ['(', ')', 'bracket.parenthesis'],
-    ['{', '}', 'bracket.curly'],
-    ['[', ']', 'bracket.square'],
+    { open: '{', close: '}', token: 'delimiter.curly' },
+    { open: '[', close: ']', token: 'delimiter.bracket' },
+    { open: '(', close: ')', token: 'delimiter.parenthesis' },
   ],
 
   // common regular expressions
@@ -257,7 +262,7 @@ const language = {
       [
         /(\[)(\^?)(?=(?:[^\]\\\/]|\\.)+)/,
         [
-          '@brackets.regexp.escape.control',
+          { token: '@brackets.regexp.escape.control' },
           {
             token: 'regexp.escape.control',
             next: '@regexrange',
@@ -286,4 +291,5 @@ const language = {
   },
 };
 
-export default { id, conf, language };
+const lang: Language = { id, conf, language };
+export default lang;

packages/console/src/monaco/lang/groovy.ts

@@ -1,6 +1,9 @@
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import { Language } from './Language';
+
 const id = 'groovy';
 
-const conf = {
+const conf: monaco.languages.LanguageConfiguration = {
   comments: {
     lineComment: '//',
     blockComment: ['/*', '*/'],
@@ -41,7 +44,9 @@ const conf = {
   },
 };
 
-const language = {
+const language:
+  | monaco.languages.IMonarchLanguage
+  | monaco.Thenable<monaco.languages.IMonarchLanguage> = {
   // Set defaultToken to invalid to see what you do not tokenize yet
   // defaultToken: 'invalid',
 
@@ -120,9 +125,9 @@ const language = {
   ],
 
   brackets: [
-    ['(', ')', 'delimiter.parenthesis'],
-    ['{', '}', 'delimiter.curly'],
-    ['[', ']', 'delimiter.square'],
+    { open: '{', close: '}', token: 'delimiter.curly' },
+    { open: '[', close: ']', token: 'delimiter.square' },
+    { open: '(', close: ')', token: 'delimiter.parenthesis' },
   ],
 
   // operator symbols
@@ -339,4 +344,5 @@ const language = {
   },
 };
 
-export default { id, conf, language };
+const lang: Language = { id, conf, language };
+export default lang;

packages/console/src/monaco/lang/log.ts

@@ -1,10 +1,14 @@
 /* eslint no-useless-escape: "off" */
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import { Language } from './Language';
 
 const id = 'log';
 
 const conf = {};
 
-const language = {
+const language:
+  | monaco.languages.IMonarchLanguage
+  | monaco.Thenable<monaco.languages.IMonarchLanguage> = {
   tokenizer: {
     root: [
       [/ FATAL[\s\S]*/, { token: 'error', next: '@error' }],
@@ -30,4 +34,5 @@ const language = {
   },
 };
 
-export default { id, conf, language };
+const lang: Language = { id, conf, language };
+export default lang;

packages/console/src/monaco/lang/python.ts

@@ -1,6 +1,9 @@
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import { Language } from './Language';
+
 const id = 'python';
 
-const conf = {
+const conf: monaco.languages.LanguageConfiguration = {
   comments: {
     lineComment: '#',
     blockComment: ["'''", "'''"],
@@ -41,7 +44,9 @@ const conf = {
   },
 };
 
-const language = {
+const language:
+  | monaco.languages.IMonarchLanguage
+  | monaco.Thenable<monaco.languages.IMonarchLanguage> = {
   // Set defaultToken to invalid to see what you do not tokenize yet
   // defaultToken: 'invalid',
 
@@ -116,11 +121,10 @@ const language = {
     '<<=',
     '**=',
   ],
-
   brackets: [
-    ['(', ')', 'delimiter.parenthesis'],
-    ['{', '}', 'delimiter.curly'],
-    ['[', ']', 'delimiter.square'],
+    { open: '{', close: '}', token: 'delimiter.curly' },
+    { open: '[', close: ']', token: 'delimiter.square' },
+    { open: '(', close: ')', token: 'delimiter.parenthesis' },
   ],
 
   // operator symbols
@@ -347,4 +351,5 @@ const language = {
   },
 };
 
-export default { id, conf, language };
+const lang: Language = { id, conf, language };
+export default lang;

packages/console/src/monaco/lang/scala.ts

@@ -26,9 +26,12 @@
  *  - https://github.com/microsoft/monaco-languages/blob/main/src/scala/scala.ts
  *--------------------------------------------------------------------------------------------*/
 
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import { Language } from './Language';
+
 const id = 'scala';
 
-const conf = {
+const conf: monaco.languages.LanguageConfiguration = {
   /*
    * `...` is allowed as an identifier.
    * $ is allowed in identifiers.
@@ -67,7 +70,9 @@ const conf = {
   },
 };
 
-const language = {
+const language:
+  | monaco.languages.IMonarchLanguage
+  | monaco.Thenable<monaco.languages.IMonarchLanguage> = {
   // tokenPostfix: '.scala',
 
   // We can't easily add everything from Dotty, but we can at least add some of its keywords
@@ -194,7 +199,7 @@ const language = {
       [
         /(\.)(@name|@symbols)/,
         [
-          'operator',
+          { token: 'operator' },
           {
             token: '@rematch',
             next: '@allowMethod',
@@ -249,8 +254,8 @@ const language = {
       [
         /(')(@escapes)(')/,
         [
-          'string',
-          'string.escape',
+          { token: 'string' },
+          { token: 'string.escape' },
           {
             token: 'string',
             next: '@allowMethod',
@@ -482,4 +487,5 @@ const language = {
   },
 };
 
-export default { id, conf, language };
+const lang: Language = { id, conf, language };
+export default lang;