@makano/rew 1.2.58 → 1.2.61

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');
@@ -18,6 +18,7 @@ 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 });
@@ -62,9 +63,36 @@ yargs(hideBin(process.argv))
 				log('File not found:'.red.bold, argv.file, ':end');
 				return;
 			}
-			utils.runFileWithArgv(filePath, { onlyCompile: argv.compile, 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]',
 		'Configuration management',
@@ -363,4 +391,4 @@ yargs(hideBin(process.argv))
 			utils.build(argv);
 		},
 	)
-	.help(!isFileGiven).argv;
+	.help(!isFileGiven).argv;

package/lib/rew/cli/utils.js

@@ -36,7 +36,7 @@ module.exports = {
 
 		const runIt = () => {
 			if (options.watch) console.clear();
-			const imports = execRewFile(filePath, [filePath, ...(argv || [])], { onlyCompile: options?.onlyCompile });
+			const imports = execRewFile(filePath, [filePath, ...(argv || [])], { onlyCompile: options?.onlyCompile, async: options?.async });
 			if (options.watch) {
 				imports.forEach((file) => {
 					watchIt(file);
@@ -48,7 +48,7 @@ module.exports = {
 		runIt();
 	},
 	runFileWithArgv(filePath, options = {}, cargv) {
-		const argv = cargv || process.argv;
+		let argv = cargv || process.argv;
 		argv.shift();
 		if (argv[0].endsWith(REW_FILE_TYPE.EXTENSION) || argv[0].endsWith('.coffee')) {
 			if (argv[1] == 'run') {
@@ -57,6 +57,12 @@ module.exports = {
 				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) {
@@ -190,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 });
 			}
 		};
 
@@ -542,5 +548,19 @@ module.exports = {
 		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/pkgs/web.js

@@ -304,6 +304,14 @@ class Page extends Node {
           el.style.setProperty(i, value[i]);
         }
         return;
+      } else if(key.startsWith('on')){
+        if(!el.listeners) el.listeners = [];
+        if(el.listeners.includes(value)) return;
+        el.listeners.push(value);
+        el.addEventListener(key.replace('on', '').toLowerCase(), (event) => {
+          new Function('event', value).call(event.target, event);
+        });
+        return;
       }
       el.setAttribute(key, defVal);
     }
@@ -443,9 +451,9 @@ module.exports = (context, importOptions) => {
     state(value) {
       return new State(value);
     }
-    useState(states, callback){
-      const statesMapped = states.map(i => `getState('${i.id}')`);
-      return `((${callback})(...[${statesMapped}]))`;
+    invokeState(states, callback){
+      const statesMapped = states.map(i => i instanceof State ? `getState('${i.id}')` : JSON.stringify(i));
+      return `((${callback})(event, ...[${statesMapped}]))`;
     }
     async bundle(filepath, options = {}) {
       const virtualModuleId = `virtual:${filepath}`;

package/package.json

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

package/runtime.d.ts

@@ -492,7 +492,7 @@ declare class ModuleWeb {
 
   state(value): ModuleWebState | any;
   // @ts-ignore
-  useState(states: State[], callback: CallableFunction): any;
+  invokeState(states: State[], callback: CallableFunction): any;
 
   bundle(filePath: string, options?: Record<string, any>): string;
 }