chore: cleanup

Author: stijnvanhulle

docs/.vitepress/config.ts

@@ -1,7 +1,8 @@
-import { defineConfig } from 'vitepress'
 import { createWriteStream } from 'node:fs'
 import { resolve } from 'node:path'
+
 import { SitemapStream } from 'sitemap'
+import { defineConfig } from 'vitepress'
 
 import { version } from '../../packages/core/package.json'
 

docs/.vitepress/theme/index.ts

@@ -1,8 +1,8 @@
 // https://vitepress.dev/guide/custom-theme
-import { h } from 'vue'
-import DefaultTheme from 'vitepress/theme'
-import { EnhanceAppContext } from 'vitepress/dist/client'
 import { inject } from '@vercel/analytics'
+import { EnhanceAppContext } from 'vitepress/dist/client'
+import DefaultTheme from 'vitepress/theme'
+import { h } from 'vue'
 
 import HomePage from './HomePage.vue'
 

e2e/package.json

@@ -34,7 +34,7 @@
     "@tanstack/react-query": "^4.36.1",
     "@tanstack/solid-query": "^4.36.1",
     "@tanstack/svelte-query": "^4.36.1",
-    "@tanstack/vue-query": "^4.36.1",
+    "@tanstack/vue-query": "^4.36.2",
     "@zodios/core": "^10.9.6",
     "axios": "^1.5.1",
     "msw": "^1.3.2",

e2e/src/client.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 
-import type { AxiosError, AxiosHeaders, AxiosResponse, AxiosRequestConfig } from 'axios'
+import type { AxiosError, AxiosHeaders, AxiosRequestConfig, AxiosResponse } from 'axios'
 
 declare const AXIOS_BASE: string
 declare const AXIOS_HEADERS: string

examples/advanced/package.json

@@ -38,7 +38,7 @@
     "@tanstack/react-query": "^4.36.1",
     "@tanstack/solid-query": "^4.36.1",
     "@tanstack/svelte-query": "^4.36.1",
-    "@tanstack/vue-query": "^4.36.1",
+    "@tanstack/vue-query": "^4.36.2",
     "@zodios/core": "^10.9.6",
     "axios": "^1.5.1",
     "msw": "^1.3.2",

examples/vue-query/package.json

@@ -28,7 +28,7 @@
     "@kubb/swagger-tanstack-query": "workspace:*",
     "@kubb/swagger-ts": "workspace:*",
     "@kubb/swagger-zod": "workspace:*",
-    "@tanstack/vue-query": "^4.36.1",
+    "@tanstack/vue-query": "^4.36.2",
     "axios": "^1.5.1",
     "vue": "^3.3.4"
   },

examples/vue-query/src/Pets.vue

@@ -18,8 +18,7 @@ export default defineComponent({
       }
     })
     
