这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/unlucky-foxes-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hey-api/openapi-ts": patch
---

fix(renderer): replace default import placeholder
47 changes: 47 additions & 0 deletions packages/openapi-ts/src/generate/__tests__/renderer.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { describe, expect, it } from 'vitest';

import { TypeScriptRenderer } from '../renderer';

describe('TypeScriptRenderer', () => {
describe('default import placeholder replacement', () => {
it('should replace placeholders in default imports correctly', () => {
const renderer = new TypeScriptRenderer();

// Create a mock project with symbols that have placeholders
const project = {
symbolIdToFiles: () => [],
symbols: new Map(),
} as any;

// Create a symbol with a placeholder
const symbolId = 95;
const symbol = {
id: symbolId,
name: 'foo',
placeholder: '_heyapi_95_',
};
project.symbols.set(symbolId, symbol);

// Create a mock file
const file = {
resolvedNames: new Map([[symbolId, 'foo']]),
} as any;

// Create bindings with a default import that has a placeholder
const bindings = new Map();
bindings.set('foo', {
aliases: {},
defaultBinding: '_heyapi_95_', // Contains placeholder that should be replaced
from: 'foo',
names: [],
typeNames: [],
});

// Generate import lines
const importLines = renderer['getImportLines'](bindings, file, project);

// The import should use 'foo' not '_heyapi_95_'
expect(importLines).toEqual(["import foo from 'foo';"]);
});
});
});
9 changes: 8 additions & 1 deletion packages/openapi-ts/src/generate/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,14 @@ export class TypeScriptRenderer implements Renderer {
let isTypeOnly = false;

if (value.defaultBinding) {
defaultBinding = tsc.identifier({ text: value.defaultBinding });
const processedDefaultBinding = renderIds(
value.defaultBinding,
(symbolId) => {
const symbol = project.symbols.get(symbolId);
return this.replacerFn({ file, project, symbol });
},
);
defaultBinding = tsc.identifier({ text: processedDefaultBinding });
if (value.typeDefaultBinding) {
isTypeOnly = true;
}
Expand Down
Loading