TypeScriptToLua · Perryvw · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022
diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -87,5 +87,9 @@ export function validateOptions(options: CompilerOptions): ts.Diagnostic[] {
         diagnostics.push(diagnosticFactories.unsupportedJsxEmit());
     }
 
+    if (options.paths && !options.baseUrl) {
+        diagnostics.push(diagnosticFactories.pathsWithoutBaseUrl());
+    }
+
     return diagnostics;
 }
diff --git a/src/transpilation/diagnostics.ts b/src/transpilation/diagnostics.ts
@@ -55,3 +55,7 @@ export const cannotBundleLibrary = createDiagnosticFactory(
 );
 
 export const unsupportedJsxEmit = createDiagnosticFactory(() => 'JSX is only supported with "react" jsx option.');
+
+export const pathsWithoutBaseUrl = createDiagnosticFactory(
+    () => "When configuring 'paths' in tsconfig.json, the option 'baseUrl' must also be provided."
+);
diff --git a/test/transpile/__snapshots__/module-resolution.spec.ts.snap b/test/transpile/__snapshots__/module-resolution.spec.ts.snap
@@ -2,16 +2,16 @@
 
 exports[`supports complicated paths configuration 1`] = `
 Array [
-  "/monorepo-complicated/dist/packages/tstl-program/packages/mypackage/src/bar.lua",
-  "/monorepo-complicated/dist/packages/tstl-program/packages/mypackage/src/index.lua",
-  "/monorepo-complicated/dist/packages/tstl-program/packages/myprogram/src/main.lua",
+  "/paths-base-tsconfig/dist/packages/tstl-program/packages/mypackage/src/bar.lua",
+  "/paths-base-tsconfig/dist/packages/tstl-program/packages/mypackage/src/index.lua",
+  "/paths-base-tsconfig/dist/packages/tstl-program/packages/myprogram/src/main.lua",
 ]
 `;
 
 exports[`supports paths configuration 1`] = `
 Array [
-  "/monorepo-with-paths/myprogram/dist/mypackage/bar.lua",
-  "/monorepo-with-paths/myprogram/dist/mypackage/index.lua",
-  "/monorepo-with-paths/myprogram/dist/myprogram/main.lua",
+  "/paths-simple/myprogram/dist/mypackage/bar.lua",
+  "/paths-simple/myprogram/dist/mypackage/index.lua",
+  "/paths-simple/myprogram/dist/myprogram/main.lua",
 ]
 `;
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -4,6 +4,7 @@ import * as util from "../util";
 import * as ts from "typescript";
 import { BuildMode } from "../../src";
 import { normalizeSlashes } from "../../src/utils";
