@kubb/core 3.0.0-alpha.3 → 3.0.0-alpha.31

package/dist/utils.cjs

@@ -1,27 +1,66 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-
-
-
-
-
-
-
-
-var _chunkYTSNYMHWcjs = require('./chunk-YTSNYMHW.cjs');
-require('./chunk-67C6RBGQ.cjs');
-require('./chunk-XCPFG6DO.cjs');
-
-
-
-
-
-
-
-
-
-
-
-exports.FunctionParams = _chunkYTSNYMHWcjs.FunctionParams; exports.URLPath = _chunkYTSNYMHWcjs.URLPath; exports.getParser = _chunkYTSNYMHWcjs.getParser; exports.getUniqueName = _chunkYTSNYMHWcjs.getUniqueName; exports.isPromise = _chunkYTSNYMHWcjs.isPromise; exports.isPromiseFulfilledResult = _chunkYTSNYMHWcjs.isPromiseFulfilledResult; exports.isPromiseRejectedResult = _chunkYTSNYMHWcjs.isPromiseRejectedResult; exports.renderTemplate = _chunkYTSNYMHWcjs.renderTemplate; exports.setUniqueName = _chunkYTSNYMHWcjs.setUniqueName; exports.timeout = _chunkYTSNYMHWcjs.timeout;
+'use strict';
+
+var chunkSX5FHSVT_cjs = require('./chunk-SX5FHSVT.cjs');
+require('./chunk-RIW2LFFQ.cjs');
+require('./chunk-VBGWLAET.cjs');
+
+
+
+Object.defineProperty(exports, "FunctionParams", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.FunctionParams; }
+});
+Object.defineProperty(exports, "URLPath", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.URLPath; }
+});
+Object.defineProperty(exports, "createFile", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.createFile; }
+});
+Object.defineProperty(exports, "createFileExport", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.createFileExport; }
+});
+Object.defineProperty(exports, "createFileImport", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.createFileImport; }
+});
+Object.defineProperty(exports, "createFileParser", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.createFileParser; }
+});
+Object.defineProperty(exports, "getFileParser", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.getFileParser; }
+});
+Object.defineProperty(exports, "getUniqueName", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.getUniqueName; }
+});
+Object.defineProperty(exports, "isPromise", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.isPromise; }
+});
+Object.defineProperty(exports, "isPromiseFulfilledResult", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.isPromiseFulfilledResult; }
+});
+Object.defineProperty(exports, "isPromiseRejectedResult", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.isPromiseRejectedResult; }
+});
+Object.defineProperty(exports, "renderTemplate", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.renderTemplate; }
+});
+Object.defineProperty(exports, "setUniqueName", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.setUniqueName; }
+});
+Object.defineProperty(exports, "timeout", {
+  enumerable: true,
+  get: function () { return chunkSX5FHSVT_cjs.timeout; }
+});
+//# sourceMappingURL=utils.cjs.map
 //# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/home/runner/work/kubb/kubb/packages/core/dist/utils.cjs"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,wDAA6B;AAC7B,gCAA6B;AAC7B,gCAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,+jBAAC","file":"/home/runner/work/kubb/kubb/packages/core/dist/utils.cjs"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"utils.cjs"}

package/dist/utils.d.cts

@@ -1,5 +1,7 @@
 import { PossiblePromise } from '@kubb/types';
