Sourcemaps for JS

Author: alehander92

compiler/commands.nim

@@ -271,6 +271,7 @@ proc testCompileOption*(switch: string, info: TLineInfo): bool =
   of "patterns": result = contains(gOptions, optPatterns)
   of "experimental": result = gExperimentalMode
   of "excessivestacktrace": result = contains(gGlobalOptions, optExcessiveStackTrace)
+  of "sourcemap": result = gOptions * {optLineDir, optSourceMap} == {optLineDir, optSourceMap}
   else: invalidCmdLineOption(passCmd1, switch, info)
 
 proc processPath(path: string, info: TLineInfo,
@@ -698,6 +699,8 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
     expectNoArg(switch, arg, pass, info)
     newDestructors = true
     defineSymbol("nimNewRuntime")
+  of "sourcemap":
+    processOnOffSwitch({optLineDir, optSourceMap}, arg, pass, info)
   else:
     if strutils.find(switch, '.') >= 0: options.setConfigVar(switch, arg)
     else: invalidCmdLineOption(pass, switch, info)

compiler/jsgen.nim

@@ -33,7 +33,7 @@ import
   ast, astalgo, strutils, hashes, trees, platform, magicsys, extccomp, options,
   nversion, nimsets, msgs, std / sha1, bitsets, idents, types, os, tables,
   times, ropes, math, passes, ccgutils, wordrecg, renderer, rodread, rodutils,
-  intsets, cgmeth, lowerings, sighashes
+  intsets, cgmeth, lowerings, sighashes, sets, sourcemap, json
 
 from modulegraphs import ModuleGraph
 
@@ -211,6 +211,8 @@ proc mapType(p: PProc; typ: PType): TJSTypeKind =
   if p.target == targetPHP: result = etyObject
   else: result = mapType(typ)
 
+var mangled = initSet[string]()
+
 proc mangleName(m: BModule, s: PSym): Rope =
   proc validJsName(name: string): bool =
     result = true
@@ -264,6 +266,11 @@ proc mangleName(m: BModule, s: PSym): Rope =
         add(result, rope(s.id))
     s.loc.r = result
 
+  # TODO: optimize
+  let s = $result
+  if '_' in s:
+    mangled.incl(s)
+
 proc escapeJSString(s: string): string =
   result = newStringOfCap(s.len + s.len shr 2)
   result.add("\"")
@@ -581,11 +588,19 @@ proc hasFrameInfo(p: PProc): bool =
   ({optLineTrace, optStackTrace} * p.options == {optLineTrace, optStackTrace}) and
       ((p.prc == nil) or not (sfPure in p.prc.flags))
 
+proc lineDir(info: TLineInfo, line: int): Rope =
+  ropes.`%`("$N// line $2 $1$N",
+         [fileInfos[info.fileIndex].quotedFullName, rope(line)])
+
 proc genLineDir(p: PProc, n: PNode) =
   let line = toLinenumber(n.info)
-  if optLineDir in p.options:
-    lineF(p, "// line $2 \"$1\"$n",
-         [rope(toFilename(n.info)), rope(line)])
+  if line < 0:
+    return
+  if optLineDir in p.options or optLineDir in gOptions:
+    softRnl = noRnl
+    line(p, lineDir(n.info, line))
+    # lineF(p, "$N// line $2 $1$N",
+    #      [fileInfos[n.info.fileIndex].quotedFullName, rope(line)])
   if {optStackTrace, optEndb} * p.options == {optStackTrace, optEndb} and
       ((p.prc == nil) or sfPure notin p.prc.flags):
     useMagic(p, "endb")
@@ -719,15 +734,16 @@ proc genTry(p: PProc, n: PNode, r: var TCompRes) =
     line(p, "}" & tnl)
 
 proc genRaiseStmt(p: PProc, n: PNode) =
-  genLineDir(p, n)
   if n.sons[0].kind != nkEmpty:
     var a: TCompRes
     gen(p, n.sons[0], a)
     let typ = skipTypes(n.sons[0].typ, abstractPtrs)
+    genLineDir(p, n)
     useMagic(p, "raiseException")
     lineF(p, "raiseException($1, $2);$n",
              [a.rdLoc, makeJSString(typ.sym.name.s)])
   else:
+    genLineDir(p, n)
     useMagic(p, "reraiseException")
     line(p, "reraiseException();" & tnl)
 
@@ -2194,6 +2210,10 @@ proc genProc(oldProc: PProc, prc: PSym): Rope =
 
   p.nested: genStmt(p, prc.getBody)
 
+
+  if optLineDir in prc.options or optLineDir in gOptions:
+    result = lineDir(prc.info, toLinenumber(prc.info))
+
   var def: Rope
   if not prc.constraint.isNil:
     def = (prc.constraint.strVal & " {$n$#$#$#$#$#") %
@@ -2206,7 +2226,7 @@ proc genProc(oldProc: PProc, prc: PSym): Rope =
               optionaLine(genProcBody(p, prc)),
               optionaLine(p.indentLine(returnStmt))]
   else:
-    result = ~tnl
+    result.add(softRnl)
 
     if optHotCodeReloading in gOptions:
       # Here, we introduce thunks that create the equivalent of a jump table
@@ -2516,13 +2536,19 @@ proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode =
     let ext = if m.target == targetJS: "js" else: "php"
     let f = if globals.classes.len == 0: m.module.filename
             else: "nimsystem"
-    let code = wholeCode(graph, m)
+    var code = wholeCode(graph, m)
     let outfile =
       if options.outFile.len > 0:
         if options.outFile.isAbsolute: options.outFile
         else: getCurrentDir() / options.outFile
       else:
         changeFileExt(completeCFilePath(f), ext)
+    
+    if optSourceMap in gOptions:
+      var map: SourceMap
+      (code, map) = genSourceMap($code, mangled, m.module.filename, $outfile)
+      writeFile(outfile & ".map", $(%map))
+    
     discard writeRopeIfNotEqual(genHeader(m.target) & code, outfile)
     for obj, content in items(globals.classes):
       genClass(obj, content, ext)

compiler/options.nim

@@ -37,7 +37,9 @@ type                          # please make sure we have under 32 options
                               # evaluation
     optPatterns,              # en/disable pattern matching
     optMemTracker,
-    optHotCodeReloading
+    optHotCodeReloading,
+    optSourceMap
+
 
   TOptions* = set[TOption]
   TGlobalOption* = enum       # **keep binary compatible**

compiler/ropes.nim

@@ -86,7 +86,7 @@ proc len*(a: Rope): int =
   if a == nil: result = 0
   else: result = a.length
 
-proc newRope(data: string = nil): Rope =
+proc newRope*(data: string = nil): Rope =
   new(result)
   if data != nil:
     result.length = len(data)