TypeScriptToLua
diff --git a/‎src/transpilation/plugins.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/transpilation/plugins.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/transpilation/resolve.ts‎
Lines changed: 39 additions & 22 deletions b/‎src/transpilation/resolve.ts‎
Lines changed: 39 additions & 22 deletions
@@ -46,7 +46,7 @@ export interface Plugin {
         result: EmitFile[]
     ) => ts.Diagnostic[] | void;
 
-    onImportResolutionFailure?: (packageRoot : string, dependency : string) => string | undefined
+    moduleResolution?: (moduleIdentifier : string, requiringFile : string) => string | undefined
 }
 
 export function getPlugins(program: ts.Program): { diagnostics: ts.Diagnostic[]; plugins: Plugin[] } {
 
@@ -79,7 +79,7 @@ class ResolutionContext {
             return;
         }
 
-        const dependencyPath = this.resolveDependencyPath(file, required.requirePath);
+        const dependencyPath = this.resolveDependencyPathsWithPlugins(file, required.requirePath) ?? this.resolveDependencyPath(file, required.requirePath);
         if (!dependencyPath) return this.couldNotResolveImport(required, file);
 
         if (this.options.tstlVerbose) {
@@ -95,6 +95,43 @@ class ResolutionContext {
         }
     }
 
+    private resolveDependencyPathsWithPlugins(required: ProcessedFile, dependency: string) {
+        if (this.plugins != null) {
+            const requiredFromLuaFile = required.fileName.endsWith(".lua");
+            const dependencyPath = requiredFromLuaFile ? luaRequireToPath(dependency) : dependency;
+
+            for (const p of this.plugins) {
+                try {
+                    if (p.moduleResolution != null) {
+                        const pluginResolvedPath = p.moduleResolution(dependency, dependencyPath)
+                        if (pluginResolvedPath !== undefined) {
+                            // If node module
+                            if (requiredFromLuaFile && isNodeModulesFile(required.fileName)) {
+                                // If requiring file is in lua module, try to resolve sibling in that file first
+                                const resolvedNodeModulesFile = this.resolveLuaDependencyPathFromNodeModules(required, pluginResolvedPath);
+                                if (resolvedNodeModulesFile) {
+                                    if (this.options.tstlVerbose) {
+                                        console.log(`Resolved file path for module ${dependency} to path ${dependencyPath} using plugin.`)
+                                    }
+                                    return resolvedNodeModulesFile
+                                }
+                            } else if (this.getFileFromPath(pluginResolvedPath)) {
+                                console.log(`Resolved file path for module ${dependency} to path ${dependencyPath} using plugin.`)
+                                return pluginResolvedPath;
+                            }
+                        }
+                    }
+                } catch (e: any) {
+                    // resolveSync errors if it fails to resolve
+                    if (this.options.tstlVerbose) {
+                        // Output resolver log
+                        console.log(e.details ?? e);
+                    }
+                }
+            }
+        }
+    }
+
     public processedDependencies = new Set<string>();
 
     private processDependency(dependencyPath: string): void {
@@ -183,6 +220,7 @@ class ResolutionContext {
         requiringFile: ProcessedFile,
         dependency: string
     ): string | undefined {
+
         // We don't know for sure where the lua root is, so guess it is at package root
         const splitPath = path.normalize(requiringFile.fileName).split(path.sep);
         let packageRootIndex = splitPath.lastIndexOf("node_modules") + 2;
@@ -201,23 +239,6 @@ class ResolutionContext {
             }
         }
 
-        if (this.plugins != null) {
-            for (let p of this.plugins) {
-                if (p.onImportResolutionFailure != null) {
-                    const pluginResolvedPath = p.onImportResolutionFailure(packageRoot, dependency)
-                    if (pluginResolvedPath !== undefined) {
-                        const fileFromPath = this.getFileFromPath(pluginResolvedPath);
-                        if (fileFromPath) {
-                            if (this.options.tstlVerbose) {
-                                console.log(`Resolved file path for ${dependency} to path ${fileFromPath} using plugin.`)
-                            }
-                            return fileFromPath
-                        }
-                    }
-                }
-            }
-        }
-
         return undefined;
     }
 
@@ -256,10 +277,6 @@ class ResolutionContext {
             path.join(resolvedPath, "init.lua"), // lua looks for <require>/init.lua if it cannot find <require>.lua
         ];
 
-        if (resolvedPath.endsWith(".lua")) {
-            possibleLuaProjectFiles.push(resolvedPath)
-        }
-
         for (const possibleFile of possibleLuaProjectFiles) {
             if (this.emitHost.fileExists(possibleFile)) {
                 return possibleFile;
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export interface Plugin {`
`46`	`46`	`result: EmitFile[]`
`47`	`47`	`) => ts.Diagnostic[] \| void;`
`48`	`48`
`49`		`- onImportResolutionFailure?: (packageRoot : string, dependency : string) => string \| undefined`
	`49`	`+ moduleResolution?: (moduleIdentifier : string, requiringFile : string) => string \| undefined`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`export function getPlugins(program: ts.Program): { diagnostics: ts.Diagnostic[]; plugins: Plugin[] } {`