@makano/rew 1.2.4 → 1.2.6

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, statSync } = require('fs');
+const { existsSync, readFileSync, writeFileSync, mkdirSync, statSync, unlinkSync } = require('fs');
 const { log } = require('./log');
 const os = require('os');
 const crypto = require('crypto');
@@ -17,6 +17,8 @@ const { print, input } = require('../functions/stdout');
 const colors = require('colors');
 const { req } = require('../misc/req');
 const { gen_key } = require('../misc/bin');
+const { REW_FILE_TYPE } = require('../const/ext');
+const { generateRandomID } = require('../functions/id');
 
 if (!existsSync(CONFIG_PATH) || !existsSync(CONFIG_PATH + '/repos.yaml')) {
 	mkdirSync(CONFIG_PATH, { recursive: true });
@@ -48,6 +50,11 @@ yargs(hideBin(process.argv))
 					alias: 'w',
 					describe: 'Watch the file for changes',
 					type: 'boolean',
+				})
+				.option('compile', {
+					alias: 'c',
+					describe: 'Compile and output the javascript',
+					type: 'boolean',
 				});
 		},
 		(argv) => {
@@ -56,8 +63,35 @@ yargs(hideBin(process.argv))
 				log('File not found:'.red.bold, argv.file, ':end');
 				return;
 			}
-			utils.runFileWithArgv(filePath, { watch: argv.watch });
+			utils.runFileWithArgv(filePath, { async: !process.stdin.isTTY, onlyCompile: argv.compile, watch: argv.watch });
+		},
+	)
+	.command(
+		'exec [code]',
+		'Executes in REPL',
+		(yargs) => {
+			yargs
+			.option('compile', {
+				alias: 'c',
+				describe: 'Compile and output the javascript',
+				type: 'boolean',
+			});
 		},
+		async (argv) => {
+			const replFile = '/tmp/rew-'+generateRandomID()+'-'+Date.now()+'.coffee';
+			let code = argv.code;
+			if(!process.stdin.isTTY) {
+				code = await utils.getAllPipeInput();
+			}
+			writeFileSync(replFile, code);
+			try{
+				utils.runFileWithArgv(replFile, { async: !process.stdin.isTTY, onlyCompile: argv.compile });
+			} catch(e){
+				console.error(e);
+			} finally {
+				unlinkSync(replFile);
+			}
+		}
 	)
 	.command(
 		'conf <command> [path] [key] [value]',
@@ -122,7 +156,7 @@ yargs(hideBin(process.argv))
 				type: 'string',
 			})
 				.option('dev', {
-					describe: 'If your entry file is a .qrew, then just use the .coffee instead',
+					describe: `If your entry file is a .qrew, then just use .coffe or ${REW_FILE_TYPE.EXTENSION} instead`,
 					type: 'boolean',
 				})
 				.option('entry', {
@@ -223,6 +257,10 @@ yargs(hideBin(process.argv))
 				alias: 'r',
 				describe: 'Install requirements of the app',
 				type: 'boolean',
+			}).option('verbose', {
+				alias: 'v',
+				describe: 'Verbose',
+				type: 'boolean',
 			}).option('update', {
 				alias: 'u',
 				describe: 'Update the app',
@@ -280,6 +318,20 @@ yargs(hideBin(process.argv))
 			}
 		},
 	)
+
+	.command(
+		'cache <command>',
+		'Manage cache',
+		(yargs) => {
+			yargs.positional('command', {
+				describe: 'Command to clear/list',
+				type: 'string',
+			});
+		},
+		async (argv) => {
+			utils.cache(argv.command)
+		},
+	)
 	.command(
 		'repo <command> [name] [url]',
 		'Manage install repositories',
@@ -331,7 +383,7 @@ yargs(hideBin(process.argv))
 				})
 				.option('remove', {
 					alias: 'r',
-					describe: 'Remove all coffee',
+					describe: 'Remove all .coffee and '+REW_FILE_TYPE.EXTENSION,
 					type: 'boolean',
 				});
 		},
@@ -339,4 +391,4 @@ yargs(hideBin(process.argv))
 			utils.build(argv);
 		},
 	)
