@xh/hoist 79.0.0-SNAPSHOT.1765833120742 → 79.0.0-SNAPSHOT.1765843522401

package/desktop/cmp/input/CodeInput.ts

@@ -11,7 +11,6 @@ import {
     foldGutter,
     foldKeymap,
     indentOnInput,
-    LanguageSupport,
     syntaxHighlighting
 } from '@codemirror/language';
 import {linter, lintGutter} from '@codemirror/lint';
@@ -54,10 +53,10 @@ import {compact, isEmpty, isFunction, isObject} from 'lodash';
 import {ReactElement} from 'react';
 import './CodeInput.scss';
 import {javascript} from '@codemirror/lang-javascript';
-import {json} from '@codemirror/lang-json';
-import {html} from '@codemirror/lang-html';
-import {sql} from '@codemirror/lang-sql';
-import {css} from '@codemirror/lang-css';
+// import {json} from '@codemirror/lang-json';
+// import {html} from '@codemirror/lang-html';
+// import {sql} from '@codemirror/lang-sql';
+// import {css} from '@codemirror/lang-css';
 export interface CodeInputProps extends HoistProps, HoistInputProps, LayoutProps {
     /** True to focus the control on render. */
     autoFocus?: boolean;
@@ -418,7 +417,6 @@ class CodeInputModel extends HoistInputModel {
     private async getExtensionsAsync(): Promise<Extension[]> {
         const {
                 autoFocus,
-                language,
                 readonly,
                 highlightActiveLine: propsHighlightActiveLine,
                 linter: propsLinter,
@@ -444,6 +442,7 @@ class CodeInputModel extends HoistInputModel {
                 indentOnInput(),
                 autocompletion(),
                 history(),
+                javascript(),
                 // Linter
                 propsLinter
                     ? linter(async view => {
@@ -476,8 +475,14 @@ class CodeInputModel extends HoistInputModel {
         if (propsHighlightActiveLine)
             extensions.push(highlightActiveLine(), highlightActiveLineGutter());
         if (autoFocus) extensions.push(this.autofocusExtension);
-        if (language) extensions.push(await this.getLanguageExtensionAsync(language));
-
+        // if (language) {
+        //     const langExt = this.getLanguageExtension(language);
+        //     if (langExt) {
+        //         extensions.push(langExt);
+        //     } else {
+        //         console.warn('Failed to load language:', language);
+        //     }
+        // }
         return extensions.filter(it => !isEmpty(it));
     }
 
@@ -486,31 +491,29 @@ class CodeInputModel extends HoistInputModel {
         return XH.darkTheme ? oneDark : lightTheme;
     }
 
-    private LANGUAGE_EXTENSIONS: Record<string, () => LanguageSupport> = {
-        js: javascript,
-        javascript: javascript,
-        html: html,
-        css: css,
-        json: json,
-        sql: sql
-    };
-
-    private async getLanguageExtensionAsync(lang: string): Promise<LanguageSupport> {
-        if (!lang) return null;
-        const extFactory = this.LANGUAGE_EXTENSIONS[lang.toLowerCase()];
-        if (!extFactory) {
-            console.warn(`Language not found: ${lang}`);
-            return null;
-        }
-        try {
-            // DEBUG
-            console.log(extFactory());
-            return extFactory(); // returns a LanguageSupport instance
-        } catch (err) {
-            console.error(`Failed to load language: ${lang}`, err);
-            return null;
-        }
-    }
+    // private LANGUAGE_EXTENSIONS: Record<string, () => LanguageSupport> = {
+    //     js: javascript,
+    //     javascript: javascript,
+    //     html: html,
+    //     css: css,
+    //     json: json,
+    //     sql: sql
+    // };
+
+    // private getLanguageExtension(lang: string): LanguageSupport {
+    //     if (!lang) return null;
+    //     const extFactory = this.LANGUAGE_EXTENSIONS[lang.toLowerCase()];
+    //     if (!extFactory) {
+    //         console.warn(`Language not found: ${lang}`);
+    //         return null;
+    //     }
+    //     try {
+    //         return extFactory(); // returns a LanguageSupport instance
+    //     } catch (err) {
+    //         console.error(`Failed to load language: ${lang}`, err);
+    //         return null;
+    //     }
+    // }
 
     private autofocusExtension = ViewPlugin.fromClass(
         class {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "79.0.0-SNAPSHOT.1765833120742",
+  "version": "79.0.0-SNAPSHOT.1765843522401",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",