ttsc 0.23.0 → 0.24.0

package/cmd/ttscgraph/serve_session_reloads_superseding_module_candidates_test.go

@@ -2,7 +2,10 @@ package main
 
 import (
   "path/filepath"
+  "strings"
   "testing"
+
+  "github.com/samchon/ttsc/packages/ttsc/internal/graph"
 )
 
 // TestServeSessionReloadsSupersedingModuleCandidates verifies a resident
@@ -15,13 +18,14 @@ import (
 //
 //  1. Load a project whose specifier resolves to the lower-priority target.
 //  2. Create only the absent target that precedes it in that resolver's search.
-//  3. Assert the resident snapshot reloads and exposes the new target when one
-//     carries a distinguishing declaration.
+//  3. Assert the resident snapshot reloads and the imported symbol resolves to
+//     the newly preferred file. Package internals remain external boundaries.
 func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
   cases := []struct {
-    name  string
-    setup func(*testing.T, string) string
-    add   func(*testing.T, string)
+    name           string
+    setup          func(*testing.T, string) string
+    add            func(*testing.T, string)
+    wantDiagnostic string
   }{
     {
       name: "relative_extension",
@@ -32,10 +36,10 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
 }`)
         writeGraphFile(t, filepath.Join(root, "src", "main.ts"), "import { winner } from './value';\nexport function main(): void { winner(); }\n")
         writeGraphFile(t, filepath.Join(root, "src", "value.js"), "export function winner() {}\n")
-        return "typescriptWinner"
+        return "src/value.ts"
       },
       add: func(t *testing.T, root string) {
-        writeGraphFile(t, filepath.Join(root, "src", "value.ts"), "export function winner(): void {}\nexport function typescriptWinner(): void {}\n")
+        writeGraphFile(t, filepath.Join(root, "src", "value.ts"), "export function winner(): void {}\n")
       },
     },
     {
@@ -52,10 +56,10 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
 }`)
         writeGraphFile(t, filepath.Join(root, "src", "main.ts"), "import { winner } from '@generated/value';\nexport function main(): void { winner(); }\n")
         writeGraphFile(t, filepath.Join(root, "fallback", "value.ts"), "export function winner(): void {}\n")
-        return "firstPathsWinner"
+        return "first/value.ts"
       },
       add: func(t *testing.T, root string) {
-        writeGraphFile(t, filepath.Join(root, "first", "value.ts"), "export function winner(): void {}\nexport function firstPathsWinner(): void {}\n")
+        writeGraphFile(t, filepath.Join(root, "first", "value.ts"), "export function winner(): void {}\n")
       },
     },
     {
@@ -71,10 +75,10 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
 }`)
         writeGraphFile(t, filepath.Join(root, "src", "views", "main.ts"), "import { winner } from './template';\nexport function main(): void { winner(); }\n")
         writeGraphFile(t, filepath.Join(root, "generated", "views", "template.ts"), "export function winner(): void {}\n")
-        return "rootDirsWinner"
+        return "src/views/template.ts"
       },
       add: func(t *testing.T, root string) {
-        writeGraphFile(t, filepath.Join(root, "src", "views", "template.ts"), "export function winner(): void {}\nexport function rootDirsWinner(): void {}\n")
+        writeGraphFile(t, filepath.Join(root, "src", "views", "template.ts"), "export function winner(): void {}\n")
       },
     },
     {
@@ -86,10 +90,10 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
 }`)
         writeGraphFile(t, filepath.Join(root, "src", "deep", "main.ts"), "import { winner } from 'fixture-package';\nexport function main(): void { winner(); }\n")
         writeGraphFile(t, filepath.Join(root, "node_modules", "fixture-package", "index.js"), "export function winner() {}\n")
-        return "nearerNodeModulesWinner"
+        return "src/node_modules/fixture-package/index.ts"
       },
       add: func(t *testing.T, root string) {
-        writeGraphFile(t, filepath.Join(root, "src", "node_modules", "fixture-package", "index.ts"), "export function winner(): void {}\nexport function nearerNodeModulesWinner(): void {}\n")
+        writeGraphFile(t, filepath.Join(root, "src", "node_modules", "fixture-package", "index.ts"), "export function winner(): void {}\n")
       },
     },
     {
@@ -113,8 +117,9 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
         return ""
       },
       add: func(t *testing.T, root string) {
-        writeGraphFile(t, filepath.Join(root, "node_modules", "fixture-package", "dist", "first.js"), "export function winner() {}\nexport function exportsWinner() {}\n")
+        writeGraphFile(t, filepath.Join(root, "node_modules", "fixture-package", "dist", "first.js"), "export function winner() {}\n")
       },
