Remove TODOs for old TS upgrades

ark120202 · ark120202 · commit 31b5c47b66b9 · 2019-07-09T00:29:42.000+05:00
diff --git a/src/TSTransformers.ts b/src/TSTransformers.ts
@@ -10,17 +10,10 @@ export function getCustomTransformers(
     customTransformers: ts.CustomTransformers,
     onSourceFile: (sourceFile: ts.SourceFile) => void
 ): ts.CustomTransformers {
-    // TODO: https://github.com/Microsoft/TypeScript/issues/28310
-    const forEachSourceFile = (node: ts.SourceFile, callback: (sourceFile: ts.SourceFile) => ts.SourceFile) =>
-        ts.isBundle(node)
-            ? ((ts.updateBundle(node, node.sourceFiles.map(callback)) as unknown) as ts.SourceFile)
-            : callback(node);
-
-    const luaTransformer: ts.TransformerFactory<ts.SourceFile> = () => node =>
-        forEachSourceFile(node, sourceFile => {
-            onSourceFile(sourceFile);
-            return ts.createSourceFile(sourceFile.fileName, "", ts.ScriptTarget.ESNext);
-        });
+    const luaTransformer: ts.TransformerFactory<ts.SourceFile> = () => sourceFile => {
+        onSourceFile(sourceFile);
+        return ts.createSourceFile(sourceFile.fileName, "", ts.ScriptTarget.ESNext);
+    };
 
     const transformersFromOptions = loadTransformersFromOptions(program, diagnostics);
     return {
diff --git a/src/Transpile.ts b/src/Transpile.ts
@@ -47,8 +47,6 @@ export function transpile({
     const diagnostics: ts.Diagnostic[] = [];
     let transpiledFiles: TranspiledFile[] = [];
 
-    // TODO: Included in TS3.5
-    type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
     const updateTranspiledFile = (fileName: string, update: Omit<TranspiledFile, "fileName">) => {
         const file = transpiledFiles.find(f => f.fileName === fileName);
         if (file) {
diff --git a/src/lualib/SourceMapTraceBack.ts b/src/lualib/SourceMapTraceBack.ts
@@ -1,16 +1,16 @@
 // TODO: In the future, change this to __TS__RegisterFileInfo and provide tstl interface to
 // get some metadata about transpilation.
 function __TS__SourceMapTraceBack(this: void, fileName: string, sourceMap: { [line: number]: number }): void {
-    _G["__TS__sourcemap"] = _G["__TS__sourcemap"] || {};
-    _G["__TS__sourcemap"][fileName] = sourceMap;
+    _G.__TS__sourcemap = _G.__TS__sourcemap || {};
+    _G.__TS__sourcemap[fileName] = sourceMap;
 
     if (_G.__TS__originalTraceback === undefined) {
         _G.__TS__originalTraceback = debug.traceback;
         debug.traceback = (thread, message, level) => {
-            const trace = _G["__TS__originalTraceback"](thread, message, level);
+            const trace = _G.__TS__originalTraceback(thread, message, level);
             const [result] = string.gsub(trace, "(%S+).lua:(%d+)", (file, line) => {
-                if (_G["__TS__sourcemap"][file + ".lua"] && _G["__TS__sourcemap"][file + ".lua"][line]) {
-                    return `${file}.ts:${_G["__TS__sourcemap"][file + ".lua"][line]}`;
+                if (_G.__TS__sourcemap[file + ".lua"] && _G.__TS__sourcemap[file + ".lua"][line]) {
+                    return `${file}.ts:${_G.__TS__sourcemap[file + ".lua"][line]}`;
                 }
                 return `${file}.lua:${line}`;
             });
diff --git a/src/lualib/declarations/global.d.ts b/src/lualib/declarations/global.d.ts
@@ -1,11 +1,11 @@
 /** @noSelfInFile */
 
-// TODO: TS3.4: typeof globalThis
-declare const _G: {
-    // Required?
-    __TS__originalTraceback(this: void, thread?: any, message?: string, level?: number): string;
-    [key: string]: any;
-};
+declare const _G: typeof globalThis;
+
+declare var __TS__sourcemap: Record<number, number> | undefined;
+declare var __TS__originalTraceback:
+    | ((this: void, thread?: any, message?: string, level?: number) => string)
+    | undefined;
 
 declare function tonumber(value: any, base?: number): number | undefined;
 declare function type(
