Do not merge namespace and class if declared strategy for this namesp…

…ace is package
karakum-team · Nov 29, 2023 · ef342c2 · ef342c2
1 parent 078f4be
commit ef342c2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/src/converter/plugins/DeclarationMergingPlugin.ts b/src/converter/plugins/DeclarationMergingPlugin.ts
@@ -1,9 +1,17 @@
-import ts, {Declaration, NamedDeclaration, Program, SignatureDeclaration, SymbolTable} from "typescript";
+import ts, {
+    Declaration,
+    ModuleDeclaration,
+    NamedDeclaration,
+    Program,
+    SignatureDeclaration,
+    SymbolTable
+} from "typescript";
 import {ConverterPlugin} from "../plugin.js";
 import {ConverterContext} from "../context.js";
 import {Render} from "../render.js";
 import {DeepMap} from "../../utils/deepMap.js";
 import {GeneratedFile} from "../generated.js";
+import {NamespaceStrategy} from "../../configuration/configuration.js";
 
 export const declarationMergingServiceKey = Symbol()
 
@@ -40,7 +48,10 @@ export class DeclarationMergingService {
         this.coveredSymbols.add(symbol)
     }
 
-    getMembers(node: NamedDeclaration): Declaration[] | undefined {
+    getMembers(
+        node: NamedDeclaration,
+        resolveNamespaceStrategy: ((node: ModuleDeclaration) => NamespaceStrategy) | undefined,
+    ): Declaration[] | undefined {
         const symbol = this.getSymbol(node)
         if (!symbol) return undefined
 
@@ -51,6 +62,10 @@ export class DeclarationMergingService {
             .filter(member => !ts.isTypeParameterDeclaration(member))
 
         return [...members, ...exports]
+            .filter(member => (
+                !ts.isModuleBlock(member.parent)
+                || resolveNamespaceStrategy?.(member.parent.parent) !== "package"
+            ))
     }
 
     private getUniqMembers(symbolTable: SymbolTable | undefined): Declaration[] {

diff --git a/src/converter/plugins/convertClassDeclaration.ts b/src/converter/plugins/convertClassDeclaration.ts
@@ -6,6 +6,7 @@ import {InheritanceModifierService, inheritanceModifierServiceKey} from "./Inher
 import {DeclarationMergingService, declarationMergingServiceKey} from "./DeclarationMergingPlugin.js";
 import {ConverterContext} from "../context.js";
 import {TypeScriptService, typeScriptServiceKey} from "./TypeScriptPlugin.js";
+import {NamespaceInfoService, namespaceInfoServiceKey} from "./NamespaceInfoPlugin.js";
 
 function extractModifiers(member: Declaration): ModifierLike[] {
     if (
@@ -42,7 +43,11 @@ function resolveConstructors(node: ClassDeclaration, members: Declaration[], con
     if (!parentDeclaration || !ts.isClassDeclaration(parentDeclaration)) return constructors
 
     const declarationMergingService = context.lookupService<DeclarationMergingService>(declarationMergingServiceKey)
-    const mergedMembers = declarationMergingService?.getMembers(parentDeclaration) ?? Array.from(parentDeclaration.members)
+    const namespaceInfoService = context.lookupService<NamespaceInfoService>(namespaceInfoServiceKey)
+
+    const resolveNamespaceStrategy = namespaceInfoService?.resolveNamespaceStrategy?.bind(namespaceInfoService)
+
+    const mergedMembers = declarationMergingService?.getMembers(parentDeclaration, resolveNamespaceStrategy) ?? Array.from(parentDeclaration.members)
 
     return resolveConstructors(parentDeclaration, mergedMembers, context)
 }
@@ -56,6 +61,7 @@ export const convertClassDeclaration = createSimplePlugin((node, context, render
     const declarationMergingService = context.lookupService<DeclarationMergingService>(declarationMergingServiceKey)
     declarationMergingService?.cover(node)
 
+    const namespaceInfoService = context.lookupService<NamespaceInfoService>(namespaceInfoServiceKey)
     const inheritanceModifierService = context.lookupService<InheritanceModifierService>(inheritanceModifierServiceKey)
 
     const exportModifier = node.modifiers?.find(it => it.kind === ts.SyntaxKind.ExportKeyword)
@@ -76,7 +82,9 @@ export const convertClassDeclaration = createSimplePlugin((node, context, render
         ?.map(heritageClause => render(heritageClause))
         ?.join(", ")
 
-    const mergedMembers = declarationMergingService?.getMembers(node) ?? Array.from(node.members)
+    const resolveNamespaceStrategy = namespaceInfoService?.resolveNamespaceStrategy?.bind(namespaceInfoService)
+
+    const mergedMembers = declarationMergingService?.getMembers(node, resolveNamespaceStrategy) ?? Array.from(node.members)
 
     // cover private members
     mergedMembers

diff --git a/src/converter/plugins/convertEnumDeclaration.ts b/src/converter/plugins/convertEnumDeclaration.ts
@@ -2,6 +2,7 @@ import ts from "typescript";
 import {createSimplePlugin} from "../plugin.js";
 import {CheckCoverageService, checkCoverageServiceKey} from "./CheckCoveragePlugin.js";
 import {DeclarationMergingService, declarationMergingServiceKey} from "./DeclarationMergingPlugin.js";
+import {NamespaceInfoService, namespaceInfoServiceKey} from "./NamespaceInfoPlugin.js";
 
 export const convertEnumDeclaration = createSimplePlugin((node, context, render) => {
     if (!ts.isEnumDeclaration(node)) return null
@@ -13,9 +14,13 @@ export const convertEnumDeclaration = createSimplePlugin((node, context, render)
     if (declarationMergingService?.isCovered(node)) return ""
     declarationMergingService?.cover(node)
 
+    const namespaceInfoService = context.lookupService<NamespaceInfoService>(namespaceInfoServiceKey)
+
     const name = render(node.name)
 
-    const members = (declarationMergingService?.getMembers(node) ?? node.members)
+    const resolveNamespaceStrategy = namespaceInfoService?.resolveNamespaceStrategy?.bind(namespaceInfoService)
+
+    const members = (declarationMergingService?.getMembers(node, resolveNamespaceStrategy) ?? node.members)
         .map(member => `${render(member)}: ${name}`)
         .join("\n")
 

diff --git a/src/converter/plugins/convertInterfaceDeclaration.ts b/src/converter/plugins/convertInterfaceDeclaration.ts
@@ -4,6 +4,7 @@ import {ifPresent} from "../render.js";
 import {CheckCoverageService, checkCoverageServiceKey} from "./CheckCoveragePlugin.js";
 import {InheritanceModifierService, inheritanceModifierServiceKey} from "./InheritanceModifierPlugin.js";
 import {DeclarationMergingService, declarationMergingServiceKey} from "./DeclarationMergingPlugin.js";
+import {NamespaceInfoService, namespaceInfoServiceKey} from "./NamespaceInfoPlugin.js";
 
 export const convertInterfaceDeclaration = createSimplePlugin((node, context, render) => {
     if (!ts.isInterfaceDeclaration(node)) return null
@@ -15,6 +16,7 @@ export const convertInterfaceDeclaration = createSimplePlugin((node, context, re
     if (declarationMergingService?.isCovered(node)) return ""
     declarationMergingService?.cover(node)
 
+    const namespaceInfoService = context.lookupService<NamespaceInfoService>(namespaceInfoServiceKey)
     const inheritanceModifierService = context.lookupService<InheritanceModifierService>(inheritanceModifierServiceKey)
 
     const exportModifier = node.modifiers?.find(it => it.kind === ts.SyntaxKind.ExportKeyword)
@@ -32,7 +34,9 @@ export const convertInterfaceDeclaration = createSimplePlugin((node, context, re
         ?.map(heritageClause => render(heritageClause))
         ?.join(", ")
 
-    const members = (declarationMergingService?.getMembers(node) ?? node.members)
+    const resolveNamespaceStrategy = namespaceInfoService?.resolveNamespaceStrategy?.bind(namespaceInfoService)
+
+    const members = (declarationMergingService?.getMembers(node, resolveNamespaceStrategy) ?? node.members)
         .map(member => render(member))
         .join("\n")