ttsc 0.16.9 → 0.16.11

package/driver/emit_plugin.go

@@ -1,8 +1,10 @@
 package driver
 
 import (
+  "context"
   "errors"
   "strings"
+  "sync"
 
   shimast "github.com/microsoft/typescript-go/shim/ast"
   shimcompiler "github.com/microsoft/typescript-go/shim/compiler"
@@ -126,16 +128,20 @@ func restoreOriginalDeclarationSymbols(ec *shimprinter.EmitContext, node *shimas
   })
 }
 
-// EmitWithPluginTransformers emits every source file by assembling tsgo's emit
-// pipeline from shim parts and running the plugin transformers FIRST (in order)
-// in the same EmitContext as the builtin chain (type-erase, import-elision,
-// module-transform, ...). No text-splice and no hand-rolled import aliasing:
-// tsgo's module-transform aliases the plugins' injected imports itself.
+// EmitWithPluginTransformers emits every source file by assembling tsgo's
+// JavaScript emit pipeline from shim parts and running the plugin transformers
+// FIRST (in order) in the same EmitContext as the builtin chain (type-erase,
+// import-elision, module-transform, ...). No text-splice and no hand-rolled
+// import aliasing: tsgo's module-transform aliases the plugins' injected
+// imports itself.
 //
-// Because this bypasses tsgo's own emitter, it reproduces the emitter's
-// source-map step via PrintFileWithSourceMap: a `sourceMap` / `inlineSourceMap`
-// build emits a `.js.map` (and `//# sourceMappingURL=` trailer) just like a
-// plain build, even when a transform expanded one source line into many.
+// Because the JavaScript side bypasses tsgo's own emitter, it reproduces the
+// emitter's source-map step via PrintFileWithSourceMap: a `sourceMap` /
+// `inlineSourceMap` build emits a `.js.map` (and `//# sourceMappingURL=`
+// trailer) just like a plain build, even when a transform expanded one source
+// line into many. All non-JavaScript outputs stay delegated to tsgo's normal
+// dts-only emitter so declaration files, declaration maps, and any future
+// declaration-lane outputs are not silently lost by the hand-assembled JS path.
 func (p *Program) EmitWithPluginTransformers(transforms []PluginTransform, writeFile shimcompiler.WriteFile) ([]Diagnostic, error) {
   if p == nil || p.TSProgram == nil {
     return nil, errors.New("driver: nil program")
@@ -144,54 +150,87 @@ func (p *Program) EmitWithPluginTransformers(transforms []PluginTransform, write
   options := p.TSProgram.Options()
   for _, sf := range shimcompiler.GetSourceFilesToEmit(host, nil, false) {
     paths := shimcompiler.GetOutputPathsFor(sf, options, host, false)
-    if p.outputEscapesOutDir(paths.JsFilePath()) {
-      continue
-    }
-    ec := shimprinter.NewEmitContext()
-    out := sf
-    for _, transform := range transforms {
-      if transform == nil {
-        continue
-      }
-      if next := transform(ec, out); next != nil {
-        out = next
+    if paths.JsFilePath() != "" && !p.outputEscapesOutDir(paths.JsFilePath()) {
+      ec := shimprinter.NewEmitContext()
+      out := sf
+      for _, transform := range transforms {
+        if transform == nil {
+          continue
+        }
+        if next := transform(ec, out); next != nil {
+          out = next
+        }
       }
-    }
-    shimast.SetParentInChildrenUnset(out.AsNode())
-    restoreOriginalDeclarationSymbols(ec, out.AsNode())
-    for _, tr := range shimcompiler.GetScriptTransformers(ec, host, out) {
-      out = tr.TransformSourceFile(out)
-    }
-    // Print through the source-map-aware helper so a `sourceMap` /
-    // `inlineSourceMap` build still gets its `.js.map` and sourceMappingURL
-    // trailer: the hand-assembled emit pipeline does not run tsgo's emitter, so
-    // the source-map step printSourceFile would otherwise perform has to happen
-    // here. With maps off this is the same bare-printer output as before.
-    printed := shimcompiler.PrintFileWithSourceMap(ec, out.AsNode(), out, options, host, paths.JsFilePath(), paths.SourceMapFilePath())
-    // A source-level preamble (e.g. @ttsc/banner linked into a typia host) shifts
-    // the map's source coordinates; correct them here too, so the
-    // preamble-plus-transform combination is not left uncorrected the way it
-    // would be if only the utility host's WriteFile patched maps. Covers both the
-    // external `.js.map` and an inline base64 map embedded in the JS.
-    if p.SourcePreamble != "" {
-      dropLines := strings.Count(p.SourcePreamble, "\n")
-      if adjusted, ok := AdjustEmittedSourceMap(paths.JsFilePath(), printed.JS, dropLines); ok {
-        printed.JS = adjusted
+      shimast.SetParentInChildrenUnset(out.AsNode())
+      restoreOriginalDeclarationSymbols(ec, out.AsNode())
+      for _, tr := range shimcompiler.GetScriptTransformers(ec, host, out) {
+        out = tr.TransformSourceFile(out)
       }
-      if printed.MapPath != "" {
-        if adjusted, ok := AdjustEmittedSourceMap(printed.MapPath, printed.MapText, dropLines); ok {
-          printed.MapText = adjusted
+      // Print through the source-map-aware helper so a `sourceMap` /
+      // `inlineSourceMap` build still gets its `.js.map` and sourceMappingURL
+      // trailer: the hand-assembled emit pipeline does not run tsgo's emitter,
+      // so the source-map step printSourceFile would otherwise perform has to
+      // happen here. With maps off this is the same bare-printer output as
+      // before.
+      printed := shimcompiler.PrintFileWithSourceMap(ec, out.AsNode(), out, options, host, paths.JsFilePath(), paths.SourceMapFilePath())
+      // A source-level preamble (e.g. @ttsc/banner linked into a typia host)
+      // shifts the map's source coordinates; correct them here too, so the
+      // preamble-plus-transform combination is not left uncorrected the way it
+      // would be if only the utility host's WriteFile patched maps. Covers both
+      // the external `.js.map` and an inline base64 map embedded in the JS.
+      if p.SourcePreamble != "" {
+        dropLines := strings.Count(p.SourcePreamble, "\n")
+        if adjusted, ok := AdjustEmittedSourceMap(paths.JsFilePath(), printed.JS, dropLines); ok {
+          printed.JS = adjusted
+        }
+        if printed.MapPath != "" {
+          if adjusted, ok := AdjustEmittedSourceMap(printed.MapPath, printed.MapText, dropLines); ok {
+            printed.MapText = adjusted
+          }
         }
       }
-    }
-    if err := writeFile(paths.JsFilePath(), printed.JS, nil); err != nil {
-      return nil, err
-    }
-    if printed.MapPath != "" {
-      if err := writeFile(printed.MapPath, printed.MapText, nil); err != nil {
+      if err := p.writePluginEmitOutput(paths.JsFilePath(), printed.JS, writeFile); err != nil {
+        return nil, err
+      }
+      if err := p.writePluginEmitOutput(printed.MapPath, printed.MapText, writeFile); err != nil {
         return nil, err
       }
     }
   }
+  if !options.GetEmitDeclarations() {
+    return nil, nil
+  }
+
+  var wfMu sync.Mutex
+  result := p.TSProgram.Emit(context.Background(), shimcompiler.EmitOptions{
+    EmitOnly: shimcompiler.EmitOnlyDts,
+    WriteFile: func(fileName string, text string, data *shimcompiler.WriteFileData) error {
+      wfMu.Lock()
+      defer wfMu.Unlock()
+      if p.outputEscapesOutDir(fileName) {
+        if data != nil {
+          data.SkippedDtsWrite = true
+        }
+        return nil
+      }
+      if writeFile != nil {
+        return writeFile(fileName, text, data)
+      }
+      return DefaultWriteFile(fileName, text)
+    },
+  })
+  if result != nil && len(result.Diagnostics) != 0 {
+    return convertDiagnostics(result.Diagnostics), nil
+  }
   return nil, nil
 }
+
+func (p *Program) writePluginEmitOutput(fileName, text string, writeFile shimcompiler.WriteFile) error {
+  if fileName == "" || p.outputEscapesOutDir(fileName) {
+    return nil
+  }
+  if writeFile != nil {
+    return writeFile(fileName, text, nil)
+  }
+  return DefaultWriteFile(fileName, text)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ttsc",
-  "version": "0.16.9",
+  "version": "0.16.11",
   "description": "General-purpose TypeScript-Go compiler, runtime, plugin host, and LSP host.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,13 +32,13 @@
     "typescript": "7.0.1-rc"
   },
   "optionalDependencies": {
-    "@ttsc/linux-x64": "0.16.9",
-    "@ttsc/linux-arm": "0.16.9",
-    "@ttsc/linux-arm64": "0.16.9",
-    "@ttsc/win32-x64": "0.16.9",
-    "@ttsc/win32-arm64": "0.16.9",
-    "@ttsc/darwin-x64": "0.16.9",
-    "@ttsc/darwin-arm64": "0.16.9"
+    "@ttsc/linux-x64": "0.16.11",
+    "@ttsc/linux-arm": "0.16.11",
+    "@ttsc/darwin-x64": "0.16.11",
+    "@ttsc/win32-x64": "0.16.11",
+    "@ttsc/linux-arm64": "0.16.11",
+    "@ttsc/win32-arm64": "0.16.11",
+    "@ttsc/darwin-arm64": "0.16.11"
   },
   "sideEffects": false,
   "files": [

package/utility/serve.go

@@ -6,10 +6,10 @@ import (
   "fmt"
   "io"
   "os"
-  "path/filepath"
   "strings"
 
   shimprinter "github.com/microsoft/typescript-go/shim/printer"
+  shimtspath "github.com/microsoft/typescript-go/shim/tspath"
 
   "github.com/samchon/ttsc/packages/ttsc/driver"
 )
@@ -147,12 +147,12 @@ func buildServeCache(opts hostOptions) (map[string]string, bool) {
   return cache, true
 }
 
-// resolveServePath turns a request's file into an absolute path so apiOutputKey
-// computes the same key buildServeCache stored, and so overlay overrides are
-// keyed the way the program asks for them.
+// resolveServePath turns a request's file into a normalized absolute path, the
+// same form TypeScript-Go's own SourceFile.FileName() and the OverlayFS key
+// already use, so apiOutputKey and overlay lookups match regardless of how the
+// caller spelled the path. tspath.ResolvePath discards cwd and normalizes in
+// place when file is already rooted, so one call covers both request cases
+// (samchon/ttsc#319).
 func resolveServePath(cwd, file string) string {
-  if filepath.IsAbs(file) {
-    return file
-  }
-  return filepath.Join(cwd, file)
+  return shimtspath.ResolvePath(cwd, file)
 }