From 999fa503330bbf95c3f4d67b111aaf87abe8acbc Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 22 Sep 2022 15:35:15 -0700 Subject: [PATCH 1/2] don't duplicate models --- packages/cadl-python/src/emitter.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/cadl-python/src/emitter.ts b/packages/cadl-python/src/emitter.ts index e1d753349cb..e88a742e89e 100644 --- a/packages/cadl-python/src/emitter.ts +++ b/packages/cadl-python/src/emitter.ts @@ -173,6 +173,14 @@ function getType( if (cached) { return cached; } + if (type.kind === "Model") { + const modelName = getName(program, type); + for (const key of typesMap.keys()) { + if (key.kind === "Model" && getName(program, key) === modelName) { + return typesMap.get(key); + } + } + } } let newValue = emitType(program, type, modelTypeProperty); if (enableCache) { From 372e86898b78a954cb8c9e25e1e404d906ced014 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 22 Sep 2022 15:36:20 -0700 Subject: [PATCH 2/2] update package.json and changelog --- packages/cadl-python/CHANGELOG.md | 6 ++++++ packages/cadl-python/package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/cadl-python/CHANGELOG.md b/packages/cadl-python/CHANGELOG.md index 1eef867330e..b49e259f1ed 100644 --- a/packages/cadl-python/CHANGELOG.md +++ b/packages/cadl-python/CHANGELOG.md @@ -1,5 +1,11 @@ # Release History +## 2022-09-23 - 0.2.2 + +**New Features** + +- Correctly filter out duplicate models #1466 + ## 2022-09-22 - 0.2.1 **New Features** diff --git a/packages/cadl-python/package.json b/packages/cadl-python/package.json index 2ee783a9de7..3ff2519bb1d 100644 --- a/packages/cadl-python/package.json +++ b/packages/cadl-python/package.json @@ -1,6 +1,6 @@ { "name": "@azure-tools/cadl-python", - "version": "0.2.1", + "version": "0.2.2", "author": "Microsoft Corporation", "description": "Cadl emitter for Python SDKs", "homepage": "https://github.com/Azure/autorest.python",