[JS IR] Take into account file annotations for calculating symbol hashes

^KT-55367 Fixed

js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/main/module.info

@@ -3,3 +3,4 @@ STEP 0:
     added file: m.kt
 STEP 1:
     dependencies: lib1
+    updated imports: m.kt

js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/project.info

@@ -1,8 +1,5 @@
 MODULES: lib1, main
 
-STEP 0:
+STEP 0..1:
     libs: lib1, main
     dirty js: lib1, main
-STEP 1:
-    libs: lib1, main
-    dirty js: lib1

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.js

@@ -0,0 +1,8 @@
+(function (_) {
+  'use strict';
+  function externalDemoFunction() { return 3; }
+
+  _.externalDemoFunction = externalDemoFunction;
+
+  return _
+}(module.exports));

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.js

@@ -0,0 +1,8 @@
+(function (_) {
+  'use strict';
+  function externalDemoFunction() { return 0; }
+
+  _.externalDemoFunction = externalDemoFunction;
+
+  return _
+}(module.exports));

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.js

@@ -0,0 +1,8 @@
+(function (_) {
+  'use strict';
+  function externalDemoFunction() { return 2; }
+
+  _.externalDemoFunction = externalDemoFunction;
+
+  return _
+}(module.exports));

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.js

@@ -0,0 +1,8 @@
+(function (_) {
+  'use strict';
+  function externalDemoFunction() { return 1; }
+
+  _.externalDemoFunction = externalDemoFunction;
+
+  return _
+}(module.exports));

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.js

@@ -0,0 +1,8 @@
+(function (_) {
+  'use strict';
+  function externalDemoFunction() { return 5; }
+
+  _.externalDemoFunction = externalDemoFunction;
+
+  return _
+}(module.exports));

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.js

@@ -0,0 +1,8 @@
+(function (_) {
+  'use strict';
+  function externalDemoFunction() { return 4; }
+
+  _.externalDemoFunction = externalDemoFunction;
+
+  return _
+}(module.exports));

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.0.kt

@@ -0,0 +1,3 @@
+@file:JsModule("js-module-a")
+
+external fun externalDemoFunction(): Int

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.1.kt

@@ -0,0 +1 @@
+@file:JsModule("js-module-a")

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.4.kt

@@ -0,0 +1,3 @@
+@file:JsModule("js-module-a-new")
+
+external fun externalDemoFunction(): Int

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.0.kt

@@ -0,0 +1 @@
+@file:JsModule("js-module-b")

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.1.kt

@@ -0,0 +1,3 @@
+@file:JsModule("js-module-b")
+
+external fun externalDemoFunction(): Int

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.2.kt

@@ -0,0 +1,3 @@
+@file:JsModule("js-module-b-new")
+
+external fun externalDemoFunction(): Int

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/demo.0.kt

@@ -0,0 +1 @@
+fun demoFunction() = externalDemoFunction()

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/demo.3.kt

@@ -0,0 +1 @@
+fun demoFunction() = -1

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/module.info

@@ -0,0 +1,32 @@
+STEP 0:
+    modifications:
+        U : JsModuleA.0.kt -> JsModuleA.kt
+        U : JsModuleB.0.kt -> JsModuleB.kt
+        U : demo.0.kt -> demo.kt
+    added file: JsModuleA.kt, JsModuleB.kt, demo.kt
+STEP 1:
+    modifications:
+        U : JsModuleA.1.kt -> JsModuleA.kt
+        U : JsModuleB.1.kt -> JsModuleB.kt
+    modified ir: JsModuleA.kt, JsModuleB.kt
+    updated imports: demo.kt
+STEP 2:
+    modifications:
+        U : JsModuleB.2.kt -> JsModuleB.kt
+    modified ir: JsModuleB.kt
+    updated imports: demo.kt
+STEP 3:
+    modifications:
+        U : demo.3.kt -> demo.kt
+    modified ir: demo.kt
+STEP 4:
+    modifications:
+        U : JsModuleA.4.kt -> JsModuleA.kt
+        U : JsModuleB.0.kt -> JsModuleB.kt
+    modified ir: JsModuleA.kt, JsModuleB.kt
+STEP 5:
+    modifications:
+        U : JsModuleA.1.kt -> JsModuleA.kt
+    modified ir: JsModuleA.kt
+    updated exports: JsModuleA.kt
+STEP 6:

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib2/JsModuleC.5.kt

@@ -0,0 +1,3 @@
+@file:JsModule("js-module-c")
+
+external fun externalDemoFunction(): Int

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib2/JsModuleC.6.kt

