Allow resolution for array configs (#54)

salesforce · Feb 2, 2018 · ccbd126 · ccbd126
1 parent f10d033
commit ccbd126
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 28 deletions.
diff --git a/...e-resolver/src/__test__/fixtures/fake_node_modules/fake-multi-component/other/resource.js b/...e-resolver/src/__test__/fixtures/fake_node_modules/fake-multi-component/other/resource.js
diff --git a/...module-resolver/src/__test__/fixtures/fake_node_modules/fake-multi-component/package.json b/...module-resolver/src/__test__/fixtures/fake_node_modules/fake-multi-component/package.json
diff --git a/packages/lwc-module-resolver/src/__test__/resolve-lwc-modules.spec.js b/packages/lwc-module-resolver/src/__test__/resolve-lwc-modules.spec.js
@@ -10,7 +10,7 @@ describe('resolve-lwc-npm-modules', () => {
 
         const lwcModules = lwcResolver.resolveLwcNpmModules(resolverOptions);
         const lwcModuleNames = Object.keys(lwcModules);
-        expect(lwcModuleNames).toHaveLength(3);
-        expect(lwcModuleNames).toContain('alias-fake-package', 'fake-module1', 'fake-module2');
+        expect(lwcModuleNames).toHaveLength(4);
+        expect(lwcModuleNames).toContain('alias-fake-package', 'fake-module1', 'fake-module2', 'other-resource');
     })
 });
diff --git a/packages/lwc-module-resolver/src/index.js b/packages/lwc-module-resolver/src/index.js
@@ -90,8 +90,33 @@ function expandModuleDirectories({ moduleDirectories, rootDir } = {}) {
     return nodeModulePaths(rootDir || __dirname, { moduleDirectory: moduleDirectories });
 }
 
+function resolveModules(modules, opts) {
+    if (Array.isArray(modules)) {
+        modules.forEach((modulePath) => resolveModules(modulePath, opts));
+    } else {
+        const { mappings, visited, moduleRoot, lwcConfig } = opts;
+        if (typeof modules === 'string') {
+            const packageEntries = resolveModulesInDir(path.join(moduleRoot, modules), lwcConfig);
+            Object.keys(packageEntries).forEach((moduleName) => {
+                if (!hasModuleBeenVisited(moduleName, visited)) {
+                    mappings[moduleName] = packageEntries[moduleName];
+                    visited.add(moduleName);
+                }
+            });
+        } else {
+            Object.keys(modules).forEach((moduleName) => {
+                if (!hasModuleBeenVisited(moduleName, visited)) {
+                    const modulePath = path.join(moduleRoot, modules[moduleName]);
+                    mappings[moduleName] = { moduleSpecifier: moduleName, entry: modulePath };
+                    visited.add(moduleName);
+                }
+            });
+        }
+    }
+}
+
 function resolveLwcNpmModules(options = {}) {
-    const VISITED = new Set();
+    const visited = new Set();
     const modulePaths = expandModuleDirectories(options);
 
     return modulePaths.reduce((m, nodeModulesDir) => {
@@ -100,30 +125,7 @@ function resolveLwcNpmModules(options = {}) {
             const lwcConfig = loadLwcConfig(moduleRoot);
 
             if (lwcConfig) {
-                let { modules } = lwcConfig;
-                if (typeof modules === 'string') {
-                    modules = [modules];
-                }
-
-                if (Array.isArray(modules)) {
-                    modules.forEach((modulePath) => {
-                        const packageEntries = resolveModulesInDir(path.join(moduleRoot, modulePath), lwcConfig);
-                        Object.keys(packageEntries).forEach((moduleName) => {
-                            if (!hasModuleBeenVisited(moduleName, VISITED)) {
-                                mappings[moduleName] = packageEntries[moduleName];
-                                VISITED.add(moduleName);
-                            }
-                        });
-                    });
-                } else {
-                    Object.keys(modules).forEach((moduleName) => {
-                        if (!hasModuleBeenVisited(moduleName, VISITED)) {
-                            const modulePath = path.join(moduleRoot, modules[moduleName]);
-                            mappings[moduleName] = { moduleSpecifier: moduleName, entry: modulePath };
-                            VISITED.add(moduleName);
-                        }
-                    });
-                }
+                resolveModules(lwcConfig.modules, {mappings, visited, moduleRoot, lwcConfig });
             }
 
             return mappings;