TypeScriptToLua · Perryvw · Apr 2, 2019 · Feb 25, 2019 · Mar 6, 2019 · Mar 22, 2019
diff --git a/appveyor.yml b/appveyor.yml
@@ -19,6 +19,7 @@ test_script:
   - node --version
   - npm --version
   # run tests
+  - npm run lint
   - npm run build
   - npm test
 

diff --git a/build_lualib.ts b/build_lualib.ts
@@ -20,7 +20,7 @@ compile([
     "./src/lualib",
     "--noHeader",
     "true",
-    ...glob.sync("./src/lualib/*.ts"),
+    ...glob.sync("./src/lualib/**/*.ts"),
 ]);
 
 if (fs.existsSync(bundlePath)) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
         "node": ">=8.5.0"
     },
     "dependencies": {
+        "source-map": "^0.7.3",
         "typescript": "^3.3.1"
     },
     "devDependencies": {

diff --git a/src/CommandLineParser.ts b/src/CommandLineParser.ts
@@ -52,6 +52,11 @@ const optionDeclarations: {[key: string]: CLIOption<any>} = {
         describe: "Disables hoisting.",
         type: "boolean",
     } as CLIOption<boolean>,
+    sourceMapTraceback: {
+        default: false,
+        describe: "Applies the source map to show source TS files and lines in error tracebacks.",
+        type: "boolean",
+    } as CLIOption<boolean>,
 };
 
 export const { version } = require("../package.json");

diff --git a/src/Compiler.ts b/src/Compiler.ts
@@ -3,7 +3,7 @@ import * as path from "path";
 import * as ts from "typescript";
 import * as CommandLineParser from "./CommandLineParser";
 import { CompilerOptions, LuaLibImportKind, LuaTarget } from "./CompilerOptions";
-import { LuaTranspiler } from "./LuaTranspiler";
+import { LuaTranspiler, TranspileResult } from "./LuaTranspiler";
 
 export function compile(argv: string[]): void {
     const parseResult = CommandLineParser.parseCommandLine(argv);
@@ -167,7 +167,7 @@ export function transpileString(
     options: CompilerOptions = defaultCompilerOptions,
     ignoreDiagnostics = false,
     filePath = "file.ts"
-): string {
+): TranspileResult {
     const program = createStringCompilerProgram(input, options, filePath);
 
     if (!ignoreDiagnostics) {
@@ -182,7 +182,5 @@ export function transpileString(
 
     const transpiler = new LuaTranspiler(program);
 
-    const result = transpiler.transpileSourceFile(program.getSourceFile(filePath));
-
-    return result.trim();
+    return transpiler.transpileSourceFile(program.getSourceFile(filePath));
 }
diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -5,6 +5,7 @@ export interface CompilerOptions extends ts.CompilerOptions {
     luaTarget?: LuaTarget;
     luaLibImport?: LuaLibImportKind;
     noHoisting?: boolean;
+    sourceMapTraceback?: boolean;
 }
 
 export enum LuaLibImportKind {

diff --git a/src/LuaAST.ts b/src/LuaAST.ts
@@ -98,10 +98,9 @@ export type Operator = UnaryOperator | BinaryOperator;
 
 export type SymbolId = number;
 
-// TODO For future sourcemap support?
 export interface TextRange {
-    pos: number;
-    end: number;
+    line?: number;
+    column?: number;
 }
 
 export interface Node extends TextRange {
@@ -110,22 +109,25 @@ export interface Node extends TextRange {
 }
 
 export function createNode(kind: SyntaxKind, tsOriginal?: ts.Node, parent?: Node): Node {
-    let pos = -1;
-    let end = -1;
-    if (tsOriginal) {
-        pos = tsOriginal.pos;
-        end = tsOriginal.end;
+    const sourcePosition = getSourcePosition(tsOriginal);
+    if (sourcePosition) {
+        return {kind, parent, line: sourcePosition.line, column: sourcePosition.column};
+    } else {
+        return {kind, parent};
     }
-    return {kind, parent, pos, end};
 }
 
 export function cloneNode<T extends Node>(node: T): T {
     return Object.assign({}, node);
 }
 
 export function setNodeOriginal<T extends Node>(node: T, tsOriginal: ts.Node): T {
-    node.pos = tsOriginal.pos;
-    node.end = tsOriginal.end;
+    const sourcePosition = getSourcePosition(tsOriginal);
+    if (sourcePosition) {
+        node.line = sourcePosition.line;
+        node.column = sourcePosition.column;
+    }
+
     return node;
 }
 
@@ -136,20 +138,32 @@ export function setParent(node: Node | Node[] | undefined, parent: Node): void
     if (Array.isArray(node)) {
         node.forEach(n => {
             n.parent = parent;
-            if (n.pos === -1 || n.end === -1) {
-                n.pos = parent.pos;
-                n.end = parent.end;
-            }
         });
     } else {
         node.parent = parent;
-        if (node.pos === -1 || node.end === -1) {
-            node.pos = parent.pos;
-            node.end = parent.end;
-        }
     }
 }
 
+function getSourcePosition(sourceNode: ts.Node): TextRange | undefined {
+    if (sourceNode !== undefined && sourceNode.getSourceFile() !== undefined && sourceNode.pos >= 0) {
+
+        const { line, character } = ts.getLineAndCharacterOfPosition(
+            sourceNode.getSourceFile(),
+            sourceNode.pos + sourceNode.getLeadingTriviaWidth()
+        );
+
+        return { line, column: character };
+    }
+}
+
+export function getOriginalPos(node: Node): TextRange {
+    while (node.line === undefined && node.parent !== undefined) {
+        node = node.parent;
+    }
+
+    return { line: node.line, column: node.column };
+}
+
 export interface Block extends Node {
     kind: SyntaxKind.Block;
     statements?: Statement[];
@@ -812,8 +826,8 @@ export function createIdentifier(
     return expression;
 }
 
-export function cloneIdentifier(identifier: Identifier): Identifier {
-    return createIdentifier(identifier.text, undefined, identifier.symbolId);
+export function cloneIdentifier(identifier: Identifier, tsOriginal?: ts.Node): Identifier {
+    return createIdentifier(identifier.text, tsOriginal, identifier.symbolId);
 }
 
 export function createAnnonymousIdentifier(tsOriginal?: ts.Node, parent?: Node): Identifier {

diff --git a/src/LuaLib.ts b/src/LuaLib.ts
@@ -37,6 +37,7 @@ export enum LuaLibFeature {
     Set = "Set",
     WeakMap = "WeakMap",
     WeakSet = "WeakSet",
+    SourceMapTraceBack = "SourceMapTraceBack",
     StringReplace = "StringReplace",
     StringSplit = "StringSplit",
     StringConcat = "StringConcat",