-    const petsQuery = useFindPetsByStatus(params  )
-
+    const petsQuery = useFindPetsByStatus(params)
     const pets = computed(() => unref(petsQuery?.data));
 
     return {

package.json

@@ -56,7 +56,6 @@
     "bun-types": "^1.0.4",
     "prettier": "^3.0.3",
     "prettier-eslint": "^15.0.1",
-    "prettier-plugin-curly": "^0.1.3",
     "ts-node": "^10.9.1",
     "turbo": "^1.10.15",
     "typescript": "~5.2.2",

packages/cli/src/generate.ts

@@ -1,17 +1,16 @@
-import { build, ParallelPluginError, PluginError, SummaryError, timeout, LogLevel } from '@kubb/core'
-
-import type { ExecaReturnValue } from 'execa'
-import type { Writable } from 'node:stream'
+import { build, LogLevel, ParallelPluginError, PluginError, SummaryError, timeout } from '@kubb/core'
 
 import { execa } from 'execa'
 import pc from 'picocolors'
 import { parseArgsStringToArgv } from 'string-argv'
 
-import type { CLIOptions, KubbConfig } from '@kubb/core'
+import { getSummary } from './utils/getSummary.ts'
 import { OraWritable } from './utils/OraWritable.ts'
 import { spinner } from './utils/spinner.ts'
-import { getSummary } from './utils/getSummary.ts'
-import type { Logger } from '@kubb/core'
+
+import type { CLIOptions, KubbConfig, Logger } from '@kubb/core'
+import type { ExecaReturnValue } from 'execa'
+import type { Writable } from 'node:stream'
 
 type GenerateProps = {
   input?: string

packages/cli/src/index.ts

@@ -1,16 +1,16 @@
 import pathParser from 'node:path'
 
+import { createLogger, LogLevel, SummaryError, Warning } from '@kubb/core'
+
 import cac from 'cac'
 import pc from 'picocolors'
 
 import { version } from '../package.json'
-import init from './init.ts'
 import generate from './generate.ts'
+import init from './init.ts'
 import { getConfig, getCosmiConfig, renderErrors, spinner, startWatcher } from './utils/index.ts'
 
-import { LogLevel, SummaryError, createLogger } from '@kubb/core'
 import type { CLIOptions } from '@kubb/core'
-import { Warning } from '@kubb/core'
 
 const moduleName = 'kubb'
 const logger = createLogger(spinner)

packages/cli/src/init.ts

@@ -1,6 +1,6 @@
 import pathParser from 'node:path'
 
-import { LogLevel, isPromiseFulfilledResult, write } from '@kubb/core'
+import { isPromiseFulfilledResult, LogLevel, write } from '@kubb/core'
 
 import { $ } from 'execa'
 import pc from 'picocolors'

packages/cli/src/utils/OraWritable.ts

@@ -3,11 +3,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import type { WritableOptions } from 'node:stream'
 import { Writable } from 'node:stream'
-import type { Ora } from 'ora'
+
 import pc from 'picocolors'
 
+import type { WritableOptions } from 'node:stream'
+import type { Ora } from 'ora'
+
 export class OraWritable extends Writable {
   public command: string
   public spinner: Ora

packages/cli/src/utils/getSummary.ts

@@ -1,9 +1,13 @@
 import pathParser from 'node:path'
-import type { BuildOutput, KubbConfig } from '@kubb/core'
-import { randomPicoColour, LogLevel } from '@kubb/core'
+
+import { LogLevel, randomPicoColour } from '@kubb/core'
+
 import pc from 'picocolors'
+
 import { parseHrtimeToSeconds } from './parseHrtimeToSeconds.ts'
 
+import type { BuildOutput, KubbConfig } from '@kubb/core'
+
 type SummaryProps = {
   pluginManager: BuildOutput['pluginManager']
   status: 'success' | 'failed'

packages/cli/src/utils/renderErrors.ts

@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 
-import { LogLevel } from '@kubb/core'
-import { ParallelPluginError } from '@kubb/core'
+import { LogLevel, ParallelPluginError } from '@kubb/core'
+
 import PrettyError from 'pretty-error'
 
 export const prettyError = new PrettyError()

packages/cli/src/utils/spinner.ts

@@ -1,4 +1,5 @@
 import ora from 'ora'
+
 export const spinner = ora({
   spinner: 'clock',
 })

packages/config/eslint-config/src/flat.ts

@@ -38,10 +38,10 @@ import vitestGlobalsPlugin from 'eslint-plugin-vitest-globals'
  */
 import globals from 'globals'
 
+import { ignores } from './ignores'
 import { rules } from './rules'
 
 import type { Linter } from 'eslint'
-import { ignores } from './ignores'
 
 /**
  * Recommended plugins CJS

packages/config/eslint-config/src/index.ts

@@ -1,9 +1,9 @@
 import globals from 'globals'
 
+import { ignores } from './ignores'
 import { rules } from './rules'
 
 import type { Linter } from 'eslint'
-import { ignores } from './ignores'
 
 const config: Linter.Config = {
   root: true,

packages/core/src/build.test.ts

@@ -1,8 +1,8 @@
 import { build } from './build'
-import type { KubbConfig } from './types'
 import { createPlugin } from './plugin'
 
 import type { File } from './managers/fileManager/types'
+import type { KubbConfig } from './types'
 
 describe('build', () => {
   const pluginMocks = {

packages/core/src/build.ts

@@ -1,13 +1,14 @@
+import pc from 'picocolors'
+
 import { createFileSource } from './managers/fileManager/index.ts'
 import { PluginManager } from './managers/pluginManager/index.ts'
-import { clean, createLogger, URLPath, randomPicoColour, read } from './utils/index.ts'
+import { LogLevel } from './types.ts'
+import { clean, createLogger, randomPicoColour, read, URLPath } from './utils/index.ts'
 import { isPromise } from './utils/isPromise.ts'
-import pc from 'picocolors'
 
 import type { File, ResolvedFile } from './managers/fileManager/index.ts'
-import { LogLevel } from './types.ts'
 import type { BuildOutput, KubbPlugin, PluginContext, TransformResult } from './types.ts'
-import type { QueueJob, Logger } from './utils/index.ts'
+import type { Logger, QueueJob } from './utils/index.ts'
 
 type BuildOptions = {
   config: PluginContext['config']

packages/core/src/managers/fileManager/FileManager.ts

@@ -1,12 +1,12 @@
 import crypto from 'node:crypto'
 
 import { read, write } from '../../utils/index.ts'
-import type { Extension } from './utils.ts'
 import { extensions } from './utils.ts'
 
-import type { Queue, QueueJob } from '../../utils/index.ts'
-import type { File, ResolvedFile, CacheItem, UUID } from './types.ts'
 import type { Path } from '../../types.ts'
+import type { Queue, QueueJob } from '../../utils/index.ts'
+import type { CacheItem, File, ResolvedFile, UUID } from './types.ts'
+import type { Extension } from './utils.ts'
 
 export class FileManager {
   private cache: Map<Path, CacheItem[]> = new Map()

packages/core/src/managers/fileManager/utils.ts

@@ -2,12 +2,13 @@ import pathParser from 'node:path'
 
 import { createExportDeclaration, createImportDeclaration, print } from '@kubb/ts-codegen'
 
+import isEqual from 'lodash.isequal'
+
 import { TreeNode } from '../../utils/index.ts'
 
 import type { Path } from '../../types.ts'
 import type { PathMode, TreeNodeOptions } from '../../utils/index.ts'
-import type { Import, Export, File } from './types.ts'
-import isEqual from 'lodash.isequal'
+import type { Export, File, Import } from './types.ts'
 
 type TreeNodeData = { type: PathMode; path: Path; name: string }
 

packages/core/src/managers/pluginManager/ParallelPluginError.test.ts

@@ -1,8 +1,8 @@
+import { createLogger } from '../../utils/logger.ts'
 import { ParallelPluginError } from './ParallelPluginError.ts'
 import { PluginManager } from './PluginManager.ts'
 
 import type { KubbConfig } from '../../types.ts'
-import { createLogger } from '../../utils/logger.ts'
 
 describe('ParallelPluginError', () => {
   const config: KubbConfig = {

packages/core/src/managers/pluginManager/PluginError.test.ts

@@ -1,8 +1,8 @@
+import { createLogger } from '../../utils/logger.ts'
 import { PluginError } from './PluginError.ts'
 import { PluginManager } from './PluginManager.ts'
 
 import type { KubbConfig } from '../../types.ts'
-import { createLogger } from '../../utils/logger.ts'
 
 describe('PluginError', () => {
   const config: KubbConfig = {

packages/core/src/managers/pluginManager/PluginManager.test.ts

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { createPlugin } from '../../plugin.ts'
+import { createLogger } from '../../utils/logger.ts'
 import { hooks, PluginManager } from './PluginManager.ts'
 
 import type { KubbConfig, TransformResult } from '../../types.ts'
-import { createLogger } from '../../utils/logger.ts'
 
 describe('PluginManager', () => {
   const pluginAMocks = {

packages/core/src/managers/pluginManager/PluginManager.ts

@@ -1,31 +1,30 @@
 /* eslint-disable @typescript-eslint/ban-types, @typescript-eslint/no-unsafe-argument */
 
 import { definePlugin } from '../../plugin.ts'
+import { EventEmitter } from '../../utils/EventEmitter.ts'
 import { isPromise, isPromiseRejectedResult } from '../../utils/isPromise.ts'
 import { Queue } from '../../utils/Queue.ts'
 import { FileManager } from '../fileManager/FileManager.ts'
 import { ParallelPluginError } from './ParallelPluginError.ts'
 import { PluginError } from './PluginError.ts'
-
-import { EventEmitter } from '../../utils/EventEmitter.ts'
+import { pluginParser } from './pluginParser.ts'
 
 import type { CorePluginOptions } from '../../plugin.ts'
 import type {
   KubbConfig,
   KubbPlugin,
-  PossiblePromise,
+  OptionalPath,
   PluginContext,
   PluginLifecycle,
   PluginLifecycleHooks,
+  PossiblePromise,
   ResolveNameParams,
   ResolvePathParams,
-  OptionalPath,
 } from '../../types.ts'
-import type { QueueJob } from '../../utils/Queue.ts'
-import type { Argument0, Executer, ParseResult, SafeParseResult, Strategy } from './types.ts'
 import type { Logger } from '../../utils/logger.ts'
+import type { QueueJob } from '../../utils/Queue.ts'
 import type { ResolvedFile } from '../fileManager/types.ts'
-import { pluginParser } from './pluginParser.ts'
+import type { Argument0, Executer, ParseResult, SafeParseResult, Strategy } from './types.ts'
 
 // inspired by: https://github.com/rollup/rollup/blob/master/src/utils/PluginDriver.ts#
 

packages/core/src/types.ts

@@ -1,7 +1,7 @@
-import type { Logger } from './utils/logger.ts'
 import type { File, FileManager } from './managers/fileManager/index.ts'
 import type { PluginManager } from './managers/index.ts'
 import type { Cache } from './utils/cache.ts'
+import type { Logger } from './utils/logger.ts'
 
 /**
  * @deprecated

packages/core/src/utils/EventEmitter.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { EventEmitter as NodeEventEmitter } from 'node:events'
+
 export class EventEmitter<TEvents extends Record<string, any>> {
   private emitter = new NodeEventEmitter()
 

packages/core/src/utils/importModule.test.ts

@@ -1,6 +1,7 @@
-import { importModule, normalizeDirectory } from './importModule.ts'
 import path from 'node:path'
 
+import { importModule, normalizeDirectory } from './importModule.ts'
+
 describe('importModule', () => {
   test('normalizeDirectory', () => {
     expect(normalizeDirectory('/user/nzakas/foo')).toBe('/user/nzakas/foo/')

packages/core/src/utils/importModule.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import mod from 'node:module'
-import { pathToFileURL } from 'node:url'
 import os from 'node:os'
+import { pathToFileURL } from 'node:url'
 
 const SLASHES = new Set(['/', '\\'])
 

packages/core/src/utils/logger.ts

@@ -1,6 +1,7 @@
-import type { Ora } from 'ora'
 import pc from 'picocolors'
 
+import type { Ora } from 'ora'
+
 export type LogType = 'error' | 'info' | 'warning'
 
 export type Logger = {

packages/core/src/utils/randomColour.ts

@@ -1,5 +1,6 @@
-import seedrandom from 'seedrandom'
 import pc from 'picocolors'
+import seedrandom from 'seedrandom'
+
 import type { Formatter } from 'picocolors/types'
 
 export const defaultColours = ['black', 'blue', 'darkBlue', 'cyan', 'gray', 'green', 'darkGreen', 'magenta', 'red', 'darkRed', 'yellow', 'darkYellow'] as const

packages/core/src/utils/read.ts

@@ -1,6 +1,6 @@
 import pathParser from 'node:path'
-import fs from 'fs-extra'
 
+import fs from 'fs-extra'
 import { switcher } from 'js-runtime'
 
 function slash(path: string, platform: 'windows' | 'mac' | 'linux' = 'linux') {

packages/core/src/utils/write.ts

@@ -1,5 +1,6 @@
-import fs from 'fs-extra'
 import pathParser from 'node:path'
+
+import fs from 'fs-extra'
 import { switcher } from 'js-runtime'
 
 async function saveCreateDirectory(path: string): Promise<void> {