@makano/rew 1.2.32 → 1.2.33

package/lib/rew/functions/require.js

@@ -3,6 +3,7 @@ const path = require('path');
 
 module.exports.customRequire = function customRequire(modulePath, filePath) {
 	const resolvedPath = resolveModulePath(modulePath, filePath);
+	if(!resolvedPath) throw new Error('Module '+modulePath+' not found');
 	return require(resolvedPath);
 };
 
@@ -20,19 +21,40 @@ function resolveModulePath(modulePath, filePath) {
 		if (fs.existsSync(fullPath + '.json')) {
 			return fullPath + '.json';
 		}
+		
 		if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
-			const packageJsonPath = path.join(fullPath, 'package.json');
-			if (fs.existsSync(packageJsonPath)) {
-				const main = require(packageJsonPath).main || 'index.js';
-				const mainPath = path.join(fullPath, main);
-				if (fs.existsSync(mainPath)) {
-					return mainPath;
-				}
-			}
-			const indexPath = path.join(fullPath, 'index.js');
-			if (fs.existsSync(indexPath)) {
-				return indexPath;
-			}
+			return searchInPath(fullPath);
+		}
+
+		const rootPath = modulePath.split('/').shift();
+		const halfFullPath = path.join(basePath, rootPath);
+		if (fs.existsSync(halfFullPath) && fs.statSync(halfFullPath).isDirectory()) {
+			return searchInPath(halfFullPath, ['.'].concat(fullPath.split('/').slice(1)).join('/'));
 		}
 	}
 }
+
+function searchInPath(fullPath, exportses){
+	const packageJsonPath = path.join(fullPath, 'package.json');
+	if (fs.existsSync(packageJsonPath)) {
+		const packageJson = require(packageJsonPath);
+		let main = packageJson.main || 'index.js';
+		if(exportses){
+			if(packageJson.exports){
+				if(exportses in packageJson.exports) main = packageJson.exports[exportses];
+			}
+		}
+		if(typeof main == "object"){
+			if(Array.isArray(main)) main = main[0].require;
+			else main = main.require;
+		}
+		const mainPath = path.join(fullPath, main);
+		if (fs.existsSync(mainPath)) {
+			return mainPath;
+		}
+	}
+	const indexPath = path.join(fullPath, 'index.js');
+	if (fs.existsSync(indexPath)) {
+		return indexPath;
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.32",
+  "version": "1.2.33",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {