@makano/rew 1.2.32 → 1.2.34

package/lib/rew/cli/cli.js

@@ -5,7 +5,7 @@ const path = require('path');
 const { hideBin } = require('yargs/helpers');
 const { execSync } = require('child_process');
 const utils = require('./utils');
-const { existsSync, readFileSync, writeFileSync, mkdirSync } = require('fs');
+const { existsSync, readFileSync, writeFileSync, mkdirSync, statSync } = require('fs');
 const { log } = require('./log');
 const os = require('os');
 const crypto = require('crypto');
@@ -18,13 +18,22 @@ const colors = require('colors');
 const { req } = require('../misc/req');
 const { gen_key } = require('../misc/bin');
 
-if (!existsSync(CONFIG_PATH) || !existsSync(CONFIG_PATH+'/repos.yaml')) {
+if (!existsSync(CONFIG_PATH) || !existsSync(CONFIG_PATH + '/repos.yaml')) {
 	mkdirSync(CONFIG_PATH, { recursive: true });
 	utils.initFirst();
 }
 
 const npm_package_name = '@makano/rew';
 
+function isFileArgument(file) {
+	try {
+		return existsSync(file) && statSync(file).isFile();
+	} catch {
+		return false;
+	}
+}
+
+const isFileGiven = isFileArgument(hideBin(process.argv)[0]) || hideBin(process.argv)[0] == 'run';
 yargs(hideBin(process.argv))
 	.command(
 		'$0 <file>',
@@ -112,25 +121,25 @@ yargs(hideBin(process.argv))
 				describe: 'Path of the app to run',
 				type: 'string',
 			})
-			.option('dev', {
-				describe: 'If your entry file is a .qrew, then just use the .coffee instead',
-				type: 'boolean',
-			})
-			.option('entry', {
-				alias: 'e',
-				describe: 'Choose entry file from app.config.exec',
-				type: 'string',
-			})
-			.option('build', {
-				alias: 'b',
-				describe: 'Builds to a .qrew before running',
-				type: 'boolean',
-			})
-			.option('translate', {
-				alias: 't',
-				describe: 'Builds to a .js before running, only used when --build is passed',
-				type: 'boolean',
-			});
+				.option('dev', {
+					describe: 'If your entry file is a .qrew, then just use the .coffee instead',
+					type: 'boolean',
+				})
+				.option('entry', {
+					alias: 'e',
+					describe: 'Choose entry file from app.config.exec',
+					type: 'string',
+				})
+				.option('build', {
+					alias: 'b',
+					describe: 'Builds to a .qrew before running',
+					type: 'boolean',
+				})
+				.option('translate', {
+					alias: 't',
+					describe: 'Builds to a .js before running, only used when --build is passed',
+					type: 'boolean',
+				});
 		},
 		(argv) => {
 			utils.runApp(argv.path, argv);
@@ -141,16 +150,16 @@ yargs(hideBin(process.argv))
 		'Add secrets to the current path',
 		(yargs) => {
 			yargs
-			.positional('command', {
-				describe: 'Path of the app to run',
-				type: 'string',
-			})
-			.option('file', {
-				alias: 'f',
-				describe: 'Set file name',
-				type: 'string',
-				default: 'secrets.qrew'
-			})
+				.positional('command', {
+					describe: 'Path of the app to run',
+					type: 'string',
+				})
+				.option('file', {
+					alias: 'f',
+					describe: 'Set file name',
+					type: 'string',
+					default: 'secrets.qrew'
+				})
 		},
 		(argv) => {
 			const appPath = findAppInfo(path.join(process.cwd(), 'app.yaml'));
@@ -225,7 +234,7 @@ yargs(hideBin(process.argv))
 			});
 		},
 		async (argv) => {
-			if(argv.requirements) utils.installReq(argv.path, argv);
+			if (argv.requirements) utils.installReq(argv.path, argv);
 			else utils.installAppFrom(argv.path, argv);
 		},
 	)
@@ -254,9 +263,9 @@ yargs(hideBin(process.argv))
 		async (argv) => {
 			const pkg = JSON.parse(readFileSync(path.resolve(__dirname, '../../../package.json'), { encoding: 'utf-8' }));
 			const getLatest = async () => {
-				try{
+				try {
 					return (await req(`https://registry.npmjs.org/${pkg.name}`)).data['dist-tags'].latest
-				} catch(e) {
+				} catch (e) {
 					return `(${'!err'.blue.bgRed}, see ${`https://npmjs.com/package/${pkg.name}`.blue.underline})`;
 				}
 			}
@@ -265,7 +274,7 @@ yargs(hideBin(process.argv))
 			const latest = await getLatest();
 			const isLatest = latest === pkg.version;
 			log(`Latest: ${pkg.name.cyan.bold}@${latest.yellow.bold}`.green.bold, isLatest ? ':end' : '');
-			if(!isLatest){
+			if (!isLatest) {
 				log(`There is an update available`.cyan.bold);
 				log('Update With:'.yellow, `npm i -g ${npm_package_name}`.green.bold, ':end');
 			}
@@ -326,4 +335,4 @@ yargs(hideBin(process.argv))
 			utils.build(argv);
 		},
 	)
-	.help().argv;
+	.help(!isFileGiven).argv;

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.34",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {