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

package/src/fs/write.ts

@@ -1,20 +1,14 @@
-import { dirname, resolve } from 'node:path'
+import { resolve } from 'node:path'
 
 import fs from 'fs-extra'
 import { switcher } from 'js-runtime'
 
-async function saveCreateDirectory(path: string): Promise<void> {
-  // resolve the full path and get just the directory, ignoring the file and extension
-  const passedPath = dirname(resolve(path))
-  // make the directory, recursively. Theoretically, if every directory in the path exists, this won't do anything.
-  await fs.mkdir(passedPath, { recursive: true })
-}
+type Options = { sanity?: boolean }
 
 const writer = switcher(
   {
-    node: async (path: string, data: string) => {
+    node: async (path: string, data: string, { sanity }: Options) => {
       try {
-        await fs.stat(resolve(path))
         const oldContent = await fs.readFile(resolve(path), { encoding: 'utf-8' })
         if (oldContent?.toString() === data?.toString()) {
           return
@@ -23,30 +17,36 @@ const writer = switcher(
         /* empty */
       }
 
-      await saveCreateDirectory(path)
-      await fs.writeFile(resolve(path), data, { encoding: 'utf-8' })
+      await fs.outputFile(resolve(path), data, { encoding: 'utf-8' })
+
+      if (sanity) {
+        const savedData = await fs.readFile(resolve(path), { encoding: 'utf-8' })
 
-      const savedData = await fs.readFile(resolve(path), { encoding: 'utf-8' })
+        if (savedData?.toString() !== data?.toString()) {
+          throw new Error(`Sanity check failed for ${path}\n\nData[${data.length}]:\n${data}\n\nSaved[${savedData.length}]:\n${savedData}\n`)
+        }
 
-      if (savedData?.toString() !== data?.toString()) {
-        throw new Error(`Sanity check failed for ${path}\n\nData[${data.length}]:\n${data}\n\nSaved[${savedData.length}]:\n${savedData}\n`)
+        return savedData
       }
 
-      return savedData
+      return data
     },
-    bun: async (path: string, data: string) => {
+    bun: async (path: string, data: string, { sanity }: Options) => {
       try {
-        await saveCreateDirectory(path)
         await Bun.write(resolve(path), data)
 
-        const file = Bun.file(resolve(path))
-        const savedData = await file.text()
+        if (sanity) {
+          const file = Bun.file(resolve(path))
+          const savedData = await file.text()
 
-        if (savedData?.toString() !== data?.toString()) {
-          throw new Error(`Sanity check failed for ${path}\n\nData[${data.length}]:\n${data}\n\nSaved[${savedData.length}]:\n${savedData}\n`)
+          if (savedData?.toString() !== data?.toString()) {
+            throw new Error(`Sanity check failed for ${path}\n\nData[${data.length}]:\n${data}\n\nSaved[${savedData.length}]:\n${savedData}\n`)
+          }
+
+          return savedData
         }
 
-        return savedData
+        return data
       } catch (e) {
         console.log(e, resolve(path))
       }
@@ -55,9 +55,25 @@ const writer = switcher(
   'node',
 )
 
-export async function write(data: string, path: string): Promise<string | undefined> {
+export async function write(data: string, path: string, options: Options = {}): Promise<string | undefined> {
   if (data.trim() === '') {
     return undefined
   }
-  return writer(path, data.trim())
+  return writer(path, data.trim(), options)
+}
+
+export async function writeLog(data: string): Promise<string | undefined> {
+  if (data.trim() === '') {
+    return undefined
+  }
+  const path = resolve(process.cwd(), 'kubb-log.log')
+  let previousLogs = ''
+
+  try {
+    previousLogs = await fs.readFile(resolve(path), { encoding: 'utf-8' })
+  } catch (_err) {
+    /* empty */
+  }
+
+  return writer(path, [previousLogs, data.trim()].filter(Boolean).join('\n\n\n'), { sanity: false })
 }

package/src/logger.ts

@@ -1,6 +1,8 @@
 import seedrandom from 'seedrandom'
 import c, { createColors } from 'tinyrainbow'
 
+import { writeLog } from './fs/write.ts'
+
 import type { Ora } from 'ora'
 import type { Formatter } from 'tinyrainbow'
 
@@ -22,6 +24,7 @@ export type Logger = {
   error: (message: string | null) => void
   info: (message: string | null) => void
   warn: (message: string | null) => void
+  debug: (message: string | null) => Promise<void>
   spinner?: Ora
   logs: string[]
 }
@@ -61,6 +64,12 @@ export function createLogger({ logLevel, name, spinner }: Props): Logger {
     }
   }
 
+  const debug: Logger['debug'] = async (message) => {
+    if (message) {
+      await writeLog(message)
+    }
+  }
+
   const logger: Logger = {
     name,
     logLevel,
@@ -68,6 +77,7 @@ export function createLogger({ logLevel, name, spinner }: Props): Logger {
     error,
     warn,
     info,
+    debug,
     spinner,
     logs,
   }

package/src/utils/FunctionParams.ts

@@ -1,6 +1,6 @@
 import { orderBy } from 'natural-orderby'
 
-import transformers from '../transformers/index.ts'
+import { camelCase } from '../transformers/casing.ts'
 
 type FunctionParamsASTWithoutType = {
   name?: string
@@ -67,7 +67,7 @@ export class FunctionParams {
           return acc
         }
         // TODO check whey we still need the camelcase here
-        const parameterName = name.startsWith('{') ? name : transformers.camelCase(name)
+        const parameterName = name.startsWith('{') ? name : camelCase(name)
 
         if (type) {
           if (required) {

package/src/utils/URLPath.ts

@@ -1,4 +1,4 @@
-import transformers from '../transformers/index.ts'
+import { camelCase } from '../transformers/casing.ts'
 
 export type URLObject = {
   url: string
@@ -90,8 +90,8 @@ export class URLPath {
     if (found) {
       newPath = found.reduce((prev, curr) => {
         const pathParam = replacer
-          ? replacer(transformers.camelCase(curr))
-          : transformers.camelCase(curr)
+          ? replacer(camelCase(curr))
+          : camelCase(curr)
         const replacement = `\${${pathParam}}`
 
         return prev.replace(curr, replacement)
@@ -114,8 +114,8 @@ export class URLPath {
       item = item.replaceAll('{', '').replaceAll('}', '')
 
       const pathParam = replacer
-        ? replacer(transformers.camelCase(item))
-        : transformers.camelCase(item)
+        ? replacer(camelCase(item))
+        : camelCase(item)
 
       params[pathParam] = pathParam
     }, this.path)

package/src/utils/index.ts

@@ -1,8 +1,6 @@
 export type { FunctionParamsAST } from './FunctionParams.ts'
 export { FunctionParams } from './FunctionParams.ts'
 export { isPromise, isPromiseFulfilledResult, isPromiseRejectedResult } from './promise.ts'
-export type { QueueJob } from './Queue.ts'
-export { Queue } from './Queue.ts'
 export { renderTemplate } from './renderTemplate.ts'
 export { timeout } from './timeout.ts'
 export { getUniqueName, setUniqueName } from './uniqueName.ts'

package/dist/Queue-2-6pMcCx.d.cts

@@ -1,32 +0,0 @@
-declare class EventEmitter<TEvents extends Record<string, any>> {
-    #private;
-    constructor();
-    emit<TEventName extends keyof TEvents & string>(eventName: TEventName, ...eventArg: TEvents[TEventName]): void;
-    on<TEventName extends keyof TEvents & string>(eventName: TEventName, handler: (...eventArg: TEvents[TEventName]) => void): void;
-    off<TEventName extends keyof TEvents & string>(eventName: TEventName, handler: (...eventArg: TEvents[TEventName]) => void): void;
-    removeAll(): void;
-}
-
-type QueueJob<T = unknown> = {
-    (...args: unknown[]): Promise<T | void>;
-};
-type RunOptions = {
-    controller?: AbortController;
-    name?: string;
-    description?: string;
-};
-type Events = {
-    jobDone: [result: unknown];
-    jobFailed: [error: Error];
-};
-declare class Queue {
-    #private;
-    readonly eventEmitter: EventEmitter<Events>;
-    constructor(maxParallel: number, debug?: boolean);
-    run<T>(job: QueueJob<T>, options?: RunOptions): Promise<T>;
-    runSync<T>(job: QueueJob<T>, options?: RunOptions): void;
-    get hasJobs(): boolean;
-    get count(): number;
-}
-
-export { EventEmitter as E, Queue as Q, type QueueJob as a };

package/dist/Queue-2-6pMcCx.d.ts

@@ -1,32 +0,0 @@
-declare class EventEmitter<TEvents extends Record<string, any>> {
-    #private;
-    constructor();
-    emit<TEventName extends keyof TEvents & string>(eventName: TEventName, ...eventArg: TEvents[TEventName]): void;
-    on<TEventName extends keyof TEvents & string>(eventName: TEventName, handler: (...eventArg: TEvents[TEventName]) => void): void;
-    off<TEventName extends keyof TEvents & string>(eventName: TEventName, handler: (...eventArg: TEvents[TEventName]) => void): void;
-    removeAll(): void;
-}
-
-type QueueJob<T = unknown> = {
-    (...args: unknown[]): Promise<T | void>;
-};
-type RunOptions = {
-    controller?: AbortController;
-    name?: string;
-    description?: string;
-};
-type Events = {
-    jobDone: [result: unknown];
-    jobFailed: [error: Error];
-};
-declare class Queue {
-    #private;
-    readonly eventEmitter: EventEmitter<Events>;
-    constructor(maxParallel: number, debug?: boolean);
-    run<T>(job: QueueJob<T>, options?: RunOptions): Promise<T>;
-    runSync<T>(job: QueueJob<T>, options?: RunOptions): void;
-    get hasJobs(): boolean;
-    get count(): number;
-}
-
-export { EventEmitter as E, Queue as Q, type QueueJob as a };

package/src/utils/Queue.ts

@@ -1,110 +0,0 @@
-import crypto from 'node:crypto'
-import { performance } from 'node:perf_hooks'
-
-import { EventEmitter } from './EventEmitter.ts'
-
-export type QueueJob<T = unknown> = {
-  (...args: unknown[]): Promise<T | void>
-}
-
-type RunOptions = {
-  controller?: AbortController
-  name?: string
-  description?: string
-}
-
-type QueueItem = {
-  reject: <T>(reason?: T) => void
-  resolve: <T>(value: T | PromiseLike<T>) => void
-  job: QueueJob<unknown>
-} & Required<RunOptions>
-
-type Events = {
-  jobDone: [result: unknown]
-  jobFailed: [error: Error]
-}
-
-export class Queue {
-  #queue: QueueItem[] = []
-  readonly eventEmitter: EventEmitter<Events> = new EventEmitter()
-
-  #workerCount = 0
-
-  #maxParallel: number
-  #debug = false
-
-  constructor(maxParallel: number, debug = false) {
-    this.#maxParallel = maxParallel
-    this.#debug = debug
-  }
-
-  run<T>(job: QueueJob<T>, options: RunOptions = { controller: new AbortController(), name: crypto.randomUUID(), description: '' }): Promise<T> {
-    return new Promise<T>((resolve, reject) => {
-      const item = { reject, resolve, job, name: options.name, description: options.description || options.name } as QueueItem
-
-      options.controller?.signal.addEventListener('abort', () => {
-        this.#queue = this.#queue.filter((queueItem) => queueItem.name === item.name)
-
-        reject('Aborted')
-      })
-
-      this.#queue.push(item)
-      this.#work()
-    })
-  }
-
-  runSync<T>(job: QueueJob<T>, options: RunOptions = { controller: new AbortController(), name: crypto.randomUUID(), description: '' }): void {
-    new Promise<T>((resolve, reject) => {
-      const item = { reject, resolve, job, name: options.name, description: options.description || options.name } as QueueItem
-
-      options.controller?.signal.addEventListener('abort', () => {
-        this.#queue = this.#queue.filter((queueItem) => queueItem.name === item.name)
-      })
-
-      this.#queue.push(item)
-      this.#work()
-    })
-  }
-
-  get hasJobs(): boolean {
-    return this.#workerCount > 0 || this.#queue.length > 0
-  }
-
-  get count(): number {
-    return this.#workerCount
-  }
-
-  #work(): void {
-    if (this.#workerCount >= this.#maxParallel) {
-      return
-    }
-
-    this.#workerCount++
-
-    let entry: QueueItem | undefined
-    while ((entry = this.#queue.shift())) {
-      const { reject, resolve, job, name, description } = entry
-
-      if (this.#debug) {
-        performance.mark(name + '_start')
-      }
-
-      job()
-        .then((result) => {
-          this.eventEmitter.emit('jobDone', result)
-
-          resolve(result)
-
-          if (this.#debug) {
-            performance.mark(name + '_stop')
-            performance.measure(description, name + '_start', name + '_stop')
-          }
-        })
-        .catch((err) => {
-          this.eventEmitter.emit('jobFailed', err as Error)
-          reject(err)
-        })
-    }
-    this.#workerCount--
-  }
-}