Remove empty lines from generated declarations

karakum-team · Jun 23, 2024 · 2a86c17 · 2a86c17
1 parent 55b98e1
commit 2a86c17
Show file tree

Hide file tree

Showing 59 changed files with 30 additions and 307 deletions.
diff --git a/src/converter/plugins/AccessorsPlugin.ts b/src/converter/plugins/AccessorsPlugin.ts
@@ -94,7 +94,7 @@ export class AccessorsPlugin implements ConverterPlugin {
 
             return `
 ${ifPresent(inheritanceModifier, it => `${it} `)}${modifier}${name}: ${type}
-            `;
+            `.trim();
         }
 
         return null

diff --git a/src/converter/plugins/AnnotationPlugin.ts b/src/converter/plugins/AnnotationPlugin.ts
@@ -42,7 +42,7 @@ export class AnnotationPlugin implements ConverterPlugin {
             return `
 ${annotations.join("\n")}
 ${next(node)}
-            `;
+            `.trim();
         }
 
         return null

diff --git a/src/converter/plugins/InheritedTypeLiteralPlugin.ts b/src/converter/plugins/InheritedTypeLiteralPlugin.ts
@@ -72,7 +72,7 @@ export function convertInheritedTypeLiteral(
 ${ifPresent(inheritanceModifier, it => `${it} `)}external interface ${name}${ifPresent(typeParameters, it => `<${it}> `)}${(ifPresent(fullHeritageClauses, it => ` : ${it}`))} {
 ${ifPresent(accessors, it => `${it}\n`)}${members}${ifPresent(injectedMembers, it => `\n${it}`)}
 }
-    `
+    `.trim()
 }
 
 export const inheritedTypeLiteralPlugin = createAnonymousDeclarationPlugin(

diff --git a/src/converter/plugins/MappedTypePlugin.ts b/src/converter/plugins/MappedTypePlugin.ts
@@ -36,15 +36,15 @@ export function convertMappedTypeBody(node: MappedTypeNode, context: ConverterCo
     const getter = `
 @seskar.js.JsNative
 ${ifPresent(getterInheritanceModifier, it => `${it} `)}operator fun <${typeParameter}> get(key: ${keyType}): ${type}
-    `
+    `.trim()
 
     let setter = ""
 
     if (!readonly) {
         setter = `
 @seskar.js.JsNative
 ${ifPresent(setterInheritanceModifier, it => `${it} `)}operator fun <${typeParameter}> set(key: ${keyType}, value: ${type})
-        `
+        `.trim()
     }
 
     const injectedMembers = (injections ?? [])
@@ -74,7 +74,7 @@ export const convertMappedType = (
 ${ifPresent(inheritanceModifier, it => `${it} `)}external interface ${name}${ifPresent(typeParameters, it => `<${it}>`)}${(ifPresent(injectedHeritageClauses, it => ` : ${it}`))} {
 ${convertMappedTypeBody(node, context, render)}
 }
-    `
+    `.trim()
 }
 
 export const mappedTypePlugin = createAnonymousDeclarationPlugin(

diff --git a/src/converter/plugins/StringUnionTypePlugin.ts b/src/converter/plugins/StringUnionTypePlugin.ts
@@ -103,15 +103,17 @@ val ${key}: ${name}
     const declaration = `
 sealed external interface ${name}${ifPresent(injectedHeritageClauses, it => ` : ${it}`)} {
 companion object {
-${body}${ifPresent(comment, it => (`
+${body}${ifPresent(comment, it => (
+    `
 /*
 Duplicated names were generated:
 ${it}
 */
-`))}
+    `.trim()
+))}
 }
 }
-    `
+    `.trim()
 
     const nullable = nullableTypes.length > 0
 

diff --git a/src/converter/plugins/TypeLiteralPlugin.ts b/src/converter/plugins/TypeLiteralPlugin.ts
@@ -46,7 +46,7 @@ export function convertTypeLiteral(
 ${ifPresent(inheritanceModifier, it => `${it} `)}external interface ${name}${ifPresent(typeParameters, it => `<${it}>`)}${(ifPresent(injectedHeritageClauses, it => ` : ${it}`))} {
 ${convertTypeLiteralBody(node, context, render)}
 }
-    `
+    `.trim()
 }
 
 export const typeLiteralPlugin = createAnonymousDeclarationPlugin(

diff --git a/src/converter/plugins/convertCallSignatureDeclaration.ts b/src/converter/plugins/convertCallSignatureDeclaration.ts
@@ -29,7 +29,7 @@ export const convertCallSignatureDeclaration = createSimplePlugin((node, context
             return `
 @seskar.js.JsNative
 ${ifPresent(inheritanceModifier, it => `${it} `)}operator fun ${ifPresent(typeParameters, it => `<${it}>`)} invoke(${parameters})${ifPresent(returnType, it => `: ${it}`)}
-            `
+            `.trim()
         }
     })
 })