-	.help(!isFileGiven).argv;
+	.help(!isFileGiven).argv;

package/lib/rew/cli/log.js

@@ -4,6 +4,8 @@ const middlePrefix = '├';
 const separator = '│';
 const endPrefix = '╰';
 
+let last = '';
+
 const log = (module.exports.log = function (...toPrint) {
 	let prefix = start ? startPrefix : middlePrefix;
 	let returns = false;
@@ -16,8 +18,10 @@ const log = (module.exports.log = function (...toPrint) {
 		toPrint.pop();
 	}
 	if (prefix == endPrefix && start) prefix = separator;
-	if (!start) console.log(separator);
+	// if(last == endPrefix && prefix == separator) prefix = startPrefix;
+	if (!start) console.log(last == endPrefix ? startPrefix : separator);
 	if (start) start = false;
+	last = prefix;
 	if (returns) return [prefix, ...toPrint].join(' ');
 	else console.log(prefix, ...toPrint);
 });

package/lib/rew/cli/run.js

@@ -1,8 +1,8 @@
 // run.js
 const { run } = require('../main');
 
-function exec(filePath, argv) {
-	return run(filePath, { argv })?.context?.module?.imports || [];
+function exec(filePath, argv, options = {}) {
+	return run(filePath, { argv, ...options })?.context?.module?.imports || [];
 }
 
 module.exports = { execRewFile: exec };

package/lib/rew/cli/utils.js

@@ -14,9 +14,15 @@ const { req } = require('../misc/req');
 const { CONFIG_PATH } = require('../const/config_path');
 const { watch } = require('chokidar');
 const { execRewFile } = require('./run');
+const { seededID } = require('../misc/seededid');
+const loading = require('loading-cli');
+const sleep = require('../functions/sleep');
+const { gen_key } = require('../misc/bin');
+const { REW_FILE_TYPE } = require('../const/ext');
 
 const binpath = path.join(conf({}).create('').root, '.bin');
 const logspath = path.join(conf({}).create('').root, '.logs');
+const cachepath = path.join(conf({}).create('').root, '.cache');
 const localBinPath = path.join(binpath, '../../../', 'bin');
 
 module.exports = {
@@ -30,7 +36,7 @@ module.exports = {
 
 		const runIt = () => {
 			if (options.watch) console.clear();
-			const imports = execRewFile(filePath, [filePath, ...(argv || [])]);
+			const imports = execRewFile(filePath, [filePath, ...(argv || [])], { onlyCompile: options?.onlyCompile, async: options?.async });
 			if (options.watch) {
 				imports.forEach((file) => {
 					watchIt(file);
@@ -42,15 +48,21 @@ module.exports = {
 		runIt();
 	},
 	runFileWithArgv(filePath, options = {}, cargv) {
-		const argv = cargv || process.argv;
+		let argv = cargv || process.argv;
 		argv.shift();
-		if (argv[0].endsWith('rew')) {
+		if (argv[0].endsWith(REW_FILE_TYPE.EXTENSION) || argv[0].endsWith('.coffee')) {
 			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);
 		}
+		if (argv[1] == 'exec') {
+			argv.splice(0, 2);
+		}
+		if (argv.includes('--')) {
+			argv = argv.slice(argv.indexOf('--') + 1, argv.length);
+		}
 		this.runFile(filePath, options, argv)
 	},
 	conf(command, fullPath, key, value) {
@@ -59,15 +71,19 @@ module.exports = {
 			if (!fullPath || fullPath == 'list') {
 				return fs.readdirSync(con.CONFIG_PATH).join('\n');
 			} else {
-				const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
-				const dpath = fullPath.indexOf('/') ? fullPath.split('/').slice(1).join('/') : '';
+				let name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
+				let dpath = fullPath.indexOf('/') ? fullPath.split('/').slice(1).join('/') : '';
+				if(fullPath.startsWith('/')){ 
+					dpath = name;
+					name = '';
+				}
 				const root = con.create(name);
 				if (dpath) {
 					const fp = path.join(root.root, dpath);
-					if (fs.existsSync(fp) && fs.statSync(fp).isDirectory()) {
+					if (!fullPath.startsWith('/') && fs.existsSync(fp) && fs.statSync(fp).isDirectory()) {
 						return fs.readdirSync(fp).join('\n');
 					} else {
-						const o = con.create(name).optionCenter(dpath);
+						const o = dpath && dpath !== '/' ? root.optionCenter(dpath) : root.optionCenter('_default');
 						return key ? o.get(key) : o.getAll(true);
 					}
 				} else {
@@ -75,14 +91,18 @@ module.exports = {
 				}
 			}
 		} else {
-			const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
-			const dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
-			if (name && key) {
+			let name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
+			let dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
+			if(fullPath.startsWith('/')){ 
+				dpath = name == '/' ? '_default' : name;
+				name = '';
+			}
+			if (key) {
 				const root = con.create(name);
 				const o = dpath ? root.optionCenter(dpath) : root;
 				if (command == 'set') {
 					if (value) {
-						o.set(key, value);
+						o.set(key, value == 'false' || value == 'true' ? (value == 'true' ? true : false) : !isNaN(parseFloat(value)) ? parseFloat(value) : value);
 					} else {
 						log('Value not specified', ':end');
 					}
@@ -90,7 +110,7 @@ module.exports = {
 					o.remove(key);
 				}
 			} else {
-				log(!name ? 'Path not specified' : 'Key not specified', ':end');
+				log('Key not specified', ':end');
 			}
 		}
 	},
@@ -105,15 +125,23 @@ module.exports = {
 		const create = () => {
 			fs.mkdirSync(projectPath, { recursive: true });
 			const confPath = path.join(projectPath, 'app.yaml');
-			const entryFile = path.join(projectPath, '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: [] } }));
+			const entryFile = path.join(projectPath, 'main'+(project.civet ? REW_FILE_TYPE.EXTENSION : '.coffee'));
+			fs.writeFileSync(confPath, jsYaml.dump({ manifest: { package: project.package, private: false }, exec: { entry: 'main'+(project.civet ? REW_FILE_TYPE.EXTENSION : '.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' });
 			}
+			if(project.intellisense){
+				fs.copyFileSync(path.join(__dirname, '../../../tsconfig.json'), path.join(projectPath, 'tsconfig.json'));
+				fs.copyFileSync(path.join(__dirname, '../../../runtime.d.ts'), path.join(projectPath, 'runtime.d.ts'));
+			}
 			execSync('cd ' + projectPath + ' && npm init -y', { stdio: 'ignore' });
+			if(project.civet){
+				log('Installing NPM Packages');
+				execSync('cd '+projectPath+' && npm i @types/node --no-save', { stdio: 'ignore' });
+			}
 			// log('Installing '+npm_package_name);
 			// exec('cd '+projectPath+' && npm i '+npm_package_name, (err) => {
 			//   if(err){
@@ -130,9 +158,15 @@ module.exports = {
 			rl.question(logget(' Package Name: '.blue), (pkg) => {
 				if (pkg.trim()) {
 					project.package = pkg.trim();
-					rl.question(logget('󰊢 Use git(y/N): '.yellow.bold), (use_git) => {
-						project.git = use_git.toLowerCase() == 'y' || use_git.toLowerCase() == 'yes';
-						create();
+					rl.question(logget(' Use intellisense declarations ? (y/N): '.magenta.bold), (inteli) => {
+						project.intellisense = inteli.toLowerCase() == 'y' || inteli.toLowerCase() == 'yes';
+						rl.question(logget(' Use Civet For main ? (y/N): '.blue.bold), (civet) => {
+							project.civet = civet.toLowerCase() == 'y' || civet.toLowerCase() == 'yes';
+							rl.question(logget('󰊢 Use git ? (y/N): '.yellow.bold), (use_git) => {
+								project.git = use_git.toLowerCase() == 'y' || use_git.toLowerCase() == 'yes';
+								create();
+							});
+						});
 					});
 				} else {
 					rl.close();
@@ -153,8 +187,8 @@ module.exports = {
 				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 (byPath && options.dev) r = r.endsWith('.qrew') ? r.replace(/\.qrew$/, (a, b) => fs.existsSync(r.replace(a, '.coffee')) ? '.coffee' : REW_FILE_TYPE.EXTENSION) : r;
 				if (options.build) {
 					this.build({
 						file: r,
@@ -162,7 +196,7 @@ module.exports = {
 					});
 					r = path.resolve(root, c.exec.entry.replace(new RegExp(path.extname(c.exec.entry).replace('.', '\\.') + '$'), options.translate ? '.js' : '.qrew'));
 				}
-				this.runFileWithArgv(r);
+				this.runFileWithArgv(r, { async: !process.stdin.isTTY });
 			}
 		};
 
@@ -195,28 +229,29 @@ module.exports = {
 			});
 			log(' Installing '.blue + pname.green.bold);
 			log(' Package'.blue + ': ' + p.name.green + '@' + p.version.yellow);
-			if (p.descriptiondescription) {
-				log(' Description'.blue + ': ' + p.description);
+			if (p.description) {
+				log(' Description'.blue + '\n' + p.description.split('\n').map((i, ind, a) => '  '+(ind == 0 && a.length > 1 ? log.startPrefix : (a.length-1 == ind ? log.endPrefix : log.middlePrefix))+' '+i).join('\n'), ':end');
+			}
+			if (p.keywords && p.keywords.length) {
+				log(' Tags'.blue + '\n  ' + log.endPrefix + p.keywords.map(i => '#'+i).join(' '), ':end')
 			}
 			const done = (f) => {
 				if (f.toLowerCase() == 'y' || f.toLowerCase() == 'yes') {
 					if (fs.existsSync(installPath)) {
 						execSync(`rm -r ${installPath}`);
 					}
-					execSync(`cp -r ${apppath} ${installPath}`);
-					execSync(`chmod 444 ${installPath}/app.yaml`);
-					if (rmidir) {
-						execSync(`rm -r ${apppath}`);
-					}
-					log(' Installed '.green + pname.cyan.bold, c.install ? '' : ':end');
-					if (c.install) {
-						if (c.install.build) {
-							log(' Building'.blue);
+					if (c.install?.build) {
+						log(' Building'.blue);
+						try{
 							this.build({
 								...c.install.build,
-								file: path.join(installPath, c.install.build.file)
+								file: path.join(apppath, c.exec[c.install.build.file] || c.install.build.file)
 							});
-						}
+						} catch(e){}
+					}
+					execSync(`cp -r ${apppath} ${installPath}`);
+					execSync(`chmod 444 ${installPath}/app.yaml`);
+					if (c.install) {
 						if (c.install.commands) {
 							for (let command of c.install.commands) {
 								try{
@@ -224,7 +259,7 @@ module.exports = {
 								} 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');
+									log(` Command Failed: ${command}, check logs at ${logFile}`);
 								}
 							}
 						}
@@ -232,28 +267,32 @@ module.exports = {
 							this.runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, []);
 						}
 						if (c.install.requirements) {
-							this.installReq(c);
+							this.installReq(c, opts);
 						}
 						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);
+							if(conf({}).create('').get('executables') == false){
+								log(' Ignoring executables'.blue);
+							} else {
+								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');
+									if(fs.existsSync(binfp)) fs.unlinkSync(binfp);
+									fs.linkSync(filepath, binfp);
+								}
 							}
 						}
+
+						log(' Installed '.green + pname.cyan.bold, ':end');
 					}
 					rl.close();
 				} else {
-					if (rmidiri) {
-						execSync(`rm -rf ${apppath}`);
-					}
 					log(' Canceled install'.red.bold, ':end');
 					rl.close();
 				}
@@ -332,6 +371,9 @@ module.exports = {
 					if (fs.existsSync(importedFilePath)) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath, importsArray);
+					} else if (fs.existsSync(importedFilePath + REW_FILE_TYPE.EXTENSION)) {
+						importsArray.push(importStatement);
+						processFile(importedFilePath + REW_FILE_TYPE.EXTENSION, importsArray);
 					} else if (fs.existsSync(importedFilePath + '.coffee')) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath + '.coffee', importsArray);
@@ -344,7 +386,7 @@ module.exports = {
 
 			const appPath = findAppInfo(filePath);
 
-			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(content, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
+			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(`"initFile ${filePath}"\n${path.basename(content)}`, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
 			writeCompiledFile(filePath, compiled);
 		}
 
@@ -355,21 +397,51 @@ module.exports = {
 		processFile(filePath, importsArray);
 		log('󰈔 Compiled'.yellow, (importsArray.length + 1 + '').blue, `file${importsArray.length ? 's' : ''}.`.yellow, ':end');
 	},
-	async cloneGit(gitpath) {
+	cache(command){
+		if(command == 'list'){
+			console.log(fs.readdirSync(cachepath).join('\n').trim());
+		} else {
+			fs.readdirSync(cachepath).forEach(file => fs.rmSync(path.join(cachepath, file), { recursive: true }));
+		}
+	},
+	async cloneGit(gitpath, opts) {
 		const p = gitpath.split('github:')[1];
+		const clonePath = path.join(cachepath, 'rew-git-clone-'+gen_key(gitpath).substring(0, 12));
 		const url = `https://github.com/${p}`;
-		const apiurl = `https://api.github.com/repos/${p}`;
+		const apiurl = `https://api.github.com/repos/${p}/commits`;
+		const load = loading("Finding Repo...".yellow).start();
 		try {
 			const response = await req(apiurl);
-			if (response.status !== 200) return log(' Repo not found'.red.bold, ':end');
-			log(''.blue, 'Cloning from github'.yellow);
-			const tempPath = '/tmp/rew-git-clone-' + p.replace(/\//g, '_') + '-' + generateRandomID();
-			execSync(`git clone ${url} ${tempPath}`, { stdio: 'ignore' });
-			log(''.blue, 'Installing deps...'.yellow);
-			execSync(`cd ${tempPath} && npm i`);
-			return tempPath;
+			if (response.status !== 200) {
+				load.stop();
+				return log(' Package not found in github'.red.bold, ':end');
+			}
+			let pull = false;
+			if(fs.existsSync(clonePath)){
+				if(fs.existsSync(path.join(clonePath, response.data[0].sha))){
+					load.stop();
+					log('Found Cache'.yellow);
+					return clonePath+'/clone';
+				} else {
+					pull = true;
+				}
+			}
+			fs.mkdirSync(clonePath, { recursive: true });
+			fs.writeFileSync(path.join(clonePath, response.data[0].sha), '');
+			load.text = 'Cloning from github'.blue.bold;
+			await sleep(100)
+			if(pull) execSync(`cd ${clonePath}/clone && git pull`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+			else execSync(`git clone ${url} ${clonePath}/clone`, { stdio: opts.verbose ? 'pipe' : 'ignore' });
+			load.text = 'Installing npm packages'.green.bold;
+			await sleep(100)
+			execSync(`cd ${clonePath}/clone && npm i`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+			load.stop();
+			return clonePath+'/clone';
 		} catch (e) {
-			log(' Repo not found'.red.bold, ':end');
+			const logFile = path.join(logspath, 'logs-'+Date.now()+'.log');
+			fs.writeFileSync(logFile, e.toString() +'\n'+ e.stack);
+			load.stop();
+			log(' Something went wrong, check logs at'.red.bold, logFile.green, ':end');
 		}
 	},
 	findRepo(repo) {
@@ -377,7 +449,7 @@ module.exports = {
 		return repos.get(repo);
 	},
 	async installAppFrom(path, opts) {
-		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path), opts, true, true);
+		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts, true);
 		else if (path.startsWith('@')) this.fromRepo(path, opts);
 		else this.installApp(path, opts, null, null);
 	},
@@ -465,7 +537,7 @@ module.exports = {
 				console.log(Object.keys(confInstance.getAll()).join('\n'));
 			}
 		} else if (command === 'delete') {
-			confInstance.remove('repos');
+			confInstance.remove(key);
 		} else {
 			log(' Invalid command'.red.bold, ':end');
 		}
@@ -474,6 +546,21 @@ 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(cachepath, { recursive: true });
 		fs.mkdirSync(logspath, { recursive: true });
+	},
+	getAllPipeInput(){
+		return new Promise((resolve) => {
+			let data = '';
+			process.stdin.setEncoding('utf8');
+			
+			process.stdin.on('data', (chunk) => {
+				data += chunk;
+			});
+			
+			process.stdin.on('end', () => {
+				resolve(data);
+			});
+		});
 	}
 };

package/lib/rew/const/default.js

@@ -7,11 +7,12 @@ 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, clear } = require('../functions/stdout');
+const { print, input, clear, printf } = 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');
+const { generateRandomID } = require('../functions/id');
 
 module.exports = {
 	cenum,
@@ -49,8 +50,11 @@ module.exports = {
 	yaml,
 	yamls,
 
+	genID: generateRandomID,
+
 	curl,
 
 	print,
+	printf,
 	input,
 };

package/lib/rew/const/ext.js

@@ -0,0 +1,5 @@
+
+module.exports.REW_FILE_TYPE = {
+  EXTENSION: '.civet',
+  TYPE: 'civet'
+}

package/lib/rew/const/opt.js

@@ -1,10 +1,15 @@
+const { REW_FILE_TYPE } = require("./ext");
+
 const execOptions = {
 	sharedContext: true,
-	resolveExtensions: [{ ext: '.js', options: { type: 'js' } }, { ext: '.qrew', options: { qrew: true } }, '.coffee'],
+	resolveExtensions: [REW_FILE_TYPE.EXTENSION, ".coffee", { ext: '.js', options: { type: 'js' } }, { ext: '.qrew', options: { qrew: true } }],
 	nativeRequire: false,
+	useImport: false,
 	cwdAlias: '$',
-	jsxPragma: 'createElement',
+	jsxPragma: '__using__.JSX.createElement',
 	jsx: false,
+	typescript: false,
+	decorators: false
 };
 
 module.exports.execOptions = execOptions;

package/lib/rew/const/usage.js

@@ -0,0 +1,15 @@
+
+
+
+module.exports.USING_DEFAULT = {
+  JSX: {
+    param: (param) => ({ createElement: param }),
+    use:  (options) => options.jsx = true
+  },
+  TYPES: {
+    use:  (options) => options.typescript = true
+  },
+  DECORATORS: {
+    use:  (options) => options.decorators = true
+  }
+}

package/lib/rew/functions/exec.js

@@ -23,8 +23,8 @@ module.exports = (currentFile) => {
 		);
 	};
 
-	function spawn(command, options) {
-		return shell.spawn(command, options);
+	function spawn(command, ...args) {
+		return shell.spawn(command, ...args);
 	}
 
 	return { exec, spawn };

package/lib/rew/functions/export.js

@@ -10,7 +10,7 @@ function exportsThe(item, name, context) {
 
 module.exports.pubFunction = function (context) {
 	return function (name, item) {
-		if (name && !item) {
+		if (name && item == null) {
 			item = name;
 			name = null;
 		}

package/lib/rew/functions/fs.js

@@ -31,7 +31,11 @@ module.exports = (currentFile) => {
 	}
 
 	function rm(filepath, options) {
-		return fs.unlinkSync(filepath);
+		return fs.rmSync(gp(filepath), { recursive: true,...options });
+	}
+
+	function unlink(filepath, options) {
+		return fs.unlinkSync(gp(filepath));
 	}
 
 	function chmod(filepath, mode, options) {
@@ -51,6 +55,7 @@ module.exports = (currentFile) => {
 		mkdir,
 		chmod,
 		rm,
+		unlink,
 		fstat,
 		exists,
 		write,

package/lib/rew/functions/id.js

@@ -1,5 +1,5 @@
-module.exports.generateRandomID = function generateRandomID(length = 12) {
-	const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+module.exports.generateRandomID = function generateRandomID(length = 12, _characters) {
+	const characters = _characters || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 	const charactersLength = characters.length;
 	let randomID = '';