filter deprecated properties in TS generator

commercetools · Aug 9, 2023 · 763bae5 · 763bae5
1 parent aa5c0b0
commit 763bae5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/languages/typescript/src/main/kotlin/io/vrap/codegen/languages/typescript/TsExtensions.kt b/languages/typescript/src/main/kotlin/io/vrap/codegen/languages/typescript/TsExtensions.kt
@@ -120,7 +120,11 @@ fun AnyType.deprecated() : Boolean {
 
 fun Property.deprecated() : Boolean {
     val anno = this.getAnnotation("deprecated")
-    return (anno != null && (anno.value as BooleanInstance).value)
+    if (anno != null) {
+        return (anno.value as BooleanInstance).value
+    }
+    val typeAnno = this.type.getAnnotation("deprecated")
+    return (typeAnno != null && (typeAnno.value as BooleanInstance).value)
 }
 
 fun ResourceContainer.allMethods(): List<Method> = this

diff --git a/...pt/src/main/kotlin/io/vrap/codegen/languages/typescript/model/TypeScriptModuleRenderer.kt b/...pt/src/main/kotlin/io/vrap/codegen/languages/typescript/model/TypeScriptModuleRenderer.kt
@@ -110,7 +110,7 @@ class TypeScriptModuleRenderer constructor(override val vrapTypeProvider: VrapTy
         val renderProperties = if (all) allProperties else properties
         return renderProperties
             .filter { !it.isPatternProperty() && it.name != discriminator() }
-            .filter { !it.deprecated() }
+            .filterNot { it.deprecated() }
             .map {
                 val comments = it.type.toTsCommentList().plus(it.markDeprecated())
                 val comment = if (comments.isEmpty()) "" else comments.joinToString("\n*\t", "/**\n*\t", "\n*/").escapeAll()