@makano/rew 1.2.92 → 1.2.94

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/functions/types.js

@@ -66,20 +66,20 @@ typef.is = function(func, returnType){
 	return typeis(func.returnType.defaultValue, returnType);
 }
 
-function typeis(obj, typeDef) {
+function typeis(obj, typeDef, missingObjects = false) {
 	// Resolve Type
 	if (typeof typeDef == 'function' && typeDef.type instanceof Type) typeDef = typeDef.type;
 
 	if (typeDef.isConstucted && typeDef.class && !(obj instanceof typeDef.class)) {
-		return false;
+		return missingObjects ? [false] : false;
 	}
 
 	if (getType(obj) == 'object' && typeDef.type == 'function') {
-		return obj instanceof typeDef.class;
+		return missingObjects ? [obj instanceof typeDef.class] : obj instanceof typeDef.class;
 	}
 
 	if (getType(obj) !== typeDef.type) {
-		return false;
+		return missingObjects ? [false] : false;
 	}
 
 	if (!typeDef.isEmpty) {
@@ -91,14 +91,28 @@ function typeis(obj, typeDef) {
 
 				if (typeof propTypeDef === 'object') {
 					if (!typeis(obj[key], propTypeDef)) {
-						return false;
+						return missingObjects ? [false, {
+							[key]: {
+								type_mismatch: propTypeDef,
+								given: obj[gen_key]
+							}
+						}] : false;
 					}
-				} else if (typeof obj[key] !== propTypeDef) {
-					return false;
+				} else if (typeof obj[key] !== typeof propTypeDef) {
+					return missingObjects ? [false, {
+						[key]: obj[key] ? {
+							type_mismatch: typeof propTypeDef,
+							given: typeof obj[key]
+						} : {
+							not_found: true
+						}
+					}] : false;
 				}
 			}
 			if (typeDef.strict) {
-				if (Object.keys(obj).some((key) => !Object.keys(typeDef.defaultValue).includes(key))) return false;
+				if (Object.keys(obj).some((key) => !Object.keys(typeDef.defaultValue).includes(key))) return missingObjects ?
+					[false, Object.fromEntries(Object.keys(obj).filter((key) => !Object.keys(typeDef.defaultValue).includes(key)).map((key) => [key, { is_extra: true }]))]
+				: false;
 			}
 		} else if (typeDef.type == 'string') {
 			return typeDef.defaultValue == obj;
@@ -107,7 +121,7 @@ function typeis(obj, typeDef) {
 		}
 	}
 
-	return true;
+	return missingObjects ? [true] : true;
 }
 
 function typex(child, parent) {

package/lib/rew/modules/compiler.js

@@ -181,7 +181,7 @@ function declareAlias(aliases, token) {
 					let nextToken = gnextToken(index, offset+1, tokens);
 					const args = nextToken.token.value;
 					setIndex(ti + offset);
-					return `${nextToken2.value} = ${token.value} ${args && args !== '(' && args !== '-' && args !== '=' ? `${args},` : ''} ${params.trim()}, ${args == '(' || args == '=' || args == '-' ? args : ''}`.replace(/,(| )$/, '');
+					return `${nextToken2.value} = ${token.value} ${args && args !== '(' && args !== '{' && args !== '[' && args !== '-' && args !== '=' ? `${args},` : ''} ${params.trim() ? params.trim() + ', ' : ''}${args == '(' || args == '[' || args == '{' || args == '=' || args == '-' ? args : ''}`.replace(/,(| )$/, '');
 				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
 					nextToken.value = '';
 					if(isDecOnly){
@@ -330,6 +330,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);
@@ -582,6 +595,8 @@ const compileCivetStuff = (file, options) => {
 	straceLog('OPTION_PREPARE() for CURRENTFILE as', preCompileOptions);
 	const prepared = compileRewStuff(file.content, preCompileOptions);
 
+	// console.log(prepared);
+
 	const compileOptions = {
 		...preCompileOptions,
 		bare: true,

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

@@ -46,11 +46,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.92",
+  "version": "1.2.94",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {