@makano/rew 1.2.44 → 1.2.47

package/lib/rew/cli/cli.js

@@ -48,6 +48,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,7 +61,7 @@ yargs(hideBin(process.argv))
 				log('File not found:'.red.bold, argv.file, ':end');
 				return;
 			}
-			utils.runFileWithArgv(filePath, { watch: argv.watch });
+			utils.runFileWithArgv(filePath, { onlyCompile: argv.compile, watch: argv.watch });
 		},
 	)
 	.command(

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

@@ -35,7 +35,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 });
 			if (options.watch) {
 				imports.forEach((file) => {
 					watchIt(file);
@@ -64,15 +64,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 {
@@ -80,14 +84,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');
 					}
@@ -95,7 +103,7 @@ module.exports = {
 					o.remove(key);
 				}
 			} else {
-				log(!name ? 'Path not specified' : 'Key not specified', ':end');
+				log('Key not specified', ':end');
 			}
 		}
 	},
@@ -222,7 +230,6 @@ module.exports = {
 					}
 					execSync(`cp -r ${apppath} ${installPath}`);
 					execSync(`chmod 444 ${installPath}/app.yaml`);
-					log(' Installed '.green + pname.cyan.bold, ':end');
 					if (c.install) {
 						if (c.install.commands) {
 							for (let command of c.install.commands) {
@@ -231,7 +238,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}`);
 								}
 							}
 						}
@@ -243,18 +250,25 @@ module.exports = {
 						}
 						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 {

package/lib/rew/modules/compiler.js

@@ -145,6 +145,15 @@ function compileRewStuff(content, options) {
       continue;
 		}
 
+
+		if (token.type === 'IDENTIFIER' && token.value === 'let') {
+			result += '`'
+			hooks.push({
+				index: fnextToken(i, tokens, 'OTHER', ';').ti,
+				value: `\``,
+			});
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'import') {
 			// console.log(nextToken.type);
 			let ind = i + n + 2;
@@ -254,13 +263,20 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 
 module.exports.compileFile = function (filepath, options = {}) {
 	const f = getFile(filepath);
+	let qrew = false;
 
 	if(options.qrew || path.extname(filepath) == '.qrew') {
+		qrew = true
 		f.content = from_qrew(readFileSync(f.path), options.package || findAppInfo(filepath)?.config.manifest.package || path.basename(filepath).split('.').slice(0, -1).join('.')).toString();
-	}
+	} 
 
 	let compiled_code =  cpl(f, { ...options });
 
+	if(options.onlyCompile && !qrew){
+		console.log(compiled_code);
+		process.exit();
+	}
+
 	return {
 		compiled_code,
 		file: f,

package/lib/rew/pkgs/conf.js

@@ -82,7 +82,7 @@ module.exports = (context) => ({
 			};
 
 			return {
-				get: (key, defaultValue) => getData(optionCenter, key) || defaultValue,
+				get: (key, defaultValue) => getData(optionCenter, key) ?? defaultValue,
 				set: (key, value) => setData(optionCenter, key, value),
 				remove: (key) => removeData(optionCenter, key),
 				reset: () => fs.writeFileSync(optionCenter.root, dumpYaml(defaults)) && (conf[name] = defaults),

package/package.json

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