Rudimentary project support?

Perryvw · Perryvw · commit 8ecb31190fee · 2022-08-06T17:36:30.000+02:00
diff --git a/src/cli/tsconfig.ts b/src/cli/tsconfig.ts
@@ -41,6 +41,14 @@ export function parseConfigFileWithSystem(
     commandLineOptions?: CompilerOptions,
     system = ts.sys
 ): ParsedCommandLine {
+    if (!system.fileExists(configFileName)) {
+        return {
+            options: {},
+            fileNames: [configFileName],
+            errors: [cliDiagnostics.theSpecifiedPathDoesNotExist(configFileName)],
+        };
+    }
+
     const parsedConfigFile = ts.parseJsonSourceFileConfigFileContent(
         ts.readJsonConfigFile(configFileName, system.readFile),
         system,
diff --git a/src/transpilation/index.ts b/src/transpilation/index.ts
@@ -19,11 +19,10 @@ export function transpileFiles(
     writeFile?: ts.WriteFileCallback
 ): EmitResult {
     const program = ts.createProgram(rootNames, options);
-    const preEmitDiagnostics = ts.getPreEmitDiagnostics(program);
     const { diagnostics: transpileDiagnostics, emitSkipped } = new Transpiler().emit({ program, writeFile });
-    const diagnostics = ts.sortAndDeduplicateDiagnostics([...preEmitDiagnostics, ...transpileDiagnostics]);
+    const diagnostics = ts.sortAndDeduplicateDiagnostics(transpileDiagnostics);
 
-    return { diagnostics: [...diagnostics], emitSkipped };
+    return { diagnostics, emitSkipped };
 }
 
 export function transpileProject(
@@ -96,10 +95,9 @@ export function transpileVirtualProject(
     options: CompilerOptions = {}
 ): TranspileVirtualProjectResult {
     const program = createVirtualProgram(files, options);
-    const preEmitDiagnostics = ts.getPreEmitDiagnostics(program);
     const collector = createEmitOutputCollector();
     const { diagnostics: transpileDiagnostics } = new Transpiler().emit({ program, writeFile: collector.writeFile });
-    const diagnostics = ts.sortAndDeduplicateDiagnostics([...preEmitDiagnostics, ...transpileDiagnostics]);
+    const diagnostics = ts.sortAndDeduplicateDiagnostics(transpileDiagnostics);
 
     return { diagnostics: [...diagnostics], transpiledFiles: collector.files };
 }
diff --git a/src/transpilation/transpile.ts b/src/transpilation/transpile.ts
@@ -8,6 +8,7 @@ import { Plugin } from "./plugins";
 import { getTransformers } from "./transformers";
 import { EmitHost, ProcessedFile } from "./utils";
 import * as performance from "../measure-performance";
+import { parseConfigFileWithSystem } from "../cli/tsconfig";
 
 export interface TranspileOptions {
     program: ts.Program;
@@ -30,13 +31,38 @@ export function getProgramTranspileResult(
 
     const options = program.getCompilerOptions() as CompilerOptions;
 
-    if (options.tstlVerbose) {
-        console.log("Parsing project settings");
-    }
+    if (options.tstlVerbose) console.log("Parsing project settings");
 
     const diagnostics = validateOptions(options);
+
     let transpiledFiles: ProcessedFile[] = [];
 
+    if (options.build) {
+        for (const projectReferences of options.projectReferences ?? [])
+        {
+            if (options.tstlVerbose) console.log(`Build mode: Checking reference ${projectReferences.path}`);
+
+            const tsConfigPath = path.join(projectReferences.path, "tsconfig.json");
+            // Parse reference path but stay in build mode
+            const parseResult = parseConfigFileWithSystem(tsConfigPath, { build: true });
+            diagnostics.push(...parseResult.errors);
+
+            if (parseResult.errors.length === 0) {
+                const referenceProgram = ts.createProgram(parseResult.fileNames, parseResult.options);
+                const referencePreEmitDiagnostics = ts.getPreEmitDiagnostics(referenceProgram);
+                const { diagnostics: referenceDiagnostics, transpiledFiles: referenceFiles } = getProgramTranspileResult(emitHost, writeFileResult, { program: referenceProgram });
+                diagnostics.push(...referencePreEmitDiagnostics, ...referenceDiagnostics);
+
+                if (projectReferences.prepend)
+                {
+                    transpiledFiles.push(...referenceFiles);
+                }
+            }
+        }
+    }
+
+    diagnostics.push(...ts.getPreEmitDiagnostics(program));
+
     if (options.noEmitOnError) {
         const preEmitDiagnostics = [
             ...diagnostics,
diff --git a/src/typescript-internal.d.ts b/src/typescript-internal.d.ts
@@ -20,7 +20,7 @@ declare module "typescript" {
         build?: boolean;
         configFile?: TsConfigSourceFile;
         configFilePath?: string;
-        projectReferences?: string[];
+        projectReferences?: ProjectReference[];
     }
 
     interface TypeChecker {
diff --git a/test/transpile/project-references.spec.ts b/test/transpile/project-references.spec.ts
@@ -1,15 +1,12 @@
-import * as util from "../util";
 import * as path from "path";
+import * as tstl from "../../src";
 
 test("should transpile all projects with --build", () => {
     const solutionDir = path.join(__dirname, "project-references", "project-references");
-    const projectDir= path.join(solutionDir, "project1");
-    const { transpiledFiles } = util
-        .testProject(path.join(solutionDir, "tsconfig.json"))
-        .setMainFileName(path.join(projectDir, "index.ts"))
-        .setOptions({ build: true })
-        .expectToHaveNoDiagnostics()
-        .getLuaResult();
+    const projectDir= path.join(solutionDir, "mainproject");
 
-    console.log(transpiledFiles);
+    const { diagnostics } = tstl.transpileProject(path.join(projectDir, "tsconfig.json"), {build: true});
+
+    expect(diagnostics).toHaveLength(0);
+    // expect(transpiledFiles.some(f => f.outPath === path.join(solutionDir, "dist", "main.lua"))).toBe(true);
 });
diff --git a/test/util.ts b/test/util.ts
@@ -583,7 +583,9 @@ class ExpressionTestBuilder extends AccessorTestBuilder {
 class ProjectTestBuilder extends ModuleTestBuilder {
     constructor(private tsConfig: string) {
         super("");
-        this.setOptions({ configFilePath: this.tsConfig, ...tstl.parseConfigFileWithSystem(this.tsConfig) });
+        const options = { configFilePath: this.tsConfig };
+        Object.assign(options, tstl.parseConfigFileWithSystem(this.tsConfig));
+        this.setOptions(options);
     }
 
     @memoize

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ declare module "typescript" {`
`20`	`20`	`build?: boolean;`
`21`	`21`	`configFile?: TsConfigSourceFile;`
`22`	`22`	`configFilePath?: string;`
`23`		`- projectReferences?: string[];`
	`23`	`+ projectReferences?: ProjectReference[];`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`interface TypeChecker {`