Use type-fest’s Writable type

remcohaszing · Dec 8, 2023 · ceda031 · ceda031
1 parent dc95bef
commit ceda031
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "monaco-editor": "^0.44.0",
     "remark-cli": "^11.0.0",
     "remark-preset-remcohaszing": "^2.0.0",
+    "type-fest": "^4.0.0",
     "vitest": "^1.0.0"
   }
 }
diff --git a/src/codeActionContext.ts b/src/codeActionContext.ts
@@ -1,4 +1,5 @@
 import type * as monaco from 'monaco-types'
+import { type Writable } from 'type-fest'
 import type * as ls from 'vscode-languageserver-protocol'
 
 import { fromCodeActionTriggerType } from './codeActionTriggerType.js'
@@ -50,9 +51,7 @@ export function toCodeActionContext(
   codeActionContext: ls.CodeActionContext,
   options?: ToCodeActionContextOptions
 ): monaco.languages.CodeActionContext {
-  const result: {
-    -readonly [K in keyof monaco.languages.CodeActionContext]: monaco.languages.CodeActionContext[K]
-  } = {
+  const result: Writable<monaco.languages.CodeActionContext> = {
     markers: codeActionContext.diagnostics.map((diagnostic) => toMarkerData(diagnostic, options)),
     trigger: fromCodeActionTriggerType(
       codeActionContext.triggerKind ?? (2 satisfies monaco.languages.CodeActionTriggerType.Auto)

diff --git a/src/semanticTokens.ts b/src/semanticTokens.ts
@@ -1,4 +1,5 @@
 import type * as monaco from 'monaco-types'
+import { type Writable } from 'type-fest'
 import type * as ls from 'vscode-languageserver-protocol'
 
 /**
@@ -34,9 +35,7 @@ export function fromSemanticTokens(
 export function toSemanticTokens(
   semanticTokens: ls.SemanticTokens
 ): monaco.languages.SemanticTokens {
-  const result: {
-    -readonly [K in keyof monaco.languages.SemanticTokens]: monaco.languages.SemanticTokens[K]
-  } = {
+  const result: Writable<monaco.languages.SemanticTokens> = {
     data: Uint32Array.from(semanticTokens.data)
   }
 

diff --git a/src/semanticTokensEdit.ts b/src/semanticTokensEdit.ts
@@ -1,4 +1,5 @@
 import type * as monaco from 'monaco-types'
+import { type Writable } from 'type-fest'
 import type * as ls from 'vscode-languageserver-protocol'
 
 /**
@@ -35,9 +36,7 @@ export function fromSemanticTokensEdit(
 export function toSemanticTokensEdit(
   semanticTokensEdit: ls.SemanticTokensEdit
 ): monaco.languages.SemanticTokensEdit {
-  const result: {
-    -readonly [K in keyof monaco.languages.SemanticTokensEdit]: monaco.languages.SemanticTokensEdit[K]
-  } = {
+  const result: Writable<monaco.languages.SemanticTokensEdit> = {
     deleteCount: semanticTokensEdit.deleteCount,
     start: semanticTokensEdit.start
   }

diff --git a/src/semanticTokensEdits.ts b/src/semanticTokensEdits.ts
@@ -1,4 +1,5 @@
 import type * as monaco from 'monaco-types'
+import { type Writable } from 'type-fest'
 import type * as ls from 'vscode-languageserver-protocol'
 
 import { fromSemanticTokensEdit, toSemanticTokensEdit } from './semanticTokensEdit.js'
@@ -14,9 +15,7 @@ import { fromSemanticTokensEdit, toSemanticTokensEdit } from './semanticTokensEd
 export function fromSemanticTokensEdits(
   semanticTokensEdits: monaco.languages.SemanticTokensEdits
 ): ls.SemanticTokensDelta {
-  const result: {
-    -readonly [K in keyof ls.SemanticTokensDelta]: ls.SemanticTokensDelta[K]
-  } = {
+  const result: Writable<ls.SemanticTokensDelta> = {
     edits: semanticTokensEdits.edits.map(fromSemanticTokensEdit)
   }
 
@@ -38,9 +37,7 @@ export function fromSemanticTokensEdits(
 export function toSemanticTokensEdits(
   semanticTokensDelta: ls.SemanticTokensDelta
 ): monaco.languages.SemanticTokensEdits {
-  const result: {
-    -readonly [K in keyof monaco.languages.SemanticTokensEdits]: monaco.languages.SemanticTokensEdits[K]
-  } = {
+  const result: Writable<monaco.languages.SemanticTokensEdits> = {
     edits: semanticTokensDelta.edits.map(toSemanticTokensEdit)
   }
 

diff --git a/src/signatureHelpContext.ts b/src/signatureHelpContext.ts
@@ -1,4 +1,5 @@
 import type * as monaco from 'monaco-types'
+import { type Writable } from 'type-fest'
 import type * as ls from 'vscode-languageserver-protocol'
 
 import { fromSignatureHelp, toSignatureHelp } from './signatureHelp.js'
@@ -42,9 +43,7 @@ export function fromSignatureHelpContext(
 export function toSignatureHelpContext(
   signatureHelpContext: ls.SignatureHelpContext
 ): monaco.languages.SignatureHelpContext {
-  const result: {
-    -readonly [K in keyof monaco.languages.SignatureHelpContext]: monaco.languages.SignatureHelpContext[K]
-  } = {
+  const result: Writable<monaco.languages.SignatureHelpContext> = {
     isRetrigger: signatureHelpContext.isRetrigger,
     triggerKind: fromSignatureHelpTriggerKind(signatureHelpContext.triggerKind)
   }