feat(non-global-cjs): add non-global and dynamic require support

Author: ersel

utils/static-require-resolver/checkMemberImports/index.js

@@ -159,7 +159,7 @@ const checkStaticRequireWithMemberExpressionsRecursively = node => {
 	) {
 		return {
 			path: '',
-			source: node.arguments[0].value
+			source: node.arguments[0].value || '***dynamic***'
 		};
 	}
 

utils/static-require-resolver/index.js

@@ -1,5 +1,6 @@
 const acorn = require('acorn');
 const injectJSX = require('acorn-jsx/inject');
+const walk = require('acorn/dist/walk');
 const injectObjectSpread = require('acorn5-object-spread/inject');
 const checkStaticRequireWithMemberExpressionsRecursively = require('./checkMemberImports');
 const parseIdentifiers = require('./parseIdentifiers');
@@ -63,55 +64,61 @@ const resolver = (moduleContents, fileName) => {
 		ast.body = [];
 	}
 	const nodes = ast.body;
+
 	for (let j = 0; j < nodes.length; j += 1) {
-		const node = nodes[j];
-		let memberImport;
-		let source;
+		const topLevelNode = nodes[j];
+		walk.full(topLevelNode, node => {
+			let memberImport;
+			let source;
+
+			if (checkifVariableDeclaratorWithFunctionCall(node)) {
+				if (checkIfDefaultRequire(node)) {
+					source = {
+						source:
+							node.declarations[0].init.arguments[0].value ||
+							'***dynamic***',
+						path: ''
+					};
+				} else {
+					memberImport = checkStaticRequireWithMemberExpressionsRecursively(
+						node.declarations[0].init
+					);
+					if (memberImport !== 'n/a') {
+						// todo: prepend . to path if it doesnt start with(
+						source = memberImport;
+					}
+				}
+			}
 
-		if (checkifVariableDeclaratorWithFunctionCall(node)) {
-			if (checkIfDefaultRequire(node)) {
+			if (!source && checkIfSoleRequire(node)) {
 				source = {
-					source: node.declarations[0].init.arguments[0].value,
+					source:
+						node.expression.arguments[0].value || '***dynamic***',
 					path: ''
 				};
-			} else {
+				dependencies.push({
+					...source,
+					imports: [],
+					type: 'commonjs'
+				});
+			} else if (!source && checkIfExpression(node)) {
 				memberImport = checkStaticRequireWithMemberExpressionsRecursively(
-					node.declarations[0].init
+					node.expression
 				);
 				if (memberImport !== 'n/a') {
 					// todo: prepend . to path if it doesnt start with(
 					source = memberImport;
+					dependencies.push({
+						...source,
+						imports: [],
+						type: 'commonjs'
+					});
 				}
+			} else if (source) {
+				const imports = parseIdentifiers(node.declarations[0].id);
+				dependencies.push({ ...source, imports, type: 'commonjs' });
 			}
-		}
-
-		if (!source && checkIfSoleRequire(node)) {
-			source = {
-				source: node.expression.arguments[0].value,
-				path: ''
-			};
-			dependencies.push({
-				...source,
-				imports: [],
-				type: 'commonjs'
-			});
-		} else if (!source && checkIfExpression(node)) {
-			memberImport = checkStaticRequireWithMemberExpressionsRecursively(
-				node.expression
-			);
-			if (memberImport !== 'n/a') {
-				// todo: prepend . to path if it doesnt start with(
-				source = memberImport;
-				dependencies.push({
-					...source,
-					imports: [],
-					type: 'commonjs'
-				});
-			}
-		} else if (source) {
-			const imports = parseIdentifiers(node.declarations[0].id);
-			dependencies.push({ ...source, imports, type: 'commonjs' });
-		}
+		});
 	}
 
 	return dependencies;

utils/static-require-resolver/index.test.js

@@ -179,4 +179,46 @@ describe('Static Require Resolvers (CJS)', () => {
 		const imports = resolver(testModule);
 		expect(imports).toEqual([]);
 	});
+
+	it('should resolve non-global require', () => {
+		const testModule = `
+		  
+		  const xyz = () => {
+			  const x = require('some-module.js').ABC
+		  }
+		  
+		  module.exports = createDelivery;
+		  `;
+		const imports = resolver(testModule);
+		expect(imports).toEqual([
+			{
+				imports: [{ imported: '*', local: 'x' }],
+				path: 'ABC',
+				source: 'some-module.js',
+				type: 'commonjs'
+			}
+		]);
+	});
+
+	it('should resolve dynamic require', () => {
+		const testModule = `
+		 const y = () => { 
+		  const xyz = () => {
+			  const somePath = Math.random() > 0.5 ? './this.js' : './that.js';
+			  const x = require(somePath)({test: 1}).yoo.lol(1).ABC
+		  }
+		}
+		  
+		  module.exports = createDelivery;
+		  `;
+		const imports = resolver(testModule);
+		expect(imports).toEqual([
+			{
+				imports: [{ imported: '*', local: 'x' }],
+				path: '().yoo.lol().ABC',
+				source: '***dynamic***',
+				type: 'commonjs'
+			}
+		]);
+	});
 });