@kubb/core 2.0.0-beta.12 → 2.0.0-beta.14

package/dist/{write-46ytbnu9.d.cts → write-A6VgHkYA.d.cts}

@@ -2,6 +2,9 @@ declare function getRelativePath(rootDir?: string | null, filePath?: string | nu
 declare function read(path: string): Promise<string>;
 declare function readSync(path: string): string;
 
-declare function write(data: string, path: string): Promise<string | undefined>;
+type Options = {
+    sanity?: boolean;
+};
+declare function write(data: string, path: string, options?: Options): Promise<string | undefined>;
 
 export { readSync as a, getRelativePath as g, read as r, write as w };

package/dist/{write-46ytbnu9.d.ts → write-A6VgHkYA.d.ts}

@@ -2,6 +2,9 @@ declare function getRelativePath(rootDir?: string | null, filePath?: string | nu
 declare function read(path: string): Promise<string>;
 declare function readSync(path: string): string;
 
-declare function write(data: string, path: string): Promise<string | undefined>;
+type Options = {
+    sanity?: boolean;
+};
+declare function write(data: string, path: string, options?: Options): Promise<string | undefined>;
 
 export { readSync as a, getRelativePath as g, read as r, write as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.14",
   "description": "Generator core",
   "keywords": [
     "typescript",
@@ -62,27 +62,28 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
+    "change-case": "^5.3.0",
     "directory-tree": "^3.5.1",
+    "find-up": "^7.0.0",
     "js-runtime": "^0.0.7",
     "natural-orderby": "^3.0.2",
+    "p-queue": "^7.4.1",
     "seedrandom": "^3.0.5",
     "semver": "^7.5.4",
-    "@kubb/parser": "2.0.0-beta.12",
-    "@kubb/types": "2.0.0-beta.12"
+    "fs-extra": "^11.2.0",
+    "@kubb/parser": "2.0.0-beta.14",
+    "@kubb/types": "2.0.0-beta.14"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/lodash.isequal": "4.5.6",
-    "@types/react": "^18.2.41",
+    "@types/react": "^18.2.42",
     "@types/seedrandom": "^3.0.8",
     "@types/semver": "^7.5.6",
-    "change-case": "^5.2.0",
     "eslint": "^8.55.0",
-    "find-up": "^7.0.0",
-    "tinyrainbow": "^1.1.0",
-    "fs-extra": "^11.2.0",
     "lodash.isequal": "^4.5.0",
     "ora": "^7.0.1",
+    "tinyrainbow": "^1.1.1",
     "tsup": "^8.0.1",
     "typescript": "^5.3.2",
     "@kubb/eslint-config": "1.1.8",

package/src/BarrelManager.ts

@@ -1,6 +1,6 @@
 import path from 'path'
 
-import transformers from './transformers/index.ts'
+import { trimExtName } from './transformers/trim.ts'
 import { TreeNode } from './utils/TreeNode.ts'
 
 import type { DirectoryTreeOptions } from 'directory-tree'
@@ -51,7 +51,7 @@ export class BarrelManager {
         const exports: KubbFile.Export[] = treeNode.children
           .filter(Boolean)
           .map((file) => {
-            const importPath: string = file.data.type === 'directory' ? `./${file.data.name}/index` : `./${transformers.trimExtName(file.data.name)}`
+            const importPath: string = file.data.type === 'directory' ? `./${file.data.name}/index` : `./${trimExtName(file.data.name)}`
 
             if (importPath.endsWith('index') && file.data.type === 'file') {
               return undefined
@@ -79,7 +79,7 @@ export class BarrelManager {
         const indexPath = path.resolve(treeNode.data.path, 'index.ts')
         const importPath = treeNodeChild.data.type === 'directory'
           ? `./${treeNodeChild.data.name}/index`
-          : `./${transformers.trimExtName(treeNodeChild.data.name)}`
+          : `./${trimExtName(treeNodeChild.data.name)}`
 
         const exports = [
           {

package/src/FileManager.ts

@@ -7,17 +7,17 @@ import * as factory from '@kubb/parser/factory'
 
 import isEqual from 'lodash.isequal'
 import { orderBy } from 'natural-orderby'
+import PQueue from 'p-queue'
 
 import { getRelativePath, read } from './fs/read.ts'
 import { write } from './fs/write.ts'
-import transformers from './transformers/index.ts'
-import { timeout } from './utils/timeout.ts'
+import { searchAndReplace } from './transformers/searchAndReplace.ts'
+import { trimExtName } from './transformers/trim.ts'
 import { BarrelManager } from './BarrelManager.ts'
 
 import type { GreaterThan } from '@kubb/types'
 import type { BarrelManagerOptions } from './BarrelManager.ts'
 import type { KubbPlugin } from './types.ts'
-import type { Queue, QueueJob } from './utils/Queue.ts'
 
 type BasePath<T extends string = string> = `${T}/`
 
@@ -191,31 +191,19 @@ type AddIndexesProps = {
 }
 
 type Options = {
-  queue?: Queue
-  task?: QueueJob<KubbFile.ResolvedFile>
-  /**
-   * Timeout between writes
-   */
-  timeout?: number
+  queue?: PQueue
+  task?: (file: KubbFile.ResolvedFile) => Promise<KubbFile.ResolvedFile>
 }
 
 export class FileManager {
   #cache: Map<KubbFile.Path, CacheItem[]> = new Map()
 
-  #task?: QueueJob<KubbFile.ResolvedFile>
-  #isWriting = false
-  /**
-   * Timeout between writes
-   */
-  #timeout: number = 0
-  #queue?: Queue
-
-  constructor(options?: Options) {
-    if (options) {
-      this.#task = options.task
-      this.#queue = options.queue
-      this.#timeout = options.timeout || 0
-    }
+  #task: Options['task']
+  #queue: PQueue
+
+  constructor({ task = async (file) => file, queue = new PQueue() }: Options = {}) {
+    this.#task = task
+    this.#queue = queue
 
     return this
   }
@@ -229,21 +217,13 @@ export class FileManager {
     return files
   }
   get isExecuting(): boolean {
-    return this.#queue?.hasJobs ?? this.#isWriting ?? false
-  }
-
-  #validate(file: KubbFile.File): void {
-    if (!file.path.toLowerCase().endsWith(file.baseName.toLowerCase())) {
-      throw new Error(`${file.path} should end with the baseName ${file.baseName}`)
-    }
+    return this.#queue.size !== 0 && this.#queue.pending !== 0
   }
 
   async add<T extends Array<KubbFile.File> = Array<KubbFile.File>>(
     ...files: T
   ): AddResult<T> {
-    const promises = files.map((file) => {
-      // this.#validate(file)
-
+    const promises = combineFiles(files).map((file) => {
       if (file.override) {
         return this.#add(file)
       }
@@ -262,20 +242,16 @@ export class FileManager {
 
   async #add(file: KubbFile.File): Promise<KubbFile.ResolvedFile> {
     const controller = new AbortController()
-    const resolvedFile: KubbFile.ResolvedFile = { id: crypto.randomUUID(), name: transformers.trimExtName(file.baseName), ...file }
+    const resolvedFile: KubbFile.ResolvedFile = { id: crypto.randomUUID(), name: trimExtName(file.baseName), ...file }
 
     this.#cache.set(resolvedFile.path, [{ cancel: () => controller.abort(), ...resolvedFile }])
 
-    if (this.#queue) {
-      await this.#queue.run(
-        async () => {
-          return this.#task?.(resolvedFile)
-        },
-        { controller },
-      )
-    }
-
-    return resolvedFile
+    return this.#queue.add(
+      async () => {
+        return this.#task?.(resolvedFile)
+      },
+      { signal: controller.signal },
+    ) as Promise<KubbFile.ResolvedFile>
   }
 
   async #addOrAppend(file: KubbFile.File): Promise<KubbFile.ResolvedFile> {
@@ -303,7 +279,7 @@ export class FileManager {
       return undefined
     }
 
-    const exportPath = output.path.startsWith('./') ? output.path : `./${output.path}`
+    const exportPath = output.path.startsWith('./') ? trimExtName(output.path) : `./${trimExtName(output.path)}`
     const barrelManager = new BarrelManager({ extName: output.extName, ...options })
     const files = barrelManager.getIndexes(resolve(root, output.path))
 
@@ -320,11 +296,11 @@ export class FileManager {
           ? {
             name: output.exportAs,
             asAlias: true,
-            path: exportPath,
+            path: output.extName ? `${exportPath}${output.extName}` : exportPath,
             isTypeOnly: options.isTypeOnly,
           }
           : {
-            path: exportPath,
+            path: output.extName ? `${exportPath}${output.extName}` : exportPath,
             isTypeOnly: options.isTypeOnly,
           },
       ],
@@ -368,18 +344,7 @@ export class FileManager {
   }
 
   async write(...params: Parameters<typeof write>): Promise<string | undefined> {
-    if (!this.#isWriting) {
-      this.#isWriting = true
-
-      const text = await write(...params)
-
-      this.#isWriting = false
-      return text
-    }
-
-    await timeout(this.#timeout)
-
-    return this.write(...params)
+    return write(...params)
   }
 
   async read(...params: Parameters<typeof read>): Promise<string> {
@@ -391,6 +356,10 @@ export class FileManager {
   static getSource<TMeta extends KubbFile.FileMetaBase = KubbFile.FileMetaBase>(file: KubbFile.File<TMeta>): string {
     return getSource<TMeta>(file)
   }
+
+  static combineFiles<TMeta extends KubbFile.FileMetaBase = KubbFile.FileMetaBase>(files: Array<KubbFile.File<TMeta> | null>): Array<KubbFile.File<TMeta>> {
+    return combineFiles<TMeta>(files)
+  }
   static getMode(path: string | undefined | null): KubbFile.Mode {
     if (!path) {
       return 'directory'
@@ -407,6 +376,41 @@ export class FileManager {
   }
 }
 
+function combineFiles<TMeta extends KubbFile.FileMetaBase = KubbFile.FileMetaBase>(
+  files: Array<KubbFile.File<TMeta> | null>,
+): Array<KubbFile.File<TMeta>> {
+  return files.filter(Boolean).reduce((acc, file: KubbFile.File<TMeta>) => {
+    const prevIndex = acc.findIndex((item) => item.path === file.path)
+
+    if (prevIndex === -1) {
+      return [...acc, file]
+    }
+
+    const prev = acc[prevIndex]
+
+    if (prev && file.override) {
+      acc[prevIndex] = {
+        imports: [],
+        exports: [],
+        ...file,
+      }
+      return acc
+    }
+
+    if (prev) {
+      acc[prevIndex] = {
+        ...file,
+        source: prev.source && file.source ? `${prev.source}\n${file.source}` : '',
+        imports: [...(prev.imports || []), ...(file.imports || [])],
+        exports: [...(prev.exports || []), ...(file.exports || [])],
+        env: { ...(prev.env || {}), ...(file.env || {}) },
+      }
+    }
+
+    return acc
+  }, [] as Array<KubbFile.File<TMeta>>)
+}
+
 export function getSource<TMeta extends KubbFile.FileMetaBase = KubbFile.FileMetaBase>(file: KubbFile.File<TMeta>): string {
   if (!FileManager.isExtensionAllowed(file.baseName)) {
     return file.source
@@ -418,7 +422,7 @@ export function getSource<TMeta extends KubbFile.FileMetaBase = KubbFile.FileMet
   const importNodes = imports.filter(item => {
     // isImportNotNeeded
     // trim extName
-    return item.path !== transformers.trimExtName(file.path)
+    return item.path !== trimExtName(file.path)
   }).map((item) => {
     return factory.createImportDeclaration({
       name: item.name,
@@ -555,9 +559,9 @@ function getEnvSource(source: string, env: NodeJS.ProcessEnv | undefined): strin
     }
 
     if (typeof replaceBy === 'string') {
-      prev = transformers.searchAndReplace({ text: prev.replaceAll(`process.env.${key}`, replaceBy), replaceBy, prefix: 'process.env', key })
+      prev = searchAndReplace({ text: prev.replaceAll(`process.env.${key}`, replaceBy), replaceBy, prefix: 'process.env', key })
       // removes `declare const ...`
-      prev = transformers.searchAndReplace({ text: prev.replaceAll(new RegExp(`(declare const).*\n`, 'ig'), ''), replaceBy, key })
+      prev = searchAndReplace({ text: prev.replaceAll(new RegExp(`(declare const).*\n`, 'ig'), ''), replaceBy, key })
     }
 
     return prev

package/src/PluginManager.ts

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/ban-types, @typescript-eslint/no-unsafe-argument */
 
+import PQueue from 'p-queue'
+
 import { transformReservedWord } from './transformers/transformReservedWord.ts'
 import { EventEmitter } from './utils/EventEmitter.ts'
-import { Queue } from './utils/Queue.ts'
 import { setUniqueName } from './utils/uniqueName.ts'
 import { ValidationPluginError } from './errors.ts'
 import { FileManager } from './FileManager.ts'
@@ -29,7 +30,6 @@ import type {
   ResolveNameParams,
   ResolvePathParams,
 } from './types.ts'
-import type { QueueJob } from './utils/Queue.ts'
 
 type RequiredPluginLifecycle = Required<PluginLifecycle>
 
@@ -64,11 +64,7 @@ type Options = {
   /**
    * Task for the FileManager
    */
-  task: QueueJob<KubbFile.ResolvedFile>
-  /**
-   * Timeout between writes in the FileManager
-   */
-  writeTimeout?: number
+  task: (file: KubbFile.ResolvedFile) => Promise<KubbFile.ResolvedFile>
 }
 
 type Events = {
@@ -82,7 +78,6 @@ export class PluginManager {
   readonly fileManager: FileManager
   readonly events: EventEmitter<Events> = new EventEmitter()
 
-  readonly queue: Queue
   readonly config: KubbConfig
 
   readonly executed: Array<Executer> = []
@@ -92,11 +87,13 @@ export class PluginManager {
   readonly #usedPluginNames: Record<string, number> = {}
   readonly #promiseManager: PromiseManager
 
+  readonly queue: PQueue
+
   constructor(config: KubbConfig, options: Options) {
     this.config = config
     this.logger = options.logger
-    this.queue = new Queue(100, this.logger.logLevel === LogLevel.debug)
-    this.fileManager = new FileManager({ task: options.task, queue: this.queue, timeout: options.writeTimeout })
+    this.queue = new PQueue({ concurrency: 1 })
+    this.fileManager = new FileManager({ task: options.task, queue: this.queue })
     this.#promiseManager = new PromiseManager({ nullCheck: (state: SafeParseResult<'resolveName'> | null) => !!state?.result })
 
     const plugins = config.plugins || []
@@ -130,7 +127,7 @@ export class PluginManager {
       })
 
       if (paths && paths?.length > 1 && this.logger.logLevel === LogLevel.debug) {
-        this.logger.warn(
+        this.logger.debug(
           `Cannot return a path where the 'pluginKey' ${params.pluginKey ? JSON.stringify(params.pluginKey) : '"'} is not unique enough\n\nPaths: ${
             JSON.stringify(paths, undefined, 2)
           }\n\nFalling back on the first item.\n`,
@@ -153,7 +150,7 @@ export class PluginManager {
       })
 
       if (names && names?.length > 1 && this.logger.logLevel === LogLevel.debug) {
-        this.logger.warn(
+        this.logger.debug(
           `Cannot return a name where the 'pluginKey' ${params.pluginKey ? JSON.stringify(params.pluginKey) : '"'} is not unique enough\n\nNames: ${
             JSON.stringify(names, undefined, 2)
           }\n\nFalling back on the first item.\n`,
@@ -442,9 +439,9 @@ export class PluginManager {
 
       if (this.logger.logLevel === LogLevel.debug) {
         if (corePlugin) {
-          this.logger.warn(`No hook '${hookName}' for pluginKey '${JSON.stringify(pluginKey)}' found, falling back on the '@kubb/core' plugin`)
+          this.logger.debug(`No hook '${hookName}' for pluginKey '${JSON.stringify(pluginKey)}' found, falling back on the '@kubb/core' plugin`)
         } else {
-          this.logger.warn(`No hook '${hookName}' for pluginKey '${JSON.stringify(pluginKey)}' found, no fallback found in the '@kubb/core' plugin`)
+          this.logger.debug(`No hook '${hookName}' for pluginKey '${JSON.stringify(pluginKey)}' found, no fallback found in the '@kubb/core' plugin`)
         }
       }
 
@@ -594,10 +591,6 @@ export class PluginManager {
 
     const key = [plugin.name, usedPluginNames[plugin.name]].filter(Boolean) as [typeof plugin.name, string]
 
-    if (plugin.name !== 'core' && usedPluginNames[plugin.name]! >= 2) {
-      pluginManager.logger.warn('Using multiple of the same plugin is an experimental feature')
-    }
-
     // default transform
     if (!plugin.transform) {
       plugin.transform = function transform(code) {

package/src/build.ts

@@ -12,7 +12,6 @@ import { isPromise } from './PromiseManager.ts'
 import type { KubbFile } from './FileManager.ts'
 import type { Logger } from './logger.ts'
 import type { KubbPlugin, PluginContext, PluginParameter, TransformResult } from './types.ts'
-import type { QueueJob } from './utils/Queue.ts'
 
 type BuildOptions = {
   config: PluginContext['config']
@@ -42,6 +41,7 @@ async function transformReducer(
 
 async function setup(options: BuildOptions): Promise<PluginManager> {
   const { config, logger = createLogger({ logLevel: LogLevel.silent }) } = options
+  let count = 0
 
   try {
     if (isInputPath(config) && !new URLPath(config.input.path).isURL) {
@@ -62,48 +62,53 @@ async function setup(options: BuildOptions): Promise<PluginManager> {
     await clean(config.output.path)
   }
 
-  const queueTask = async (file: KubbFile.File) => {
+  const task = async (file: KubbFile.ResolvedFile): Promise<KubbFile.ResolvedFile> => {
     const { path } = file
 
-    let code: string | null = FileManager.getSource(file)
+    let source: string | null = FileManager.getSource(file)
 
     const { result: loadedResult } = await pluginManager.hookFirst({
       hookName: 'load',
       parameters: [path],
     })
     if (loadedResult && isPromise(loadedResult)) {
-      code = await loadedResult
+      source = await loadedResult
     }
     if (loadedResult && !isPromise(loadedResult)) {
-      code = loadedResult
+      source = loadedResult
     }
 
-    if (code) {
-      const transformedCode = await pluginManager.hookReduceArg0({
+    if (source) {
+      source = await pluginManager.hookReduceArg0({
         hookName: 'transform',
-        parameters: [code, path],
+        parameters: [source, path],
         reduce: transformReducer,
       })
 
       if (config.output.write || config.output.write === undefined) {
         if (file.meta?.pluginKey) {
           // run only for pluginKey defined in the meta of the file
-          return pluginManager.hookForPlugin({
+          await pluginManager.hookForPlugin({
             pluginKey: file.meta?.pluginKey,
             hookName: 'writeFile',
-            parameters: [transformedCode, path],
+            parameters: [source, path],
           })
         }
 
-        return pluginManager.hookFirst({
+        await pluginManager.hookFirst({
           hookName: 'writeFile',
-          parameters: [transformedCode, path],
+          parameters: [source, path],
         })
       }
     }
+
+    return {
+      ...file,
+      source: source || '',
+    }
   }
 
-  const pluginManager = new PluginManager(config, { logger, task: queueTask as QueueJob<KubbFile.ResolvedFile>, writeTimeout: 0 })
+  const pluginManager = new PluginManager(config, { logger, task })
 
   pluginManager.on('execute', (executer) => {
     const { hookName, parameters, plugin } = executer
@@ -111,40 +116,60 @@ async function setup(options: BuildOptions): Promise<PluginManager> {
     if (hookName === 'writeFile' && logger.spinner) {
       const [code] = parameters as PluginParameter<'writeFile'>
 
-      if (logger.logLevel === LogLevel.info) {
-        logger.spinner.start(`💾 Writing`)
-      }
-
       if (logger.logLevel === LogLevel.debug) {
-        logger.info(`PluginKey ${c.dim(JSON.stringify(plugin.key))} \nwith source\n\n${code}`)
+        logger.debug(`PluginKey ${c.dim(JSON.stringify(plugin.key))} \nwith source\n\n${code}`)
       }
     }
   })
 
-  pluginManager.on('executed', (executer) => {
-    const { hookName, plugin, output, parameters } = executer
-    const messsage = `${randomCliColour(plugin.name)} Executing ${hookName}`
+  pluginManager.queue.on('add', () => {
+    if (logger.logLevel !== LogLevel.info) {
+      return
+    }
 
-    if (logger.logLevel === LogLevel.info && logger.spinner) {
-      if (hookName === 'writeFile') {
-        const [_code, path] = parameters as PluginParameter<'writeFile'>
+    if (logger.spinner && count === 0) {
+      logger.spinner?.start(`💾 Writing`)
+    }
+  })
 
-        logger.spinner.suffixText = c.dim(path)
-      } else {
-        logger.spinner.suffixText = messsage
-      }
+  pluginManager.queue.on('active', () => {
+    if (logger.logLevel !== LogLevel.info) {
+      return
     }
 
+    if (logger.spinner && pluginManager.queue.size > 0) {
+      const text = `Item: ${count} Size: ${pluginManager.queue.size}  Pending: ${pluginManager.queue.pending}`
+
+      logger.spinner.suffixText = c.dim(text)
+    }
+    ;++count
+  })
+
+  pluginManager.queue.on('completed', () => {
+    if (logger.logLevel !== LogLevel.info) {
+      return
+    }
+
+    if (logger.spinner) {
+      const text = `Item: ${count} Size: ${pluginManager.queue.size}  Pending: ${pluginManager.queue.pending}`
+
+      logger.spinner.suffixText = c.dim(text)
+    }
+  })
+
+  pluginManager.on('executed', (executer) => {
+    const { hookName, plugin, output, parameters } = executer
+
     if (logger.logLevel === LogLevel.debug) {
-      logger.info(messsage)
       const logs = [
+        `${randomCliColour(plugin.name)} Executing ${hookName}`,
         parameters && `${c.bgWhite(`Parameters`)} ${randomCliColour(plugin.name)} ${hookName}`,
         JSON.stringify(parameters, undefined, 2),
         output && `${c.bgWhite('Output')} ${randomCliColour(plugin.name)} ${hookName}`,
         output,
       ].filter(Boolean)
 
-      console.log(logs.join('\n'))
+      logger.debug(logs.join('\n'))
     }
   })
 
@@ -163,7 +188,7 @@ export async function build(options: BuildOptions): Promise<BuildOutput> {
 
   await pluginManager.hookParallel({ hookName: 'buildEnd' })
 
-  if (!fileManager.isExecuting && logger.spinner) {
+  if (logger.logLevel === LogLevel.info && logger.spinner) {
     logger.spinner.suffixText = ''
     logger.spinner.succeed(`💾 Writing completed`)
   }
@@ -184,7 +209,7 @@ export async function safeBuild(options: BuildOptions): Promise<BuildOutput> {
 
     await pluginManager.hookParallel({ hookName: 'buildEnd' })
 
-    if (!fileManager.isExecuting && logger.spinner) {
+    if (logger.logLevel === LogLevel.info && logger.spinner) {
       logger.spinner.suffixText = ''
       logger.spinner.succeed(`💾 Writing completed`)
     }

package/src/fs/clean.ts

@@ -1,5 +1,5 @@
-import { remove } from 'fs-extra'
+import fs from 'fs-extra'
 
 export async function clean(path: string): Promise<void> {
-  return remove(path)
+  return fs.remove(path)
 }

package/src/fs/read.ts

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