Skip to content

fix(*): resolve typeScript visitor imports for map types #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mttrbrts merged 1 commit into from
May 31, 2026
Merged

fix(*): resolve typeScript visitor imports for map types #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/codegen/fromcto/typescript/typescriptvisitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ class TypescriptVisitor {
if (!property.isPrimitive()) {
const typeNamespace = ModelUtil.getNamespace(property.getFullyQualifiedTypeName());
const typeName = ModelUtil.getShortName(property.getFullyQualifiedTypeName());
const isMapRef = declaration.getModelFile().getModelManager().getType(property.getFullyQualifiedTypeName?.()).isMapDeclaration?.();
addImport(typeNamespace,
property.isTypeEnum?.() || property.isTypeScalar?.() ? typeName : `I${typeName}`);
property.isTypeEnum?.() || property.isTypeScalar?.() || isMapRef ? typeName : `I${typeName}`);
}
});

Expand Down
2 changes: 1 addition & 1 deletion test/codegen/__snapshots__/codegen.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6997,7 +6997,7 @@ exports[`codegen #formats check we can convert all formats from namespace versio
// Warning: Beware of circular dependencies when modifying these imports

// Warning: Beware of circular dependencies when modifying these imports
import {Time,SSN,IAddress,IEmployeeTShirtSizes} from './org.acme.hr.base@1.0.0';
import {Time,SSN,IAddress,EmployeeTShirtSizes} from './org.acme.hr.base@1.0.0';
import {IDecorator} from './concerto.decorator@1.0.0';
import {IConcept,IAsset,IParticipant,IEvent,ITransaction} from './concerto@1.0.0';

Expand Down
17 changes: 16 additions & 1 deletion test/codegen/fromcto/typescript/typescriptvisitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,15 @@ describe('TypescriptVisitor', function () {
mockClassDeclaration.accept = acceptSpy;

let mockClassDeclaration2 = sinon.createStubInstance(ClassDeclaration);
mockClassDeclaration.isEnum.returns(false);
mockClassDeclaration2.isEnum.returns(false);
mockClassDeclaration2.getSuperType.returns('super.Parent');
mockClassDeclaration2.getProperties.returns([]);
mockClassDeclaration2.accept = acceptSpy;

let mockModelManager = sinon.createStubInstance(ModelManager);
mockModelManager.isModelManager.returns(true);
mockModelManager.getType.returns({ isMapDeclaration: () => false });

let mockModelFile = sinon.createStubInstance(ModelFile);
mockModelFile.getNamespace.returns('org.acme');
mockModelFile.getAllDeclarations.returns([
Expand All @@ -266,6 +270,9 @@ describe('TypescriptVisitor', function () {
'super.Property3',
'super.Parent'
]);
mockModelFile.getModelManager.returns(mockModelManager);
mockClassDeclaration.getModelFile.returns(mockModelFile);
mockClassDeclaration2.getModelFile.returns(mockModelFile);
mockModelFile.imports= [];

typescriptVisitor.visitModelFile(mockModelFile, param);
Expand Down Expand Up @@ -323,6 +330,7 @@ describe('TypescriptVisitor', function () {

let mockModelManager = sinon.createStubInstance(ModelManager);
mockModelManager.isModelManager.returns(true);
mockModelManager.getType.returns({ isMapDeclaration: () => false });

let mockModelFile = sinon.createStubInstance(ModelFile);
mockModelFile.isModelFile.returns(true);
Expand All @@ -337,6 +345,7 @@ describe('TypescriptVisitor', function () {
'org.org2.Import1'
]);
mockModelFile.getModelManager.returns(mockModelManager);
mockClassDeclaration.getModelFile.returns(mockModelFile);
mockModelFile.imports= [];
typescriptVisitor.visitModelFile(mockModelFile, param);

Expand Down Expand Up @@ -438,8 +447,14 @@ describe('TypescriptVisitor', function () {

mockClassDeclaration.getDirectSubclasses.returns([]);

let mockModelManager = sinon.createStubInstance(ModelManager);
mockModelManager.isModelManager.returns(true);
mockModelManager.getType.returns({ isMapDeclaration: () => false });

let mockModelFile = sinon.createStubInstance(ModelFile);
mockModelFile.getNamespace.returns('org.test.collection');
mockModelFile.getModelManager.returns(mockModelManager);
mockClassDeclaration.getModelFile.returns(mockModelFile);
mockModelFile.imports = [
{
'$class': 'concerto.metamodel@1.0.0.ImportTypes',
Expand Down
Loading