@makano/rew 1.2.31 → 1.2.33

package/lib/rew/cli/cli.js

@@ -214,11 +214,19 @@ yargs(hideBin(process.argv))
 				alias: 'r',
 				describe: 'Install requirements of the app',
 				type: 'boolean',
+			}).option('update', {
+				alias: 'u',
+				describe: 'Update the app',
+				type: 'boolean',
+			}).option('yes', {
+				alias: 'y',
+				describe: 'Auto yes',
+				type: 'boolean',
 			});
 		},
 		async (argv) => {
-			if(argv.requirements) utils.installReq(argv.path);
-			else utils.installAppFrom(argv.path);
+			if(argv.requirements) utils.installReq(argv.path, argv);
+			else utils.installAppFrom(argv.path, argv);
 		},
 	)
 	.command(

package/lib/rew/cli/utils.js

@@ -16,6 +16,7 @@ const { watch } = require('chokidar');
 const { execRewFile } = require('./run');
 
 const binpath = path.join(conf({}).create('').root, '.bin');
+const logspath = path.join(conf({}).create('').root, '.logs');
 const localBinPath = path.join(binpath, '../../../', 'bin');
 
 module.exports = {
@@ -176,7 +177,7 @@ module.exports = {
 			}
 		}
 	},
-	installApp(pathname, rmidir, rmidiri) {
+	installApp(pathname, opts, rmidir, rmidiri) {
 		if (!pathname) {
 			return;
 		}
@@ -197,8 +198,8 @@ module.exports = {
 			if (p.descriptiondescription) {
 				log(' Description'.blue + ': ' + p.description);
 			}
-			rl.question(logget('Install '.blue + pname.green.bold + '? (y/N) '), (f) => {
-				if (f.toLowerCase() == 'y') {
+			const done = (f) => {
+				if (f.toLowerCase() == 'y' || f.toLowerCase() == 'yes') {
 					if (fs.existsSync(installPath)) {
 						execSync(`rm -r ${installPath}`);
 					}
@@ -218,7 +219,13 @@ module.exports = {
 						}
 						if (c.install.commands) {
 							for (let command of c.install.commands) {
-								execSync(command.replace(/\$installPath/g, installPath));
+								try{
+									execSync(command.replace(/\$installPath/g, installPath), { stdio: 'inherit' });
+								} catch(e){
+									const logFile = path.join(logspath, 'logs-'+Date.now()+'.log');
+									fs.writeFileSync(logFile, e.toString() +'\n'+ e.stack);
+									log(` Command Failed: ${command}, check logs at ${logFile}`, ':end');
+								}
 							}
 						}
 						if (c.install.file) {
@@ -250,12 +257,19 @@ module.exports = {
 					log(' Canceled install'.red.bold, ':end');
 					rl.close();
 				}
-			});
+			};
+			if (fs.existsSync(installPath) && !opts.update) {
+				rl.close();
+				log(` App Already Installed`.green.bold);
+				return log(`  Run With --update or -u to update.`.green.bold, ':end');
+			}
+			if(opts.yes) done('y');
+			else rl.question(logget('Install '.blue + pname.green.bold + '? (y/N) '), done);
 		} else {
 			log(' Path is not a rew app'.red.bold, ':end');
 		}
 	},
-	installReq(config) {
+	installReq(config, opts) {
 		if (typeof config !== "object") {
 			const confPath = path.join(config, './app.yaml');
 			if (!fs.existsSync(confPath)) return log(' Path is not a rew app'.red.bold, ':end');
@@ -265,7 +279,7 @@ module.exports = {
 			if (!Array.isArray(config.install.requirements)) return log(' Requirements must be an array'.red.bold, ':end');
 			config.install.requirements.forEach(req => {
 				log('Finding '.cyan + req.green);
-				this.installAppFrom(req);
+				this.installAppFrom(req, opts);
 			});
 		}
 	},
@@ -362,10 +376,10 @@ module.exports = {
 		const repos = conf({}).create('').optionCenter('repos');
 		return repos.get(repo);
 	},
-	async installAppFrom(path) {
-		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path), true, true);
-		else if (path.startsWith('@')) this.fromRepo(path);
-		else this.installApp(path);
+	async installAppFrom(path, opts) {
+		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path), opts, true, true);
+		else if (path.startsWith('@')) this.fromRepo(path, opts);
+		else this.installApp(path, opts, null, null);
 	},
 	uninstall(packageName, all) {
 		const confPath = path.join(CONFIG_PATH, packageName);
@@ -409,7 +423,7 @@ module.exports = {
 			return {};
 		}
 	},
-	async fromRepo(repoAndPkg) {
+	async fromRepo(repoAndPkg, opts) {
 		const [repo, pkg] = repoAndPkg.slice(1).split('/');
 		const repoUrl = this.findRepo(repo);
 		if (!repoUrl) {
@@ -418,7 +432,7 @@ module.exports = {
 		} else {
 			const repoJson = await this.getRepoJson(repoUrl);
 			if (repoJson?.packages?.[pkg]) {
-				await this.installAppFrom(repoJson.packages[pkg]);
+				await this.installAppFrom(repoJson.packages[pkg], opts);
 			} else {
 				log(` Package "${pkg.cyan}" is not in repo "${repo.green}"`.red.bold, ":end");
 			}
@@ -457,5 +471,6 @@ module.exports = {
 		log('First time init')
 		conf({}).create('').optionCenter('repos').set('rewpkgs', '//raw.githubusercontent.com/kevinJ045/rewpkgs/main/main.yaml');
 		fs.mkdirSync(binpath, { recursive: true });
+		fs.mkdirSync(logspath, { recursive: true });
 	}
 };

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