Require searches recursively node_modules dir

Author: jasssonpet

src/NativeScript/GlobalObject.moduleLoader.mm

@@ -45,15 +45,51 @@
     return nil;
 }
 
-static NSString* resolveFile(NSString* filePath) {
-    if (stat<S_IFREG>(filePath)) {
-        return filePath;
-    } else if (NSString* path = stat<S_IFREG>([filePath stringByAppendingPathExtension:@"js"])) {
+static NSString* resolveDirectory(NSString* absolutePath, WTF::HashMap<WTF::String, WTF::String, WTF::ASCIICaseInsensitiveHash>& cache, NSError** error) {
+    if (cache.contains(absolutePath)) {
+        return cache.get(absolutePath);
+    }
+
+    if (stat<S_IFREG>(absolutePath)) {
+        cache.set(absolutePath, absolutePath);
+        return absolutePath;
+    }
+
+    if (NSString* path = stat<S_IFREG>([absolutePath stringByAppendingPathExtension:@"js"])) {
+        cache.set(absolutePath, path);
         return path;
-    } else if (NSString* path = stat<S_IFREG>([filePath stringByAppendingPathExtension:@"json"])) {
+    }
+
+    if (NSString* path = stat<S_IFREG>([absolutePath stringByAppendingPathExtension:@"json"])) {
+        cache.set(absolutePath, path);
         return path;
     }
 
+    if (stat<S_IFDIR>(absolutePath)) {
+        NSString* mainName = @"index.js";
+
+        NSString* packageJsonPath = [absolutePath stringByAppendingPathComponent:@"package.json"];
+        if (stat<S_IFREG>(packageJsonPath)) {
+            NSData* packageJsonData = [NSData dataWithContentsOfFile:packageJsonPath options:0 error:error];
+            if (!packageJsonData && error) {
+                return nil;
+            }
+
+            NSDictionary* packageJson = [NSJSONSerialization JSONObjectWithData:packageJsonData options:0 error:error];
+            if (!packageJson && error) {
+                return nil;
+            }
+
+            if (NSString* packageMain = [packageJson objectForKey:@"main"]) {
+                mainName = packageMain;
+            }
+        }
+
+        NSString* resolved = resolveDirectory([absolutePath stringByAppendingPathComponent:mainName], cache, error);
+        cache.set(absolutePath, resolved);
+        return resolved;
+    }
+
     return nil;
 }
 
@@ -94,42 +130,32 @@
         absolutePath = [[absolutePath stringByAppendingPathComponent:path] stringByStandardizingPath];
     }
 
-    WTF::String requestedPath = absolutePath;
-    if (self->modulePathCache().contains(requestedPath)) {
-        return deferred->resolve(execState, jsString(execState, self->modulePathCache().get(requestedPath)));
-    }
-
-    NSString* absoluteFilePath = resolveFile(absolutePath);
-    if (!absoluteFilePath && stat<S_IFDIR>(absolutePath)) {
-        NSString* mainFileName = @"index.js";
-
-        NSString* packageJsonPath = [absolutePath stringByAppendingPathComponent:@"package.json"];
-        if (stat<S_IFREG>(packageJsonPath)) {
-            NSError* error = nil;
-            NSData* packageJsonData = [NSData dataWithContentsOfFile:packageJsonPath options:0 error:&error];
-            if (!packageJsonData && error) {
-                return deferred->reject(execState, self->interop()->wrapError(execState, error));
-            }
+    NSError* error = nil;
+    NSString* absoluteFilePath = resolveDirectory(absolutePath, self->modulePathCache(), &error);
 
-            NSDictionary* packageJson = [NSJSONSerialization JSONObjectWithData:packageJsonData options:0 error:&error];
-            if (!packageJson && error) {
-                return deferred->reject(execState, self->interop()->wrapError(execState, error));
-            }
+    if (error) {
+        return deferred->reject(execState, self->interop()->wrapError(execState, error));
+    }
 
-            if (NSString* packageMain = [packageJson objectForKey:@"main"]) {
-                mainFileName = packageMain;
+    if (!absoluteFilePath) {
+        NSString* currentSearchPath = [static_cast<NSString*>(referrerValue.toWTFString(execState)) stringByDeletingLastPathComponent];
+        do {
+            NSString* currentNodeModulesPath = [[currentSearchPath stringByAppendingPathComponent:@"node_modules"] stringByStandardizingPath];
+            if (stat<S_IFDIR>(currentNodeModulesPath)) {
+                absoluteFilePath = resolveDirectory([currentNodeModulesPath stringByAppendingPathComponent:path], self->modulePathCache(), &error);
+                if (absoluteFilePath) {
+                    break;
+                }
             }
-        }
-
-        absoluteFilePath = resolveFile([absolutePath stringByAppendingPathComponent:mainFileName]);
+            currentSearchPath = [currentSearchPath stringByDeletingLastPathComponent];
+        } while (currentSearchPath.length > self->applicationPath().length());
     }
 
     if (!absoluteFilePath) {
         WTF::String errorMessage = WTF::String::format("Could not find module '%s'. Computed path '%s'.", keyValue.toWTFString(execState).utf8().data(), absolutePath.UTF8String);
         return deferred->reject(execState, createError(execState, errorMessage));
     }
 
-    self->modulePathCache().set(requestedPath, absoluteFilePath);
     return deferred->resolve(execState, jsString(execState, absoluteFilePath));
 }