@kubb/core 2.0.0-beta.11 → 2.0.0-beta.13

package/src/FileManager.ts

@@ -10,7 +10,8 @@ import { orderBy } from 'natural-orderby'
 
 import { getRelativePath, read } from './fs/read.ts'
 import { write } from './fs/write.ts'
-import transformers from './transformers/index.ts'
+import { searchAndReplace } from './transformers/searchAndReplace.ts'
+import { trimExtName } from './transformers/trim.ts'
 import { timeout } from './utils/timeout.ts'
 import { BarrelManager } from './BarrelManager.ts'
 
@@ -262,7 +263,7 @@ 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 }])
 
@@ -418,7 +419,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 +556,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/build.ts

@@ -1,11 +1,11 @@
-import pc from 'picocolors'
+import c from 'tinyrainbow'
 
 import { clean } from './fs/clean.ts'
 import { read } from './fs/read.ts'
 import { URLPath } from './utils/URLPath.ts'
 import { isInputPath } from './config.ts'
 import { FileManager } from './FileManager.ts'
-import { createLogger, LogLevel, randomPicoColour } from './logger.ts'
+import { createLogger, LogLevel, randomCliColour } from './logger.ts'
 import { PluginManager } from './PluginManager.ts'
 import { isPromise } from './PromiseManager.ts'
 
@@ -50,7 +50,7 @@ async function setup(options: BuildOptions): Promise<PluginManager> {
   } catch (e) {
     if (isInputPath(config)) {
       throw new Error(
-        'Cannot read file/URL defined in `input.path` or set with `kubb generate PATH` in the CLI of your Kubb config ' + pc.dim(config.input.path),
+        'Cannot read file/URL defined in `input.path` or set with `kubb generate PATH` in the CLI of your Kubb config ' + c.dim(config.input.path),
         {
           cause: e,
         },
@@ -116,20 +116,20 @@ async function setup(options: BuildOptions): Promise<PluginManager> {
       }
 
       if (logger.logLevel === LogLevel.debug) {
-        logger.info(`PluginKey ${pc.dim(JSON.stringify(plugin.key))} \nwith source\n\n${code}`)
+        logger.info(`PluginKey ${c.dim(JSON.stringify(plugin.key))} \nwith source\n\n${code}`)
       }
     }
   })
 
   pluginManager.on('executed', (executer) => {
     const { hookName, plugin, output, parameters } = executer
-    const messsage = `${randomPicoColour(plugin.name)} Executing ${hookName}`
+    const messsage = `${randomCliColour(plugin.name)} Executing ${hookName}`
 
     if (logger.logLevel === LogLevel.info && logger.spinner) {
       if (hookName === 'writeFile') {
         const [_code, path] = parameters as PluginParameter<'writeFile'>
 
-        logger.spinner.suffixText = pc.dim(path)
+        logger.spinner.suffixText = c.dim(path)
       } else {
         logger.spinner.suffixText = messsage
       }
@@ -138,9 +138,9 @@ async function setup(options: BuildOptions): Promise<PluginManager> {
     if (logger.logLevel === LogLevel.debug) {
       logger.info(messsage)
       const logs = [
-        parameters && `${pc.bgWhite(`Parameters`)} ${randomPicoColour(plugin.name)} ${hookName}`,
+        parameters && `${c.bgWhite(`Parameters`)} ${randomCliColour(plugin.name)} ${hookName}`,
         JSON.stringify(parameters, undefined, 2),
-        output && `${pc.bgWhite('Output')} ${randomPicoColour(plugin.name)} ${hookName}`,
+        output && `${c.bgWhite('Output')} ${randomCliColour(plugin.name)} ${hookName}`,
         output,
       ].filter(Boolean)
 

package/src/logger.ts

@@ -1,8 +1,8 @@
-import pc from 'picocolors'
 import seedrandom from 'seedrandom'
+import c, { createColors } from 'tinyrainbow'
 
 import type { Ora } from 'ora'
-import type { Formatter } from 'picocolors/types.ts'
+import type { Formatter } from 'tinyrainbow'
 
 export const LogLevel = {
   silent: 'silent',
@@ -49,7 +49,7 @@ export function createLogger({ logLevel, name, spinner }: Props): Logger {
 
   const warn: Logger['warn'] = (message) => {
     if (message && spinner) {
-      spinner.warn(pc.yellow(message))
+      spinner.warn(c.yellow(message))
       logs.push(message)
     }
   }
@@ -88,8 +88,8 @@ export function randomColour(text?: string, colours = defaultColours): string {
   return colour
 }
 
-export function randomPicoColour(text?: string, colors = defaultColours): string {
-  const colours = pc.createColors(true)
+export function randomCliColour(text?: string, colors = defaultColours): string {
+  const colours = createColors(true)
 
   if (!text) {
     return colours.white(text)
@@ -101,7 +101,7 @@ export function randomPicoColour(text?: string, colors = defaultColours): string
   const formatter: Formatter = colours[key] as Formatter
 
   if (isDark) {
-    return pc.bold(formatter(text))
+    return c.bold(formatter(text))
   }
 
   if (typeof formatter !== 'function') {
@@ -109,5 +109,3 @@ export function randomPicoColour(text?: string, colors = defaultColours): string
   }
   return formatter(text)
 }
-
-export { default as pc } from 'picocolors'

package/src/plugin.ts

@@ -21,7 +21,7 @@ type Options = {
   resolvePath: PluginContext['resolvePath']
   resolveName: PluginContext['resolveName']
   logger: PluginContext['logger']
-  getPlugins: () => KubbPlugin[]
+  getPlugins: () => Array<KubbPlugin>
   plugin?: PluginContext['plugin']
 }
 

package/src/transformers/casing.ts

@@ -1,9 +1,9 @@
-import { camelCase as changeCaseCamel, camelCaseTransformMerge, pascalCase as changePascalCase, pascalCaseTransformMerge } from 'change-case'
+import { camelCase as changeCaseCamel, pascalCase as changePascalCase } from 'change-case'
 
 export function camelCase(text: string): string {
-  return changeCaseCamel(text, { delimiter: '', stripRegexp: /[^A-Z0-9$]/gi, transform: camelCaseTransformMerge })
+  return changeCaseCamel(text, { delimiter: '', mergeAmbiguousCharacters: true })
 }
 
 export function pascalCase(text: string): string {
-  return changePascalCase(text, { delimiter: '', stripRegexp: /[^A-Z0-9$]/gi, transform: pascalCaseTransformMerge })
+  return changePascalCase(text, { delimiter: '', mergeAmbiguousCharacters: true })
 }

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)