Merge pull request #3615 from hey-api/fix/resolve-module-name-ctx

fix: pass context to resolvemodulename

Author: mrlubos

.changeset/dark-areas-give.md

@@ -0,0 +1,6 @@
+---
+"@hey-api/openapi-ts": patch
+"@hey-api/shared": patch
+---
+
+**output**: pass context as second argument in `resolveModuleName()` function

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

@@ -1,4 +1,5 @@
 import type { RenderContext, Renderer } from '@hey-api/codegen-core';
+import type { ResolveModuleName } from '@hey-api/shared';
 import type { MaybeArray, MaybeFunc } from '@hey-api/types';
 
 import { py } from '../../py-compiler';
@@ -51,14 +52,14 @@ export class PythonRenderer implements Renderer {
    *
    * @private
    */
-  private _resolveModuleName?: (moduleName: string) => string | undefined;
+  private _resolveModuleName?: ResolveModuleName;
 
   constructor(
     args: {
       header?: HeaderArg;
       preferExportAll?: boolean;
       preferFileExtension?: string;
-      resolveModuleName?: (moduleName: string) => string | undefined;
+      resolveModuleName?: ResolveModuleName;
     } = {},
   ) {
     this._header = args.header;
@@ -202,7 +203,7 @@ export class PythonRenderer implements Renderer {
         preferFileExtension: this._preferFileExtension,
         root: ctx.project.root,
       });
-      const modulePath = this._resolveModuleName?.(sortKey[2]) ?? sortKey[2];
+      const modulePath = this._resolveModuleName?.(sortKey[2], ctx) ?? sortKey[2];
       const [groupIndex] = sortKey;
 
       if (!groups.has(groupIndex)) groups.set(groupIndex, new Map());
@@ -268,7 +269,7 @@ export class PythonRenderer implements Renderer {
         preferFileExtension: this._preferFileExtension,
         root: ctx.project.root,
       });
-      const modulePath = this._resolveModuleName?.(sortKey[2]) ?? sortKey[2];
+      const modulePath = this._resolveModuleName?.(sortKey[2], ctx) ?? sortKey[2];
       const [groupIndex] = sortKey;
 
       if (!groups.has(groupIndex)) groups.set(groupIndex, new Map());

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

@@ -1,4 +1,5 @@
 import type { RenderContext, Renderer } from '@hey-api/codegen-core';
+import type { ResolveModuleName } from '@hey-api/shared';
 import type { MaybeArray, MaybeFunc } from '@hey-api/types';
 import ts from 'typescript';
 
@@ -52,14 +53,14 @@ export class TypeScriptRenderer implements Renderer {
    *
    * @private
    */
-  private _resolveModuleName?: (moduleName: string) => string | undefined;
+  private _resolveModuleName?: ResolveModuleName;
 
   constructor(
     args: {
       header?: HeaderArg;
       preferExportAll?: boolean;
       preferFileExtension?: string;
-      resolveModuleName?: (moduleName: string) => string | undefined;
+      resolveModuleName?: ResolveModuleName;
     } = {},
   ) {
     this._header = args.header;
@@ -197,7 +198,7 @@ export class TypeScriptRenderer implements Renderer {
         preferFileExtension: this._preferFileExtension,
         root: ctx.project.root,
       });
-      const modulePath = this._resolveModuleName?.(sortKey[2]) ?? sortKey[2];
+      const modulePath = this._resolveModuleName?.(sortKey[2], ctx) ?? sortKey[2];
       const [groupIndex] = sortKey;
 
       if (!groups.has(groupIndex)) groups.set(groupIndex, new Map());
@@ -263,7 +264,7 @@ export class TypeScriptRenderer implements Renderer {
         preferFileExtension: this._preferFileExtension,
         root: ctx.project.root,
       });
-      const modulePath = this._resolveModuleName?.(sortKey[2]) ?? sortKey[2];
+      const modulePath = this._resolveModuleName?.(sortKey[2], ctx) ?? sortKey[2];
       const [groupIndex] = sortKey;
 
       if (!groups.has(groupIndex)) groups.set(groupIndex, new Map());

packages/shared/src/config/shared.ts

@@ -1,4 +1,4 @@
-import type { NameConflictResolver, Symbol } from '@hey-api/codegen-core';
+import type { NameConflictResolver, RenderContext, Symbol } from '@hey-api/codegen-core';
 import type { MaybeArray } from '@hey-api/types';
 
 import type { Plugin } from '../plugins/types';
@@ -169,7 +169,7 @@ export interface BaseUserOutput {
    *
    * @default undefined
    */
-  resolveModuleName?: (moduleName: string) => string | undefined;
+  resolveModuleName?: ResolveModuleName;
   /**
    * Configuration for generating a copy of the input source used to produce this output.
    *
@@ -247,7 +247,7 @@ export interface BaseOutput {
   /**
    * Optional function to transform module specifiers.
    */
-  resolveModuleName: ((moduleName: string) => string | undefined) | undefined;
+  resolveModuleName: ResolveModuleName | undefined;
   /**
    * Configuration for generating a copy of the input source used to produce this output.
    */
@@ -346,3 +346,8 @@ export type BaseConfig<TUserConfig extends object, TOutput extends BaseOutput> =
  * For shared utilities that operate on any config.
  */
 export type AnyConfig = BaseConfig<Record<string, unknown>, BaseOutput>;
+
+/**
+ * Function to transform module specifiers.
+ */
+export type ResolveModuleName = (moduleName: string, ctx: RenderContext) => string | undefined;

packages/shared/src/index.ts

@@ -23,6 +23,7 @@ export type {
   FeatureToggle,
   IndexExportOption,
   NamingOptions,
+  ResolveModuleName,
   UserCommentsOption,
   UserIndexExportOption,
 } from './config/shared';