+      wantDiagnostic: "node_modules/fixture-package/dist/first.js",
     },
     {
       name: "conditional_package_exports",
@@ -139,7 +144,7 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
   }
 }`)
         writeGraphFile(t, filepath.Join(root, "node_modules", "fixture-package", "dist", "fallback.js"), "export function winner() {}\n")
-        return ""
+        return "node_modules/fixture-package/dist/types.d.ts"
       },
       add: func(t *testing.T, root string) {
         writeGraphFile(t, filepath.Join(root, "node_modules", "fixture-package", "dist", "types.d.ts"), "export declare function winner(): void;\n")
@@ -168,7 +173,7 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
 }`)
         writeGraphFile(t, filepath.Join(root, "src", "main.ts"), "import { winner } from '#feature';\nexport function main(): void { winner(); }\n")
         writeGraphFile(t, filepath.Join(root, "generated", "fallback.js"), "export function winner() {}\n")
-        return ""
+        return "generated/types.d.ts"
       },
       add: func(t *testing.T, root string) {
         writeGraphFile(t, filepath.Join(root, "generated", "types.d.ts"), "export declare function winner(): void;\n")
@@ -183,10 +188,10 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
 }`)
         writeGraphFile(t, filepath.Join(root, "src", "main.ts"), "import { winner } from './feature';\nexport function main(): void { winner(); }\n")
         writeGraphFile(t, filepath.Join(root, "src", "feature", "index.js"), "export function winner() {}\n")
-        return "fileWinner"
+        return "src/feature.js"
       },
       add: func(t *testing.T, root string) {
-        writeGraphFile(t, filepath.Join(root, "src", "feature.js"), "export function winner() {}\nexport function fileWinner() {}\n")
+        writeGraphFile(t, filepath.Join(root, "src", "feature.js"), "export function winner() {}\n")
       },
     },
   }
@@ -208,9 +213,30 @@ func TestServeSessionReloadsSupersedingModuleCandidates(t *testing.T) {
       if err != nil {
         t.Fatal(err)
       }
-      if dump == nil || mode != serveModeReload || !changed || (want != "" && !hasDumpNode(*dump, want)) {
-        t.Fatalf("superseding candidate = dump:%v mode:%q changed:%v want-node:%q", dump != nil, mode, changed, want)
+      if dump == nil || mode != serveModeReload || !changed ||
+        (want != "" && !hasDumpNodeAt(*dump, "winner", want)) ||
+        (test.wantDiagnostic != "" && !hasDumpDiagnosticContaining(*dump, test.wantDiagnostic)) {
+        t.Fatalf("superseding candidate = dump:%v mode:%q changed:%v want-file:%q want-diagnostic:%q", dump != nil, mode, changed, want, test.wantDiagnostic)
       }
     })
   }
 }
+
+func hasDumpNodeAt(dump graph.Dump, name, fileSuffix string) bool {
+  suffix := filepath.ToSlash(fileSuffix)
+  for _, node := range dump.Nodes {
+    if node.Name == name && strings.HasSuffix(filepath.ToSlash(node.File), suffix) {
+      return true
+    }
+  }
+  return false
+}
+
+func hasDumpDiagnosticContaining(dump graph.Dump, fragment string) bool {
+  for _, diagnostic := range dump.Diagnostics {
+    if strings.Contains(filepath.ToSlash(diagnostic.Message), filepath.ToSlash(fragment)) {
+      return true
+    }
+  }
+  return false
+}

package/cmd/ttscgraph/serve_session_retries_failed_dump_test.go

@@ -36,13 +36,13 @@ func TestServeSessionKeepsChangeDetectionLiveAfterInitialDumpError(t *testing.T)
   if err == nil || !strings.Contains(err.Error(), "project root") {
     t.Fatalf("initial dump error = %v, want absolute-root rejection", err)
   }
-  if dump != nil || changed || !session.initialized || session.pendingDumpMode != serveModeInitial {
+  if dump != nil || changed || !session.initialized || session.pending == nil || session.pending.mode != serveModeInitial {
     t.Fatalf(
       "failed initial state = dump:%v changed:%v initialized:%v pending:%q",
       dump != nil,
       changed,
       session.initialized,
-      session.pendingDumpMode,
+      session.pending.mode,
     )
   }
 
@@ -71,11 +71,11 @@ func TestServeSessionRetriesAPendingDumpBeforeUnchanged(t *testing.T) {
     t.Fatalf("NewSession returned nil session (diagnostics: %v)", diags)
   }
   session := &graphSession{
-    cwd:             root,
-    tsconfig:        "tsconfig.json",
-    compiler:        compiler,
-    initialized:     true,
-    pendingDumpMode: serveModeReload,
+    cwd:         root,
+    tsconfig:    "tsconfig.json",
+    compiler:    compiler,
+    initialized: true,
+    pending:     &graphChange{mode: serveModeReload, full: true},
   }
   defer session.Close()
   if err := session.captureState(); err != nil {
@@ -89,8 +89,8 @@ func TestServeSessionRetriesAPendingDumpBeforeUnchanged(t *testing.T) {
   if dump == nil || mode != serveModeReload || !changed {
     t.Fatalf("pending dump retry = dump:%v mode:%q changed:%v", dump != nil, mode, changed)
   }
-  if session.pendingDumpMode != "" {
-    t.Fatalf("successful retry left pending mode %q", session.pendingDumpMode)
+  if session.pending != nil {
+    t.Fatalf("successful retry left pending change %#v", session.pending)
   }
 
   dump, mode, changed, err = session.Snapshot()