typescript-to-lua - npm Package Compare versions

Comparing version 0.41.1 to 0.41.2

dist/transpilation/bundle.js

@@ -18,7 +18,7 @@ "use strict";
     if ____moduleCache[file] then
-        return ____moduleCache[file]
+        return ____moduleCache[file].value
     end
     if ____modules[file] then
-        ____moduleCache[file] = ____modules[file]()
-        return ____moduleCache[file]
+        ____moduleCache[file] = { value = ____modules[file]() }
+        return ____moduleCache[file].value
     else
@@ -25,0 +25,0 @@ if ____originalRequire then

dist/transpilation/resolve.js

@@ -116,5 +116,9 @@ "use strict";
         if (required.startsWith("@NoResolution:")) {
-            const path = required.replace("@NoResolution:", "");
-            replaceRequireInCode(file, required, path);
-            replaceRequireInSourceMap(file, required, path);
+            // Remove @NoResolution prefix if not building in library mode
+            if (!isBuildModeLibrary(context.program)) {
+                const path = required.replace("@NoResolution:", "");
+                replaceRequireInCode(file, required, path);
+                replaceRequireInSourceMap(file, required, path);
+            }
+            // Skip
             continue;
@@ -130,2 +134,3 @@ }
 function resolveDependency(requiringFile, dependency, program, emitHost) {
+    var _a;
     const options = program.getCompilerOptions();
@@ -137,3 +142,3 @@ const fileDirectory = path.dirname(requiringFile.fileName);
     // Check if file is a file in the project
-    const resolvedPath = path.join(fileDirectory, dependency);
+    const resolvedPath = path.join((_a = options.baseUrl) !== null && _a !== void 0 ? _a : fileDirectory, dependency);
     const possibleProjectFiles = [
@@ -193,3 +198,3 @@ resolvedPath,
         if (luaRoot) {
-            return path.join(luaRoot, dependency.replace(".", path.sep)) + ".lua";
+            return path.join(luaRoot, dependency.replace(/\./g, path.sep)) + ".lua";
         }
@@ -232,7 +237,7 @@ }
     const paths = [];
-    const pattern = /require\("(.+)"\)/g;
+    const pattern = /(^|\s|;|=)require\("(.+)"\)/g;
     // eslint-disable-next-line @typescript-eslint/ban-types
     let match;
     while ((match = pattern.exec(code))) {
-        paths.push(match[1]);
+        paths.push(match[2]);
     }
@@ -243,3 +248,5 @@ return paths;
     const requirePath = utils_1.formatPathToLuaPath(newRequire.replace(".lua", ""));
-    file.code = file.code.replace(`require("${originalRequire}")`, `require("${requirePath}")`);
+    // Escape special characters to prevent the regex from breaking...
+    const escapedRequire = originalRequire.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+    file.code = file.code.replace(new RegExp(`(^|\\s|;|=)require\\("${escapedRequire}"\\)`), `$1require("${requirePath}")`);
 }
@@ -246,0 +253,0 @@ function replaceRequireInSourceMap(file, originalRequire, newRequire) {

package.json

 {
     "name": "typescript-to-lua",
-    "version": "0.41.1",
+    "version": "0.41.2",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
@@ -5,0 +5,0 @@ "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

761921

increased by0.06%

Lines of code

11943

increased by0.06%

No dependency changes