@makano/rew 1.4.6 → 1.5.0

package/lib/rew/cli/cli.js

@@ -302,6 +302,10 @@ yargs(hideBin(process.argv))
 				alias: 'u',
 				describe: 'Update the app',
 				type: 'boolean',
+			}).option('clean', {
+				alias: 'c',
+				describe: 'Clean intall the app',
+				type: 'boolean',
 			}).option('yes', {
 				alias: 'y',
 				describe: 'Auto yes',

package/lib/rew/cli/helpers.js

@@ -9,6 +9,9 @@ const logspath = path.join(conf({}).create('').root, '.logs');
 const cachepath = path.join(conf({}).create('').root, '.cache');
 const localBinPath = path.join(binpath, '../../../', 'bin');
 
+const FILE_DL_EXTRACT_REGEX = /^file\+sha\(([^)]+)\)\+([a-zA-Z0-9_-]+)(\([^\)]*\))?:(.*)$|^file\+([a-zA-Z0-9_-]+)(\([^\)]*\))?:(.*)$/;
+
+
 if (!fs.existsSync(CONFIG_PATH) || !fs.existsSync(CONFIG_PATH + '/repos.yaml')) {
 	fs.mkdirSync(CONFIG_PATH, { recursive: true });
 	log('First time init');
@@ -66,5 +69,6 @@ module.exports = {
   localBinPath,
   npm_package_name,
   getAllPipeInput,
-  hashTags
+  hashTags,
+  FILE_DL_EXTRACT_REGEX
 }

package/lib/rew/cli/utils.js

@@ -21,10 +21,13 @@ const {
   logspath,
   cachepath,
   localBinPath,
-	hashTags
+	hashTags,
+	FILE_DL_EXTRACT_REGEX
 } = require('./helpers');
 const { input } = require('../functions/stdout');
 
+
+
 module.exports = {
 	conf(command, fullPath, key, value) {
 		const con = conf({});
@@ -399,8 +402,8 @@ module.exports = {
 		if(command == 'list'){
 			console.log(fs.readdirSync(cachepath).join('\n').trim());
 		} else if(command == 'clear'){
-			if(file) fs.rmSync(path.join(cachepath, file), { recursive: true });
-			else if(file == 'all') fs.readdirSync(cachepath).forEach(file => fs.rmSync(path.join(cachepath, file), { recursive: true }));
+			if(file && file !== 'all') fs.rmSync(path.join(cachepath, file), { recursive: true });
+			else if(file == 'all' || !file) fs.readdirSync(cachepath).forEach(file => fs.rmSync(path.join(cachepath, file), { recursive: true }));
 		} else if(command == 'install'){
 			if(!file) return process.exit(1);
 			this.installApp(path.join(cachepath, file, 'clone'), {
@@ -496,8 +499,146 @@ module.exports = {
 		const repos = conf({}).create('').optionCenter('repos');
 		return repos.get(repo);
 	},
+	isCommandAvailable(command) {
+    try {
+			execSync(`command -v ${command}`, { stdio: 'ignore' });
+			return true;
+    } catch (e) {
+			return false;
+    }
+	},
+	downloadFileFromUrl(url, dest, sha, opts) {
+    const isCurlAvailable = this.isCommandAvailable('curl');
+    const isWgetAvailable = this.isCommandAvailable('wget');
+    
+    if (!isCurlAvailable && !isWgetAvailable) {
+			log(` Failed to download: Nither curl nor wget command were found.`.red.bold, ':end');
+			return false;
+		}
+
+		if(opts.c || opts.clean){
+			if(fs.existsSync(dest)) fs.rmSync(dest);
+		}
+		let tries = 0;
+
+		const checkSha = (throwErr) => {
+			if(sha){
+				const thisSha = execSync(`sha256sum "${dest}"`).toString().split(' ')[0];
+				if(thisSha === sha){
+					return true;
+				} else {
+					if(throwErr) {
+						log(` Failed to verify file checksum, ${tries == 0 ? 'trying again...' : 'try again.'}`.red.bold, ':end');
+						fs.rmSync(dest);
+						tries++;
+						if(tries < 2) return tryDl();
+					}
+					return false;
+				}
+			} else return true;
+		}
+    
+    const downloadCommand = isCurlAvailable 
+			? `curl -L -o "${dest}" "${url}"` 
+			: `wget -O "${dest}" "${url}"`;
+
+		const tryDl = () => {
+			try {
+				if(fs.existsSync(dest)){
+					return checkSha(true);
+				} else {
+					execSync(downloadCommand, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+					return checkSha(true);
+				}
+			} catch(e){
+				log(` Failed to download ${url}: ${e.name}: ${e.message}.`.red.bold, ':end');
+				return false;
+			}
+		}
+
+		return tryDl();
+	},
+	downloadFile(fullPath, opts){
+		const pathToDownloadInto = path.join(cachepath, 'rew-file-download-'+gen_key(fullPath).substring(0, 12));
+
+		const commandMatch = fullPath.match(FILE_DL_EXTRACT_REGEX);
+
+		let shaHash = null;
+    let command = null;
+    let args = [];
+    let url = null;
+
+    if (commandMatch) {
+			// If sha() is present in the format file+sha(SHA-AAAA)+command(args):URL
+			if (commandMatch[1]) {
+				shaHash = commandMatch[1];
+				command = commandMatch[2];
+				args = commandMatch[3] ? commandMatch[3].slice(1, -1).split(' ') : [];
+				url = commandMatch[4];
+			} else {
+				command = commandMatch[5];
+				args = commandMatch[6] ? commandMatch[6].slice(1, -1).split(' ') : [];
+				url = commandMatch[7];
+			}
+
+			fs.mkdirSync(pathToDownloadInto, { recursive: true });
+    } else {
+			log(` Format not correct`.red.bold, ':end');
+			process.exit(1);
+    }
+
+		const fileName = path.basename(url);
+		const filePath = path.join(pathToDownloadInto, fileName);
+
+		const extractPath = path.join(pathToDownloadInto, 'extract');
+		if(opts.c || opts.clean || opts.u){
+			if(fs.existsSync(extractPath)) execSync(`rm -rf ${extractPath}`);
+		}
+
+    const fixedArgs = args.join(' ')
+			.replaceAll('$path', extractPath)
+			.replaceAll('$file', filePath) || (
+				command == 'unzip' ?
+				`${filePath} -d ${extractPath}` :
+				`${filePath} ${extractPath}`
+			);
+		
+		if(opts.verbose){
+			log('Download started for'.cyan, url.yellow, 'at'.cyan, filePath.yellow, shaHash ? 'with sha'.cyan : '', shaHash ? shaHash.yellow : '');
+		} else {
+			log(`Downloading`.cyan, fileName.yellow);
+		}
+		const downloaded = fs.existsSync(extractPath) ? true : this.downloadFileFromUrl(url, filePath, shaHash, opts);
+		if(downloaded){
+			log(`Download Complete for`.cyan, fileName.yellow);
+			log('Extracting'.cyan, fileName.yellow);
+			if(opts.verbose){
+				log('Running command:'.cyan, command.green.bold, 'for'.cyan, filePath.yellow, 'at'.cyan, extractPath.yellow);
+			}
+			if(this.isCommandAvailable(command)){
+				try{
+					if(fs.existsSync(extractPath)) {
+						log('Found Extracted Directory'.cyan);
+					} else execSync(`${command} ${fixedArgs}`, {
+						stdio: opts.verbose ? 'inherit' : 'ignore'
+					});
+				} catch(e){
+					log(` Failed to extract`.red.bold, ':end');
+					return null;
+				}
+			} else {
+				log(` Command "${command}" not found.`.red.bold, ':end');
+				return null;
+			}
+
+			return extractPath;
+		} else {
+			return null;
+		}
+	},
 	async installAppFrom(path, opts) {
 		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts, true);
+		if (path.match(FILE_DL_EXTRACT_REGEX)) this.installApp(this.downloadFile(path, opts), opts, true);
 		else if (path.startsWith('@')) this.fromRepo(path, opts);
 		else this.installApp(path, opts, null, null);
 	},

package/lib/rew/functions/exec.js

@@ -20,7 +20,7 @@ module.exports = (currentFile) => {
 				...options,
 			},
 			callback,
-		);
+		)
 	};
 
 	function spawn(command, ...args) {

package/lib/rew/functions/stdout.js

@@ -1,10 +1,86 @@
 const { spawnSync } = require('child_process');
+const r = require('colors')
+
+const baseAnsii = '\x1b';
+const fg = {
+	o: ["30", '39'],
+	r: ["31", '39'],
+	g: ["32", '39'],
+	y: ["33", '39'],
+	b: ["34", '39'],
+	m: ["35", '39'],
+	c: ["36", '39'],
+	w: ["37", '39'],
+	a: ["90", '39']
+}
+const bg = {
+	O: ["40", '49'],
+	R: ["41", '49'],
+	G: ["42", '49'],
+	Y: ["43", '49'],
+	B: ["44", '49'],
+	M: ["45", '49'],
+	C: ["46", '49'],
+	W: ["47", '49'],
+	A: ["48", '49']
+}
+const styles = {
+	"!": ["1", '22'], // bold
+	"'": ["2", '22'], // dim
+	"/": ["3", '23'], // italic
+	"_": ["4", '24'], // underline
+	"i": ["7", '27'],
+	"h": ["8", '28'],
+	"-": ["9", '29'],
+}
+
+const findStyle = (name) => {
+	return styles[name] || bg[name] || fg[name];
+}
+
+const addColorize = (applied) => {
+	return `${baseAnsii}[${applied.fg}m${applied.bg ? `${baseAnsii}[${applied.bg}m` : ''}${applied.style ? `${baseAnsii}[${applied.style}m` : ''}`
+}
+
+const colorize = (baseString = '') => {
+	const applied = {
+		style: '',
+		fg: "39",
+		bg: "49",
+	};
+	const stringParts = baseString.replace(/%([orgybmcwaORGYBMCWA!'\/_ih-])/gmi, (_, col) => {
+		const val = findStyle(col);
+		if(!val) return _;
+		const tag = col in styles ? 'style' :
+			col in fg ? 'fg' : 'bg';
+		if(applied[tag] == val[0]){
+			applied[tag] = val[1];
+		} else {
+			applied[tag] = val[0];
+		}
+		return addColorize(applied);
+	});
+	return stringParts + addColorize({
+		style: '',
+		fg: "39",
+		bg: "49",
+	});
+}
 
 (module.exports.print = function print(...args) {
+	if(!args.some(i => typeof i !== "string")){
+		args = [args.join(' ')]
+	}
+	if(typeof args[0] === "string" && args[0].startsWith('%c')){
+		args[0] = colorize(args[0]);
+	}
 	return console.log(...args);
 });
 
 module.exports.printf = function printf(buffer, cb) {
+	if(typeof buffer === "string" && buffer.startsWith('%c')){
+		buffer = colorize(buffer);
+	}
 	return process.stdout.write(buffer, cb);
 };
 

package/lib/rew/functions/types.js

@@ -41,7 +41,7 @@ function typedef(value, strict = false) {
 	});
 }
 
-function typef(fn, returnType) {
+function typef(fn, returnType, argumentsTypes) {
 	if(typeof returnType == "function"){
 		const ref = fn;
 		fn = returnType;
@@ -51,7 +51,17 @@ function typef(fn, returnType) {
 		throw new Error('First argument must be a function');
 	}
 	if (typeof returnType == 'function' && returnType.type instanceof Type) returnType = returnType.type;
+	const requiredArguments = Array.isArray(argumentsTypes) ? argumentsTypes.filter(i => Array.isArray(i) ? !i.includes(null) : true) : [];
 	const wrappedFn = function(...args){
+		if(argumentsTypes && Array.isArray(argumentsTypes)){
+			if(args.length !== requiredArguments.length && args.length !== argumentsTypes.length){
+				throw new TypeError(`Function ${fn.name || '<anonymous>'} takes exactly ${requiredArguments.length} parameters`)
+			}	
+			const argumentsTyped = typeAre(args, argumentsTypes);
+			if(argumentsTyped !== false){
+				throw new TypeError(`Function ${fn.name || '<anonymous>'} call error: Parameter at index ${argumentsTyped} is of the wrong type`);
+			}
+		}
 		const result = fn.call(this, ...args);
 		if(!typeis(result, wrappedFn.returnType)){
 			throw new TypeError(`Function ${fn.name || '<anonymous>'} does not return it's own return type.`);
@@ -60,13 +70,32 @@ function typef(fn, returnType) {
 	}
 	wrappedFn.returnType = returnType;
 	wrappedFn.type = returnType;
+	wrappedFn.argumentsTypes = argumentsTypes;
 	return wrappedFn;
 }
-typef.is = function(func, returnType){
+typef.is = function(func, returnType, argumentsTypes){
 	return typeis(func.returnType.defaultValue, returnType);
 }
 
+const typeAre = (values, types) => {
+	const verified = values.map((t, i) => Array.isArray(types[i]) ? (types[i].map((t2) => typeis(t, t2)).includes(true)) : typeis(t, types[i]));
+	const hasWrong = verified.indexOf(false);
+	return hasWrong > -1 ? hasWrong : false;
+}
+
 function typeis(obj, typeDef, missingObjects = false) {
+
+	if(obj == null && typeDef === null) return true;
+	else if(obj == null) return false;
+	if(obj == undefined && typeDef === undefined) return true;
+	else if(obj == undefined) return false;
+
+	if(typeDef == null && obj === null) return true;
+	else if(typeDef == null) return false;
+
+	if(typeDef == undefined && obj === undefined) return true;
+	else if(typeDef == undefined) return false;
+
 	// Resolve Type
 	if (typeof typeDef == 'function' && typeDef.type instanceof Type) typeDef = typeDef.type;
 
@@ -123,6 +152,7 @@ function typeis(obj, typeDef, missingObjects = false) {
 
 	return missingObjects ? [true] : true;
 }
+typeis.multi = (values, types) => typeAre(values, types);
 
 function typex(child, parent) {
 	return child.prototype instanceof parent || child === parent;

package/lib/rew/modules/context.js

@@ -81,7 +81,7 @@ module.exports.prepareContext = function (
           this['@cb'] = cb;
         }
       });
-    }, out: {...process.stdout, put: (...logs) => context.print(...logs), strace: (...logs) => straceLog('==> STRACE_OUT():', ...logs  ), write: (logs) => context.printf(logs+'\n') }, in: {...process.stdin, read: (...args) => context.input(...args)}, define: (name, object) => {
+    }, out: {...process.stdout, cols: process.stdout.columns, rows: process.stdout.rows, put: (...logs) => context.print(...logs), strace: (...logs) => straceLog('==> STRACE_OUT():', ...logs  ), write: (logs) => context.printf(logs+'\n') }, in: {...process.stdin, read: (...args) => context.input(...args)}, define: (name, object) => {
       if(Array.isArray(name) && name.length == 2 && typeof name[0] == 'string'){
         object = name[1];
         name = name[0];

package/lib/rew/pkgs/conf.js

@@ -62,6 +62,9 @@ module.exports = (context) => ({
 				},
 				fileRoot,
 				exists,
+				create(ifExists){
+					return this.write('');
+				}
 			};
 		};
 

package/lib/rew/pkgs/modules/threads/worker.js

@@ -38,7 +38,7 @@ parentPort.on('message', (data) => {
 						},
 					},
 					context: workerData.context,
-				});
+				}, '', 'thread');
 			} catch (e) {
 				parentPort.postMessage({ type: 'error', error: e.message });
 			}

package/lib/rew/pkgs/threads.js

@@ -33,7 +33,7 @@ module.exports = (context) => ({
 						dataResult.resolve(data.result);
 						stop();
 					} else if (data.type === 'error') {
-						reject(new Error(data.error));
+						listener.emit('error', new Error(data.error));
 						stop();
 					} else if (data.type === 'event') {
 						listener.emit(data.event, data.data);
@@ -41,7 +41,7 @@ module.exports = (context) => ({
 				});
 
 				worker.on('error', (error) => {
-					console.log(error);
+					listener.emit('error', error);
 					stop();
 				});
 
@@ -51,7 +51,7 @@ module.exports = (context) => ({
 					if (exiting) return;
 					stop();
 					if (code !== 0) {
-						throw new Error(`Worker stopped with exit code ${code}`);
+						listener.emit('error', new Error(`Worker stopped with exit code ${code}`));
 					}
 				});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {
@@ -23,7 +23,9 @@
     "url": "git+https://github.com/kevinj045/rew.git"
   },
   "keywords": [
-    "coffescript",
+    "coffeescript",
+    "coffee",
+    "compiler",
     "rew",
     "runtime"
   ],