@makano/rew 1.2.93 → 1.2.95

package/lib/rew/functions/reval.js

@@ -0,0 +1,16 @@
+const { compile } = require("../modules/compiler")
+
+const _compilePart = (code, filepath) => compile(
+  {
+    path: filepath,
+    content: code
+  },
+  {}
+);
+
+module.exports = (filepath) => ({
+  _compilePart: (code) => {
+    return _compilePart(code, filepath);
+  },
+  _call: (fn, ...args) => args.length ? fn.call(...args) : fn()
+})

package/lib/rew/modules/compiler.js

@@ -115,6 +115,13 @@ const ValueIfy = (val) => {
   }
 }
 
+function insertTokenAt(array, index, value) {
+	if (index < 0 || index > array.length) {
+			throw new RangeError('Index out of bounds');
+	}
+	array.splice(index, 0, value);
+}
+
 const gnextToken = (i, n, tokens) => {
 	return tokens[i + n] ? (tokens[i + n].type == 'WHITESPACE' ? gnextToken(i, n + 1, tokens) : { token: tokens[i + n], n, ti: i + n }) : null;
 };
@@ -330,6 +337,19 @@ function compileRewStuff(content, options) {
 			}
     }
 
+		if (token.type === "COMMENT" && token.value.startsWith('#alias')) {
+			let value = '#declare';
+			if(token.value.match(/^#alias\*/)) value += '*';
+			let subs;
+			subs = token.value.replace(/^#alias/, '');
+			if(token.value.endsWith('*')) subs.split('*')[1];
+			
+			value += ' key';
+			value += ' ' + subs.replace(/([\S]+)\s*=\s*([\S]+)/, '"$1" = $2').trim();
+			value += ';';
+			declareAlias(aliases, {...token, value});
+    }
+
 		if (token.type === "COMMENT" && token.value.startsWith('#declare')) {
       if (token.value.includes(';')) {
         declareAlias(aliases, token);
@@ -396,6 +416,19 @@ function compileRewStuff(content, options) {
 			} else straceLog('==> UNKNOWN');
 		}
 
+		if (token.type === 'IDENTIFIER' && token.value === 'as' && !options.keepImports) {
+			const isFrom = gnextToken(i, 3, tokens);
+			const isInImport = tokens[i-2];
+			if(isFrom?.token.value == 'from' && isInImport?.value !== '*'){
+				insertTokenAt(tokens, i, { type: 'WHITESPACE', value: ' ' });
+				insertTokenAt(tokens, i, { type: 'OTHER', value: '*' });
+				insertTokenAt(tokens, i, { type: 'WHITESPACE', value: ' ' });
+				insertTokenAt(tokens, i, { type: 'IDENTIFIER', value: 'import' });
+				i -= 1;
+				continue;
+			}
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
 			straceLog('IMPORT()');
@@ -428,8 +461,8 @@ function compileRewStuff(content, options) {
 				}
 			} else if (nextToken.value === '*') {
 				const asToken = fnextToken(ind, tokens, 'IDENTIFIER', 'as');
-				const nameToken = fnextToken(asToken.ri, tokens, 'STRING');
 				if (asToken) {
+					const nameToken = fnextToken(asToken.ti, tokens, 'STRING');
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
 					straceLog('==>', defaultName, 'from', nameToken.value);

package/lib/rew/modules/context.js

@@ -12,6 +12,7 @@ const { USING_DEFAULT, Usage, Namespace } = require("../const/usage");
 const runtime = require("./runtime");
 const { permission } = require("process");
 const { straceLog } = require("../misc/strace");
+const reval = require("../functions/reval");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -37,6 +38,7 @@ module.exports.prepareContext = function (
     },
     app: findAppInfo(filepath),
     ...fsLib(filepath),
+    ...reval(filepath),
     __using__: {}
   };
   if (options.useContext) {

package/lib/rew/modules/runtime.js

@@ -36,7 +36,8 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 	
 		if(context.app){
 			const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
-			if(existsSync(p) && context.app.path !== p){
+			const p2 = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app/.allow');
+			if(existsSync(p) && context.app.path !== p && !existsSync(p2)){
 				console.log("App with the same package name has been installed. Conflicts happened. \nTo fix this, change your app's package name or remove the app making the conflict.");
 				return {
 					context: { module: { exports: null } },
@@ -46,11 +47,21 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 		}
 	
 		compiled_code = preScript+'\n'+compiled_code;
-	
-		return {
-			context,
-			returns: exec(compiled_code, context, file.content),
-		};
+
+		let execd = exec(compiled_code, context, file.content);
+
+		if(context.module.main && (context.module.exports?.main || (typeof context.module.exports == "function" && context.module.exports.name == 'main'))){
+			const mainFn = context.module.exports.main ?? context.module.exports;
+			return {
+				context,
+				returns: mainFn(context.process.argv)
+			}
+		} else {
+			return {
+				context,
+				returns: execd,
+			};
+		}
 	}
 
 	if(options.async){

package/package.json

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