@kubb/core 2.8.2 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "2.8.2",
+  "version": "2.9.1",
   "description": "Generator core",
   "keywords": [
     "typescript",
@@ -95,17 +95,20 @@
     "p-queue": "^8.0.1",
     "seedrandom": "^3.0.5",
     "semver": "^7.6.0",
-    "@kubb/parser": "2.8.2",
-    "@kubb/types": "2.8.2"
+    "unraw": "^3.0.0",
+    "@kubb/parser": "2.9.1",
+    "@kubb/types": "2.9.1"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/react": "^18.2.64",
+    "@types/lodash.tonumber": "^4.0.9",
+    "@types/react": "^18.2.67",
     "@types/seedrandom": "^3.0.8",
     "@types/semver": "^7.5.8",
     "eslint": "^8.57.0",
     "lodash.isequal": "^4.5.0",
+    "lodash.tonumber": "^4.0.3",
     "ora": "^8.0.1",
     "tinyrainbow": "^1.1.1",
     "tsup": "^8.0.2",

package/src/transformers/escape.ts

@@ -29,3 +29,15 @@ export function jsStringEscape(input: any): string {
     }
   })
 }
+
+export function escapeStringRegexp(string: string) {
+  if (typeof string !== 'string') {
+    throw new TypeError('Expected a string')
+  }
+
+  // Escape characters with special meaning either inside or outside character sets.
+  // Use a simple backslash escape when it’s always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns’ stricter grammar.
+  return string
+    .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+    .replace(/-/g, '\\x2d')
+}

package/src/transformers/index.ts

@@ -5,8 +5,11 @@ import { escape, jsStringEscape } from './escape.ts'
 import { createIndent } from './indent.ts'
 import { nameSorter } from './nameSorter.ts'
 import { searchAndReplace } from './searchAndReplace.ts'
+import { stringify } from './stringify.ts'
+import { isNumber, toNumber } from './toNumber.ts'
+import { toRegExp, toRegExpString } from './toRegExp.ts'
 import { transformReservedWord } from './transformReservedWord.ts'
-import { trim, trimExtName } from './trim.ts'
+import { trim, trimExtName, trimQuotes } from './trim.ts'
 
 export { camelCase, pascalCase, pathCase } from './casing.ts'
 export { combineCodes } from './combineCodes.ts'
@@ -15,8 +18,11 @@ export { escape, jsStringEscape } from './escape.ts'
 export { createIndent } from './indent.ts'
 export { nameSorter } from './nameSorter.ts'
 export { searchAndReplace } from './searchAndReplace.ts'
+export { stringify } from './stringify.ts'
+export { isNumber, toNumber } from './toNumber.ts'
+export { toRegExp, toRegExpString } from './toRegExp.ts'
 export { transformReservedWord } from './transformReservedWord.ts'
