Make transpiledFiles an Array (#553)

ark120202 · Perryvw · commit bd2d81b84f9b · 2019-05-02T15:34:39.000+02:00
diff --git a/src/Emit.ts b/src/Emit.ts
@@ -14,7 +14,7 @@ export interface OutputFile {
 let lualibContent: string;
 export function emitTranspiledFiles(
     options: CompilerOptions,
-    transpiledFiles: Map<string, TranspiledFile>
+    transpiledFiles: TranspiledFile[]
 ): OutputFile[] {
     let { rootDir, outDir, outFile, luaLibImport } = options;
 
@@ -26,7 +26,7 @@ export function emitTranspiledFiles(
     outDir = outDir ? path.resolve(baseDir, outDir) : rootDir;
 
     const files: OutputFile[] = [];
-    for (const [fileName, { lua, sourceMap, declaration, declarationMap }] of transpiledFiles) {
+    for (const { fileName, lua, sourceMap, declaration, declarationMap } of transpiledFiles) {
         let outPath = fileName;
         if (outDir !== rootDir) {
             outPath = path.resolve(outDir, path.relative(rootDir, fileName));
diff --git a/src/Transpile.ts b/src/Transpile.ts
@@ -37,6 +37,7 @@ function getCustomTransformers(
 }
 
 export interface TranspiledFile {
+    fileName: string;
     luaAst?: Block;
     lua?: string;
     sourceMap?: string;
@@ -46,7 +47,7 @@ export interface TranspiledFile {
 
 export interface TranspileResult {
     diagnostics: ts.Diagnostic[];
-    transpiledFiles: Map<string, TranspiledFile>;
+    transpiledFiles: TranspiledFile[];
 }
 
 export interface TranspileOptions {
@@ -67,12 +68,16 @@ export function transpile({
     const options = program.getCompilerOptions() as CompilerOptions;
 
     const diagnostics: ts.Diagnostic[] = [];
-    const transpiledFiles = new Map<string, TranspiledFile>();
-    const updateTranspiledFile = (filePath: string, file: TranspiledFile) => {
-        if (transpiledFiles.has(filePath)) {
-            Object.assign(transpiledFiles.get(filePath), file);
+    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) {
+            Object.assign(file, update);
         } else {
-            transpiledFiles.set(filePath, file);
+            transpiledFiles.push({ fileName, ...update });
         }
     };
 
@@ -172,7 +177,7 @@ export function transpile({
     options.noEmit = oldNoEmit;
 
     if (options.noEmit || (options.noEmitOnError && diagnostics.length > 0)) {
-        transpiledFiles.clear();
+        transpiledFiles = [];
     }
 
     return { diagnostics, transpiledFiles };
diff --git a/src/index.ts b/src/index.ts
@@ -121,5 +121,5 @@ export function transpileString(
     options: CompilerOptions = {}
 ): TranspileStringResult {
     const { diagnostics, transpiledFiles } = transpileVirtualProject({ "main.ts": main }, options);
-    return { diagnostics, file: transpiledFiles.get("main.ts") };
+    return { diagnostics, file: transpiledFiles.find(({ fileName }) => fileName === "main.ts") };
 }
diff --git a/src/tstl.ts b/src/tstl.ts
@@ -170,7 +170,7 @@ function performCompilation(
     const exitCode =
         diagnostics.length === 0
             ? ts.ExitStatus.Success
-            : transpiledFiles.size === 0
+            : transpiledFiles.length === 0
             ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped
             : ts.ExitStatus.DiagnosticsPresent_OutputsGenerated;
 
diff --git a/test/util.ts b/test/util.ts
@@ -44,12 +44,12 @@ export function transpileStringResult(
         optionsWithDefaults,
     );
 
-    const mainFileName = [...transpiledFiles.keys()].find(x => /\bmain\.[a-z]+$/.test(x));
-    if (mainFileName === undefined) {
+    const file = transpiledFiles.find(({ fileName }) => /\bmain\.[a-z]+$/.test(fileName));
+    if (file === undefined) {
         throw new Error('Program should have a file named "main"');
     }
 
-    return { diagnostics, file: transpiledFiles.get(mainFileName)! };
+    return { diagnostics, file };
 }
 
 const lualibContent = fs.readFileSync(

Original file line number	Diff line number	Diff line change
`@@ -121,5 +121,5 @@ export function transpileString(`
`121`	`121`	`options: CompilerOptions = {}`
`122`	`122`	`): TranspileStringResult {`
`123`	`123`	`const { diagnostics, transpiledFiles } = transpileVirtualProject({ "main.ts": main }, options);`
`124`		`- return { diagnostics, file: transpiledFiles.get("main.ts") };`
	`124`	`+ return { diagnostics, file: transpiledFiles.find(({ fileName }) => fileName === "main.ts") };`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ export function transpileStringResult(`
`44`	`44`	`optionsWithDefaults,`
`45`	`45`	`);`
`46`	`46`
`47`		`- const mainFileName = [...transpiledFiles.keys()].find(x => /\bmain\.[a-z]+$/.test(x));`
`48`		`- if (mainFileName === undefined) {`
	`47`	`+ const file = transpiledFiles.find(({ fileName }) => /\bmain\.[a-z]+$/.test(fileName));`
	`48`	`+ if (file === undefined) {`
`49`	`49`	`throw new Error('Program should have a file named "main"');`
`50`	`50`	`}`
`51`	`51`
`52`		`- return { diagnostics, file: transpiledFiles.get(mainFileName)! };`
	`52`	`+ return { diagnostics, file };`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`const lualibContent = fs.readFileSync(`