Improve types

src/classes/config.ts

@@ -1,5 +1,5 @@
 import {DEFAULT_COMPLETION_MODEL} from '../constants/completion';
-import {CompletionModel} from '../types/completion';
+import type {CompletionModel} from '../types/completion';
 
 /**
  * Configuration class to store the following:

src/classes/copilot.ts

@@ -4,7 +4,7 @@ import {
   GROQ_API_ENDPOINT,
 } from '../constants/completion';
 import {generateSystemPrompt, generateUserPrompt} from '../helpers/prompt';
-import {
+import type {
   CompletionRequest,
   CompletionResponse,
   GroqCompletion,

src/classes/local-code-prediction-engine.ts

@@ -1,5 +1,5 @@
 import predictions from '../helpers/local-prediction';
-import {LocalPredictionSnippets} from '../types/completion';
+import type {LocalPredictionSnippets} from '../types/completion';
 
 export class LocalCodePredictionEngine {
   private predictions: Map<string, LocalPredictionSnippets>;

src/constants/common.ts

@@ -1,4 +1,4 @@
-import {EditorBuiltInTheme, EditorOptions} from '../types/common';
+import type {EditorBuiltInTheme, EditorOptions} from '../types/common';
 
 export const EDITOR_DEFAULT_OPTIONS: EditorOptions = {
   scrollBeyondLastColumn: 0,

src/constants/completion.ts

@@ -1,4 +1,4 @@
-import {CompletionModel} from '../types/completion';
+import type {CompletionModel} from '../types/completion';
 
 export const COMPLETION_MODEL_IDS: Record<CompletionModel, string> = {
   llama: 'llama3-70b-8192',

src/editor.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {Monaco, Editor as MonacoEditor} from '@monaco-editor/react';
+import {Editor as MonacoEditor, type Monaco} from '@monaco-editor/react';
 
 import {
   EDITOR_BUILT_IN_THEMES,
@@ -13,7 +13,7 @@ import type {
   EditorOptions,
   StandaloneCodeEditor,
 } from './types/common';
-import EditorProps from './types/editor-props';
+import type EditorProps from './types/editor-props';
 import {deepMerge} from './utils/common';
 
 const Editor = ({

src/helpers/contextual-filter.ts

@@ -4,7 +4,7 @@ import {
   FILTER_LANGUAGE_MAP,
   FILTER_WEIGHTS,
 } from '../constants/contextual-filter';
-import {ContextualFilterContext} from '../types/completion';
+import type {ContextualFilterContext} from '../types/completion';
 import {getLastLineLength} from '../utils/completion/common';
 
 class ContextualFilterManager {

src/helpers/get-completion.ts

@@ -1,12 +1,9 @@
-import {
-  EditorModel,
-  EditorPosition,
-  FetchCompletionItemParams,
-} from '../types/common';
-import {
+import type {EditorModel, EditorPosition} from '../types/common';
+import type {
   CompletionMetadata,
   CompletionRequest,
   CompletionResponse,
+  FetchCompletionItemParams,
 } from '../types/completion';
 import {
   determineCompletionMode,

src/helpers/local-prediction/index.ts

@@ -1,4 +1,4 @@
-import {LocalPrediction} from '../../types/completion';
+import type {LocalPrediction} from '../../types/completion';
 import javascript from './javascript';
 
 export default [

src/helpers/local-prediction/javascript.ts

@@ -10,4 +10,7 @@ export default {
   'async (': ') => {\n\t$1\n}$0',
   'async =>': ' {\n\t$1\n}$0',
   ') =>': ' {',
+  '=>': ' {',
+  'new M': 'ap',
+  'new W': 'eakMap',
 };

src/helpers/prompt.ts

@@ -1,5 +1,5 @@
-import {CompletionMetadata, CompletionMode} from '../types/completion';
-import {Technologies} from '../types/editor-props';
+import type {CompletionMetadata, CompletionMode} from '../types/completion';
+import type {Technologies} from '../types/editor-props';
 import {joinWithAnd} from '../utils/common';
 
 const CURSOR_PLACEHOLDER = '<<CURSOR>>';

src/hooks/use-start-completion.ts

@@ -7,8 +7,8 @@ import {
   computeCompletionCacheKey,
   fetchCompletionItem,
 } from '../helpers/get-completion';
-import {EditorInlineCompletion} from '../types/common';
-import {
+import type {EditorInlineCompletion} from '../types/common';
+import type {
   CompletionSpeed,
   Endpoint,
   ExternalContext,

src/themes.ts

@@ -1,4 +1,4 @@
-import {EditorThemeData} from './types/common';
+import type {EditorThemeData} from './types/common';
 
 interface CustomThemeCollection {
   [key: string]: EditorThemeData;

src/types/common.ts

@@ -1,13 +1,6 @@
 import {Theme} from '@monaco-editor/react';
 import * as monaco from 'monaco-editor';
 
-import {
-  Endpoint,
-  ExternalContext,
-  Filename,
-  Technologies,
-} from './editor-props';
-
 export type EditorOptions = monaco.editor.IEditorOptions;
 export type StandaloneCodeEditor = monaco.editor.IStandaloneCodeEditor;
 export type EditorModel = monaco.editor.ITextModel;
@@ -16,15 +9,4 @@ export type EditorRange = monaco.IRange;
 export type EditorInlineCompletion = monaco.languages.InlineCompletion;
 export type EditorThemeData = monaco.editor.IStandaloneThemeData;
 export type EditorBuiltInTheme = Theme;
-
-export interface FetchCompletionItemParams {
-  code: string;
-  language: string;
-  endpoint: Endpoint;
-  filename: Filename | undefined;
-  technologies: Technologies | undefined;
-  externalContext: ExternalContext | undefined;
-  model: EditorModel;
-  position: EditorPosition;
-  token: monaco.CancellationToken;
-}
+export type EditorCompletionCancellationToken = monaco.CancellationToken;

src/types/completion.ts

@@ -1,9 +1,19 @@
-import {
+import type {
   ChatCompletion,
   ChatCompletionCreateParamsBase,
 } from 'groq-sdk/resources/chat/completions';
 
-import {ExternalContext, Filename, Technologies} from './editor-props';
+import type {
+  EditorCompletionCancellationToken,
+  EditorModel,
+  EditorPosition,
+} from './common';
+import type {
+  Endpoint,
+  ExternalContext,
+  Filename,
+  Technologies,
+} from './editor-props';
 
 export type CompletionModel = 'llama';
 
@@ -49,3 +59,15 @@ export interface ContextualFilterContext {
   };
   prefix?: string;
 }
+
+export interface FetchCompletionItemParams {
+  code: string;
+  language: string;
+  endpoint: Endpoint;
+  filename: Filename | undefined;
+  technologies: Technologies | undefined;
+  externalContext: ExternalContext | undefined;
+  model: EditorModel;
+  position: EditorPosition;
+  token: EditorCompletionCancellationToken;
+}

src/types/copilot.ts

@@ -1,4 +1,4 @@
-import {CompletionModel} from './completion';
+import type {CompletionModel} from './completion';
 
 export interface CopilotOptions {
   model: CompletionModel | undefined;

src/types/editor-props.ts

@@ -1,6 +1,6 @@
 import type {EditorProps as MonacoEditorProps} from '@monaco-editor/react';
 
-import {EditorBuiltInTheme} from './common';
+import type {EditorBuiltInTheme} from './common';
 
 /**
  * Themes available for the Monacopilot

src/utils/completion/common.ts

@@ -1,4 +1,4 @@
-import {EditorPosition} from '../../types/common';
+import type {EditorPosition} from '../../types/common';
 
 export const getCharAtPosition = (line: string, position: number) =>
   line[position] || '';

src/utils/completion/syntax-parser.ts

@@ -1,5 +1,5 @@
-import {EditorModel, EditorPosition} from '../../types/common';
-import {CompletionMode} from '../../types/completion';
+import type {EditorModel, EditorPosition} from '../../types/common';
+import type {CompletionMode} from '../../types/completion';
 import {getCharAtPosition} from './common';
 
 export const isAfterCursorWhitespace = (

src/utils/completion/validate-completion.ts

@@ -1,6 +1,6 @@
 import {CONTEXTUAL_FILTER_ACCEPT_THRESHOLD} from '../../constants/contextual-filter';
 import {getContextualFilterScore} from '../../helpers/contextual-filter';
-import {EditorModel, EditorPosition} from '../../types/common';
+import type {EditorModel, EditorPosition} from '../../types/common';
 import {
   getCodeBeforeAndAfterCursor,
   isAfterCursorWhitespace,