-export { trim, trimExtName } from './trim.ts'
+export { trim, trimExtName, trimQuotes } from './trim.ts'
 
 export default {
   combineCodes,
@@ -26,7 +32,13 @@ export default {
   transformReservedWord,
   nameSorter,
   searchAndReplace,
+  toNumber,
+  isNumber,
+  stringify,
+  toRegExp,
+  toRegExpString,
   trim,
+  trimQuotes,
   trimExtName,
   JSDoc: {
     createJSDocBlockText,

package/src/transformers/stringify.ts

@@ -0,0 +1,8 @@
+import { trimQuotes } from './trim'
+
+export function stringify(text: string | number | undefined): string {
+  if (text === undefined) {
+    return '""'
+  }
+  return JSON.stringify(trimQuotes(text.toString()))
+}

package/src/transformers/toNumber.ts

@@ -0,0 +1,13 @@
+import _toNumber from 'lodash.tonumber'
+
+export function isNumber(value: unknown): value is number {
+  if (typeof value === 'string') {
+    if (value === '') {
+      return false
+    }
+
+    return !isNaN(toNumber(value))
+  }
+  return typeof value === 'number'
+}
+export const toNumber = _toNumber

package/src/transformers/toRegExp.ts

@@ -0,0 +1,35 @@
+import { jsStringEscape } from './escape'
+import { trimQuotes } from './trim'
+
+function stringToRegex(text: string) {
+  const isStartWithSlash = text.startsWith('/')
+  const isEndWithSlash = text.endsWith('/')
+
+  return new RegExp(text.slice(isStartWithSlash ? 1 : 0, isEndWithSlash ? -1 : undefined))
+}
+
+/**
+ * @experimental
+ */
+export function toRegExp(text: string | RegExp): RegExp {
+  if (typeof text === 'string') {
+    const source = trimQuotes(text)
+
+    return stringToRegex(source)
+  }
+
+  return stringToRegex(text.toString())
+}
+
+export function toRegExpString(text: string): string {
+  const isStartWithSlash = text.startsWith('/')
+  const isEndWithSlash = text.endsWith('/')
+
+  const regexp = `new RegExp('${
+    jsStringEscape(
+      text.slice(isStartWithSlash ? 1 : 0, isEndWithSlash ? -1 : undefined),
+    )
+  }')`
+
+  return regexp
+}

package/src/transformers/trim.ts

@@ -2,6 +2,21 @@ export function trim(text: string): string {
   return text.replaceAll(/\n/g, '').trim()
 }
 
+export function trimQuotes(text: string): string {
+  if (text.match(/^"(.*)"$/)) {
+    return text.replace(/^"(.*)"$/, '$1')
+  }
+  if (text.match(/^'(.*)'$/)) {
+    return text.replace(/^'(.*)'$/, '$1')
+  }
+
+  if (text.match(/^`(.*)`$/)) {
+    return text.replace(/^`(.*)`$/, '$1')
+  }
+
+  return text
+}
+
 export function trimExtName(text: string): string {
   return text.replace(/\.[^/.]+$/, '')
 }

package/src/utils/FunctionParams.ts

@@ -32,55 +32,128 @@ type FunctionParamsASTWithType = {
 
 export type FunctionParamsAST = FunctionParamsASTWithoutType | FunctionParamsASTWithType
 export class FunctionParams {
-  public type?: 'generics' | 'typed'
-  public items: FunctionParamsAST[] = []
+  type?: 'generics' | 'typed'
+  #items: Array<FunctionParamsAST | FunctionParamsAST[]> = []
   constructor(type?: 'generics' | 'typed') {
     this.type = type
 
     return this
   }
 
-  add(item: FunctionParamsAST | Array<FunctionParamsAST | undefined> | undefined): FunctionParams {
+  get items(): FunctionParamsAST[] {
+    return this.#items.flat()
+  }
+
+  add(item: FunctionParamsAST | Array<FunctionParamsAST | FunctionParamsAST[] | undefined> | undefined): FunctionParams {
     if (!item) {
       return this
     }
 
     if (Array.isArray(item)) {
-      item.filter(Boolean).forEach((it) => this.items.push(it))
+      item.filter(Boolean).forEach((it) => this.#items.push(it))
       return this
     }
-    this.items.push(item)
+    this.#items.push(item)
 
     return this
   }
+  static #orderItems(items: Array<FunctionParamsAST | FunctionParamsAST[]>) {
+    return orderBy(items.filter(Boolean), [
+      (v) => {
+        if (Array.isArray(v)) {
+          return undefined
+        }
+        return !v.default
+      },
+      (v) => {
+        if (Array.isArray(v)) {
+          return undefined
+        }
+        return v.required ?? true
+      },
+    ], [
+      'desc',
+      'desc',
+    ])
+  }
 
-  toString(): string {
-    const sortedData = orderBy(this.items.filter(Boolean), [(v) => !v.default, (v) => v.required ?? true], ['desc', 'desc'])
+  static #addParams(acc: string[], item: FunctionParamsAST) {
+    const { enabled = true, name, type, required = true, ...rest } = item
+
+    if (!enabled) {
+      return acc
+    }
+
+    if (!name) {
+      // when name is not se we will use TypeScript generics
+      acc.push(`${type}${rest.default ? ` = ${rest.default}` : ''}`)
+
+      return acc
+    }
+    // TODO check whey we still need the camelcase here
+    const parameterName = name.startsWith('{') ? name : camelCase(name)
+
+    if (type) {
+      if (required) {
+        acc.push(`${parameterName}: ${type}${rest.default ? ` = ${rest.default}` : ''}`)
+      } else {
+        acc.push(`${parameterName}?: ${type}`)
+      }
+    } else {
+      acc.push(`${parameterName}`)
+    }
+
+    return acc
+  }
+
+  static toObject(items: FunctionParamsAST[]): FunctionParamsAST {
+    let type: string[] = []
+    let name: string[] = []
+
+    const enabled = items.every(item => item.enabled) ? items.at(0)?.enabled : true
+    const required = items.every(item => item.required) ?? true
+
+    items.forEach(item => {
+      name = FunctionParams.#addParams(name, { ...item, type: undefined })
+      if (items.some(item => item.type)) {
+        type = FunctionParams.#addParams(type, item)
+      }
+    })
+
+    return {
+      name: `{ ${name.join(', ')} }`,
+      type: type.length ? `{ ${type.join(', ')} }` : undefined,
+      enabled,
+      required,
+    }
+  }
+
+  static toString(items: (FunctionParamsAST | FunctionParamsAST[])[]): string {
+    const sortedData = this.#orderItems(items)
 
     return sortedData
-      .filter(({ enabled = true }) => enabled)
-      .reduce((acc, { name, type, required = true, ...rest }) => {
-        if (!name) {
-          // when name is not se we will use TypeScript generics
-          acc.push(`${type}${rest.default ? ` = ${rest.default}` : ''}`)
+      .reduce((acc, item) => {
+        if (Array.isArray(item)) {
+          const subItems = this.#orderItems(item) as FunctionParamsAST[]
+          const objectItem = FunctionParams.toObject(subItems)
 
-          return acc
-        }
-        // TODO check whey we still need the camelcase here
-        const parameterName = name.startsWith('{') ? name : camelCase(name)
-
-        if (type) {
-          if (required) {
-            acc.push(`${parameterName}: ${type}${rest.default ? ` = ${rest.default}` : ''}`)
-          } else {
-            acc.push(`${parameterName}?: ${type}`)
-          }
-        } else {
-          acc.push(`${parameterName}`)
+          return FunctionParams.#addParams(acc, objectItem)
         }
 
-        return acc
+        return FunctionParams.#addParams(acc, item)
       }, [] as string[])
       .join(', ')
   }
+
+  toObject(): FunctionParamsAST {
+    const items = FunctionParams.#orderItems(this.#items).flat()
+
+    return FunctionParams.toObject(items)
+  }
+
+  toString(): string {
+    const items = FunctionParams.#orderItems(this.#items)
+
+    return FunctionParams.toString(items)
+  }
 }

package/dist/chunk-L3XMZMJ5.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/transformers/searchAndReplace.ts","../src/transformers/trim.ts","../src/transformers/transformReservedWord.ts"],"sourcesContent":["type Options = {\n  text: string\n  replaceBy: string\n  prefix?: string\n  key: string\n  searchValues?: (prefix: string, key: string) => Array<RegExp | string>\n}\n\nexport function searchAndReplace(options: Options): string {\n  const { text, replaceBy, prefix = '', key } = options\n\n  const searchValues = options.searchValues?.(prefix, key) || [\n    `${prefix}[\"${key}\"]`,\n    `${prefix}['${key}']`,\n    `${prefix}[\\`${key}\\`]`,\n    `${prefix}\"${key}\"`,\n    `${prefix}'${key}'`,\n    `${prefix}\\`${key}\\``,\n    new RegExp(`${prefix}${key}`, 'g'),\n  ]\n\n  return searchValues.reduce((prev, searchValue) => {\n    return prev.toString().replaceAll(searchValue, replaceBy)\n  }, text) as string\n}\n","export function trim(text: string): string {\n  return text.replaceAll(/\\n/g, '').trim()\n}\n\nexport function trimExtName(text: string): string {\n  return text.replace(/\\.[^/.]+$/, '')\n}\n","/**\n * @link https://github.com/jonschlinkert/reserved/blob/master/index.js\n */\nconst reservedWords = [\n  'abstract',\n  'arguments',\n  'boolean',\n  'break',\n  'byte',\n  'case',\n  'catch',\n  'char',\n  'class',\n  'const',\n  'continue',\n  'debugger',\n  'default',\n  'delete',\n  'do',\n  'double',\n  'else',\n  'enum',\n  'eval',\n  'export',\n  'extends',\n  'false',\n  'final',\n  'finally',\n  'float',\n  'for',\n  'function',\n  'goto',\n  'if',\n  'implements',\n  'import',\n  'in',\n  'instanceof',\n  'int',\n  'interface',\n  'let',\n  'long',\n  'native',\n  'new',\n  'null',\n  'package',\n  'private',\n  'protected',\n  'public',\n  'return',\n  'short',\n  'static',\n  'super',\n  'switch',\n  'synchronized',\n  'this',\n  'throw',\n  'throws',\n  'transient',\n  'true',\n  'try',\n  'typeof',\n  'var',\n  'void',\n  'volatile',\n  'while',\n  'with',\n  'yield',\n\n  'Array',\n  'Date',\n  'eval',\n  'function',\n  'hasOwnProperty',\n  'Infinity',\n  'isFinite',\n  'isNaN',\n  'isPrototypeOf',\n  'length',\n  'Math',\n  'name',\n  'NaN',\n  'Number',\n  'Object',\n  'prototype',\n  'String',\n  'toString',\n  'undefined',\n  'valueOf',\n]\n\nexport function transformReservedWord(word: string): string {\n  if ((word && reservedWords.includes(word)) || word?.match(/^\\d/)) {\n    return `_${word}`\n  }\n\n  return word\n}\n"],"mappings":";;;;;AAAA;AAQO,SAAS,iBAAiB,SAA0B;AACzD,QAAM,EAAE,MAAM,WAAW,SAAS,IAAI,IAAI,IAAI;AAE9C,QAAM,eAAe,QAAQ,eAAe,QAAQ,GAAG,KAAK;AAAA,IAC1D,GAAG,MAAM,KAAK,GAAG;AAAA,IACjB,GAAG,MAAM,KAAK,GAAG;AAAA,IACjB,GAAG,MAAM,MAAM,GAAG;AAAA,IAClB,GAAG,MAAM,IAAI,GAAG;AAAA,IAChB,GAAG,MAAM,IAAI,GAAG;AAAA,IAChB,GAAG,MAAM,KAAK,GAAG;AAAA,IACjB,IAAI,OAAO,GAAG,MAAM,GAAG,GAAG,IAAI,GAAG;AAAA,EACnC;AAEA,SAAO,aAAa,OAAO,CAAC,MAAM,gBAAgB;AAChD,WAAO,KAAK,SAAS,EAAE,WAAW,aAAa,SAAS;AAAA,EAC1D,GAAG,IAAI;AACT;;;ACxBA;AAAO,SAAS,KAAK,MAAsB;AACzC,SAAO,KAAK,WAAW,OAAO,EAAE,EAAE,KAAK;AACzC;AAEO,SAAS,YAAY,MAAsB;AAChD,SAAO,KAAK,QAAQ,aAAa,EAAE;AACrC;;;ACNA;AAGA,IAAM,gBAAgB;AAAA,EACpB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,SAAS,sBAAsB,MAAsB;AAC1D,MAAK,QAAQ,cAAc,SAAS,IAAI,KAAM,MAAM,MAAM,KAAK,GAAG;AAChE,WAAO,IAAI,IAAI;AAAA,EACjB;AAEA,SAAO;AACT;","names":[]}

package/dist/chunk-XXN4BH6X.cjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/transformers/searchAndReplace.ts","../src/transformers/trim.ts","../src/transformers/transformReservedWord.ts"],"names":[],"mappings":";;;;;AAAA;AAQO,SAAS,iBAAiB,SAA0B;AACzD,QAAM,EAAE,MAAM,WAAW,SAAS,IAAI,IAAI,IAAI;AAE9C,QAAM,eAAe,QAAQ,eAAe,QAAQ,GAAG,KAAK;AAAA,IAC1D,GAAG,MAAM,KAAK,GAAG;AAAA,IACjB,GAAG,MAAM,KAAK,GAAG;AAAA,IACjB,GAAG,MAAM,MAAM,GAAG;AAAA,IAClB,GAAG,MAAM,IAAI,GAAG;AAAA,IAChB,GAAG,MAAM,IAAI,GAAG;AAAA,IAChB,GAAG,MAAM,KAAK,GAAG;AAAA,IACjB,IAAI,OAAO,GAAG,MAAM,GAAG,GAAG,IAAI,GAAG;AAAA,EACnC;AAEA,SAAO,aAAa,OAAO,CAAC,MAAM,gBAAgB;AAChD,WAAO,KAAK,SAAS,EAAE,WAAW,aAAa,SAAS;AAAA,EAC1D,GAAG,IAAI;AACT;;;ACxBA;AAAO,SAAS,KAAK,MAAsB;AACzC,SAAO,KAAK,WAAW,OAAO,EAAE,EAAE,KAAK;AACzC;AAEO,SAAS,YAAY,MAAsB;AAChD,SAAO,KAAK,QAAQ,aAAa,EAAE;AACrC;;;ACNA;AAGA,IAAM,gBAAgB;AAAA,EACpB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,SAAS,sBAAsB,MAAsB;AAC1D,MAAK,QAAQ,cAAc,SAAS,IAAI,KAAM,MAAM,MAAM,KAAK,GAAG;AAChE,WAAO,IAAI,IAAI;AAAA,EACjB;AAEA,SAAO;AACT","sourcesContent":["type Options = {\n  text: string\n  replaceBy: string\n  prefix?: string\n  key: string\n  searchValues?: (prefix: string, key: string) => Array<RegExp | string>\n}\n\nexport function searchAndReplace(options: Options): string {\n  const { text, replaceBy, prefix = '', key } = options\n\n  const searchValues = options.searchValues?.(prefix, key) || [\n    `${prefix}[\"${key}\"]`,\n    `${prefix}['${key}']`,\n    `${prefix}[\\`${key}\\`]`,\n    `${prefix}\"${key}\"`,\n    `${prefix}'${key}'`,\n    `${prefix}\\`${key}\\``,\n    new RegExp(`${prefix}${key}`, 'g'),\n  ]\n\n  return searchValues.reduce((prev, searchValue) => {\n    return prev.toString().replaceAll(searchValue, replaceBy)\n  }, text) as string\n}\n","export function trim(text: string): string {\n  return text.replaceAll(/\\n/g, '').trim()\n}\n\nexport function trimExtName(text: string): string {\n  return text.replace(/\\.[^/.]+$/, '')\n}\n","/**\n * @link https://github.com/jonschlinkert/reserved/blob/master/index.js\n */\nconst reservedWords = [\n  'abstract',\n  'arguments',\n  'boolean',\n  'break',\n  'byte',\n  'case',\n  'catch',\n  'char',\n  'class',\n  'const',\n  'continue',\n  'debugger',\n  'default',\n  'delete',\n  'do',\n  'double',\n  'else',\n  'enum',\n  'eval',\n  'export',\n  'extends',\n  'false',\n  'final',\n  'finally',\n  'float',\n  'for',\n  'function',\n  'goto',\n  'if',\n  'implements',\n  'import',\n  'in',\n  'instanceof',\n  'int',\n  'interface',\n  'let',\n  'long',\n  'native',\n  'new',\n  'null',\n  'package',\n  'private',\n  'protected',\n  'public',\n  'return',\n  'short',\n  'static',\n  'super',\n  'switch',\n  'synchronized',\n  'this',\n  'throw',\n  'throws',\n  'transient',\n  'true',\n  'try',\n  'typeof',\n  'var',\n  'void',\n  'volatile',\n  'while',\n  'with',\n  'yield',\n\n  'Array',\n  'Date',\n  'eval',\n  'function',\n  'hasOwnProperty',\n  'Infinity',\n  'isFinite',\n  'isNaN',\n  'isPrototypeOf',\n  'length',\n  'Math',\n  'name',\n  'NaN',\n  'Number',\n  'Object',\n  'prototype',\n  'String',\n  'toString',\n  'undefined',\n  'valueOf',\n]\n\nexport function transformReservedWord(word: string): string {\n  if ((word && reservedWords.includes(word)) || word?.match(/^\\d/)) {\n    return `_${word}`\n  }\n\n  return word\n}\n"]}