@makano/rew 1.2.2 → 1.2.4

package/README.md

@@ -31,6 +31,9 @@ in the process.
   ```
   Optionally, you can run single files with `rew [filename]`
 
+## Docs
+You can pay a visit to the [docs](https://kevinj045.github.io/rew-docs/) to learn more about rew and how it works.
+
 ## Author's Notes
 
 Any suggestions, bug fixes or ideas are accepted, feel free to ask anything. 

package/bin/rew

@@ -1,9 +1,3 @@
 #!/usr/bin/env node
-const path = require('path');
-const fs = require('fs');
-const rew_mod = path.resolve(process.cwd(), 'snode_moduless/@makano/rew');
-if(fs.existsSync(rew_mod)){
-  require(path.join(rew_mod, 'lib/rew/cli/cli.js'));
-} else {
-  require('../lib/rew/cli/cli.js');
-}
+global.fileName = __filename;
+require("../lib/rew/cli/cli.js");

package/lib/rew/cli/cli.js

@@ -3,10 +3,9 @@
 const yargs = require('yargs/yargs');
 const path = require('path');
 const { hideBin } = require('yargs/helpers');
-const { fork, exec, execSync } = require('child_process');
-const { watch } = require('chokidar');
+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');
@@ -16,12 +15,25 @@ const { to_qrew, from_qrew } = require('../qrew/compile');
 const { findAppInfo } = require('../misc/findAppInfo');
 const { print, input } = require('../functions/stdout');
 const colors = require('colors');
+const { req } = require('../misc/req');
+const { gen_key } = require('../misc/bin');
 
-if (!existsSync(CONFIG_PATH)) {
+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>',
@@ -41,31 +53,10 @@ yargs(hideBin(process.argv))
 		(argv) => {
 			const filePath = path.resolve(process.cwd(), argv.file);
 			if (!existsSync(filePath)) {
-				log('File not found:', argv.file, ':end');
+				log('File not found:'.red.bold, argv.file, ':end');
 				return;
 			}
-			const watching = [];
-			const watchIt = (file) => {
-				if (watching.includes(file)) return;
-				watch(file).on('change', () => runIt());
-				watching.push(file);
-			};
-			let prevFork;
-			const runIt = () => {
-				if (argv.watch) console.clear();
-				if (prevFork && !prevFork.killed) prevFork.kill?.();
-				prevFork = fork(path.resolve(__dirname, './run.js'))
-					.on('message', (data) => {
-						if (argv.watch) {
-							data.forEach((file) => {
-								watchIt(file);
-							});
-						}
-					})
-					.send({ filePath, watch: argv.watch });
-				if (argv.watch) watchIt(filePath);
-			};
-			runIt();
+			utils.runFileWithArgv(filePath, { watch: argv.watch });
 		},
 	)
 	.command(
@@ -122,19 +113,6 @@ yargs(hideBin(process.argv))
 			console.log('Encryption Key:', rune({}).genKey(input('Secret Value: ') || null));
 		},
 	)
-	.command(
-		'ui-bin <path>',
-		'Build the UI bin for your own app',
-		(yargs) => {
-			yargs.positional('path', {
-				describe: 'Path of the output bin',
-				type: 'string',
-			});
-		},
-		(argv) => {
-			execSync('sh ' + path.resolve(__dirname, '../../../build.sh') + ' ' + argv.path);
-		},
-	)
 	.command(
 		'run <path | package>',
 		'Run an app',
@@ -143,20 +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('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);
@@ -166,30 +149,37 @@ yargs(hideBin(process.argv))
 		'secret <command> [key]',
 		'Add secrets to the current path',
 		(yargs) => {
-			yargs.positional('command', {
-				describe: 'Path of the app to run',
-				type: 'string',
-			});
+			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'
+				})
 		},
 		(argv) => {
 			const appPath = findAppInfo(path.join(process.cwd(), 'app.yaml'));
 
 			if (!appPath) return log(''.red.bold, 'Secrets only available in apps'.red.bold, ':end');
 
-			const qrewPath = path.join(appPath.path, 'secrets.qrew');
+			const qrewPath = path.join(appPath.path, argv.file || 'secrets.qrew');
 
-			const getHost = () => `${process.env.USER}@${os.platform()}.${os.hostname()}`;
+			const getPass = () => gen_key(input('Secret Encryptor: '));//`${process.env.USER}@${os.platform()}.${os.hostname()}`;
 
 			const verifyUser = (content) => {
 				const owner = content.match(/^owner = "(.*)" # end$/m)?.[1];
-				if (owner == getHost()) return true;
+				if (owner == getPass()) return true;
 				return false;
 			};
 
 			if (argv.command == 'init') {
-				writeFileSync(qrewPath, to_qrew(`secrets = {} # end\n\nowner = "${getHost()}" # end\n \nexports { ...secrets }`, appPath.config.package))
+				writeFileSync(qrewPath, to_qrew(`secrets = {} # end\n\nowner = "${getPass()}" # end\n \nexports { ...secrets }`, appPath.config.manifest.package))
 			} else {
-				const currentFileContent = from_qrew(readFileSync(qrewPath), appPath.config.package).toString();
+				const currentFileContent = from_qrew(readFileSync(qrewPath), appPath.config.manifest.package).toString();
 				if (!verifyUser(currentFileContent)) return log(''.red.bold, 'You are not allowed to change this data'.red.bold, ':end');
 
 				const secrets = currentFileContent.match(/^secrets = (.*) # end$/m)?.[1];
@@ -208,7 +198,7 @@ yargs(hideBin(process.argv))
 					const newSecrets = `secrets = ${JSON.stringify(secretsJson)} # end`;
 					const newFileContent = currentFileContent.replace(/^secrets = .* # end$/m, newSecrets);
 
-					writeFileSync(qrewPath, to_qrew(newFileContent, appPath.config.package))
+					writeFileSync(qrewPath, to_qrew(newFileContent, appPath.config.manifest.package))
 				} else if (argv.command == 'get') {
 					if (argv.key) {
 						console.log(argv.key.yellow, '=', secretsJson[argv.key].green);
@@ -229,10 +219,23 @@ yargs(hideBin(process.argv))
 			yargs.positional('path', {
 				describe: 'Path or github or repo id of the app to install',
 				type: 'string',
+			}).option('requirements', {
+				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) => {
-			utils.installAppFrom(argv.path);
+			if (argv.requirements) utils.installReq(argv.path, argv);
+			else utils.installAppFrom(argv.path, argv);
 		},
 	)
 	.command(
@@ -260,15 +263,21 @@ yargs(hideBin(process.argv))
 		async (argv) => {
 			const pkg = JSON.parse(readFileSync(path.resolve(__dirname, '../../../package.json'), { encoding: 'utf-8' }));
 			const getLatest = async () => {
-				try{
-					return (await (await fetch(`https://registry.npmjs.org/${pkg.name}`)).json()).dist_tags.latest.yellow.bold
-				} catch(e) {
+				try {
+					return (await req(`https://registry.npmjs.org/${pkg.name}`)).data['dist-tags'].latest
+				} catch (e) {
 					return `(${'!err'.blue.bgRed}, see ${`https://npmjs.com/package/${pkg.name}`.blue.underline})`;
 				}
 			}
 			log(`${'Rew'.red.bold} ${'RUNTIME'.yellow}`);
-			log(`Version: ${pkg.name.green}@${pkg.version.yellow.bold}`);
-			log(`Latest: ${pkg.name}@${await getLatest()}`, ':end');
+			log(`Version: ${pkg.name.green.bold}@${pkg.version.yellow.bold}`.magenta.bold);
+			const latest = await getLatest();
+			const isLatest = latest === pkg.version;
+			log(`Latest: ${pkg.name.cyan.bold}@${latest.yellow.bold}`.green.bold, isLatest ? ':end' : '');
+			if (!isLatest) {
+				log(`There is an update available`.cyan.bold);
+				log('Update With:'.yellow, `npm i -g ${npm_package_name}`.green.bold, ':end');
+			}
 		},
 	)
 	.command(
@@ -287,9 +296,13 @@ yargs(hideBin(process.argv))
 				describe: 'url of the repo',
 				type: 'string',
 			});
+			yargs.option('json', {
+				describe: 'Return a json output',
+				type: 'boolean',
+			});
 		},
 		async (argv) => {
-			utils.repo(argv.command, argv.name, argv.url);
+			utils.repo(argv.command, argv.name, argv.url, argv);
 		},
 	)
 	.command(
@@ -326,4 +339,4 @@ yargs(hideBin(process.argv))
 			utils.build(argv);
 		},
 	)
-	.help().argv;
+	.help(!isFileGiven).argv;

package/lib/rew/cli/run.js

@@ -1,15 +1,8 @@
+// run.js
 const { run } = require('../main');
 
-function exec(filePath) {
-	return run(filePath).context.module.imports;
+function exec(filePath, argv) {
+	return run(filePath, { argv })?.context?.module?.imports || [];
 }
 
-const onmsg = ({ filePath, watch }) => {
-	const imports = exec(filePath);
-	if (watch) {
-		process.send(imports);
-	}
-	process.off('message', onmsg);
-};
-
-process.on('message', onmsg);
+module.exports = { execRewFile: exec };