require can resolve current working dir

Author: Sergii.Kliuchnyk

.travis.yml

@@ -2,4 +2,4 @@ language: node_js
 node_js:
  - "10"
 before_script:
- - npm install react react-dom --no-save
+ - npm run peer

README.md

@@ -185,7 +185,7 @@ const requireJSX = engine.require || require('express-engine-jsx/require');
 
 This is a function which you can use as regular `require` but this one can run jsx files. It checks if path is jsx file and if it is then `requireJSX` will [convert](#convert) this file to js code and then run it.
 
-It also takes optional second parameter - `currentWorkingDir` which should be an absolute path to file directory which calls `require` in case when main path is relative.
+It also can take optional second parameter - `currentWorkingDir` which should be an absolute path to file directory which calls `require` in case when you call `require` from some unusual place like debugger console.
 
 Every compiled jsx file will be cached to `requireJSX.cache` object where key will be path to jsx file and value will be value of `module.exports` inside jsx file, usually react component. 
 You can delete any key in this cache, requireJSX will recompile jsx file on next call.

package-lock.json

@@ -1,11 +1,12 @@
 {
   "name": "express-engine-jsx",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "JSX engine for ExpressJS",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "test": "NODE_ENV=production ./node_modules/.bin/mocha -R spec tests"
+    "test": "NODE_ENV=production ./node_modules/.bin/mocha -R spec tests",
+    "peer": "npm i react react-dom --no-save"
   },
   "repository": {
     "type": "git",
@@ -29,7 +30,8 @@
     "@babel/plugin-transform-react-jsx": "^7.12.16",
     "@babel/template": "^7.12.13",
     "@babel/traverse": "^7.12.13",
-    "@babel/types": "^7.12.13"
+    "@babel/types": "^7.12.13",
+    "callsites": "^3.1.0"
   },
   "devDependencies": {
     "@types/babylon": "^6.16.5",

package.json

@@ -1,4 +1,4 @@
-const {resolve, isAbsolute} = require('path');
+const {resolve, isAbsolute, dirname} = require('path');
 const fs = require('fs');
 const convert = require('./convert');
 const run = require('./run');
@@ -29,7 +29,11 @@ function requireJSX(path, currentWorkingDir) {
 		currentWorkingDir = null;
 	}
 	else if (!currentWorkingDir) {
-		throw new Error(`Relative path. Required currentWorkingDir parameter`);
+		const site = require('callsites')()[1];
+
+		currentWorkingDir = site && dirname(site.getFileName());
+
+		if (!currentWorkingDir || !isAbsolute(currentWorkingDir)) throw new Error('currentWorkingDir required');
 	}
 	else if (!isAbsolute(currentWorkingDir)) {
 		throw new Error('currentWorkingDir must be absolute path');
@@ -43,13 +47,13 @@ function requireJSX(path, currentWorkingDir) {
 
 	if (cache[path]) return cache[path];
 
-	if (fs.existsSync(path + '.js')) {
+	if (fs.existsSync(path + '.js') || fs.existsSync(resolve(path, 'index.js'))) {
 		return require(path);
 	}
 
-	const pathJSX = path + '.jsx';
+	var pathJSX;
 
-	if (!fs.existsSync(pathJSX)) {
+	if (!fs.existsSync((pathJSX = path + '.jsx')) && !fs.existsSync((pathJSX = resolve(path, 'index.jsx')))) {
 		throw new Error(`JSX file not found ${JSON.stringify(path)}`);
 	}
 
@@ -64,8 +68,13 @@ function resolveJSX(path) {
 	try {
 		path = require.resolve(path + '.jsx');
 	}
-	catch (e) {
-		return null;
+	catch (e1) {
+		try {
+			path = require.resolve(resolve(path, 'index.jsx'));
+		}
+		catch (e2) {
+			return null;
+		}
 	}
 
 	return path.replace(/\.jsx$/, '');

require.js

@@ -142,4 +142,12 @@ describe('convert', function () {
 }));`
 		);
 	});
+
+	it('should require', function () {
+		const Layout = requireJSX('./views/layout');
+		const Users = requireJSX('./views/app/components/users');
+
+		expect(Layout).to.be.a('function');
+		expect(Users).to.be.a('function');
+	});
 });

tests/index.js

@@ -0,0 +1 @@
+module.exports = 1;

tests/views/app/components/users.jsx …sts/views/app/components/users/index.jsxtests/views/app/components/users.jsx renamed to tests/views/app/components/users/index.jsx tests/views/app/components/users.jsx renamed to tests/views/app/components/users/index.jsx

@@ -0,0 +1 @@
+module.exports = 2;

tests/views/app/helpers/script.js

@@ -1,6 +1,10 @@
-var Layout = require('../layout');
-var Users = require('./components/users');
-var helper = require('./helpers/script');
+const Layout = require('../layout');
+const Users = require('./components/users');
+const helper1 = require('./helpers/script');
+const helper2 = require('./helpers/sub');
+
+if (helper1 !== 1) throw new Error('helper1');
+if (helper2 !== 2) throw new Error('helper2');
 
 <Layout>
 	<Users users={users}/>