+import { pathsWithoutBaseUrl } from "../../src/transpilation/diagnostics";
 
 describe("basic module resolution", () => {
     const projectPath = path.resolve(__dirname, "module-resolution", "project-with-node-modules");
@@ -542,7 +543,7 @@ test("lualib_module with parent directory import (#1307)", () => {
 
 test("supports paths configuration", () => {
     // Package root
-    const baseProjectPath = path.resolve(__dirname, "module-resolution", "monorepo-with-paths");
+    const baseProjectPath = path.resolve(__dirname, "module-resolution", "paths-simple");
     // myprogram package
     const projectPath = path.join(baseProjectPath, "myprogram");
     const projectTsConfig = path.join(projectPath, "tsconfig.json");
@@ -565,7 +566,7 @@ test("supports paths configuration", () => {
 
 test("supports complicated paths configuration", () => {
     // Package root
-    const baseProjectPath = path.resolve(__dirname, "module-resolution", "monorepo-complicated");
+    const baseProjectPath = path.resolve(__dirname, "module-resolution", "paths-base-tsconfig");
     // myprogram package
     const projectPath = path.join(baseProjectPath, "packages", "myprogram");
     const projectTsConfig = path.join(projectPath, "tsconfig.json");
@@ -586,6 +587,10 @@ test("supports complicated paths configuration", () => {
         .expectToEqual({ foo: 314, bar: 271 });
 });
 
+test("paths without baseUrl is error", () => {
+    util.testFunction``.setOptions({ paths: {} }).expectToHaveDiagnostics([pathsWithoutBaseUrl.code]);
+});
+
 function snapshotPaths(files: tstl.TranspiledFile[]) {
     return files.map(f => normalizeSlashes(f.outPath).split("module-resolution")[1]).sort();
 }
diff --git a/test/transpile/module-resolution/monorepo-with-paths/myprogram/main.ts b/test/transpile/module-resolution/monorepo-with-paths/myprogram/main.ts
diff --git a/test/transpile/module-resolution/monorepo-with-paths/myprogram/tsconfig.json b/test/transpile/module-resolution/monorepo-with-paths/myprogram/tsconfig.json
diff --git a/...complicated/packages/mypackage/src/bar.ts → ...se-tsconfig/packages/mypackage/src/bar.ts b/...complicated/packages/mypackage/src/bar.ts → ...se-tsconfig/packages/mypackage/src/bar.ts
diff --git a/...mplicated/packages/mypackage/src/index.ts → ...-tsconfig/packages/mypackage/src/index.ts b/...mplicated/packages/mypackage/src/index.ts → ...-tsconfig/packages/mypackage/src/index.ts
diff --git a/...plicated/packages/mypackage/tsconfig.json → ...tsconfig/packages/mypackage/tsconfig.json b/...plicated/packages/mypackage/tsconfig.json → ...tsconfig/packages/mypackage/tsconfig.json
diff --git a/...omplicated/packages/myprogram/src/main.ts → ...e-tsconfig/packages/myprogram/src/main.ts b/...omplicated/packages/myprogram/src/main.ts → ...e-tsconfig/packages/myprogram/src/main.ts
diff --git a/...plicated/packages/myprogram/tsconfig.json → ...tsconfig/packages/myprogram/tsconfig.json b/...plicated/packages/myprogram/tsconfig.json → ...tsconfig/packages/myprogram/tsconfig.json
diff --git a/...n/monorepo-complicated/tsconfig.base.json → ...on/paths-base-tsconfig/tsconfig.base.json b/...n/monorepo-complicated/tsconfig.base.json → ...on/paths-base-tsconfig/tsconfig.base.json
diff --git a/...tion/monorepo-with-paths/mypackage/bar.ts → ...-resolution/paths-simple/mypackage/bar.ts b/...tion/monorepo-with-paths/mypackage/bar.ts → ...-resolution/paths-simple/mypackage/bar.ts
diff --git a/...on/monorepo-with-paths/mypackage/index.ts → ...esolution/paths-simple/mypackage/index.ts b/...on/monorepo-with-paths/mypackage/index.ts → ...esolution/paths-simple/mypackage/index.ts
diff --git a/...norepo-with-paths/mypackage/tsconfig.json → ...tion/paths-simple/mypackage/tsconfig.json b/...norepo-with-paths/mypackage/tsconfig.json → ...tion/paths-simple/mypackage/tsconfig.json
diff --git a/test/transpile/module-resolution/paths-simple/myprogram/main.ts b/test/transpile/module-resolution/paths-simple/myprogram/main.ts
@@ -0,0 +1,4 @@
+import { foo } from "myOtherPackage";
+import { bar } from "myOtherPackage/bar";
+
+export { foo, bar };
diff --git a/test/transpile/module-resolution/paths-simple/myprogram/tsconfig.json b/test/transpile/module-resolution/paths-simple/myprogram/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "outDir": "dist",
+        "paths": {
+            "myOtherPackage": ["../mypackage"],
+            "myOtherPackage/*": ["../mypackage/*"]
+        }
+    }
+}
diff --git a/test/unit/jsx.spec.ts b/test/unit/jsx.spec.ts
@@ -1,6 +1,8 @@
 import * as util from "../util";
 import { TestBuilder } from "../util";
 import { JsxEmit } from "typescript";
+import { unsupportedJsxEmit } from "../../src/transpilation/diagnostics";
+import { unsupportedNodeKind } from "../../src/transformation/utils/diagnostics";
 
 // language=TypeScript
 const reactLib = `
@@ -368,6 +370,6 @@ describe("jsx", () => {
             .setOptions({
                 jsx: JsxEmit.Preserve,
             })
-            .expectToHaveDiagnostics();
+            .expectToHaveDiagnostics([unsupportedJsxEmit.code, unsupportedNodeKind.code]);
     });
 });