@@ -0,0 +1,3 @@
+@file:JsModule("js-module-c-new")
+
+external fun externalDemoFunction(): Int

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib2/module.info

@@ -0,0 +1,28 @@
+STEP 0:
+    dependencies: lib1
+    modifications:
+        U : test.0.kt -> test.kt
+    added file: test.kt
+STEP 1..2:
+    dependencies: lib1
+STEP 3:
+    dependencies: lib1
+    modifications:
+        U : test.3.kt -> test.kt
+    modified ir: test.kt
+STEP 4:
+    dependencies: lib1
+    updated imports: test.kt
+STEP 5:
+    dependencies: lib1
+    modifications:
+        U : JsModuleC.5.kt -> JsModuleC.kt
+    added file: JsModuleC.kt
+    updated exports: JsModuleC.kt
+    updated imports: test.kt
+STEP 6:
+    dependencies: lib1
+    modifications:
+        U : JsModuleC.6.kt -> JsModuleC.kt
+    modified ir: JsModuleC.kt
+    updated imports: test.kt

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib2/test.0.kt

@@ -0,0 +1 @@
+fun testFunction() = demoFunction()

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib2/test.3.kt

@@ -0,0 +1 @@
+fun testFunction() = externalDemoFunction() + 1

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/main/m.kt

@@ -0,0 +1,7 @@
+fun box(stepId: Int): String {
+    val x = testFunction()
+    if (x != stepId) {
+        return "Fail: $x != $stepId"
+    }
+    return "OK"
+}

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/main/module.info

@@ -0,0 +1,5 @@
+STEP 0:
+    dependencies: lib1, lib2
+    added file: m.kt
+STEP 1..6:
+    dependencies: lib1, lib2

js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/project.info

@@ -0,0 +1,14 @@
+MODULES: lib1, lib2, main
+
+STEP 0:
+    libs: lib1, lib2, main
+    dirty js: lib1, lib2, main
+STEP 1..2:
+    libs: lib1, lib2, main
+    dirty js: lib1
+STEP 3..5:
+    libs: lib1, lib2, main
+    dirty js: lib1, lib2
+STEP 6:
+    libs: lib1, lib2, main
+    dirty js: lib2

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.0.d.ts

@@ -1,4 +1,2 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    function box(stepId: number): string;
-}
+type Nullable<T> = T | null | undefined
+export declare function box(stepId: number): string;

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.1.d.ts

@@ -1,5 +1,3 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    function foo(): number;
-    function box(stepId: number): string;
-}
+type Nullable<T> = T | null | undefined
+export declare function foo(): number;
+export declare function box(stepId: number): string;

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.2.d.ts

@@ -1,5 +1,3 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    function bar(): number;
-    function box(stepId: number): string;
-}
+type Nullable<T> = T | null | undefined
+export declare function bar(): number;
+export declare function box(stepId: number): string;

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.3.d.ts

@@ -1,10 +1,8 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    function bar(): number;
-    class MyClass {
-        constructor(stepId: number);
-        get stepId(): number;
-        qux(): number;
-    }
-    function box(stepId: number): string;
+type Nullable<T> = T | null | undefined
+export declare function bar(): number;
+export declare class MyClass {
+    constructor(stepId: number);
+    get stepId(): number;
+    qux(): number;
 }
+export declare function box(stepId: number): string;

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.4.d.ts

@@ -1,9 +1,7 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    class MyClass {
-        constructor(stepId: number);
-        get stepId(): number;
-        qux(): number;
-    }
-    function box(stepId: number): string;
+type Nullable<T> = T | null | undefined
+export declare class MyClass {
+    constructor(stepId: number);
+    get stepId(): number;
+    qux(): number;
 }
+export declare function box(stepId: number): string;

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.5.d.ts

@@ -1,9 +1,7 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    class MyClass {
-        constructor(stepId: number);
-        get stepId(): number;
-        baz(): number;
-    }
-    function box(stepId: number): string;
+type Nullable<T> = T | null | undefined
+export declare class MyClass {
+    constructor(stepId: number);
+    get stepId(): number;
+    baz(): number;
 }
+export declare function box(stepId: number): string;

js/js.translator/testData/incremental/invalidation/typeScriptExports/main/m.6.d.ts

@@ -1,9 +1,7 @@
-declare namespace kotlin_main {
-    type Nullable<T> = T | null | undefined
-    class MyClass {
-        constructor(stepId: number);
-        get stepId(): number;
-        bar(): number;
-    }
-    function box(stepId: number): string;
+type Nullable<T> = T | null | undefined
+export declare class MyClass {
+    constructor(stepId: number);
+    get stepId(): number;
+    bar(): number;
 }
+export declare function box(stepId: number): string;