@makano/rew 1.2.3 → 1.2.4

package/bin/rew

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
+global.fileName = __filename;
 require("../lib/rew/cli/cli.js");

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)) {
+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'));
@@ -214,11 +223,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(
@@ -246,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})`;
 				}
 			}
@@ -257,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');
 			}
@@ -279,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(
@@ -318,4 +339,4 @@ yargs(hideBin(process.argv))
 			utils.build(argv);
 		},
 	)
-	.help().argv;
+	.help(!isFileGiven).argv;

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,13 +432,13 @@ 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");
 			}
 		}
 	},
-	async repo(command, key, value) {
+	async repo(command, key, value, options) {
 		const confInstance = conf({}).create('').optionCenter('repos') || {};
 
 		if (command === 'add' || command === 'set') {
@@ -433,6 +447,7 @@ module.exports = {
 			if (key) {
 				console.log(confInstance.get(key) || 'Not found');
 			} else {
+				if(options.json) return console.log(JSON.stringify(confInstance.getAll()));
 				console.log(Object.keys(confInstance.getAll()).join('\n'));
 			}
 		} else if (command === 'view') {
@@ -440,11 +455,13 @@ module.exports = {
 				const url = confInstance.get(key);
 				if (!url) return log(' Repo not found'.red.bold, ':end');
 				const json = await this.getRepoJson(url);
+				if(options.json) return console.log(JSON.stringify(json));
 				if (json.name) log(json.name);
 				log('Packages:'.yellow)
 				if (json.packages) Object.keys(json.packages).forEach(name => log(name)) || log(`${Object.keys(json.packages).length} Packages in ${key}`, ':end');
 				else log('None'.blue, ':end')
 			} else {
+				if(options.json) return JSON.stringify(confInstance.getAll());
 				console.log(Object.keys(confInstance.getAll()).join('\n'));
 			}
 		} else if (command === 'delete') {
@@ -454,7 +471,9 @@ module.exports = {
 		}
 	},
 	initFirst() {
+		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/const/default.js

@@ -11,6 +11,7 @@ const { print, input, clear } = require('../functions/stdout');
 const { curl } = require('../functions/curl');
 const { wait } = require('../functions/wait');
 const { scheduleFrame } = require('../functions/misc');
+const { jsons, yaml, json, yamls } = require('../functions/json');
 
 module.exports = {
 	cenum,
@@ -43,6 +44,11 @@ module.exports = {
 	compose,
 	curry,
 
+	json,
+	jsons,
+	yaml,
+	yamls,
+
 	curl,
 
 	print,

package/lib/rew/functions/curl.js

@@ -17,7 +17,7 @@ module.exports.curl = function curl(options, url){
   }).then(async r => {
     if(options.o) fs.writeFileSync(options.o, Buffer.from(await r.clone().arrayBuffer()));
     return r;
-  }).then(r => options.json ? r.clone().json() : r));
+  }).then(r => options.json ? r.clone().json() : options.text ? r.clone().text() : r));
   if(options.a) return f.wait();
   else return f;
 }

package/lib/rew/functions/json.js

@@ -0,0 +1,27 @@
+const jsYaml = require("js-yaml");
+
+
+
+function json(thing){
+  return JSON.parse(thing);
+}
+
+function jsons(thing){
+  return JSON.stringify(thing);
+}
+
+
+function yaml(thing){
+  return jsYaml.loadAll(thing)[0];
+}
+
+function yamls(thing){
+  return jsYaml.dump(thing);
+}
+
+module.exports = {
+  yaml,
+  yamls,
+  json,
+  jsons
+}

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,21 +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);
 		}
-	}
 
-	throw new Error(`Cannot find module '${modulePath}'`);
+		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/lib/rew/modules/context.js

@@ -42,19 +42,6 @@ module.exports.prepareContext = function (
       ...defaultContext,
       ...pathLib(filepath),
       ...execLib(filepath),
-      require: (package) => {
-        try {
-          return execOptions.nativeRequire || package.startsWith("node:")
-            ? require(
-                package.startsWith("node:")
-                  ? package.split("node:")[1]
-                  : package,
-              )
-            : customRequire(package, filepath);
-        } catch (e) {
-          throw new Error("Module " + package + " not found");
-        }
-      },
       ...custom_context,
     };
   }
@@ -66,6 +53,7 @@ module.exports.prepareContext = function (
         off: (event, listener) => process.off(event, listener),
         emit: (event, code) => process.emit(event, code),
       },
+      __execFile: global.fileName,
       env: process.env,
       cwd: () => process.cwd(),
       arch: process.arch,
@@ -74,6 +62,21 @@ module.exports.prepareContext = function (
   context.global = context;
   context.imports.assert = options.import ?? {};
   context.imp = imp(runPath, context);
+  context.require = (package) => {
+    try {
+      const search = execOptions.nativeRequire || package.startsWith("node:")
+        ? require(
+            package.startsWith("node:")
+              ? package.split("node:")[1]
+              : package,
+          )
+        : customRequire(package, filepath);
+        if(!search) throw new Error("Module " + package + " not found");
+        return search;
+    } catch (e) {
+      throw e;
+    }
+  };
   context.inc = (package, asserts) => {
     try {
       if (package.startsWith("node:") || package.startsWith("pkg:"))

package/lib/rew/modules/yaml.js

@@ -22,7 +22,7 @@ function yamlFile(file) {
 		}),
 	]);
 
-	return yaml.load(file.content, { schema });
+	return file.content.startsWith('---') ? yaml.loadAll(file.content, { schema })[0] : yaml.load(file.content, { schema });
 }
 
 const importYaml = (module.exports.importYaml = function importYaml(filepath, file) {

package/lib/rew/pkgs/conf.js

@@ -14,7 +14,7 @@ module.exports = (context) => ({
 	CONFIG_PATH,
 	_onImport() {
 		if (context.app) {
-			return this.create(context.app.config.package);
+			return this.create(context.app.config.manifest.package);
 		} else {
 			return this.create(seededID(path.basename(context.module.filepath).replace(/[-_/\.]/g, '')));
 		}
@@ -101,6 +101,7 @@ module.exports = (context) => ({
 			remove: (key) => defaultCenter.remove(key),
 			root: rootPath,
 			package: packageName,
+			loadYaml: (file) => jsYaml.load(fs.readFileSync(file, { encoding: 'utf-8' }))
 		};
 	},
 });

package/package.json

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