Do not add type alias suppress in target file for top-level granularity

karakum-team · Jun 28, 2023 · cd344c8 · cd344c8
1 parent e795d25
commit cd344c8
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 45 deletions.
diff --git a/src/structure/createTargetFile.ts b/src/structure/createTargetFile.ts
@@ -10,20 +10,24 @@ export function createTargetFile(
     configuration: Configuration,
 ) {
     const {
+        fileName,
+        package: packageChunks,
         moduleName,
         qualifier,
         hasRuntime,
     } = item
 
-    const packageName = createPackageName(item.package)
+    const granularity = configuration.granularity ?? "file"
 
-    const outputFileName = packageToOutputFileName(item.package, item.fileName, configuration)
+    const packageName = createPackageName(packageChunks)
+
+    const outputFileName = packageToOutputFileName(packageChunks, fileName, configuration)
 
     const imports = generateImports(outputFileName, configuration)
 
     const jsModule = hasRuntime ? `@file:JsModule("${moduleName}")` : ""
     const jsQualifier = hasRuntime && qualifier !== undefined ? `@file:JsQualifier("${qualifier}")` : ""
-    const typeAliasSuppress = `
+    const typeAliasSuppress = granularity === "top-level" ? "" : `
 @file:Suppress(
     "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
 )

diff --git a/test/sandbox/namespace/generated/index.kt b/test/sandbox/namespace/generated/index.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-namespace/index")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.namespace
 

diff --git a/test/sandbox/namespace/generated/package/namespace/namespace.kt b/test/sandbox/namespace/generated/package/namespace/namespace.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("package-namespace")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package `package`.namespace
 

diff --git a/test/sandbox/namespace/generated/package/namespace/nestednamespace/namespace.kt b/test/sandbox/namespace/generated/package/namespace/nestednamespace/namespace.kt
@@ -1,9 +1,6 @@
 
 @file:JsModule("package-namespace")
 @file:JsQualifier("NestedNamespace")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package `package`.namespace.nestednamespace
 

diff --git a/test/sandbox/namespace/generated/was/mapped/main/namespace.kt b/test/sandbox/namespace/generated/was/mapped/main/namespace.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("will-be-mapped")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package was.mapped.main
 

diff --git a/test/sandbox/namespace/generated/was/mapped/nested/namespace.kt b/test/sandbox/namespace/generated/was/mapped/nested/namespace.kt
@@ -1,9 +1,6 @@
 
 @file:JsModule("will-be-mapped")
 @file:JsQualifier("AndThis")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package was.mapped.nested
 

diff --git a/test/sandbox/top-level/generated/MyClass.kt b/test/sandbox/top-level/generated/MyClass.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/MyClassWithTypeLiteral.kt b/test/sandbox/top-level/generated/MyClassWithTypeLiteral.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/MyEnum.kt b/test/sandbox/top-level/generated/MyEnum.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/MyInterface.kt b/test/sandbox/top-level/generated/MyInterface.kt
@@ -1,7 +1,5 @@
 
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
+
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/MyTypeAlias.kt b/test/sandbox/top-level/generated/MyTypeAlias.kt
@@ -1,7 +1,5 @@
 
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
+
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/createMemoryRouter.kt b/test/sandbox/top-level/generated/createMemoryRouter.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/index.kt b/test/sandbox/top-level/generated/index.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/myFunction1.kt b/test/sandbox/top-level/generated/myFunction1.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level
 

diff --git a/test/sandbox/top-level/generated/myFunction2.kt b/test/sandbox/top-level/generated/myFunction2.kt
@@ -1,8 +1,5 @@
 
 @file:JsModule("sandbox-top-level")
-@file:Suppress(
-    "NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE",
-)
 
 package sandbox.top.level