@makano/rew 1.2.2 → 1.2.4

package/lib/rew/cli/utils.js

@@ -4,7 +4,7 @@ const conf = require('../pkgs/conf');
 const jsYaml = require('js-yaml');
 const readline = require('readline');
 const { log, logget } = require('./log');
-const { execSync, exec } = require('child_process');
+const { fork, execSync, exec } = require('child_process');
 const { run } = require('../main');
 const { generateRandomID } = require('../functions/id');
 const { compile } = require('../modules/compiler');
@@ -12,10 +12,47 @@ const { to_qrew } = require('../qrew/compile');
 const { findAppInfo } = require('../misc/findAppInfo');
 const { req } = require('../misc/req');
 const { CONFIG_PATH } = require('../const/config_path');
+const { watch } = require('chokidar');
+const { execRewFile } = require('./run');
 
-const npm_package_name = '@makano/rew';
+const binpath = path.join(conf({}).create('').root, '.bin');
+const logspath = path.join(conf({}).create('').root, '.logs');
+const localBinPath = path.join(binpath, '../../../', 'bin');
 
 module.exports = {
+	runFile(filePath, options = {}, argv) {
+		const watching = [];
+		const watchIt = (file) => {
+			if (watching.includes(file)) return;
+			watch(file).on('change', () => runIt());
+			watching.push(file);
+		};
+
+		const runIt = () => {
+			if (options.watch) console.clear();
+			const imports = execRewFile(filePath, [filePath, ...(argv || [])]);
+			if (options.watch) {
+				imports.forEach((file) => {
+					watchIt(file);
+				});
+				watchIt(filePath);
+			}
+		};
+
+		runIt();
+	},
+	runFileWithArgv(filePath, options = {}, cargv) {
+		const argv = cargv || process.argv;
+		argv.shift();
+		if (argv[0].endsWith('rew')) {
+			if (argv[1] == 'run') {
+				argv.splice(0, 3);
+			} else if(argv[1] == '-w' || argv[1] == '--watch'){
+				argv.splice(0, 3);
+			} else argv.splice(0, 2);
+		}
+		this.runFile(filePath, options, argv)
+	},
 	conf(command, fullPath, key, value) {
 		const con = conf({});
 		if (command == 'get') {
@@ -69,8 +106,9 @@ module.exports = {
 			fs.mkdirSync(projectPath, { recursive: true });
 			const confPath = path.join(projectPath, 'app.yaml');
 			const entryFile = path.join(projectPath, 'main.coffee');
-			fs.writeFileSync(confPath, jsYaml.dump({ package: project.package, entry: 'main.coffee' }));
+			fs.writeFileSync(confPath, jsYaml.dump({ manifest: { package: project.package, private: false }, exec: { entry: 'main.coffee' }, assets: { icon: 'assets/icon.png', folder: './assets' }, install: { requirements: [] } }));
 			fs.writeFileSync(entryFile, `print("Hello World!")`);
+			fs.mkdirSync(path.join(projectPath, 'assets'), { recursive: true });
 			if (project.git) {
 				fs.writeFileSync(path.join(projectPath, '.gitignore'), `node_modules/\npackage-lock.json`);
 				execSync('cd ' + projectPath + ' && git init . && git branch -m main', { stdio: 'ignore' });
@@ -111,22 +149,20 @@ module.exports = {
 
 		const runAppRoot = (root, confPath, byPath) => {
 			const c = jsYaml.load(fs.readFileSync(confPath, { encoding: 'utf-8' }));
-			if (c.entry) {
-				if(byPath && options.dev) c.entry = c.entry.endsWith('.qrew') ? c.entry.replace(/\.qrew$/, '.coffee') : c.entry;
-				let r = path.resolve(root, c.entry);
-				if(options.build) {
+			if (options.entry) {
+				c.exec.entry = c.exec[options.entry] || c.exec.entry;
+			}
+			if (c.exec.entry) {
+				if (byPath && options.dev) c.exec.entry = c.entry.endsWith('.qrew') ? c.exec.entry.replace(/\.qrew$/, '.coffee') : c.exec.entry;
+				let r = path.resolve(root, c.exec.entry);
+				if (options.build) {
 					this.build({
 						file: r,
 						translate: options.translate || false
 					});
-					r = path.resolve(root, c.entry.replace(new RegExp(path.extname(c.entry).replace('.', '\\.') + '$'), options.translate ? '.js' : '.qrew'));
+					r = path.resolve(root, c.exec.entry.replace(new RegExp(path.extname(c.exec.entry).replace('.', '\\.') + '$'), options.translate ? '.js' : '.qrew'));
 				}
-				const mod_path = path.resolve(root, 'snode_moduless/@makano/rew');
-				const mod_path_lib = path.join(mod_path, 'lib/rew/cli');
-				if (fs.existsSync(mod_path) && __dirname !== mod_path_lib) {
-					const mod_path_utilsjs = path.join(mod_path_lib, '../main.js');
-					require(mod_path_utilsjs).run(r);
-				} else run(r);
+				this.runFileWithArgv(r);
 			}
 		};
 
@@ -141,7 +177,7 @@ module.exports = {
 			}
 		}
 	},
-	installApp(pathname, rmidir, rmidiri) {
+	installApp(pathname, opts, rmidir, rmidiri) {
 		if (!pathname) {
 			return;
 		}
@@ -151,7 +187,7 @@ module.exports = {
 		if (fs.existsSync(apppath) && fs.existsSync(appConfpath)) {
 			const c = jsYaml.load(fs.readFileSync(appConfpath, { encoding: 'utf-8' }));
 			const p = JSON.parse(fs.readFileSync(appPackagepath, { encoding: 'utf-8' }));
-			const pname = c.package;
+			const pname = c.manifest.package;
 			const installPath = path.join(conf({}).create(pname).root, 'app');
 			const rl = readline.createInterface({
 				input: process.stdin,
@@ -159,11 +195,11 @@ module.exports = {
 			});
 			log(' Installing '.blue + pname.green.bold);
 			log(' Package'.blue + ': ' + p.name.green + '@' + p.version.yellow);
-			if (p.description) {
+			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}`);
 					}
@@ -173,21 +209,44 @@ module.exports = {
 						execSync(`rm -r ${apppath}`);
 					}
 					log(' Installed '.green + pname.cyan.bold, c.install ? '' : ':end');
-					if(c.install){
-						if(c.install.build){
+					if (c.install) {
+						if (c.install.build) {
 							log(' Building'.blue);
 							this.build({
 								...c.install.build,
 								file: path.join(installPath, c.install.build.file)
 							});
 						}
-						if(c.install.commands){
-							for(let command of c.install.commands){
-								execSync(command.replace(/\$installPath/g, installPath));
+						if (c.install.commands) {
+							for (let command of c.install.commands) {
+								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){
-							run(path.join(installPath, c.install.file));
+						if (c.install.file) {
+							this.runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, []);
+						}
+						if (c.install.requirements) {
+							this.installReq(c);
+						}
+						if (c.install.exec) {
+							// this.installReq(c);
+							for (let i in c.install.exec) {
+								let iff = c.install.exec[i];
+								if (iff in c.exec) iff = c.exec[iff];
+								const file = path.join(installPath, iff);
+								const filepath = path.join(binpath, i);
+								const binfp = path.join(localBinPath, i);
+								if (!fs.existsSync(localBinPath)) fs.mkdirSync(localBinPath, { recursive: true });
+								fs.writeFileSync(filepath, `#!/usr/bin/env bash\n#@app.${pname}\nrew ${file} $*`);
+								fs.chmodSync(filepath, '755');
+								fs.linkSync(filepath, binfp);
+							}
 						}
 					}
 					rl.close();
@@ -198,12 +257,33 @@ 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');
 		}
 	},
-	build(argv){
+	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');
+			config = jsYaml.load(fs.readFileSync(confPath, { encoding: 'utf-8' }));
+		}
+		if (config.install?.requirements) {
+			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, opts);
+			});
+		}
+	},
+	build(argv) {
 		function readFile(filePath) {
 			return fs.readFileSync(filePath, { encoding: 'utf-8' });
 		}
@@ -236,7 +316,7 @@ module.exports = {
 			const newFilePath = path.join(dirName, `${baseName}.${argv.translate ? 'js' : 'qrew'}`);
 			fs.writeFileSync(newFilePath, compiledCode);
 			log(`${'Compiled'.green.bold}: ${newFilePath.yellow}`);
-			if(argv.remove){
+			if (argv.remove) {
 				fs.unlinkSync(filePath);
 				log(`${'Removed'.red.bold}: ${filePath.yellow}`);
 			}
@@ -264,7 +344,7 @@ module.exports = {
 
 			const appPath = findAppInfo(filePath);
 
-			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(content, appPath?.config?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
+			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(content, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
 			writeCompiledFile(filePath, compiled);
 		}
 
@@ -279,7 +359,7 @@ module.exports = {
 		const p = gitpath.split('github:')[1];
 		const url = `https://github.com/${p}`;
 		const apiurl = `https://api.github.com/repos/${p}`;
-		try{
+		try {
 			const response = await req(apiurl);
 			if (response.status !== 200) return log(' Repo not found'.red.bold, ':end');
 			log(''.blue, 'Cloning from github'.yellow);
@@ -288,39 +368,49 @@ module.exports = {
 			log(''.blue, 'Installing deps...'.yellow);
 			execSync(`cd ${tempPath} && npm i`);
 			return tempPath;
-		} catch(e){
+		} catch (e) {
 			log(' Repo not found'.red.bold, ':end');
 		}
 	},
-	findRepo(repo){
+	findRepo(repo) {
 		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){
+	uninstall(packageName, all) {
 		const confPath = path.join(CONFIG_PATH, packageName);
 		const apppath = path.resolve(confPath, 'app');
 		const appConfpath = path.join(apppath, 'app.yaml');
-		if(!fs.existsSync(appConfpath) && fs.existsSync(confPath) && !all){
+		if (!fs.existsSync(appConfpath) && fs.existsSync(confPath) && !all) {
 			log(` App ${packageName.green}`.red.bold, `not found`.red.bold, `but configs are found.`.green.bold);
 			return log(`Use the`.cyan, '--all'.green, 'flag to remove them.'.cyan, ':end');
-		} else if(!fs.existsSync(appConfpath) && !all){
+		} else if (!fs.existsSync(appConfpath) && !all) {
 			return log(` App ${packageName.green}`.red.bold, `not found.`.red.bold, ':end');
 		}
 		log('Uninstalling'.cyan, packageName.green);
-		execSync('rm -rf '+(all ? confPath : apppath));
+		execSync('rm -rf ' + (all ? confPath : apppath));
+		fs.readdirSync(binpath)
+			.forEach(filename => {
+				const filepath = path.join(binpath, filename);
+				const lfilepath = path.join(localBinPath, filename);
+				const content = fs.readFileSync(filepath, { encoding: 'utf-8' });
+				if (content.split('\n')[1].startsWith('#@app.' + packageName)) {
+					fs.unlinkSync(lfilepath);
+					fs.unlinkSync(filepath);
+				}
+			});
 		log('Uninstalled'.cyan, ':end');
 	},
-	async getRepoJson(repoUrl){
-		try{
-			const text = (await req(repoUrl.startsWith('//.') ? 'http://'+repoUrl.slice(3) : repoUrl.startsWith('//') ? 'https://'+repoUrl : repoUrl)).data;
+	async getRepoJson(repoUrl) {
+		try {
+			const text = (await req(repoUrl.startsWith('//.') ? 'http://' + repoUrl.slice(3) : repoUrl.startsWith('//') ? 'https://' + repoUrl : repoUrl)).data;
 			const json = text.startsWith('---') || text.startsWith('%YAML') ? jsYaml.loadAll(text)[0] : JSON.parse(text);
-			if(Array.isArray(json.include)){
-				for(let i of json.include){
+			if (Array.isArray(json.include)) {
+				for (let i of json.include) {
 					json.packages = {
 						...json.packages,
 						...((await this.getRepoJson(i.startsWith('.') ? path.join(path.dirname(repoUrl), i) : i)).packages || {})
@@ -328,47 +418,50 @@ module.exports = {
 				}
 			}
 			return json;
-		} catch(e){
+		} catch (e) {
 			log(` Fetch Error. Check your connection.`.red.bold);
 			return {};
 		}
 	},
-  async fromRepo(repoAndPkg){
-    const [repo, pkg] = repoAndPkg.slice(1).split('/');
+	async fromRepo(repoAndPkg, opts) {
+		const [repo, pkg] = repoAndPkg.slice(1).split('/');
 		const repoUrl = this.findRepo(repo);
-		if(!repoUrl){
-		 	log(` Repository "${repo.green}"`.red.bold, `not found.`.red.bold);
+		if (!repoUrl) {
+			log(` Repository "${repo.green}"`.red.bold, `not found.`.red.bold);
 			return log(`Add with:`.yellow, '\n\t$'.green, `rew repo add ${repo} URL`.cyan.bold, ':end');
 		} else {
 			const repoJson = await this.getRepoJson(repoUrl);
-			if(repoJson?.packages?.[pkg]){
-				await this.installAppFrom(repoJson.packages[pkg]);
+			if (repoJson?.packages?.[pkg]) {
+				await this.installAppFrom(repoJson.packages[pkg], opts);
 			} else {
-				log(` Package "${pkg}" is not in repo "${repo.green}"`.red.bold, ":end");
+				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') {
 			confInstance.set(key, value.replace('https://', '//').replace('http://', '//.'));
 		} else if (command === 'get') {
 			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') {
 			if (key) {
 				const url = confInstance.get(key);
-				if(!url) return log(' Repo not found'.red.bold, ':end');
+				if (!url) return log(' Repo not found'.red.bold, ':end');
 				const json = await this.getRepoJson(url);
-				if(json.name) log(json.name);
+				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');
+				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') {
@@ -376,8 +469,11 @@ module.exports = {
 		} else {
 			log(' Invalid command'.red.bold, ':end');
 		}
-	},	
-	initFirst(){
+	},
+	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

@@ -7,8 +7,11 @@ const { match } = require('../functions/match');
 const { map } = require('../functions/map');
 const { typex, typeis, typedef, typei, int, float, num, str, bool } = require('../functions/types');
 const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry } = require('../functions/core');
-const { print, input } = require('../functions/stdout');
+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,
@@ -16,8 +19,11 @@ module.exports = {
 	future,
 	emitter,
 	sleep,
+	wait,
+	scheduleFrame,
 	match,
 	map,
+	clear,
 
 	typex,
 	typei,
@@ -38,6 +44,11 @@ module.exports = {
 	compose,
 	curry,
 
+	json,
+	jsons,
+	yaml,
+	yamls,
+
 	curl,
 
 	print,

package/lib/rew/const/files.js

@@ -1,15 +1,9 @@
 const fs = require('fs');
 const path = require('path');
-
-const HOME_PATH = path.resolve(process.env.HOME, '.config/rew/default');
-const THEME_PATH = (module.exports.THEME_PATH = path.resolve(HOME_PATH, 'theme.css'));
+const { CONFIG_PATH } = require('./config_path');
 
 module.exports.FILES = [
 	{
-		path: HOME_PATH,
-	},
-	{
-		path: THEME_PATH,
-		content: fs.readFileSync(path.resolve(__dirname, '../css/theme.css')),
-	},
+		path: CONFIG_PATH,
+	}
 ];

package/lib/rew/const/pre-exec.js

@@ -0,0 +1,3 @@
+Function.prototype.wait = function(...args) {
+	return wait(this, ...args);
+};

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/import.js

@@ -14,14 +14,15 @@ const lookUpInOtherApps = (fullPath) => {
 	const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
 	let dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
 	let ppath = path.join(con.CONFIG_PATH, name, 'app');
-	const config = jsYaml.load(readFileSync(path.join(ppath, 'app.yaml'), 'utf-8'));
 	if (!existsSync(ppath)) return null;
+	const config = jsYaml.load(readFileSync(path.join(ppath, 'app.yaml'), 'utf-8'));
 	if (!dpath) {
-		dpath = config.entry;
+		dpath = config.exec.entry;
 	}
 	if(config.private == true) return null;
+	if(dpath in config.exec) dpath = config.exec[dpath];
 	const pepath = path.join(ppath, dpath);
-	if(Array.isArray(config.private)){
+	if(Array.isArray(config.manifest.private)){
 		if(config.private.find(f => pepath == path.join(ppath, f))) return null;
 	}
 	if (existsSync(pepath)) return pepath;

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/misc.js

@@ -0,0 +1,5 @@
+
+module.exports.scheduleFrame = function scheduleFrame(cb, immediate = false){
+	return immediate ? setImmediate(cb) : setTimeout(cb, 1);
+}
+

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/functions/sleep.js

@@ -1,5 +1,5 @@
 const future = require('./future');
 
 module.exports = async function sleep(time) {
-	return new Promise((r) => setTimeout(r, time));
+	return new Promise((r) => setTimeout(() => r(time), time));
 };

package/lib/rew/functions/stdout.js

@@ -1,8 +1,7 @@
-const { execSync, spawnSync } = require('child_process');
-const fs = require('fs');
+const { spawnSync } = require('child_process');
 
-const print = (module.exports.print = function print(...arguments) {
-	return console.log(...arguments);
+const print = (module.exports.print = function print(...args) {
+	return console.log(...args);
 });
 
 print.stdout = process.stdout;
@@ -28,3 +27,7 @@ module.exports.input = function input(prompt) {
 
 	return spawnSync(cmd, args, opts).stdout.toString().trim();
 };
+
+module.exports.clear = () => {
+	console.clear();
+}

package/lib/rew/functions/wait.js

@@ -0,0 +1,11 @@
+const deasync = require("deasync");
+
+
+module.exports.wait = (...args) => {
+  const fn = args.shift();
+  if(typeof fn !== "function") throw new TypeError("The first argument must be a function to use wait.");
+  const df = deasync(async (cb) => {
+    cb(null, await fn(...args));
+  });
+  return df();
+}