typescript-to-lua 1.11.1 → 1.12.1

package/dist/transpilation/resolve.js

@@ -9,6 +9,7 @@ const transpiler_1 = require("./transpiler");
 const utils_1 = require("../utils");
 const diagnostics_1 = require("./diagnostics");
 const CompilerOptions_1 = require("../CompilerOptions");
+const find_lua_requires_1 = require("./find-lua-requires");
 const resolver = resolve.ResolverFactory.createResolver({
     extensions: [".lua"],
     enforceExtension: true,
@@ -32,12 +33,13 @@ class ResolutionContext {
         if (this.resolvedFiles.has(file.fileName))
             return;
         this.resolvedFiles.set(file.fileName, file);
-        for (const required of findRequiredPaths(file.code)) {
+        // Do this backwards so the replacements do not mess with the positions of the previous requires
+        for (const required of (0, find_lua_requires_1.findLuaRequires)(file.code).reverse()) {
             // Do not resolve noResolution paths
-            if (required.startsWith("@NoResolution:")) {
+            if (required.requirePath.startsWith("@NoResolution:")) {
                 // Remove @NoResolution prefix if not building in library mode
                 if (!isBuildModeLibrary(this.program)) {
-                    const path = required.replace("@NoResolution:", "");
+                    const path = required.requirePath.replace("@NoResolution:", "");
                     replaceRequireInCode(file, required, path);
                     replaceRequireInSourceMap(file, required, path);
                 }
@@ -50,21 +52,21 @@ class ResolutionContext {
     }
     resolveImport(file, required) {
         // Do no resolve lualib - always use the lualib of the application entry point, not the lualib from external packages
-        if (required === "lualib_bundle") {
+        if (required.requirePath === "lualib_bundle") {
             this.resolvedFiles.set("lualib_bundle", { fileName: "lualib_bundle", code: "" });
             return;
         }
-        if (this.noResolvePaths.has(required)) {
+        if (this.noResolvePaths.has(required.requirePath)) {
             if (this.options.tstlVerbose) {
-                console.log(`Skipping module resolution of ${required} as it is in the tsconfig noResolvePaths.`);
+                console.log(`Skipping module resolution of ${required.requirePath} as it is in the tsconfig noResolvePaths.`);
             }
             return;
         }
-        const dependencyPath = this.resolveDependencyPath(file, required);
+        const dependencyPath = this.resolveDependencyPath(file, required.requirePath);
         if (!dependencyPath)
             return this.couldNotResolveImport(required, file);
         if (this.options.tstlVerbose) {
-            console.log(`Resolved ${required} to ${(0, utils_1.normalizeSlashes)(dependencyPath)}`);
+            console.log(`Resolved ${required.requirePath} to ${(0, utils_1.normalizeSlashes)(dependencyPath)}`);
         }
         this.processDependency(dependencyPath);
         // Figure out resolved require path and dependency output path
@@ -96,7 +98,7 @@ class ResolutionContext {
         const fallbackRequire = fallbackResolve(required, (0, transpiler_1.getSourceDir)(this.program), path.dirname(file.fileName));
         replaceRequireInCode(file, required, fallbackRequire);
         replaceRequireInSourceMap(file, required, fallbackRequire);
-        this.diagnostics.push((0, diagnostics_1.couldNotResolveRequire)(required, path.relative((0, transpiler_1.getProjectRoot)(this.program), file.fileName)));
+        this.diagnostics.push((0, diagnostics_1.couldNotResolveRequire)(required.requirePath, path.relative((0, transpiler_1.getProjectRoot)(this.program), file.fileName)));
     }
     resolveDependencyPath(requiringFile, dependency) {
         var _a;
@@ -261,27 +263,17 @@ function shouldIncludeDependency(resolvedDependency, program) {
 function isBuildModeLibrary(program) {
     return program.getCompilerOptions().buildMode === CompilerOptions_1.BuildMode.Library;
 }
-function findRequiredPaths(code) {
-    // Find all require("<path>") paths in a lua code string
-    const paths = [];
-    const pattern = /(^|\s|;|=|\()require\s*\(?(["|'])(.+?)\2\)?/g;
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    let match;
-    while ((match = pattern.exec(code))) {
-        paths.push(match[3]);
-    }
-    return paths;
-}
 function replaceRequireInCode(file, originalRequire, newRequire) {
     const requirePath = (0, utils_1.formatPathToLuaPath)(newRequire.replace(".lua", ""));
-    // Escape special characters to prevent the regex from breaking...
-    const escapedRequire = originalRequire.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-    file.code = file.code.replace(new RegExp(`(^|\\s|;|=|\\()require\\s*\\(?["|']${escapedRequire}["|']\\)?`), `$1require("${requirePath}")`);
+    file.code = file.code =
+        file.code.substring(0, originalRequire.from) +
+            `require("${requirePath}")` +
+            file.code.substring(originalRequire.to + 1);
 }
 function replaceRequireInSourceMap(file, originalRequire, newRequire) {
     const requirePath = (0, utils_1.formatPathToLuaPath)(newRequire.replace(".lua", ""));
     if (file.sourceMapNode) {
-        replaceInSourceMap(file.sourceMapNode, file.sourceMapNode, `"${originalRequire}"`, `"${requirePath}"`);
+        replaceInSourceMap(file.sourceMapNode, file.sourceMapNode, `"${originalRequire.requirePath}"`, `"${requirePath}"`);
     }
 }
 function replaceInSourceMap(node, parent, require, resolvedRequire) {
@@ -316,7 +308,7 @@ function hasSourceFileInProject(filePath, program) {
 // Transform an import path to a lua require that is probably not correct, but can be used as fallback when regular resolution fails
 function fallbackResolve(required, sourceRootDir, fileDir) {
     return (0, utils_1.formatPathToLuaPath)(path
-        .normalize(path.join(path.relative(sourceRootDir, fileDir), required))
+        .normalize(path.join(path.relative(sourceRootDir, fileDir), required.requirePath))
         .split(path.sep)
         .filter(s => s !== "." && s !== "..")
         .join(path.sep));

package/dist/transpilation/transpiler.d.ts

@@ -19,6 +19,7 @@ export declare class Transpiler {
     protected getEmitPlan(program: ts.Program, diagnostics: ts.Diagnostic[], files: ProcessedFile[]): {
         emitPlan: EmitFile[];
     };
+    private getLuaLibBundleContent;
 }
 export declare function getEmitPath(file: string, program: ts.Program): string;
 export declare function getEmitPathRelativeToOutDir(fileName: string, program: ts.Program): string;

package/dist/transpilation/transpiler.js

@@ -61,7 +61,6 @@ class Transpiler {
         return diagnostics;
     }
     getEmitPlan(program, diagnostics, files) {
-        var _a;
         performance.startSection("getEmitPlan");
         const options = program.getCompilerOptions();
         if (options.tstlVerbose) {
@@ -79,8 +78,8 @@ class Transpiler {
             }
             // Add lualib bundle to source dir 'virtually', will be moved to correct output dir in emitPlan
             const fileName = (0, utils_1.normalizeSlashes)(path.resolve(getSourceDir(program), "lualib_bundle.lua"));
-            const luaTarget = (_a = options.luaTarget) !== null && _a !== void 0 ? _a : CompilerOptions_1.LuaTarget.Universal;
-            resolutionResult.resolvedFiles.unshift({ fileName, code: (0, LuaLib_1.getLuaLibBundle)(luaTarget, this.emitHost) });
+            const code = this.getLuaLibBundleContent(options, resolutionResult.resolvedFiles);
+            resolutionResult.resolvedFiles.unshift({ fileName, code });
         }
         let emitPlan;
         if ((0, CompilerOptions_1.isBundleEnabled)(options)) {
@@ -97,6 +96,17 @@ class Transpiler {
         performance.endSection("getEmitPlan");
         return { emitPlan };
     }
+    getLuaLibBundleContent(options, resolvedFiles) {
+        var _a;
+        const luaTarget = (_a = options.luaTarget) !== null && _a !== void 0 ? _a : CompilerOptions_1.LuaTarget.Universal;
+        if (options.luaLibImport === CompilerOptions_1.LuaLibImportKind.RequireMinimal) {
+            const usedFeatures = (0, LuaLib_1.findUsedLualibFeatures)(luaTarget, this.emitHost, resolvedFiles.map(f => f.code));
+            return (0, LuaLib_1.buildMinimalLualibBundle)(usedFeatures, luaTarget, this.emitHost);
+        }
+        else {
+            return (0, LuaLib_1.getLuaLibBundle)(luaTarget, this.emitHost);
+        }
+    }
 }
 exports.Transpiler = Transpiler;
 function getEmitPath(file, program) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.11.1",
+    "version": "1.12.1",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
     "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",
     "homepage": "https://typescripttolua.github.io/",