@ttsc/wasm 0.26.1 → 0.26.2

package/dist/.ttsc-wasm-build.json

@@ -1,11 +1,11 @@
 {
   "schema": 1,
-  "identity": "752eeb8e4ed48203ae31a47a136b0a4040e52f80d04b20b14b7c6f73060f57c5",
+  "identity": "d2aaebc4a3fb711653c25dd4bd96266235c1765720f25de03366130d14fe1d2e",
   "artifacts": [
     {
       "path": "/home/runner/work/ttsc/ttsc/packages/wasm/dist/ttsc.wasm",
       "type": "file",
-      "sha256": "d22e7d8a0fdfbb4041027288e2b25199570d4f94bc6e7011dbd9ba67689030eb"
+      "sha256": "29bafd930043ecd531782f8565448fb18ea8c5ae703b78dd1dca1c183e06ba83"
     },
     {
       "path": "/home/runner/work/ttsc/ttsc/packages/wasm/dist/wasm_exec.js",
@@ -119,7 +119,7 @@
         },
         {
           "path": "compiler/emit_sourcemap.go",
-          "sha256": "f488641b1ef9f20a54abf4a58a4c0e39a691ad175b51fb30417bc7a35d76c9ad"
+          "sha256": "78e2a0ad04a7d8845b95a7a248c70fc8348d1c932854ab7976aa7e4e2cc7ecdc"
         },
         {
           "path": "compiler/emitassemble.go",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttsc/wasm",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "description": "Build in-browser ttsc playgrounds. Compose ttsc + typescript-go with your own plugins via the Go host helper.",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",

package/shim-vendor/shim/compiler/emit_sourcemap.go

@@ -5,12 +5,27 @@
 // tsgo's Program.Emit has no hook to inject a custom transformer, so ttsc's
 // driver assembles the per-file emit pipeline by hand (see GetSourceFilesToEmit
 // / GetScriptTransformers / GetOutputPathsFor). That hand-assembly must also
-// reproduce the source-map step the emitter would otherwise run: a bare
-// printer.Write with a nil generator drops the `.js.map` entirely. This file
-// ports internal/compiler/emitter.go's `printSourceFile` source-map branch so a
-// `sourceMap` / `inlineSourceMap` build that goes through a plugin transform
-// produces the same map (and `//# sourceMappingURL=` trailer) a plain build
-// does. Keep it in sync with that emitter source when the pin is bumped.
+// reproduce every step the emitter would otherwise run: building the printer's
+// options from the compiler options, the source-map branch a bare printer.Write
+// with a nil generator drops entirely, the `emitBOM` byte-order mark, and the
+// `WriteFileData` the emitter hands its writeFile callback. This file ports
+// internal/compiler/emitter.go's `emitJSFile` PrinterOptions construction and
+// the whole of its `printSourceFile` so a build that goes through a plugin
+// transform honors the same compiler options — and produces the same map (and
+// `//# sourceMappingURL=` trailer, and the same first bytes) — a plain build
+// does.
+//
+// Keep it in sync with that emitter source when the pin is bumped. Anything
+// `emitJSFile` sets and this file omits takes the Go zero value, which silently
+// turns the option off for every project that emits through a plugin transform,
+// and anything `printSourceFile` does around the printer that this file omits
+// is missing from the plugin lane's output even when the option set matches.
+// `printer_options_field_set_matches_pinned_emitter_test.go` fails when the pin
+// changes the PrinterOptions field set,
+// `write_file_data_field_set_matches_pinned_emitter_test.go` fails when it
+// changes the WriteFileData field set, and
+// `emit_plugin_transform_matches_plain_emit_for_printer_options_test.go` fails
+// when a forwarded option stops matching the plain emit.
 package compiler
 
 import (
@@ -25,24 +40,43 @@ import (
 
 // PrintedFile is the rendered output of one source file in the plugin-transform
 // emit path. JS is the JavaScript text, already carrying a trailing
-// `//# sourceMappingURL=` comment when a map was produced. MapText/MapPath are
-// the external source-map file and its path; both are empty when no external map
-// is written (source maps disabled, or an inline map encoded into the JS).
+// `//# sourceMappingURL=` comment when a map was produced and a leading UTF-8
+// byte order mark when `emitBOM` is on. MapText/MapPath are the external
+// source-map file and its path; both are empty when no external map is written
+// (source maps disabled, or an inline map encoded into the JS).
 type PrintedFile struct {
   JS      string
   MapText string
   MapPath string
+  // SourceMapUrlPos is the offset of the `//# sourceMappingURL=` trailer in JS,
+  // or -1 when no trailer was written — the value tsgo's emitter reports as
+  // WriteFileData.SourceMapUrlPos so a caller can locate and rewrite the
+  // trailer without re-scanning the text. Like the emitter's, it is the printer
+  // writer's text position, taken BEFORE the `emitBOM` mark is prepended, so a
+  // BOM build's offset is three bytes short of the trailer's position in the
+  // written file. That is the pinned emitter's own behavior
+  // (internal/compiler/emitter.go::printSourceFile computes sourceMapUrlPos
+  // from the writer and only then calls AddUTF8ByteOrderMark), and this lane
+  // exists to match it: "correcting" the offset here would make a plugin build
+  // disagree with the plain build of the same project.
+  SourceMapUrlPos int
 }
 
 // PrintFileWithSourceMap renders sourceFile through a printer built from options
 // and emitContext, optionally generating a source map, mirroring
-// emitter.printSourceFile for the single-file plugin-transform path. When
+// emitter.emitJSFile and emitter.printSourceFile for the single-file
+// plugin-transform path. The PrinterOptions below are emitJSFile's, field for
+// field: `removeComments`, `newLine`, `noEmitHelpers`, `sourceMap`,
+// `inlineSourceMap`, `inlineSources`, and `target`. When
 // `sourceMap`/`inlineSourceMap` is enabled (and the file is not JSON) it builds a
 // sourcemap.Generator, feeds it to the printer so positions are recorded,
-// appends the sourceMappingURL trailer, and returns the external map text/path
-// (or encodes the map inline). host supplies the same directory/casing context
-// tsgo's emitter reads. With source maps off it is byte-for-byte the prior
-// bare-printer behavior.
+// appends the sourceMappingURL trailer, records its offset, and returns the
+// external map text/path (or encodes the map inline). `emitBOM` prepends the
+// UTF-8 byte order mark to the JavaScript afterwards, exactly where
+// printSourceFile does it — outside PrinterOptions, which is why forwarding the
+// whole options struct never reached it. The external map is written without a
+// mark, matching the emitter's own `writeText(sourceMapFilePath, ..., nil)`.
+// host supplies the same directory/casing context tsgo's emitter reads.
 func PrintFileWithSourceMap(
   emitContext *innerprinter.EmitContext,
   node *innerast.Node,
@@ -53,10 +87,13 @@ func PrintFileWithSourceMap(
   sourceMapFilePath string,
 ) PrintedFile {
   printer := innerprinter.NewPrinter(innerprinter.PrinterOptions{
+    RemoveComments:  options.RemoveComments.IsTrue(),
     NewLine:         options.NewLine,
+    NoEmitHelpers:   options.NoEmitHelpers.IsTrue(),
     SourceMap:       options.SourceMap.IsTrue(),
     InlineSourceMap: options.InlineSourceMap.IsTrue(),
     InlineSources:   options.InlineSources.IsTrue(),
+    Target:          options.Target,
   }, innerprinter.PrintHandlers{}, emitContext)
   writer := innerprinter.NewTextWriter(options.NewLine.GetNewLineCharacter(), 0)
 
@@ -78,7 +115,7 @@ func PrintFileWithSourceMap(
 
   printer.Write(node, sourceFile, writer, generator)
 
-  result := PrintedFile{}
+  result := PrintedFile{SourceMapUrlPos: -1}
   if generator != nil {
     url := sourceMappingURL(options, generator, host, jsFilePath, sourceMapFilePath, sourceFile)
     if len(url) > 0 {
@@ -89,6 +126,7 @@ func PrintFileWithSourceMap(
           writer.RawWrite("\n")
         }
       }
+      result.SourceMapUrlPos = writer.GetTextPos()
       writer.WriteComment("//# sourceMappingURL=")
       writer.WriteComment(url)
     }
@@ -100,6 +138,9 @@ func PrintFileWithSourceMap(
     writer.WriteLine()
   }
   result.JS = writer.String()
+  if options.EmitBOM.IsTrue() {
+    result.JS = innerstringutil.AddUTF8ByteOrderMark(result.JS)
+  }
   return result
 }