chore: lint

bench/compare.bench.ts

@@ -1,13 +1,13 @@
 /* eslint-disable import/first */
 process.env.NODE_ENV = 'production'
 
-import { fileURLToPath } from 'node:url'
 import fs from 'node:fs/promises'
 import { basename } from 'node:path'
-import { bench, describe } from 'vitest'
-import fg from 'fast-glob'
+import { fileURLToPath } from 'node:url'
 import { twoslasher as twoslasherOld } from '@typescript/twoslash'
+import fg from 'fast-glob'
 import { createTwoslasher } from 'twoslash'
+import { bench, describe } from 'vitest'
 
 const codes = await fg([
   'examples/*.ts',

docs/.vitepress/config.ts

@@ -1,9 +1,9 @@
-import type { DefaultTheme } from 'vitepress'
-import { defineConfig } from 'vitepress'
-import { bundledThemes } from 'shiki'
+import antfu from '@antfu/eslint-config'
 import { transformerTwoslash } from '@shikijs/vitepress-twoslash'
+import { bundledThemes } from 'shiki'
 import { createTwoslasher as createTwoslasherESLint } from 'twoslash-eslint'
-import antfu from '@antfu/eslint-config'
+import { defineConfig } from 'vitepress'
+import type { DefaultTheme } from 'vitepress'
 import { version } from '../../package.json'
 import vite from './vite.config'
 

docs/.vitepress/theme/index.ts

@@ -1,6 +1,6 @@
 // https://vitepress.dev/guide/custom-theme
-import Theme from 'vitepress/theme'
 import TwoslashFloatingVue from '@shikijs/vitepress-twoslash/client'
+import Theme from 'vitepress/theme'
 import type { EnhanceAppContext } from 'vitepress'
 
 import '@shikijs/vitepress-twoslash/style.css'

docs/.vitepress/vite.config.ts

@@ -1,11 +1,11 @@
-import { fileURLToPath } from 'node:url'
-import { resolve } from 'node:path'
 import fs from 'node:fs/promises'
-import { defineConfig } from 'vite'
+import { resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import JITI from 'jiti'
+import { format } from 'pretty-format'
 import UnoCSS from 'unocss/vite'
 import Components from 'unplugin-vue-components/vite'
-import { format } from 'pretty-format'
-import JITI from 'jiti'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
   plugins: [

docs/guide/highlight.md

@@ -7,8 +7,8 @@ To get the beautiful result you see on this website, you can use [Shiki](https:/
 It provides [`@shikijs/twoslash`](https://shiki.style/packages/twoslash) that integrates the type information into your code snippets.
 
 ```ts twoslash
-import { codeToHtml } from 'shiki'
 import { transformerTwoslash } from '@shikijs/twoslash' // [!code hl]
+import { codeToHtml } from 'shiki'
 
 const html = await codeToHtml(`console.log()`, {
   lang: 'ts',

docs/package.json

@@ -15,6 +15,6 @@
     "sass": "^1.78.0",
     "unocss": "^0.62.3",
     "vitepress": "^1.3.4",
-    "vue": "^3.5.2"
+    "vue": "^3.5.3"
   }
 }

docs/packages/cdn.md

@@ -74,9 +74,9 @@ Fetching files from CDN is asynchronous, and there is no way to make the whole p
 For example, in [Shiki](https://shiki.style/), the `codeToHtml` function is synchronous as well as the [`@shikijs/twoslash` transformer](https://shiki.style/packages/twoslash).
 
 ```ts
-import { createTwoslashFromCDN } from 'twoslash-cdn'
-import { createHighlighter } from 'shiki'
 import { transformerTwoslash } from '@shikijs/twoslash'
+import { createHighlighter } from 'shiki'
+import { createTwoslashFromCDN } from 'twoslash-cdn'
 
 const highlighter = await createHighlighter({})
 

docs/packages/eslint.md

@@ -66,9 +66,9 @@ If you are using [`@shikijs/twoslash`](https://shiki.style/packages/twoslash) an
 
 ```ts twoslash
 // @noErrors
+import Shiki from '@shikijs/markdown-it'
 import { transformerTwoslash } from '@shikijs/twoslash'
 import { createTwoslasher as createTwoslasherESLint } from 'twoslash-eslint'
-import Shiki from '@shikijs/markdown-it'
 
 const shikiPlugin = await Shiki({
   theme: 'vitesse-light',

package.json

@@ -16,7 +16,7 @@
     "prepare": "simple-git-hooks"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.2.1",
+    "@antfu/eslint-config": "^3.3.2",
     "@iconify-json/ri": "^1.2.0",
     "@iconify-json/svg-spinners": "^1.2.0",
     "@shikijs/markdown-it": "^1.16.2",
@@ -54,7 +54,7 @@
     "vite": "^5.4.3",
     "vite-tsconfig-paths": "^5.0.1",
     "vitest": "^2.0.5",
-    "vue": "^3.5.2"
+    "vue": "^3.5.3"
   },
   "resolutions": {
     "@types/node": "^22.5.4",

packages/twoslash-cdn/playground/main.ts

@@ -1,9 +1,10 @@
-import '@shikijs/twoslash/style-rich.css'
 import { createTransformerFactory, rendererRich } from '@shikijs/twoslash/core'
 import { codeToHtml } from 'shiki'
+import { createTwoslashFromCDN } from 'twoslash-cdn'
 import { createStorage } from 'unstorage'
 import indexedDbDriver from 'unstorage/drivers/indexedb'
-import { createTwoslashFromCDN } from 'twoslash-cdn'
+
+import '@shikijs/twoslash/style-rich.css'
 
 const storage = createStorage({
   driver: indexedDbDriver({ base: 'twoslash-cdn:' }),

packages/twoslash-cdn/src/index.ts

@@ -1,8 +1,8 @@
-import type { TwoslashExecuteOptions, TwoslashFunction, TwoslashOptions, TwoslashReturn } from 'twoslash'
+import { setupTypeAcquisition } from '@typescript/ata'
+import { createDefaultMapFromCDN } from '@typescript/vfs'
 import { createTwoslasher } from 'twoslash'
 import ts from 'typescript'
-import { createDefaultMapFromCDN } from '@typescript/vfs'
-import { setupTypeAcquisition } from '@typescript/ata'
+import type { TwoslashExecuteOptions, TwoslashFunction, TwoslashOptions, TwoslashReturn } from 'twoslash'
 
 /**
  * A subset of `unstorage`'s interface to maximize the compatibility

packages/twoslash-eslint/src/index.ts

@@ -1,5 +1,5 @@
-import { createPositionConverter, resolveNodePositions } from 'twoslash-protocol'
 import { Linter } from 'eslint'
+import { createPositionConverter, resolveNodePositions } from 'twoslash-protocol'
 import type { NodeErrorWithoutPosition, TwoslashGenericFunction, TwoslashGenericResult } from 'twoslash-protocol'
 
 export interface CreateTwoslashESLintOptions {

packages/twoslash-eslint/test/fixtures.test.ts

@@ -2,10 +2,10 @@
 
 import { extname } from 'node:path'
 import process from 'node:process'
-import { expect, it } from 'vitest'
-import type { TwoslashGenericResult } from 'twoslash-protocol'
 import antfu from '@antfu/eslint-config'
+import { expect, it } from 'vitest'
 import type { Linter } from 'eslint'
+import type { TwoslashGenericResult } from 'twoslash-protocol'
 import { createTwoslasher } from '../src/index'
 
 // To add a test, create a file in the fixtures folder and it will will run through

packages/twoslash-vue/src/index.ts

@@ -1,17 +1,4 @@
-import type { Language, VueCompilerOptions } from '@vue/language-core'
-import { FileMap, createLanguage, createVueLanguagePlugin, defaultMapperFactory, resolveVueCompilerOptions, setupGlobalTypes } from '@vue/language-core'
-import type { CompilerOptions } from 'typescript'
-import ts from 'typescript'
-import type {
-  CompilerOptionDeclaration,
-  CreateTwoslashOptions,
-  HandbookOptions,
-  ParsedFlagNotation,
-  Range,
-  TwoslashExecuteOptions,
-  TwoslashInstance,
-  TwoslashReturnMeta,
-} from 'twoslash'
+import { createLanguage, createVueLanguagePlugin, defaultMapperFactory, FileMap, resolveVueCompilerOptions, setupGlobalTypes } from '@vue/language-core'
 import {
   createTwoslasher as createTwoslasherBase,
   defaultCompilerOptions,
@@ -25,6 +12,19 @@ import {
   removeCodeRanges,
   resolveNodePositions,
 } from 'twoslash-protocol'
+import ts from 'typescript'
+import type { Language, VueCompilerOptions } from '@vue/language-core'
+import type {
+  CompilerOptionDeclaration,
+  CreateTwoslashOptions,
+  HandbookOptions,
+  ParsedFlagNotation,
+  Range,
+  TwoslashExecuteOptions,
+  TwoslashInstance,
+  TwoslashReturnMeta,
+} from 'twoslash'
+import type { CompilerOptions } from 'typescript'
 
 export interface VueSpecificOptions {
   /**

packages/twoslash-vue/test/shikiji.test.ts → packages/twoslash-vue/test/shiki.test.ts

@@ -1,6 +1,6 @@
-import { expect, it } from 'vitest'
-import { codeToHtml } from 'shiki'
 import { createTransformerFactory, rendererRich } from '@shikijs/twoslash/core'
+import { codeToHtml } from 'shiki'
+import { expect, it } from 'vitest'
 import { createTwoslasher } from '../src'
 
 const code = await import('./fixtures/example.vue?raw').then(m => m.default)

packages/twoslash/scripts/flag-keys.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises'
 import ts from 'typescript'
-import type { CompilerOptionDeclaration } from '../src/types/options'
 import { defaultHandbookOptions } from '../src/defaults'
+import type { CompilerOptionDeclaration } from '../src/types/options'
 
 async function generateFlagKeys() {
   const tsOptionDeclarations = (ts as any).optionDeclarations as CompilerOptionDeclaration[]

packages/twoslash/src/core.ts

@@ -1,12 +1,15 @@
-import type { CompilerOptions, CompletionEntry, CompletionTriggerKind, DiagnosticCategory, JsxEmit } from 'typescript'
 import { createFSBackedSystem, createSystem, createVirtualTypeScriptEnvironment } from '@typescript/vfs'
-import type { ErrorLevel, NodeError, NodeWithoutPosition, Position, Range } from 'twoslash-protocol'
 import { createPositionConverter, isInRange, isInRanges, removeCodeRanges, resolveNodePositions } from 'twoslash-protocol'
+
+import type { ErrorLevel, NodeError, NodeWithoutPosition, Position, Range } from 'twoslash-protocol'
+import type { CompilerOptions, CompletionEntry, CompletionTriggerKind, DiagnosticCategory, JsxEmit } from 'typescript'
+
+import { defaultCompilerOptions, defaultHandbookOptions } from './defaults'
 import { TwoslashError } from './error'
+import { findCutNotations, findFlagNotations, findQueryMarkers, getExtension, getIdentifierTextSpans, getObjectHash, removeTsExtension, splitFiles, typesToExtension } from './utils'
 import { validateCodeForErrors } from './validation'
-import { defaultCompilerOptions, defaultHandbookOptions } from './defaults'
+
 import type { CompilerOptionDeclaration, CreateTwoslashOptions, TwoslashExecuteOptions, TwoslashInstance, TwoslashOptions, TwoslashReturn, TwoslashReturnMeta, VirtualFile } from './types'
-import { findCutNotations, findFlagNotations, findQueryMarkers, getExtension, getIdentifierTextSpans, getObjectHash, removeTsExtension, splitFiles, typesToExtension } from './utils'
 
 export * from './public'
 

packages/twoslash/src/fallback.ts

@@ -1,8 +1,8 @@
 import { removeCodeRanges } from 'twoslash-protocol'
+import { flagKeys } from './flag-keys'
 import { reAnnonateMarkers, reConfigBoolean, reConfigValue } from './regexp'
-import type { TwoslashReturnMeta } from './types'
 import { findCutNotations } from './utils'
-import { flagKeys } from './flag-keys'
+import type { TwoslashReturnMeta } from './types'
 
 /**
  * A fallback function to strip out twoslash annotations from a string and does nothing else.

packages/twoslash/src/index.ts

@@ -1,11 +1,11 @@
 import ts from 'typescript'
-import type { TwoslashOptions } from './core'
 import { createTwoslasher as _createTwoslasher, twoslasher as _twoslasher } from './core'
 import { convertLegacyOptions, convertLegacyReturn } from './legacy'
+import type { TwoslashOptions } from './core'
 import type { TwoslashOptionsLegacy, TwoslashReturnLegacy } from './legacy'
 
-export * from './public'
 export * from './legacy'
+export * from './public'
 
 // eslint-disable-next-line node/prefer-global/process
 const cwd = /* @__PURE__ */ typeof process !== 'undefined' && typeof process.cwd === 'function' ? process.cwd() : ''

packages/twoslash/src/legacy.ts

@@ -1,5 +1,5 @@
-import type { CompilerOptions } from 'typescript'
 import type { ErrorLevel } from 'twoslash-protocol'
+import type { CompilerOptions } from 'typescript'
 import type { HandbookOptions, TwoslashExecuteOptions, TwoslashReturn } from './types'
 
 export interface TwoslashOptionsLegacy extends TwoslashExecuteOptions {

packages/twoslash/src/public.ts

@@ -1,8 +1,12 @@
 // Public Utilities
 
+export * from './defaults'
 export * from './error'
+export {
+  removeTwoslashNotations,
+} from './fallback'
+
 export * from './types'
-export * from './defaults'
 
 export {
   findCutNotations,
@@ -11,10 +15,6 @@ export {
   getObjectHash,
 } from './utils'
 
-export {
-  removeTwoslashNotations,
-} from './fallback'
-
 export {
   validateCodeForErrors,
 } from './validation'

packages/twoslash/src/types/index.ts

@@ -1,5 +1,5 @@
+export * from './handbook-options'
 export * from './instance'
 export * from './options'
 export * from './returns'
-export * from './handbook-options'
 export * from 'twoslash-protocol/types'

packages/twoslash/src/types/instance.ts

@@ -1,6 +1,6 @@
 import type { VirtualTypeScriptEnvironment } from '@typescript/vfs'
-import type { TwoslashReturn } from './returns'
 import type { TwoslashExecuteOptions } from './options'
+import type { TwoslashReturn } from './returns'
 
 export type TwoslashFunction = (code: string, extension?: string, options?: TwoslashExecuteOptions) => TwoslashReturn
 

packages/twoslash/src/types/options.ts

@@ -1,6 +1,6 @@
 import type { VirtualTypeScriptEnvironment } from '@typescript/vfs'
-import type { CompilerOptions, CustomTransformers } from 'typescript'
 import type { NodeWithoutPosition } from 'twoslash-protocol'
+import type { CompilerOptions, CustomTransformers } from 'typescript'
 import type { HandbookOptions } from './handbook-options'
 import type { TwoslashReturnMeta } from './returns'
 

packages/twoslash/src/types/returns.ts

@@ -1,5 +1,5 @@
-import type { CompilerOptions } from 'typescript'
 import type { NodeCompletion, NodeError, NodeHighlight, NodeHover, NodeQuery, NodeTag, Range, TwoslashGenericResult } from 'twoslash-protocol'
+import type { CompilerOptions } from 'typescript'
 import type { HandbookOptions } from './handbook-options'
 
 export interface TwoslashReturn extends TwoslashGenericResult {

packages/twoslash/src/utils.ts

@@ -1,10 +1,10 @@
-import type { SourceFile } from 'typescript'
 import { objectHash } from 'ohash'
-import type { Range, createPositionConverter } from 'twoslash-protocol'
-import { TwoslashError } from './error'
-import type { CompilerOptionDeclaration, ParsedFlagNotation, TwoslashReturnMeta, VirtualFile } from './types'
+import type { createPositionConverter, Range } from 'twoslash-protocol'
+import type { SourceFile } from 'typescript'
 import { defaultHandbookOptions } from './defaults'
+import { TwoslashError } from './error'
 import { reAnnonateMarkers, reConfigBoolean, reConfigValue, reCutAfter, reCutBefore, reCutEnd, reCutStart, reFilenamesMakers } from './regexp'
+import type { CompilerOptionDeclaration, ParsedFlagNotation, TwoslashReturnMeta, VirtualFile } from './types'
 
 export function getObjectHash(obj: any): string {
   return objectHash(obj)

packages/twoslash/test/custom_transformers.test.ts

@@ -1,6 +1,6 @@
-import type { Node, SourceFile, TransformationContext, TransformerFactory } from 'typescript'
 import { isSourceFile, isStringLiteral, visitEachChild, visitNode } from 'typescript'
 import { expect, it } from 'vitest'
+import type { Node, SourceFile, TransformationContext, TransformerFactory } from 'typescript'
 import { twoslasher } from '../src/index'
 
 it('applies custom transformers', () => {

packages/twoslash/test/fixtures.test.ts

@@ -3,8 +3,8 @@
 import { extname } from 'node:path'
 import process from 'node:process'
 import { expect, it } from 'vitest'
-import type { TwoslashReturn } from '../src/types'
 import { createTwoslasher, removeTwoslashNotations } from '../src/index'
+import type { TwoslashReturn } from '../src/types'
 
 // To add a test, create a file in the fixtures folder and it will will run through
 // as though it was the codeblock.

packages/twoslash/test/new.test.ts

@@ -1,8 +1,8 @@
-import { expect, it } from 'vitest'
 import ts from 'typescript'
+import { expect, it } from 'vitest'
+import { twoslasher } from '../src'
 import { splitFiles } from '../src/utils'
 import type { TwoslashReturn } from '../src/types'
-import { twoslasher } from '../src'
 
 export type TS = typeof import('typescript')