TypeScriptToLua · Perryvw · Jun 14, 2021 · Apr 17, 2021 · May 13, 2021 · May 14, 2021
diff --git a/.eslintignore b/.eslintignore
@@ -3,4 +3,5 @@
 /test/cli/errors
 /test/cli/watch
 /test/transpile/directories
+/test/transpile/module-resolution/*/node_modules
 /test/transpile/outFile
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,29 +76,29 @@ jobs:
         run: rm -rf ./master/benchmark && cp -rf ./commit/benchmark ./master/benchmark
       # Run master benchmark first and output to commit benchmark data
       - name: Build benchmark Lua 5.3 master
-        run: node ../dist/tstl.js -p tsconfig.53.json
+        run: node ../../commit/dist/tstl.js -p tsconfig.53.json
         working-directory: master/benchmark
       - name: Run benchmark Lua 5.3 master
         id: benchmark-lua-master
         run: lua5.3 -- run.lua ../../../commit/benchmark/data/benchmark_master_53.json
         working-directory: master/benchmark/dist
       - name: Build benchmark LuaJIT master
-        run: node ../dist/tstl.js -p tsconfig.jit.json
+        run: node ../../commit/dist/tstl.js -p tsconfig.jit.json
         working-directory: master/benchmark
       - name: Run benchmark LuaJIT master
         id: benchmark-jit-master
         run: luajit -- run.lua ../../../commit/benchmark/data/benchmark_master_jit.json
         working-directory: master/benchmark/dist
       # Run commit benchmark and compare with master
       - name: Build benchmark Lua 5.3 commit
-        run: node ../dist/tstl.js -p tsconfig.53.json
+        run: node ../../commit/dist/tstl.js -p tsconfig.53.json
         working-directory: commit/benchmark
       - name: Run benchmark Lua 5.3 commit
         id: benchmark-lua-commit
         run: lua5.3 -- run.lua ../data/benchmark_master_vs_commit_53.json ../data/benchmark_master_53.json
         working-directory: commit/benchmark/dist
       - name: Build benchmark LuaJIT commit
-        run: node ../dist/tstl.js -p tsconfig.jit.json
+        run: node ../../commit/dist/tstl.js -p tsconfig.jit.json
         working-directory: commit/benchmark
       - name: Run benchmark LuaJIT commit
         id: benchmark-jit-commit

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug current jest test",
+            "type": "node",
+            "request": "launch",
+            "env": { "CI": "true" },
+            "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/jest",
+            "args": ["--runInBand", "--no-cache", "--runTestsByPath", "${relativeFile}"],
+            "cwd": "${workspaceRoot}",
+            "protocol": "inspector",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        }
+    ]
+}
diff --git a/benchmark/dist/json.lua → benchmark/src/json.lua b/benchmark/dist/json.lua → benchmark/src/json.lua
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
         "node": ">=12.13.0"
     },
     "dependencies": {
+        "enhanced-resolve": "^5.8.2",
         "resolve": "^1.15.1",
         "source-map": "^0.7.3",
         "typescript": "~4.3.2"

diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -25,6 +25,7 @@ export interface LuaPluginImport {
 }
 
 export type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
+    buildMode?: BuildMode;
     noImplicitSelf?: boolean;
     noHeader?: boolean;
     luaBundle?: string;
@@ -53,6 +54,11 @@ export enum LuaTarget {
     LuaJIT = "JIT",
 }
 
+export enum BuildMode {
+    Default = "default",
+    Library = "library",
+}
+
 export const isBundleEnabled = (options: CompilerOptions) =>
     options.luaBundle !== undefined && options.luaBundleEntry !== undefined;
 

diff --git a/src/LuaPrinter.ts b/src/LuaPrinter.ts
@@ -1,12 +1,11 @@
-import * as path from "path";
 import { Mapping, SourceMapGenerator, SourceNode } from "source-map";
 import * as ts from "typescript";
 import { CompilerOptions, LuaLibImportKind } from "./CompilerOptions";
 import * as lua from "./LuaAST";
 import { loadLuaLibFeatures, LuaLibFeature } from "./LuaLib";
 import { isValidLuaIdentifier } from "./transformation/utils/safe-names";
 import { EmitHost } from "./transpilation";
-import { intersperse, normalizeSlashes, trimExtension } from "./utils";
+import { intersperse, trimExtension } from "./utils";
 
 // https://www.lua.org/pil/2.4.html
 // https://www.ecma-international.org/ecma-262/10.0/index.html#table-34
@@ -25,6 +24,8 @@ const escapeStringMap: Record<string, string> = {
 
 export const escapeString = (value: string) => `"${value.replace(escapeStringRegExp, char => escapeStringMap[char])}"`;
 
+export const tstlHeader = "--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]\n";
+
 /**
  * Checks that a name is valid for use in lua function declaration syntax:
  *
@@ -124,22 +125,7 @@ export class LuaPrinter {
 
     constructor(private emitHost: EmitHost, program: ts.Program, fileName: string) {
         this.options = program.getCompilerOptions();
-
-        if (this.options.outDir) {
-            const relativeFileName = path.relative(program.getCommonSourceDirectory(), fileName);
-            if (this.options.sourceRoot) {
-                // When sourceRoot is specified, just use relative path inside rootDir
-                this.sourceFile = relativeFileName;
-            } else {
-                // Calculate relative path from rootDir to outDir
-                const outputPath = path.resolve(this.options.outDir, relativeFileName);
-                this.sourceFile = path.relative(path.dirname(outputPath), fileName);
-            }
-            // We want forward slashes, even in windows
-            this.sourceFile = normalizeSlashes(this.sourceFile);
-        } else {
-            this.sourceFile = path.basename(fileName); // File will be in same dir as source
-        }
+        this.sourceFile = fileName;
     }
 
     public print(file: lua.File): PrintResult {
@@ -201,7 +187,7 @@ export class LuaPrinter {
         let header = file.trivia;
 
         if (!this.options.noHeader) {
-            header += "--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]\n";
+            header += tstlHeader;
         }
 
         const luaLibImport = this.options.luaLibImport ?? LuaLibImportKind.Require;

diff --git a/src/cli/parse.ts b/src/cli/parse.ts
@@ -1,5 +1,5 @@
 import * as ts from "typescript";
-import { CompilerOptions, LuaLibImportKind, LuaTarget } from "../CompilerOptions";
+import { BuildMode, CompilerOptions, LuaLibImportKind, LuaTarget } from "../CompilerOptions";
 import * as cliDiagnostics from "./diagnostics";
 
 export interface ParsedCommandLine extends ts.ParsedCommandLine {
@@ -24,6 +24,12 @@ interface CommandLineOptionOfPrimitive extends CommandLineOptionBase {
 type CommandLineOption = CommandLineOptionOfEnum | CommandLineOptionOfPrimitive;
 
 export const optionDeclarations: CommandLineOption[] = [
+    {
+        name: "buildMode",
+        description: "'default' or  'library'. Compiling as library will not resolve external dependencies.",
+        type: "enum",
+        choices: Object.values(BuildMode),
+    },
     {
         name: "luaBundle",
         description: "The name of the lua file to bundle output lua to. Requires luaBundleEntry.",

diff --git a/src/transformation/utils/diagnostics.ts b/src/transformation/utils/diagnostics.ts
@@ -124,10 +124,6 @@ export const invalidAmbientIdentifierName = createErrorDiagnosticFactory(
     (text: string) => `Invalid ambient identifier name '${text}'. Ambient identifiers must be valid lua identifiers.`
 );
 
-export const unresolvableRequirePath = createErrorDiagnosticFactory(
-    (path: string) => `Cannot create require path. Module '${path}' does not exist within --rootDir.`
-);
-
 export const unsupportedVarDeclaration = createErrorDiagnosticFactory(
     "`var` declarations are not supported. Use `let` or `const` instead."
 );

diff --git a/src/transformation/visitors/modules/import.ts b/src/transformation/visitors/modules/import.ts
@@ -1,7 +1,6 @@
 import * as path from "path";
 import * as ts from "typescript";
 import * as lua from "../../../LuaAST";
-import { formatPathToLuaPath } from "../../../utils";
 import { FunctionVisitor, TransformationContext } from "../../context";
 import { AnnotationKind, getSymbolAnnotations } from "../../utils/annotations";
 import { createDefaultExportStringLiteral } from "../../utils/export";
@@ -10,36 +9,13 @@ import { createSafeName } from "../../utils/safe-names";
 import { peekScope } from "../../utils/scope";
 import { transformIdentifier } from "../identifier";
 import { transformPropertyName } from "../literal";
-import { unresolvableRequirePath } from "../../utils/diagnostics";
 
-const getAbsoluteImportPath = (relativePath: string, directoryPath: string, options: ts.CompilerOptions): string =>
-    !relativePath.startsWith(".") && options.baseUrl
-        ? path.resolve(options.baseUrl, relativePath)
-        : path.resolve(directoryPath, relativePath);
-
-function getImportPath(context: TransformationContext, relativePath: string, node: ts.Node): string {
-    const { options, sourceFile } = context;
-    const { fileName } = sourceFile;
-    const rootDir = options.rootDir ? path.resolve(options.rootDir) : path.resolve(".");
-
-    const absoluteImportPath = path.format(
-        path.parse(getAbsoluteImportPath(relativePath, path.dirname(fileName), options))
-    );
-    const absoluteRootDirPath = path.format(path.parse(rootDir));
-    if (absoluteImportPath.includes(absoluteRootDirPath)) {
-        return formatPathToLuaPath(absoluteImportPath.replace(absoluteRootDirPath, "").slice(1));
-    } else {
-        context.diagnostics.push(unresolvableRequirePath(node, relativePath));
-        return relativePath;
-    }
-}
-
-function shouldResolveModulePath(context: TransformationContext, moduleSpecifier: ts.Expression): boolean {
+function isNoResolutionPath(context: TransformationContext, moduleSpecifier: ts.Expression): boolean {
     const moduleOwnerSymbol = context.checker.getSymbolAtLocation(moduleSpecifier);
-    if (!moduleOwnerSymbol) return true;
+    if (!moduleOwnerSymbol) return false;
 
     const annotations = getSymbolAnnotations(moduleOwnerSymbol);
-    return !annotations.has(AnnotationKind.NoResolution);
+    return annotations.has(AnnotationKind.NoResolution);
 }
 
 export function createModuleRequire(
@@ -49,8 +25,8 @@ export function createModuleRequire(
 ): lua.CallExpression {
     const params: lua.Expression[] = [];
     if (ts.isStringLiteral(moduleSpecifier)) {
-        const modulePath = shouldResolveModulePath(context, moduleSpecifier)
-            ? getImportPath(context, moduleSpecifier.text.replace(/"/g, ""), moduleSpecifier)
+        const modulePath = isNoResolutionPath(context, moduleSpecifier)
+            ? `@NoResolution:${moduleSpecifier.text}`
             : moduleSpecifier.text;
 
         params.push(lua.createStringLiteral(modulePath));