PR feedback

GlassBricks · GlassBricks · commit c5e3e9e9970f · 2022-02-27T11:06:07.000-08:00
diff --git a/src/LuaPrinter.ts b/src/LuaPrinter.ts
@@ -173,7 +173,7 @@ export class LuaPrinter {
 
     public print(file: lua.File): PrintResult {
         // Add traceback lualib if sourcemap traceback option is enabled
-        if (this.options.sourceMapTraceback && !isBundleEnabled(this.options)) {
+        if (this.options.sourceMapTraceback) {
             file.luaLibFeatures.add(LuaLibFeature.SourceMapTraceBack);
         }
 
diff --git a/src/transpilation/bundle.ts b/src/transpilation/bundle.ts
@@ -104,7 +104,6 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
     const footers: string[] = [];
     if (options.sourceMapTraceback) {
         // Generates SourceMapTraceback for the entire file
-        // TODO: remove
         footers.push('local __TS__SourceMapTraceBack = require("lualib_bundle").__TS__SourceMapTraceBack\n');
         footers.push(`${sourceMapTracebackBundlePlaceholder}\n`);
     }
diff --git a/src/transpilation/transpiler.ts b/src/transpilation/transpiler.ts
@@ -100,22 +100,19 @@ export class Transpiler {
         } else {
             emitPlan = resolutionResult.resolvedFiles.map(file => ({
                 ...file,
-                outputPath: getEmitPath(file, program),
+                outputPath: file.isRawFile
+                    ? path.join(getEmitOutDir(program), file.fileName)
+                    : getEmitPath(file.fileName, program),
             }));
         }
 
         return { emitPlan };
     }
 }
 
-export function getEmitPath(file: string | ProcessedFile, program: ts.Program): string {
+export function getEmitPath(file: string, program: ts.Program): string {
     const outDir = getEmitOutDir(program);
-    if (typeof file !== "string" && file.isRawFile) {
-        return path.join(outDir, file.fileName);
-    }
-    const fileName = typeof file === "string" ? file : file.fileName;
-    const relativeOutputPath = getEmitPathRelativeToOutDir(fileName, program);
-
+    const relativeOutputPath = getEmitPathRelativeToOutDir(file, program);
     return path.join(outDir, relativeOutputPath);
 }
 
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -490,7 +490,8 @@ test("includes lualib_bundle when external lua requests it", () => {
         .addExtraFile(
             "lualibuser.lua",
             `
-                local __TS__ArrayPush = require("lualib_bundle").__TS__ArrayPush
+                local ____lualib = require("lualib_bundle")
+                local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 
                 local result = {}
                 __TS__ArrayPush(result, "foo")

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ export class LuaPrinter {`
`173`	`173`
`174`	`174`	`public print(file: lua.File): PrintResult {`
`175`	`175`	`// Add traceback lualib if sourcemap traceback option is enabled`
`176`		`- if (this.options.sourceMapTraceback && !isBundleEnabled(this.options)) {`
	`176`	`+ if (this.options.sourceMapTraceback) {`
`177`	`177`	`file.luaLibFeatures.add(LuaLibFeature.SourceMapTraceBack);`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t`
`104`	`104`	`const footers: string[] = [];`
`105`	`105`	`if (options.sourceMapTraceback) {`
`106`	`106`	`// Generates SourceMapTraceback for the entire file`
`107`		`- // TODO: remove`
`108`	`107`	`footers.push('local __TS__SourceMapTraceBack = require("lualib_bundle").__TS__SourceMapTraceBack\n');`
`109`	`108`	footers.push(`${sourceMapTracebackBundlePlaceholder}\n`);
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,8 @@ test("includes lualib_bundle when external lua requests it", () => {`
`490`	`490`	`.addExtraFile(`
`491`	`491`	`"lualibuser.lua",`
`492`	`492`	`
`493`		`- local __TS__ArrayPush = require("lualib_bundle").__TS__ArrayPush`
	`493`	`+ local ____lualib = require("lualib_bundle")`
	`494`	`+ local __TS__ArrayPush = ____lualib.__TS__ArrayPush`
`494`	`495`
`495`	`496`	`local result = {}`
`496`	`497`	`__TS__ArrayPush(result, "foo")`