@makano/rew 1.2.69 → 1.2.71

package/lib/civet/main.js

@@ -438,11 +438,11 @@ ${input.slice(result.pos)}
             hint = JSON.stringify(hint);
           else
             hint = "EOF";
-          const error = new ParseError2("Failed to parse", `Expected:
-	${expectations.join("\n	")}
-Found: ${hint}
-`, filename2, line, column, maxFailPos);
-          throw error;
+//           const error = new ParseError2("Failed to parse", `Expected:
+// 	${expectations.join("\n	")}
+// Found: ${hint}
+// `, filename2, line, column, maxFailPos);
+          throw new SyntaxError(`Unexpected Token at ${filename2}:${line}:${column}.\nFound: ${hint}\nExpected: ${expectations.join("\n	")}`);
         }
         if (result) {
           throw new Error(`

package/lib/rew/cli/cli.js

@@ -1,31 +1,21 @@
 #!/usr/bin/env node
 
+const colors = require('colors');
 const yargs = require('yargs/yargs');
 const path = require('path');
 const { hideBin } = require('yargs/helpers');
-const { execSync } = require('child_process');
-const utils = require('./utils');
-const { existsSync, readFileSync, writeFileSync, mkdirSync, statSync, unlinkSync } = require('fs');
+const { existsSync, readFileSync, writeFileSync, statSync, unlinkSync } = require('fs');
 const { log } = require('./log');
-const os = require('os');
-const crypto = require('crypto');
-const { CONFIG_PATH } = require('../const/config_path');
 const rune = require('../pkgs/rune');
 const { to_qrew, from_qrew } = require('../qrew/compile');
 const { findAppInfo } = require('../misc/findAppInfo');
-const { print, input } = require('../functions/stdout');
-const colors = require('colors');
+const { input } = require('../functions/stdout');
 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 });
-	utils.initFirst();
-}
-
-const npm_package_name = '@makano/rew';
+const { runFileWithArgv } = require('./run');
+const { npm_package_name, getAllPipeInput } = require('./helpers');
 
 function isFileArgument(file) {
 	try {
@@ -36,6 +26,7 @@ function isFileArgument(file) {
 }
 
 const isFileGiven = isFileArgument(hideBin(process.argv)[0]) || hideBin(process.argv)[0] == 'run';
+try{
 yargs(hideBin(process.argv))
 	.command(
 		'$0 <file>',
@@ -63,7 +54,7 @@ yargs(hideBin(process.argv))
 				log('File not found:'.red.bold, argv.file, ':end');
 				return;
 			}
-			utils.runFileWithArgv(filePath, { async: !process.stdin.isTTY, onlyCompile: argv.compile, watch: argv.watch });
+			runFileWithArgv(filePath, { async: !process.stdin.isTTY, onlyCompile: argv.compile, watch: argv.watch });
 		},
 	)
 	.command(
@@ -81,11 +72,11 @@ yargs(hideBin(process.argv))
 			const replFile = '/tmp/rew-'+generateRandomID()+'-'+Date.now()+'.coffee';
 			let code = argv.code;
 			if(!process.stdin.isTTY) {
-				code = await utils.getAllPipeInput();
+				code = await getAllPipeInput();
 			}
 			writeFileSync(replFile, code);
 			try{
-				utils.runFileWithArgv(replFile, { async: !process.stdin.isTTY, onlyCompile: argv.compile });
+				runFileWithArgv(replFile, { async: !process.stdin.isTTY, onlyCompile: argv.compile });
 			} catch(e){
 				console.error(e);
 			} finally {
@@ -121,7 +112,7 @@ yargs(hideBin(process.argv))
 		},
 		(argv) => {
 			const { command, path, key, value } = argv;
-			const result = utils.conf(command, path, key, value);
+			const result = require('./utils').conf(command, path, key, value);
 			if (result) console.log(result);
 		},
 	)
@@ -135,7 +126,7 @@ yargs(hideBin(process.argv))
 			});
 		},
 		(argv) => {
-			utils.createProject(argv.path);
+			require('./utils').createProject(argv.path);
 		},
 	)
 	.command(
@@ -176,7 +167,7 @@ yargs(hideBin(process.argv))
 				});
 		},
 		(argv) => {
-			utils.runApp(argv.path, argv);
+			require('./utils').runApp(argv.path, argv);
 		},
 	)
 	.command(
@@ -272,8 +263,8 @@ yargs(hideBin(process.argv))
 			});
 		},
 		async (argv) => {
-			if (argv.requirements) utils.installReq(argv.path, argv);
-			else utils.installAppFrom(argv.path, argv);
+			if (argv.requirements) require('./utils').installReq(argv.path, argv);
+			else require('./utils').installAppFrom(argv.path, argv);
 		},
 	)
 	.command(
@@ -290,7 +281,7 @@ yargs(hideBin(process.argv))
 			});
 		},
 		async (argv) => {
-			utils.uninstall(argv.package, argv.all);
+			require('./utils').uninstall(argv.package, argv.all);
 		},
 	)
 	.command(
@@ -329,7 +320,7 @@ yargs(hideBin(process.argv))
 			});
 		},
 		async (argv) => {
-			utils.cache(argv.command)
+			require('./utils').cache(argv.command)
 		},
 	)
 	.command(
@@ -354,7 +345,7 @@ yargs(hideBin(process.argv))
 			});
 		},
 		async (argv) => {
-			utils.repo(argv.command, argv.name, argv.url, argv);
+			require('./utils').repo(argv.command, argv.name, argv.url, argv);
 		},
 	)
 	.command(
@@ -388,7 +379,11 @@ yargs(hideBin(process.argv))
 				});
 		},
 		(argv) => {
-			utils.build(argv);
+			require('./utils').build(argv);
 		},
 	)
-	.help(!isFileGiven).argv;
+	.help(!isFileGiven).argv;
+} catch(e) {
+	console.error(e);
+	process.exit(1);
+}

package/lib/rew/cli/helpers.js

@@ -0,0 +1,44 @@
+const { CONFIG_PATH } = require("../const/config_path");
+const path = require('path');
+const fs = require('fs');
+const conf = require("../pkgs/conf");
+
+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');
+
+if (!fs.existsSync(CONFIG_PATH) || !fs.existsSync(CONFIG_PATH + '/repos.yaml')) {
+	fs.mkdirSync(CONFIG_PATH, { recursive: true });
+	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 });
+}
+
+const npm_package_name = '@makano/rew';
+
+function getAllPipeInput(){
+  return new Promise((resolve) => {
+    let data = '';
+    process.stdin.setEncoding('utf8');
+    
+    process.stdin.on('data', (chunk) => {
+      data += chunk;
+    });
+    
+    process.stdin.on('end', () => {
+      resolve(data);
+    });
+  });
+}
+
+module.exports = {
+  binpath,
+  logspath,
+  cachepath,
+  localBinPath,
+  npm_package_name,
+  getAllPipeInput
+}

package/lib/rew/cli/run.js

@@ -1,8 +1,51 @@
 // run.js
+const { REW_FILE_TYPE } = require('../const/ext');
 const { run } = require('../main');
+const { watch } = require('chokidar');
 
 function exec(filePath, argv, options = {}) {
 	return run(filePath, { argv, ...options })?.context?.module?.imports || [];
 }
 
-module.exports = { execRewFile: exec };
+function 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 = exec(filePath, [filePath, ...(argv || [])], { onlyCompile: options?.onlyCompile, async: options?.async });
+		if (options.watch) {
+			imports.forEach((file) => {
+				watchIt(file);
+			});
+			watchIt(filePath);
+		}
+	};
+
+	runIt();
+}
+
+function runFileWithArgv(filePath, options = {}, cargv) {
+	let argv = cargv || process.argv;
+	argv.shift();
+	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);
+	}
+	runFile(filePath, options, argv);
+}
+
+module.exports = { runFileWithArgv, runFile, execRewFile: exec };

package/lib/rew/cli/utils.js

@@ -13,58 +13,21 @@ 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 { execRewFile, runFileWithArgv } = 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');
+const {
+  binpath,
+  logspath,
+  cachepath,
+  localBinPath
+} = require('./helpers');
 
 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 || [])], { onlyCompile: options?.onlyCompile, async: options?.async });
-			if (options.watch) {
-				imports.forEach((file) => {
-					watchIt(file);
-				});
-				watchIt(filePath);
-			}
-		};
-
-		runIt();
-	},
-	runFileWithArgv(filePath, options = {}, cargv) {
-		let argv = cargv || process.argv;
-		argv.shift();
-		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) {
 		const con = conf({});
 		if (command == 'get') {
@@ -196,7 +159,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, { async: !process.stdin.isTTY });
+				runFileWithArgv(r, { async: !process.stdin.isTTY });
 			}
 		};
 
@@ -208,6 +171,9 @@ module.exports = {
 			const appConfpath = path.join(apppath, 'app.yaml');
 			if (fs.existsSync(apppath) && fs.existsSync(appConfpath)) {
 				runAppRoot(apppath, appConfpath);
+			} else {
+				log('App does not exist'.red.bold, ':end');
+				process.exit(1);
 			}
 		}
 	},
@@ -267,7 +233,7 @@ module.exports = {
 							this.installReq(c, opts);
 						}
 						if (c.install.file) {
-							this.runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, [installPath]);
+							runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, [installPath]);
 						}
 						if (c.install.exec) {
 							// this.installReq(c);
@@ -281,7 +247,7 @@ module.exports = {
 									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.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);
@@ -561,26 +527,5 @@ module.exports = {
 		} else {
 			log(' Invalid command'.red.bold, ':end');
 		}
-	},
-	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(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/functions/wait.js

@@ -5,7 +5,9 @@ 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));
+    fn(...args)
+      .then(d => cb(null, d))
+      .catch(d => cb(d));
   });
   return df();
 }

package/lib/rew/modules/compiler.js

@@ -293,14 +293,13 @@ const compileCivetStuff = (file, options) => {
 	const compileOptions = {
 		...options,
 		bare: true,
-		filename: file.content,
+		filename: file.path,
 		inlineMap: false,
 		js: true
 	};
 
 	const prepared = compileRewStuff(file.content, options);
-
-	const compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
+	let compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
 
 	return {
 		compiled,

package/lib/rew/modules/context.js

@@ -9,6 +9,7 @@ const path = require("path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
 const { USING_DEFAULT, Usage, Namespace } = require("../const/usage");
+const runtime = require("./runtime");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -114,9 +115,8 @@ module.exports.prepareContext = function (
       const childContext = {...context, ...name.namespace, trigger};
       childContext.currentNamespace = name.namespace;
       childContext.parentNamespace = context;
-      with(childContext){
-        eval(`(${trigger.toString()})()`);
-      }
+      const code = `(${trigger.toString()})()`;
+      runtime.exec(code, childContext, code, context.module.filepath);
     } else if(name instanceof Usage) {
       const v = name.trigger(...params) || true;
       if(name.save !== false) context.__using__[name.name] = v;

package/lib/rew/modules/runtime.js

@@ -7,9 +7,9 @@ const path = require('path');
 
 const preScript = readFileSync(path.join(__dirname, '../const/pre-exec.js'), { encoding: 'utf-8' });
 
-const exec = (module.exports.exec = function (code, context, original = '') {
+const exec = (module.exports.exec = function (code, context, original = '', filepath) {
 	return vm.runInNewContext(code, context.do ? null : vm.createContext(context), {
-		filename: context.module.filepath,
+		filename: filepath || context.module.filepath,
 		lineOffset: (original.split('\n').length + preScript.split('\n').length) - code.split('\n').length,
 		displayErrors: true,
 	});

package/package.json

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