-import * as _kubb_parser_ts from '@kubb/parser-ts';
+import * as KubbFile from '@kubb/fs/types';
+import { L as Logger } from './logger-DvbHXjIO.cjs';
+import 'consola';
 
 type FunctionParamsASTWithoutType = {
     name?: string;
@@ -101,6 +103,30 @@ declare class URLPath {
     toURLPath(): string;
 }
 
-declare function getParser(language: string | undefined): Promise<typeof _kubb_parser_ts>;
+/**
+ * Helper to create a file with name and id set
+ */
+declare function createFile<TMeta extends object = object>(file: KubbFile.File<TMeta>): KubbFile.ResolvedFile<TMeta>;
+/**
+ * Helper to create a fileImport with extname set
+ */
+declare function createFileImport(imp: KubbFile.Import): KubbFile.ResolvedImport;
+/**
+ * Helper to create a fileExport with extname set
+ */
+declare function createFileExport(exp: KubbFile.Export): KubbFile.ResolvedExport;
+type ParserModule<TMeta extends object = object> = {
+    format: (source: string) => Promise<string>;
+    /**
+     * Convert a file to string
+     */
+    print: (file: KubbFile.ResolvedFile<TMeta>, options: PrintOptions) => Promise<string>;
+};
+declare function createFileParser<TMeta extends object = object>(parser: ParserModule<TMeta>): ParserModule<TMeta>;
+type PrintOptions = {
+    extname?: KubbFile.Extname;
+    logger?: Logger;
+};
+declare function getFileParser<TMeta extends object = object>(extname: KubbFile.Extname | undefined): Promise<ParserModule<TMeta>>;
 
-export { FunctionParams, type FunctionParamsAST, type URLObject, URLPath, getParser, getUniqueName, isPromise, isPromiseFulfilledResult, isPromiseRejectedResult, renderTemplate, setUniqueName, timeout };
+export { FunctionParams, type FunctionParamsAST, type ParserModule, type URLObject, URLPath, createFile, createFileExport, createFileImport, createFileParser, getFileParser, getUniqueName, isPromise, isPromiseFulfilledResult, isPromiseRejectedResult, renderTemplate, setUniqueName, timeout };

package/dist/utils.d.ts

@@ -1,5 +1,7 @@
 import { PossiblePromise } from '@kubb/types';
-import * as _kubb_parser_ts from '@kubb/parser-ts';
+import * as KubbFile from '@kubb/fs/types';
+import { L as Logger } from './logger-DvbHXjIO.js';
+import 'consola';
 
 type FunctionParamsASTWithoutType = {
     name?: string;
@@ -101,6 +103,30 @@ declare class URLPath {
     toURLPath(): string;
 }
 
-declare function getParser(language: string | undefined): Promise<typeof _kubb_parser_ts>;
+/**
+ * Helper to create a file with name and id set
+ */
+declare function createFile<TMeta extends object = object>(file: KubbFile.File<TMeta>): KubbFile.ResolvedFile<TMeta>;
+/**
+ * Helper to create a fileImport with extname set
+ */
+declare function createFileImport(imp: KubbFile.Import): KubbFile.ResolvedImport;
+/**
+ * Helper to create a fileExport with extname set
+ */
+declare function createFileExport(exp: KubbFile.Export): KubbFile.ResolvedExport;
+type ParserModule<TMeta extends object = object> = {
+    format: (source: string) => Promise<string>;
+    /**
+     * Convert a file to string
+     */
+    print: (file: KubbFile.ResolvedFile<TMeta>, options: PrintOptions) => Promise<string>;
+};
+declare function createFileParser<TMeta extends object = object>(parser: ParserModule<TMeta>): ParserModule<TMeta>;
+type PrintOptions = {
+    extname?: KubbFile.Extname;
+    logger?: Logger;
+};
+declare function getFileParser<TMeta extends object = object>(extname: KubbFile.Extname | undefined): Promise<ParserModule<TMeta>>;
 
-export { FunctionParams, type FunctionParamsAST, type URLObject, URLPath, getParser, getUniqueName, isPromise, isPromiseFulfilledResult, isPromiseRejectedResult, renderTemplate, setUniqueName, timeout };
+export { FunctionParams, type FunctionParamsAST, type ParserModule, type URLObject, URLPath, createFile, createFileExport, createFileImport, createFileParser, getFileParser, getUniqueName, isPromise, isPromiseFulfilledResult, isPromiseRejectedResult, renderTemplate, setUniqueName, timeout };

package/dist/utils.js

@@ -1,27 +1,4 @@
-import {
-  FunctionParams,
-  URLPath,
-  getParser,
-  getUniqueName,
-  isPromise,
-  isPromiseFulfilledResult,
-  isPromiseRejectedResult,
-  renderTemplate,
-  setUniqueName,
-  timeout
-} from "./chunk-5JZNFPUP.js";
-import "./chunk-4X5FFJPJ.js";
-import "./chunk-HMLY7DHA.js";
-export {
-  FunctionParams,
-  URLPath,
-  getParser,
-  getUniqueName,
-  isPromise,
-  isPromiseFulfilledResult,
-  isPromiseRejectedResult,
-  renderTemplate,
-  setUniqueName,
-  timeout
-};
+export { FunctionParams, URLPath, createFile, createFileExport, createFileImport, createFileParser, getFileParser, getUniqueName, isPromise, isPromiseFulfilledResult, isPromiseRejectedResult, renderTemplate, setUniqueName, timeout } from './chunk-MD2LDZ3Z.js';
+import './chunk-4X5FFJPJ.js';
+//# sourceMappingURL=utils.js.map
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"utils.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.31",
   "description": "Generator core",
   "keywords": [
     "typescript",
@@ -76,31 +76,28 @@
   ],
   "dependencies": {
     "change-case": "^5.4.4",
-    "directory-tree": "^3.5.2",
     "find-up": "^7.0.0",
     "natural-orderby": "^3.0.2",
+    "object-hash": "^3.0.0",
     "p-queue": "^8.0.1",
-    "remeda": "^2.11.0",
+    "remeda": "^2.14.0",
     "seedrandom": "^3.0.5",
     "semver": "^7.6.3",
-    "unraw": "^3.0.0",
-    "@kubb/fs": "3.0.0-alpha.3",
-    "@kubb/parser-ts": "3.0.0-alpha.3",
-    "@kubb/types": "3.0.0-alpha.3"
+    "@kubb/fs": "3.0.0-alpha.31",
+    "@kubb/parser-ts": "3.0.0-alpha.31",
+    "@kubb/types": "3.0.0-alpha.31"
   },
   "devDependencies": {
-    "@types/react": "^18.3.4",
+    "@types/object-hash": "^3.0.6",
     "@types/seedrandom": "^3.0.8",
     "@types/semver": "^7.5.8",
     "consola": "^3.2.3",
-    "ora": "^8.0.1",
     "prettier": "^3.3.3",
     "tinyrainbow": "^1.2.0",
-    "tsup": "^8.2.4",
-    "typescript": "^5.5.4",
-    "@kubb/config-biome": "3.0.0-alpha.3",
-    "@kubb/config-ts": "3.0.0-alpha.3",
-    "@kubb/config-tsup": "3.0.0-alpha.3"
+    "tsup": "^8.3.0",
+    "typescript": "^5.6.2",
+    "@kubb/config-ts": "3.0.0-alpha.31",
+    "@kubb/config-tsup": "3.0.0-alpha.31"
   },
   "engines": {
     "node": ">=20"

package/src/BarrelManager.ts

@@ -1,20 +1,14 @@
-import { getExports } from '@kubb/parser-ts'
+import { join } from 'node:path'
 
-import path from 'node:path'
-
-import { trimExtName } from './transformers/trim.ts'
 import { TreeNode } from './utils/TreeNode.ts'
 
+import { getRelativePath } from '@kubb/fs'
 import type * as KubbFile from '@kubb/fs/types'
-import type { DirectoryTreeOptions } from 'directory-tree'
-
-export type BarrelManagerOptions = {
-  treeNode?: DirectoryTreeOptions
-  isTypeOnly?: boolean
-  /**
-   * Add .ts or .js
-   */
-  extName?: KubbFile.Extname
+import type { FileMetaBase } from './FileManager.ts'
+import type { Logger } from './logger.ts'
+
+type BarrelManagerOptions = {
+  logger?: Logger
 }
 
 export class BarrelManager {
@@ -26,116 +20,108 @@ export class BarrelManager {
     return this
   }
 
-  getNamedExport(root: string, item: KubbFile.Export): KubbFile.Export[] {
-    const exportedNames = getExports(path.resolve(root, item.path))
-
-    if (!exportedNames) {
-      return [item]
-    }
+  getFiles({ files: generatedFiles, root, meta }: { files: KubbFile.File[]; root?: string; meta?: FileMetaBase | undefined }): Array<KubbFile.File> {
+    const { logger } = this.#options
 
-    return exportedNames.reduce(
-      (prev, curr) => {
-        if (!prev[0]?.name || !prev[1]?.name) {
-          return prev
-        }
-
-        if (curr.isTypeOnly) {
-          prev[1] = { ...prev[1], name: [...prev[1].name, curr.name] }
-        } else {
-          prev[0] = { ...prev[0], name: [...prev[0].name, curr.name] }
-        }
-
-        return prev
-      },
-      [
-        {
-          ...item,
-          name: [],
-          isTypeOnly: false,
-        },
-        {
-          ...item,
-          name: [],
-          isTypeOnly: true,
-        },
-      ] as KubbFile.Export[],
-    )
-  }
-
-  getNamedExports(root: string, exports: KubbFile.Export[]): KubbFile.Export[] {
-    return exports?.flatMap((item) => {
-      return this.getNamedExport(root, item)
-    })
-  }
+    const cachedFiles = new Map<KubbFile.Path, KubbFile.File>()
 
-  getIndexes(root: string): Array<KubbFile.File> | null {
-    const { treeNode = {}, isTypeOnly, extName } = this.#options
-    const tree = TreeNode.build(root, treeNode)
+    logger?.emit('debug', { date: new Date(), logs: [`Start barrel generation for pluginKey ${meta?.pluginKey?.join('.')} and root '${root}'`] })
 
-    if (!tree) {
-      return null
-    }
+    TreeNode.build(generatedFiles, root)?.forEach((treeNode) => {
+      if (!treeNode || !treeNode.children || !treeNode.parent?.data.path) {
+        return undefined
+      }
 
-    const fileReducer = (files: Array<KubbFile.File>, treeNode: TreeNode) => {
-      if (!treeNode.children) {
-        return []
+      const barrelFile: KubbFile.File = {
+        path: join(treeNode.parent?.data.path, 'index.ts') as KubbFile.Path,
+        baseName: 'index.ts',
+        exports: [],
+        sources: [],
       }
+      const previousBarrelFile = cachedFiles.get(barrelFile.path)
+      const leaves = treeNode.leaves
 
-      if (treeNode.children.length > 1) {
-        const indexPath: KubbFile.Path = path.resolve(treeNode.data.path, 'index.ts')
+      leaves.forEach((item) => {
+        if (!item.data.name) {
+          return undefined
+        }
 
-        const exports: Array<KubbFile.Export> = treeNode.children
-          .filter(Boolean)
-          .map((file) => {
-            const importPath: string = file.data.type === 'split' ? `./${file.data.name}/index` : `./${trimExtName(file.data.name)}`
+        const sources = item.data.file?.sources || []
 
-            if (importPath.endsWith('index') && file.data.type === 'single') {
-              return undefined
-            }
+        if (!sources.some((source) => source.isIndexable)) {
+          logger?.emit(
+            'warning',
+            `No isIndexable source found(source should have a name and isIndexable):\nFile: ${JSON.stringify(item.data.file, undefined, 2)}`,
+          )
+        }
 
-            return {
-              path: extName ? `${importPath}${extName}` : importPath,
-              isTypeOnly,
-            } as KubbFile.Export
+        sources.forEach((source) => {
+          if (!item.data.file?.path || !source.isIndexable || !source.name) {
+            return undefined
+          }
+          const alreadyContainInPreviousBarrelFile = previousBarrelFile?.sources.some((item) => item.name === source.name)
+
+          if (alreadyContainInPreviousBarrelFile) {
+            return undefined
+          }
+
+          if (!barrelFile.exports) {
+            barrelFile.exports = []
+          }
+
+          // true when we have a subdirectory that also contains barrel files
+          const isSubExport = !!treeNode.parent?.data.path?.split?.('/')?.length
+
+          if (isSubExport) {
+            barrelFile.exports.push({
+              name: [source.name],
+              path: getRelativePath(treeNode.parent?.data.path, item.data.path),
+              isTypeOnly: source.isTypeOnly,
+            })
+          } else {
+            barrelFile.exports.push({
+              name: [source.name],
+              path: `./${item.data.file.baseName}`,
+              isTypeOnly: source.isTypeOnly,
+            })
+          }
+
+          barrelFile.sources.push({
+            name: source.name,
+            isTypeOnly: source.isTypeOnly,
+            //TODO use parser to generate import
+            value: '',
+            isExportable: false,
+            isIndexable: false,
           })
-          .filter(Boolean)
-
-        files.push({
-          path: indexPath,
-          baseName: 'index.ts',
-          source: '',
-          exports,
-          exportable: true,
         })
-      } else if (treeNode.children.length === 1) {
-        const [treeNodeChild] = treeNode.children as [TreeNode]
-
-        const indexPath = path.resolve(treeNode.data.path, 'index.ts')
-        const importPath = treeNodeChild.data.type === 'split' ? `./${treeNodeChild.data.name}/index` : `./${trimExtName(treeNodeChild.data.name)}`
-
-        const exports = [
-          {
-            path: extName ? `${importPath}${extName}` : importPath,
-            isTypeOnly,
-          },
-        ]
-
-        files.push({
-          path: indexPath,
-          baseName: 'index.ts',
-          source: '',
-          exports,
-          exportable: true,
-        })
-      }
+      })
+
+      logger?.emit('debug', {
+        date: new Date(),
+        logs: [
+          `Generating barrelFile '${getRelativePath(root, barrelFile.path)}' for '${getRelativePath(root, treeNode.data?.path)}' with ${barrelFile.sources.length} indexable exports: '${barrelFile.sources?.map((source) => source.name).join(', ')}'`,
+        ],
+      })
 
-      treeNode.children.forEach((childItem) => {
-        fileReducer(files, childItem)
+      logger?.emit('debug', {
+        date: new Date(),
+        logs: [
+          `Generated barrelFile '${getRelativePath(root, barrelFile.path)}' for '${getRelativePath(root, treeNode.data?.path)}' with exports: '${cachedFiles
+            .get(barrelFile.path)
+            ?.sources?.map((source) => source.name)
+            .join(', ')}'`,
+        ],
       })
 
-      return files
-    }
+      if (previousBarrelFile) {
+        previousBarrelFile.sources.push(...barrelFile.sources)
+        previousBarrelFile.exports?.push(...(barrelFile.exports || []))
+      } else {
+        cachedFiles.set(barrelFile.path, barrelFile)
+      }
+    })
 
-    return fileReducer([], tree).reverse()
+    return [...cachedFiles.values()]
   }
 }

package/src/{Generator.ts → BaseGenerator.ts}

@@ -2,7 +2,7 @@
  * Abstract class that contains the building blocks for plugins to create their own Generator
  * @link idea based on https://github.com/colinhacks/zod/blob/master/src/types.ts#L137
  */
-export abstract class Generator<TOptions = unknown, TContext = unknown> {
+export abstract class BaseGenerator<TOptions = unknown, TContext = unknown> {
   #options: TOptions = {} as TOptions
   #context: TContext = {} as TContext