@kubb/core 3.0.0-alpha.6 → 3.0.0-alpha.8

package/dist/utils.d.cts

@@ -1,5 +1,7 @@
 import { PossiblePromise } from '@kubb/types';
 import * as KubbFile from '@kubb/fs/types';
+import { L as Logger } from './logger-BWFeedRk.cjs';
+import 'consola';
 
 type FunctionParamsASTWithoutType = {
     name?: string;
@@ -105,29 +107,28 @@ declare class URLPath {
  * Helper to create a file with name and id set
  */
 declare function createFile<TMeta extends object = object>(file: KubbFile.File<TMeta>): KubbFile.ResolvedFile<TMeta>;
-type ParserModule<TImport = unknown, TExport = unknown> = {
-    createImport: (props: {
-        name: string | Array<string | {
-            propertyName: string;
-            name?: string;
-        }>;
-        path: string;
-        isTypeOnly?: boolean;
-        isNameSpace?: boolean;
-    }) => TImport | undefined;
-    createExport: (props: {
-        path: string;
-        asAlias?: boolean;
-        isTypeOnly?: boolean;
-        name?: string | Array<string>;
-    }) => TExport | undefined;
-    print: (props: {
-        imports: Array<TImport>;
-        exports: Array<TExport>;
-        source: string;
-    }) => string;
+/**
+ * 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> = {
+    /**
+     * By default @kubb/react is used
+     */
+    render: (item: any) => any;
+    /**
+     * 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 = {
+    logger?: Logger;
 };
-declare function createFileParser<TImport = unknown, TExport = unknown>(parser: ParserModule<TImport, TExport>): ParserModule<TImport, TExport>;
-declare function getFileParser(extName: string | undefined): Promise<ParserModule<any, any>>;
+declare function getFileParser<TMeta extends object = object>(extName: KubbFile.Extname | undefined): Promise<ParserModule<TMeta>>;
 
-export { FunctionParams, type FunctionParamsAST, type ParserModule, type URLObject, URLPath, createFile, createFileParser, getFileParser, 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 KubbFile from '@kubb/fs/types';
+import { L as Logger } from './logger-BWFeedRk.js';
+import 'consola';
 
 type FunctionParamsASTWithoutType = {
     name?: string;
@@ -105,29 +107,28 @@ declare class URLPath {
  * Helper to create a file with name and id set
  */
 declare function createFile<TMeta extends object = object>(file: KubbFile.File<TMeta>): KubbFile.ResolvedFile<TMeta>;
-type ParserModule<TImport = unknown, TExport = unknown> = {
-    createImport: (props: {
-        name: string | Array<string | {
-            propertyName: string;
-            name?: string;
-        }>;
-        path: string;
-        isTypeOnly?: boolean;
-        isNameSpace?: boolean;
-    }) => TImport | undefined;
-    createExport: (props: {
-        path: string;
-        asAlias?: boolean;
-        isTypeOnly?: boolean;
-        name?: string | Array<string>;
-    }) => TExport | undefined;
-    print: (props: {
-        imports: Array<TImport>;
-        exports: Array<TExport>;
-        source: string;
-    }) => string;
+/**
+ * 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> = {
+    /**
+     * By default @kubb/react is used
+     */
+    render: (item: any) => any;
+    /**
+     * 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 = {
+    logger?: Logger;
 };
-declare function createFileParser<TImport = unknown, TExport = unknown>(parser: ParserModule<TImport, TExport>): ParserModule<TImport, TExport>;
-declare function getFileParser(extName: string | undefined): Promise<ParserModule<any, any>>;
+declare function getFileParser<TMeta extends object = object>(extName: KubbFile.Extname | undefined): Promise<ParserModule<TMeta>>;
 
-export { FunctionParams, type FunctionParamsAST, type ParserModule, type URLObject, URLPath, createFile, createFileParser, getFileParser, 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

@@ -2,6 +2,8 @@ import {
   FunctionParams,
   URLPath,
   createFile,
+  createFileExport,
+  createFileImport,
   createFileParser,
   getFileParser,
   getUniqueName,
@@ -11,13 +13,14 @@ import {
   renderTemplate,
   setUniqueName,
   timeout
-} from "./chunk-AWAZR3D5.js";
+} from "./chunk-27CPVXAT.js";
 import "./chunk-4X5FFJPJ.js";
-import "./chunk-HMLY7DHA.js";
 export {
   FunctionParams,
   URLPath,
   createFile,
+  createFileExport,
+  createFileImport,
   createFileParser,
   getFileParser,
   getUniqueName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.0-alpha.8",
   "description": "Generator core",
   "keywords": [
     "typescript",
@@ -84,9 +84,9 @@
     "seedrandom": "^3.0.5",
     "semver": "^7.6.3",
     "unraw": "^3.0.0",
-    "@kubb/fs": "3.0.0-alpha.6",
-    "@kubb/parser-ts": "3.0.0-alpha.6",
-    "@kubb/types": "3.0.0-alpha.6"
+    "@kubb/fs": "3.0.0-alpha.8",
+    "@kubb/parser-ts": "3.0.0-alpha.8",
+    "@kubb/types": "3.0.0-alpha.8"
   },
   "devDependencies": {
     "@types/object-hash": "^3.0.6",
@@ -98,9 +98,9 @@
     "tinyrainbow": "^1.2.0",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
-    "@kubb/config-biome": "3.0.0-alpha.6",
-    "@kubb/config-ts": "3.0.0-alpha.6",
-    "@kubb/config-tsup": "3.0.0-alpha.6"
+    "@kubb/config-biome": "3.0.0-alpha.8",
+    "@kubb/config-ts": "3.0.0-alpha.8",
+    "@kubb/config-tsup": "3.0.0-alpha.8"
   },
   "engines": {
     "node": ">=20"

package/src/BarrelManager.ts

@@ -1,21 +1,16 @@
-import path from 'node:path'
+import { join } from 'node:path'
 
 import { TreeNode } from './utils/TreeNode.ts'
 
+import { getRelativePath } from '@kubb/fs'
 import type * as KubbFile from '@kubb/fs/types'
-import { trimExtName } from '@kubb/fs'
+import { combineExports, combineSources } from './FileManager.ts'
+import type { Logger } from './logger.ts'
 
 export type BarrelManagerOptions = {
-  isTypeOnly?: boolean
-  /**
-   * Add .ts or .js
-   */
-  extName?: string
+  logger?: Logger
 }
 
-/**
- * Replace with the use of the FileManager exports/imports
- */
 export class BarrelManager {
   #options: BarrelManagerOptions
 
@@ -25,51 +20,106 @@ export class BarrelManager {
     return this
   }
 
-  getIndexes(generatedFiles: KubbFile.File[], root: string): Array<KubbFile.File> | null {
-    const { isTypeOnly, extName } = this.#options
-    const tree = TreeNode.build(generatedFiles, root)
+  getFiles(generatedFiles: KubbFile.File[], root?: string): Array<KubbFile.File> {
+    const { logger } = this.#options
 
-    if (!tree) {
-      return null
-    }
+    const files = new Map<KubbFile.Path, KubbFile.File>()
 
-    const fileReducer = (files: Array<KubbFile.File>, treeNode: TreeNode) => {
-      if (!treeNode.children) {
-        return []
+    TreeNode.build(generatedFiles, root)?.forEach((treeNode) => {
+      if (!treeNode || !treeNode.children || !treeNode.parent?.data.path) {
+        return undefined
       }
 
-      const indexPath: KubbFile.Path = path.resolve(treeNode.data.path, 'index.ts')
+      const barrelPath: KubbFile.Path = join(treeNode.parent?.data.path, 'index.ts')
 
-      const exports: Array<KubbFile.Export> = treeNode.children
-        .filter((item) => !!item.data.name)
-        .map((treeNode) => {
-          const importPath: string = treeNode.data.file ? `./${trimExtName(treeNode.data.name)}` : `./${treeNode.data.name}/index`
+      const leaves = treeNode.leaves
 
-          if (importPath.endsWith('index') && treeNode.data.file) {
+      // biome-ignore lint/complexity/useFlatMap: we have a custom map in TreeNode
+      const exports = leaves
+        .map((item) => {
+          if (!item.data.name) {
             return undefined
           }
 
-          return {
-            path: extName ? `${importPath}${extName}` : importPath,
-            isTypeOnly,
-          } as KubbFile.Export
+          const sources = item.data.file?.sources || []
+
+          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 sources.map((source) => {
+            if (!item.data.file?.path || !source.isIndexable) {
+              return undefined
+            }
+
+            // true when we have a subdirectory that also contains barrel files
+            const isSubExport = !!treeNode.parent?.data.path?.split?.('/')?.length
+
+            if (isSubExport) {
+              return {
+                name: [source.name],
+                path: getRelativePath(treeNode.parent?.data.path, item.data.path),
+                isTypeOnly: source.isTypeOnly,
+              } as KubbFile.Export
+            }
+
+            return {
+              name: [source.name],
+              path: `./${item.data.file.baseName}`,
+              isTypeOnly: source.isTypeOnly,
+            } as KubbFile.Export
+          })
         })
+        .flat()
         .filter(Boolean)
 
-      files.push({
-        path: indexPath,
+      const barrelFile: KubbFile.File = {
+        path: barrelPath,
         baseName: 'index.ts',
-        exports,
-        sources: [],
-      })
+        exports: exports,
+        sources: exports.flatMap((item) => {
+          if (Array.isArray(item.name)) {
+            return item.name.map((name) => {
+              return {
+                name: name,
+                isTypeOnly: item.isTypeOnly,
+                //TODO use parser to generate import
+                value: '',
+                isExportable: false,
+                isIndexable: false,
+              } as KubbFile.Source
+            })
+          }
+          return [
+            {
+              name: item.name,
+              isTypeOnly: item.isTypeOnly,
+              //TODO use parser to generate import
+              value: '',
+              isExportable: false,
+              isIndexable: false,
+            } as KubbFile.Source,
+          ]
+        }),
+      }
 
-      treeNode.children.forEach((childItem) => {
-        fileReducer(files, childItem)
-      })
+      const previousBarrelFile = files.get(barrelFile.path)
 
-      return files
-    }
+      if (previousBarrelFile) {
+        files.set(barrelFile.path, {
+          ...previousBarrelFile,
+          ...barrelFile,
+          exports: combineExports([...(previousBarrelFile.exports || []), ...(barrelFile.exports || [])]),
+          sources: combineSources([...(previousBarrelFile.sources || []), ...(barrelFile.sources || [])]),
+        })
+      } else {
+        files.set(barrelFile.path, barrelFile)
+      }
+    })
 
-    return fileReducer([], tree).reverse()
+    return [...files.values()]
   }
 }