updated codemirror setup

Author: zamoore

packages/components/package.json

@@ -397,7 +397,11 @@
       "types": "./declarations/*.d.ts",
       "default": "./dist/*"
     },
-    "./addon-main.js": "./addon-main.cjs"
+    "./addon-main.js": "./addon-main.cjs",
+    "./codemirror": {
+      "types": "./declarations/codemirror.d.ts",
+      "default": "./dist/codemirror.js"
+    }
   },
   "typesVersions": {
     "*": {

packages/components/src/codemirror.ts

@@ -0,0 +1,5 @@
+export * from '@codemirror/state';
+export * from '@codemirror/view';
+export * from '@codemirror/commands';
+export * from '@codemirror/language';
+export * from '@codemirror/lint';

packages/components/src/components/hds/code-editor/index.hbs

@@ -55,6 +55,7 @@
       ariaDescribedBy=this.ariaDescribedBy
       ariaLabel=@ariaLabel
       ariaLabelledBy=this.ariaLabelledBy
+      customExtensions=@customExtensions
       cspNonce=@cspNonce
       extraKeys=@extraKeys
       hasLineWrapping=@hasLineWrapping

packages/components/src/modifiers/hds-code-editor.ts

@@ -42,8 +42,8 @@ type HdsCodeEditorBlurHandler = (
 ) => void;
 
 interface HdsCodeEditorExtraKeys {
-  [key: string]: () => void;
-}
+  [key: string]: (view: EditorViewType) => boolean;
+};
 
 export interface HdsCodeEditorSignature {
   Args: {
@@ -53,6 +53,7 @@ export interface HdsCodeEditorSignature {
       ariaLabelledBy?: string;
       cspNonce?: string;
       extraKeys?: HdsCodeEditorExtraKeys;
+      customExtensions?: Extension[];
       hasLineWrapping?: boolean;
       isLintingEnabled?: boolean;
       language?: HdsCodeEditorLanguages;
@@ -397,8 +398,18 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
       language,
       hasLineWrapping,
       isLintingEnabled,
+      customExtensions,
       onLint,
-    }) => {
+    }: Pick<
+      HdsCodeEditorSignature['Args']['Named'],
+      | 'cspNonce'
+      | 'extraKeys'
+      | 'language'
+      | 'hasLineWrapping'
+      | 'isLintingEnabled'
+      | 'customExtensions'
+      | 'onLint'
+    >) => {
       const [
         {
           keymap,
@@ -417,11 +428,8 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
 
       const languageExtensions = await this._loadLanguageExtensionsTask.perform(
         {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           language,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           isLintingEnabled,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           onLint,
         }
       );
@@ -448,7 +456,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
         hasLineWrapping ? EditorView.lineWrapping : []
       );
 
-      let extensions = [
+      let extensions: Extension[] = [
         lineWrappingExtension,
         bracketMatching(),
         highlightActiveLine(),
@@ -458,13 +466,14 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
         keymap.of([...defaultKeymap, ...historyKeymap]),
         // custom extensions
         handleUpdateExtension,
+        // user-provided extensions
+        ...(customExtensions ?? []),
         // hds dark theme
         hdsDarkTheme,
         syntaxHighlighting(hdsDarkHighlightStyle),
       ];
 
       if (extraKeys !== undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         const customKeyMap = Object.entries(extraKeys).map(([key, value]) => ({
           key: key,
           run: value,
@@ -478,11 +487,9 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
       }
 
       // add nonce to the editor view if it exists
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const nonce = cspNonce ?? getCSPNonceFromMeta();
 
       if (nonce !== undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         extensions = [...extensions, EditorView.cspNonce.of(nonce)];
       }
 
@@ -504,6 +511,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
         value,
         hasLineWrapping,
         isLintingEnabled,
+        customExtensions,
         onLint,
       }: Pick<
         HdsCodeEditorSignature['Args']['Named'],
@@ -513,6 +521,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
         | 'value'
         | 'hasLineWrapping'
         | 'isLintingEnabled'
+        | 'customExtensions'
         | 'onLint'
       >
     ) => {
@@ -525,6 +534,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
           language,
           hasLineWrapping: hasLineWrapping ?? false,
           isLintingEnabled,
+          customExtensions,
           onLint,
         });
 
@@ -592,6 +602,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
         isLintingEnabled,
         language,
         value,
+        customExtensions,
       } = named;
 
       this.onInput = onInput;
@@ -610,6 +621,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
         extraKeys,
         language,
         value,
+        customExtensions,
       });
 
       if (editor === undefined) {

showcase/app/components/page-components/code-editor/index.gts

@@ -12,6 +12,7 @@ import SubSectionStandalone from 'showcase/components/page-components/code-edito
 import SubSectionHeader from 'showcase/components/page-components/code-editor/sub-sections/header';
 import SubSectionSyntaxHighlighting from 'showcase/components/page-components/code-editor/sub-sections/syntax-highlighting';
 import SubSectionLinting from 'showcase/components/page-components/code-editor/sub-sections/linting';
+import SubSectionCustomExtension from 'showcase/components/page-components/code-editor/sub-sections/custom-extension';
 import SubSectionStandaloneModifier from 'showcase/components/page-components/code-editor/sub-sections/standalone-modifier';
 
 const CodeEditorIndex: TemplateOnlyComponent = <template>
@@ -25,6 +26,7 @@ const CodeEditorIndex: TemplateOnlyComponent = <template>
     <SubSectionHeader />
     <SubSectionSyntaxHighlighting />
     <SubSectionLinting />
+    <SubSectionCustomExtension />
     <SubSectionStandaloneModifier />
   </section>
 </template>;

showcase/app/components/page-components/code-editor/sub-sections/custom-extension.gts

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+import Component from '@glimmer/component';
+import { keymap } from '@hashicorp/design-system-components/codemirror';
+
+import ShwTextH2 from 'showcase/components/shw/text/h2';
+
+import { HdsCodeEditor } from '@hashicorp/design-system-components/components';
+
+import type { EditorView } from '@hashicorp/design-system-components/codemirror';
+
+const insertCodeSnippet = (view: EditorView) => {
+  view.dispatch({
+    changes: {
+      from: view.state.selection.main.head,
+      insert: '// This is a custom inserted snippet\n',
+    },
+  });
+
+  return true;
+};
+
+const codeSnippetKeymap = keymap.of([
+  {
+    key: 'Ctrl-Shift-h',
+    run: insertCodeSnippet,
+  },
+]);
+
+export default class SubSectionCustomExtension extends Component {
+  customExtensions = [codeSnippetKeymap];
+
+  <template>
+    <ShwTextH2>Custom Extension</ShwTextH2>
+
+    <HdsCodeEditor @customExtensions={{this.customExtensions}} as |CE|>
+      <CE.Title>Code editor with custom extension</CE.Title>
+      <CE.Description>
+        This extension will listen for a specific key combination (<code
+        >Ctrl-Shift-h</code>
+        ) and insert a predefined snippet of code at the current cursor
+        position.
+      </CE.Description>
+    </HdsCodeEditor>
+  </template>
+}

showcase/app/components/page-components/code-editor/sub-sections/linting.gts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 import Component from '@glimmer/component';
-import type { Diagnostic as DiagnosticType } from '@codemirror/lint';
+import type { Diagnostic as DiagnosticType } from '@hashicorp/design-system-components/codemirror';
 
 import ShwTextH2 from 'showcase/components/shw/text/h2';
 import ShwFlex from 'showcase/components/shw/flex';

showcase/tests/unit/modifiers/hds-code-editor/linters/json-linter-test.ts

@@ -4,7 +4,7 @@
  */
 
 import { module, test } from 'qunit';
-import { Text } from '@codemirror/state';
+import { Text } from '@hashicorp/design-system-components/codemirror';
 import {
   findNextToken,
   determineErrorMessage,