diff --git a/src/converter/plugins/convertClassDeclaration.ts b/src/converter/plugins/convertClassDeclaration.ts
@@ -146,12 +146,12 @@ export const convertClassDeclaration = createSimplePlugin((node, context, render
 companion object {
 ${staticMembers}${ifPresent(staticInjectedMembers, it => `\n${it}`)}
 }
-        `
+        `.trim()
     }
 
     return `
 ${ifPresent(inheritanceModifier, it => `${it} `)}${externalModifier}class ${name}${ifPresent(typeParameters, it => `<${it}>`)}${ifPresent(fullHeritageClauses, it => ` : ${it}`)} {
 ${members}${ifPresent(injectedMembers, it => `\n${it}`)}${companionObject}
 }
-    `
+    `.trim()
 })
diff --git a/src/converter/plugins/convertEnumDeclaration.ts b/src/converter/plugins/convertEnumDeclaration.ts
@@ -50,5 +50,5 @@ companion object {
 ${members}
 }
 }
-    `
+    `.trim()
 })
diff --git a/src/converter/plugins/convertIndexedSignatureDeclaration.ts b/src/converter/plugins/convertIndexedSignatureDeclaration.ts
@@ -32,15 +32,15 @@ export const convertIndexedSignatureDeclaration = createSimplePlugin((node, cont
     const getter = `
 @seskar.js.JsNative
 ${ifPresent(getterInheritanceModifier, it => `${it} `)}operator fun get(key: ${keyType}): ${type}
-    `
+    `.trim()
 
     let setter = ""
 
     if (!readonly) {
         setter = `
 @seskar.js.JsNative
 ${ifPresent(setterInheritanceModifier, it => `${it} `)}operator fun set(key: ${keyType}, value: ${type})
-        `
+        `.trim()
     }
 
 

diff --git a/src/converter/plugins/convertInterfaceDeclaration.ts b/src/converter/plugins/convertInterfaceDeclaration.ts
@@ -72,5 +72,5 @@ export const convertInterfaceDeclaration = createSimplePlugin((node, context, re
 ${ifPresent(inheritanceModifier, it => `${it} `)}${externalModifier}interface ${name}${ifPresent(typeParameters, it => `<${it}>`)}${ifPresent(fullHeritageClauses, it => ` : ${it}`)} {
 ${members}${ifPresent(injectedMembers, it => `\n${it}`)}
 }
-    `
+    `.trim()
 })
diff --git a/src/converter/plugins/convertModuleDeclaration.ts b/src/converter/plugins/convertModuleDeclaration.ts
@@ -36,7 +36,7 @@ export const convertModuleDeclaration = createSimplePlugin((node, context, rende
 ${externalModifier}object ${name} {
 ${body}
 }
-        `
+        `.trim()
     }
 
     if (namespaceStrategy === "package") {

diff --git a/test/functional/base/generated/accessor/simple.kt b/test/functional/base/generated/accessor/simple.kt
@@ -7,52 +7,29 @@
 
 package sandbox.base.accessor
 
-
 external class Simple {
-
 var property: String
-
 }
-
-
 
 external class DifferentTypes {
-
 var property: String
-
 }
-
-
 
 external class Readonly {
-
 val property: String
-
 }
-
-
 
 external class Setteronly {
-
 var property: String
-
 }
-
-
 
 external interface Split {
-
 var property: String
-
 }
-
-
 
 
 
 external interface Anonymous {
-
 var property: String
-
 
 }
diff --git a/test/functional/base/generated/class/parentContstructors.kt b/test/functional/base/generated/class/parentContstructors.kt
@@ -7,38 +7,27 @@
 
 package sandbox.base.`class`
 
-
 external class GrandparentWithConstructor {
 constructor (param: Double)
 constructor (param: String)
 }
-
-
 
 external class ParentWithoutConstructor : GrandparentWithConstructor {
 constructor (param: Double)
 constructor (param: String)
 }
-
-
 
 external class ChildWithoutConstructor : ParentWithoutConstructor {
 constructor (param: Double)
 constructor (param: String)
 }
-
-
 
 external object NSWithParent {
-
 class ParentWithConstructor {
 constructor (param: Double)
 constructor (param: Boolean)
 }
-
 }
-
-
 
 external class ChildWithoutConstructor2 : NSWithParent.ParentWithConstructor {
 constructor (param: Double)

diff --git a/test/functional/base/generated/declarationMerging/classWithInterfaces.kt b/test/functional/base/generated/declarationMerging/classWithInterfaces.kt
@@ -11,12 +11,9 @@ package sandbox.base.declarationMerging
 
 
 
-
 external class ExampleClass {
-
 @seskar.js.JsNative
 operator fun  invoke(param: String): Unit
-
 var a: Double
 var b: String
 var c: Boolean

diff --git a/test/functional/base/generated/declarationMerging/enums.kt b/test/functional/base/generated/declarationMerging/enums.kt
@@ -7,7 +7,6 @@
 
 package sandbox.base.declarationMerging
 
-
 sealed external interface ExampleEnum {
 companion object {
 val a: ExampleEnum

diff --git a/test/functional/base/generated/declarationMerging/heritageClauses.kt b/test/functional/base/generated/declarationMerging/heritageClauses.kt
@@ -7,30 +7,21 @@
 
 package sandbox.base.declarationMerging
 
-
 external interface ExampleParentForInterface {
 
 }
-
-
 
 external interface SecondExampleParentForInterface {
 
 }
-
-
 
 external interface ExampleParentForClass {
 
 }
-
-
 
 external interface ExampleInterfaceWithParent : ExampleParentForInterface, SecondExampleParentForInterface {
 
 }
-
-
 
 
 

diff --git a/test/functional/base/generated/declarationMerging/interfaces.kt b/test/functional/base/generated/declarationMerging/interfaces.kt
@@ -7,17 +7,12 @@
 
 package sandbox.base.declarationMerging
 
-
 external interface Example {
-
 @seskar.js.JsNative
 operator fun  invoke(param1: String): Unit
-
 var a: Double
 var b: String
 }
-
-
 
 
 

diff --git a/test/functional/base/generated/function/bindingPattern.kt b/test/functional/base/generated/function/bindingPattern.kt
@@ -7,12 +7,10 @@
 
 package sandbox.base.function
 
-
 external interface Path {
 var pathname: String
 var search: String
 var hash: String
 }
-
 
 external fun createPath(options: Path): String
diff --git a/test/functional/base/generated/function/stringUnionParam.kt b/test/functional/base/generated/function/stringUnionParam.kt
@@ -16,7 +16,6 @@ external fun getGPUInfo3(infoType: ((GetGPUInfo3InfoType))): Any?
 external fun getGPUInfo4(infoType: (((GetGPUInfo4InfoType)))): Any?
 
 external fun setVibrancy(type: SetVibrancyType?): Unit
-
 sealed external interface GetGPUInfoInfoType {
 companion object {
 @seskar.js.JsValue("basic")
@@ -25,8 +24,6 @@ val basic: GetGPUInfoInfoType
 val complete: GetGPUInfoInfoType
 }
 }
-
-
 
 sealed external interface GetGPUInfo2InfoType {
 companion object {
@@ -36,8 +33,6 @@ val basic: GetGPUInfo2InfoType
 val complete: GetGPUInfo2InfoType
 }
 }
-
-
 
 sealed external interface GetGPUInfo3InfoType {
 companion object {
@@ -47,8 +42,6 @@ val basic: GetGPUInfo3InfoType
 val complete: GetGPUInfo3InfoType
 }
 }
-
-
 
 sealed external interface GetGPUInfo4InfoType {
 companion object {
@@ -58,8 +51,6 @@ val basic: GetGPUInfo4InfoType
 val complete: GetGPUInfo4InfoType
 }
 }
-
-
 
 sealed external interface SetVibrancyType {
 companion object {
@@ -68,5 +59,4 @@ val light: SetVibrancyType
 @seskar.js.JsValue("dark")
 val dark: SetVibrancyType
 }
-}
-
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,5 +50,5 @@ companion object { @@
     ${members}
     }
     }
-        `
+        `.trim()
     })