Merge branch 'main' into feat/name-dedup

Author: mrlubos

docs/partials/contributors-list.md

@@ -60,6 +60,7 @@
 - [Michiel Lankamp](https://github.com/mlankamp)
 - [Mika Vilpas](https://github.com/mikavilpas)
 - [Miklos](https://github.com/jumika)
+- [Nacho García](https://github.com/nachogarcia)
 - [Nicolas Chaulet](https://github.com/nicolas-chaulet)
 - [Nimo Beeren](https://github.com/nimobeeren)
 - [Novak Antonijevic](https://github.com/NovakAnton)

packages/codegen-core/src/__tests__/exports.test.ts

@@ -4,6 +4,9 @@ import * as index from '../index';
 
 const constExports = [
   'debug',
+  'defaultExtensions',
+  'defaultNameConflictResolvers',
+  'File',
   'fromRef',
   'fromRefs',
   'isNode',
@@ -15,24 +18,30 @@ const constExports = [
   'Project',
   'ref',
   'refs',
+  'simpleNameConflictResolver',
   'Symbol',
   'symbolBrand',
+  'underscoreNameConflictResolver',
 ];
 
 // Type-level test: will fail to compile if any type export is missing or renamed
 export type _TypeExports = [
   index.AnalysisContext,
+  index.BindingKind,
+  index.ExportMember,
+  index.ExportModule,
+  index.Extensions,
   index.File,
-  index.FileIdentifier,
   index.FileIn,
   index.FromRef<any>,
   index.FromRefs<any>,
   index.IProject,
+  index.ImportMember,
+  index.ImportModule,
+  index.Language,
+  index.NameConflictResolvers,
   index.Node,
   index.Output,
-  index.PlannedExport,
-  index.PlannedImport,
-  index.PlannedReexport,
   index.Project,
   index.ProjectRenderMeta,
   index.Ref<any>,

packages/codegen-core/src/bindings.d.ts

@@ -1,25 +1,7 @@
 import type { File } from './files/file';
 import type { BindingKind } from './symbols/types';
 
-export interface ImportSingle {
-  /** Whether this import is type-only. */
-  isTypeOnly: boolean;
-  /** Import flavor. */
-  kind: BindingKind;
-  /**
-   * The name this symbol will have locally in this file.
-   * This is where aliasing is applied:
-   *
-   * import { Foo as Foo$2 } from "./x"
-   *
-   * localName === "Foo$2"
-   */
-  localName: string;
-  /** The exported name of the symbol in its source file. */
-  sourceName: string;
-}
-
-export interface ExportSingle {
+export interface ExportMember {
   /**
    * Name under which the symbol is exported in this file.
    *
@@ -36,22 +18,40 @@ export interface ExportSingle {
   sourceName: string;
 }
 
-export type ExportGroup = Pick<ExportSingle, 'isTypeOnly'> & {
+export type ExportModule = Pick<ExportMember, 'isTypeOnly'> & {
   /** Whether this module can export all symbols: `export * from 'module'`. */
   canExportAll: boolean;
-  /** List of symbol exported from this module. */
-  exports: Array<ExportSingle>;
+  /** Members exported from this module. */
+  exports: Array<ExportMember>;
   /** Source file. */
   from: File;
   /** Namespace export: `export * as ns from 'module'`. Mutually exclusive with `exports`. */
   namespaceExport?: string;
 };
 
-export type ImportGroup = Pick<ImportSingle, 'isTypeOnly'> & {
+export interface ImportMember {
+  /** Whether this import is type-only. */
+  isTypeOnly: boolean;
+  /** Import flavor. */
+  kind: BindingKind;
+  /**
+   * The name this symbol will have locally in this file.
+   * This is where aliasing is applied:
+   *
+   * import { Foo as Foo$2 } from "./x"
+   *
+   * localName === "Foo$2"
+   */
+  localName: string;
+  /** The exported name of the symbol in its source file. */
+  sourceName: string;
+}
+
+export type ImportModule = Pick<ImportMember, 'isTypeOnly'> & {
   /** Source file. */
   from: File;
   /** List of symbols imported from this module. */
-  imports: Array<ImportSingle>;
+  imports: Array<ImportMember>;
   /** Namespace import: `import * as name from 'module'`. Mutually exclusive with `imports`. */
   namespaceImport?: string;
 };

packages/codegen-core/src/files/file.ts

@@ -1,4 +1,4 @@
-import type { ExportGroup, ImportGroup } from '../bindings';
+import type { ExportModule, ImportModule } from '../bindings';
 import { fileBrand } from '../brands';
 import { debug } from '../debug';
 import type { Language } from '../languages/types';
@@ -12,7 +12,7 @@ export class File {
   /**
    * Exports from this file.
    */
-  private _exports: Array<ExportGroup> = [];
+  private _exports: Array<ExportModule> = [];
   /**
    * File extension (e.g. `.ts`).
    */
@@ -24,7 +24,7 @@ export class File {
   /**
    * Imports to this file.
    */
-  private _imports: Array<ImportGroup> = [];
+  private _imports: Array<ImportModule> = [];
   /**
    * Language of the file.
    */
@@ -71,7 +71,7 @@ export class File {
   /**
    * Exports from this file.
    */
-  get exports(): ReadonlyArray<ExportGroup> {
+  get exports(): ReadonlyArray<ExportModule> {
     return [...this._exports];
   }
 
@@ -103,7 +103,7 @@ export class File {
   /**
    * Imports to this file.
    */
-  get imports(): ReadonlyArray<ImportGroup> {
+  get imports(): ReadonlyArray<ImportModule> {
     return [...this._imports];
   }
 
@@ -154,14 +154,14 @@ export class File {
   /**
    * Add an export group to the file.
    */
-  addExport(group: ExportGroup): void {
+  addExport(group: ExportModule): void {
     this._exports.push(group);
   }
 
   /**
    * Add an import group to the file.
    */
-  addImport(group: ImportGroup): void {
+  addImport(group: ImportModule): void {
     this._imports.push(group);
   }
 

packages/codegen-core/src/index.ts

@@ -1,8 +1,8 @@
 export type {
-  ExportGroup,
-  ExportSingle,
-  ImportGroup,
-  ImportSingle,
+  ExportMember,
+  ExportModule,
+  ImportMember,
+  ImportModule,
 } from './bindings';
 export { nodeBrand, symbolBrand } from './brands';
 export { debug } from './debug';

packages/codegen-core/src/planner/planner.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import type { ExportGroup, ImportGroup } from '../bindings';
+import type { ExportModule, ImportModule } from '../bindings';
 import type { IProjectRenderMeta } from '../extensions';
 import type { File } from '../files/file';
 import type { IFileIn } from '../files/types';
@@ -174,7 +174,7 @@ export class Planner {
     });
 
     for (const [file, fileMap] of seenByFile) {
-      const exports = new Map<File, ExportGroup>();
+      const exports = new Map<File, ExportModule>();
       for (const [, entry] of fileMap) {
         const source = sourceFile.get(entry.symbol.id)!;
         let exp = exports.get(source);
@@ -285,7 +285,7 @@ export class Planner {
     });
 
     for (const [file, fileMap] of seenByFile) {
-      const imports = new Map<File, ImportGroup>();
+      const imports = new Map<File, ImportModule>();
       for (const [, entry] of fileMap) {
         const source = entry.dep.file!;
         let imp = imports.get(source);

packages/openapi-ts/src/ir/context.ts

@@ -1,4 +1,4 @@
-import { Project } from '@hey-api/codegen-core';
+import { Project, simpleNameConflictResolver } from '@hey-api/codegen-core';
 
 import type { Package } from '~/config/utils/package';
 import { packageFactory } from '~/config/utils/package';
@@ -70,6 +70,9 @@ export class Context<Spec extends Record<string, any> = any> {
     this.config = config;
     this.gen = new Project({
       defaultFileName: 'index',
+      defaultNameConflictResolver(args) {
+        return simpleNameConflictResolver(args);
+      },
       fileName: (base) => {
         const name = buildName({
           config: config.output.fileName,
@@ -83,6 +86,9 @@ export class Context<Spec extends Record<string, any> = any> {
           ? name
           : `${name}${suffix}`;
       },
+      nameConflictResolvers: {
+        // TODO: allow overriding via config
+      },
       // TODO: allow overriding via config
       renderers: [
         new TypeScriptRenderer({

packages/openapi-ts/src/ts-dsl/render/utils.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import type { ExportGroup, File, ImportGroup } from '@hey-api/codegen-core';
+import type { ExportModule, File, ImportModule } from '@hey-api/codegen-core';
 import ts from 'typescript';
 
 const printer = ts.createPrinter({
@@ -76,12 +76,12 @@ export type SortDistance = number;
 export type SortModule = string;
 export type SortKey = [SortGroup, SortDistance, SortModule];
 
-export type ModuleExport = Omit<ExportGroup, 'from'> & {
+export type ModuleExport = Omit<ExportModule, 'from'> & {
   /** Module specifier for re-exports, e.g. `./foo`. */
   modulePath: string;
 };
 
-export type ModuleImport = Omit<ImportGroup, 'from'> & {
+export type ModuleImport = Omit<ImportModule, 'from'> & {
   /** Module specifier for imports, e.g. `./foo`. */
   modulePath: string;
 };