Pass sourceFile path to the ModuleDeclaration directly

Kotlin · Sep 28, 2020 · 30fa88b · 30fa88b
1 parent 71d95d0
commit 30fa88b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/javascript/js-type-analysis/src/org/jetbrains/dukat/js/type/analysis/introduceTypes.kt b/javascript/js-type-analysis/src/org/jetbrains/dukat/js/type/analysis/introduceTypes.kt
@@ -41,7 +41,7 @@ fun ModuleDeclaration.introduceTypes(context: TypeAnalysisContext): ModuleDeclar
     environment.resolveConstraints()
 
     val declarations =
-            context.getExportsFrom(environment, resourceName)
+            context.getExportsFrom(environment, sourceName)
                     .map {
                         when (it) {
                             is FunctionDeclaration -> it.copy(modifiers = makeExternal())

diff --git a/typescript/ts-converter/src/AstConverter.ts b/typescript/ts-converter/src/AstConverter.ts
@@ -124,7 +124,7 @@ export class AstConverter {
 
   private createModuleFromSourceFile(sourceFile: ts.SourceFile, filter?: (node: ts.Node) => boolean): ModuleDeclaration {
     let packageNameFragments = sourceFile.fileName.split("/");
-    let sourceName = packageNameFragments[packageNameFragments.length - 1].replace(".d.ts", "");
+    let sourceName = sourceFile.fileName;
 
     let statements = filter ? sourceFile.statements.filter(filter) : sourceFile.statements;
 

diff --git a/typescript/ts-converter/src/ast/AstFactory.ts b/typescript/ts-converter/src/ast/AstFactory.ts
@@ -512,7 +512,7 @@ export class AstFactory {
     moduleDeclarations: Iterable<Declaration>,
     modifiers: Array<ModifierDeclaration>,
     uid: string,
-    resourceName: string,
+    sourceName: string,
     definitions: Array<DefinitionInfoDeclaration>,
     kind: MODULE_KINDMap[keyof MODULE_KINDMap]
   ): ModuleDeclaration {
@@ -527,7 +527,7 @@ export class AstFactory {
     moduleDeclaration.setModifiersList(modifiers);
 
     moduleDeclaration.setUid(uid);
-    moduleDeclaration.setResourcename(resourceName);
+    moduleDeclaration.setSourcename(sourceName);
     moduleDeclaration.setDefinitionsinfoList(definitions);
     moduleDeclaration.setKind(kind);
 

diff --git a/typescript/ts-model-proto/src/tsdeclarations.proto b/typescript/ts-model-proto/src/tsdeclarations.proto
@@ -554,7 +554,7 @@ message ModuleDeclarationProto {
     repeated TopLevelDeclarationProto declarations = 4;
     repeated ModifierDeclarationProto modifiers = 5;
     string uid = 6;
-    string resourceName = 7;
+    string sourceName = 7;
     repeated DefinitionInfoDeclarationProto definitionsInfo = 8;
 
     enum MODULE_KIND {

diff --git a/typescript/ts-model/src/org/jetbrains/dukat/tsmodel/ModuleDeclaration.kt b/typescript/ts-model/src/org/jetbrains/dukat/tsmodel/ModuleDeclaration.kt
@@ -16,6 +16,6 @@ data class ModuleDeclaration(
 
         override val definitionsInfo: List<DefinitionInfoDeclaration>,
         override val uid: String,
-        val resourceName: String,
+        val sourceName: String,
         val kind: ModuleDeclarationKind
 ) : TopLevelDeclaration, WithModifiersDeclaration, MergeableDeclaration
diff --git a/typescript/ts-model/src/org/jetbrains/dukat/tsmodel/factory/convertProtobuf.kt b/typescript/ts-model/src/org/jetbrains/dukat/tsmodel/factory/convertProtobuf.kt
@@ -357,7 +357,7 @@ fun ModuleDeclarationProto.convert(): ModuleDeclaration {
             modifiers = modifiersList.mapNotNull { it.convert() }.toSet(),
             definitionsInfo = definitionsInfoList.map { it.convert() },
             uid = uid,
-            resourceName = resourceName,
+            sourceName = sourceName,
             kind = when (kind) {
                 ModuleDeclarationProto.MODULE_KIND.DECLARATION_FILE -> ModuleDeclarationKind.DECLARATION_FILE
                 ModuleDeclarationProto.MODULE_KIND.SOURCE_FILE -> ModuleDeclarationKind.SOURCE_FILE