@makano/rew 1.5.3 → 1.5.5

package/lib/rew/functions/import.js

@@ -20,7 +20,7 @@ module.exports.cleanCache = () => {
 	while(cachedFiles.length) cachedFiles.pop();
 };
 const lookUpInOtherApps = (fullPath) => {
-	straceLog('===> WARN: LOOKUP SLOWS PROCESS');
+	straceLog('===> WARN: Lookup slows process');
 	const con = conf({});
 	const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
 	let dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
@@ -51,10 +51,10 @@ module.exports.imp = function (runPath, context) {
 		let exports,
 			ispkg = findPackage(filename);
 
-		straceLog('IMPORT for', filename, 'as', type);
+		straceLog('import file', '"' + filename + '"', 'as type', type);
 
 		if (filename.startsWith('@') && context.app) {
-			straceLog('===> FROM APP ROOT');
+			straceLog('===> from app root');
 			filename = filename.replace('@', context.app.path);
 		}
 
@@ -62,7 +62,7 @@ module.exports.imp = function (runPath, context) {
 		if(path.extname(filepath) == '.qrew') options.qrew = true;
 
 		const lookUp = () => {
-			straceLog('===> LOOKUP()');
+			straceLog('===> lookUp()');
 			const otherPath = lookUpInOtherApps(filename);
 			if (!otherPath) throw new Error('Module "' + filename + '" not found');
 			else filepath = otherPath;
@@ -80,7 +80,7 @@ module.exports.imp = function (runPath, context) {
 					typeof ext == 'string' ? existsSync(filepath + ext) : existsSync(filepath + (ext.ext || '')),
 				);
 				if (resolve) {
-					straceLog('===> RESOLVE()');
+					straceLog('===> resolve()');
 					filepath += typeof resolve == 'string' ? resolve : resolve.ext;
 					if (typeof resolve == 'object' && resolve.options) {
 						if (resolve.options.type) type = resolve.options.type;
@@ -91,7 +91,7 @@ module.exports.imp = function (runPath, context) {
 		}
 
 		const exec = (coptions = {}) => {
-			straceLog('===> EXECUTE() IMPORTFILE');
+			straceLog('===> execute(importFile)');
 			const r = runPath(
 				filepath,
 				{
@@ -113,7 +113,7 @@ module.exports.imp = function (runPath, context) {
 		}
 
 		if (ispkg) {
-			straceLog('===> FIND_PACKAGE()');
+			straceLog('===> findPackage()');
 			const pkg = getPackage(filename)(context, options);
 			exports = pkg._onImport ? pkg._onImport() : pkg;
 			if(options.useDefaultForPackages) exports = { default: exports };
@@ -124,10 +124,10 @@ module.exports.imp = function (runPath, context) {
 		} else if (type == 'js') {
 			exports = exec({ compile: false });
 		} else if (type == 'yaml' || type == 'json' || type == 'text') {
-			straceLog('===> GET_RAW_FILE()');
+			straceLog('===> getRawFile()');
 			const f = getFile(filepath);
 			if (type == 'yaml') {
-				straceLog('===> FROM_YAML()');
+				straceLog('===> fromYaml()');
 				exports = _returns(options, importYaml(f.path, f));
 			} else if (type == 'json') {
 				straceLog('===>');
@@ -137,7 +137,7 @@ module.exports.imp = function (runPath, context) {
 					exports = _returns(options, {});
 				}
 			} else {
-				straceLog('===> FROM_TEXT');
+				straceLog('===> fromText()');
 				exports = _returns(options, f.content);
 			}
 		}

package/lib/rew/misc/findAppInfo.js

@@ -6,11 +6,11 @@ const { straceLog } = require('./strace');
 
 module.exports.findAppInfo = function (filepath) {
 	const appPath = findAppPath(path.dirname(filepath));
-	straceLog('FINDAPPINFO() for', filepath);
+	straceLog('findAppInfo() for', filepath);
 	if (appPath) {
 		const config = jsYaml.load(readFileSync(path.join(appPath, 'app.yaml')));
-		straceLog('==> FOUND CONFIG AT', appPath);
-		straceLog('==> APP PACKAGE', config?.manifest?.package);
+		straceLog('==> INFO Found config at:', '"' + appPath + '"');
+		straceLog('==> INFO App Package:', '"' + config?.manifest?.package + '"');
 		return {
 			path: appPath,
 			config,

package/lib/rew/misc/findAppPath.js

@@ -3,23 +3,19 @@ const fs = require('fs'); // Import the 'path' module
 const { straceLog } = require('./strace');
 
 module.exports.findAppPath = (currentDir = __dirname) => {
-	// Check if app.yaml exists in the current directory
-	straceLog('FINDAPP() for', currentDir);
+	straceLog('findApp() for', '"' + currentDir + '"');
 	const appYamlPath = path.join(currentDir, 'app.yaml');
 	if (fs.existsSync(appYamlPath)) {
 
-		straceLog('==> FOUND PATH', appYamlPath);
+		straceLog('==> INFO found path', `"${appYamlPath}"`);
 		return currentDir;
 	}
 
-	// If not found, move up a directory level
 	const parentDir = path.dirname(currentDir);
 
-	// Check if we reached the root directory
 	if (parentDir === currentDir) {
-		return null; // Not found
+		return null;
 	}
 
-	// Recursively call the function on the parent directory
 	return module.exports.findAppPath(parentDir);
 };

package/lib/rew/misc/strace.js

@@ -1,5 +1,5 @@
 module.exports.straceLog = function(...logs){
   if(process.straceMode){
-		console.log(`[${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()} ${new Date().getDate()}/${new Date().getMonth()}/${new Date().getFullYear()}] [${process.pid}]`, ...logs);
+		console.log(`[${new Date().toLocaleTimeString()} ${new Date().getDate()}/${new Date().getMonth()}/${new Date().getFullYear()}] [${process.pid}]`, ...logs.map(i => i.replace(/^([=>]+)/, '\x1b[34m$1\x1b[39m').replace(/WARN:/g, '\x1b[30m\x1b[43m WARN \x1b[39m\x1b[49m').replace(/INFO/g, '\x1b[30m\x1b[44m INFO \x1b[39m\x1b[49m').replace(/^"(.+)"$/, '\x1b[32m$1\x1b[39m').replace(/!([A-Z-+]+)/, (_, a) => `\x1b[30m\x1b[4${a.startsWith('-') ? '5' : a.startsWith('+') ? '6' : '2'}m ${a.replace(/^[-+]/, '')} \x1b[39m\x1b[49m`)));
 	}
 }

package/lib/rew/modules/compiler.js

@@ -137,15 +137,15 @@ const fnextToken = (i, tokens, type, value) => {
 function declareAlias(aliases, token) {
   const regex = /^#declare(\*)?\s+(\w+)\s+"([^"]+)"\s*=\s*([\s\S]*);$/;
   const match = token.value.trim().match(regex);
-	straceLog('DECLARECASE()');
-	straceLog('==> EXPERIMENTAL FEATURE DETECTED');
+	straceLog('declareCase()');
+	straceLog('==> WARN: Experimental feature detected');
 
   if (match) {
     const isPublic = !!match[1];
     const type = match[2] == "key" ? 'IDENTIFIER' : match[2];
     let name = match[3];
     let value = match[4].trim();
-		straceLog('==> DECLARE', name, 'as', value);
+		straceLog('==> INFO !DECLARE', name, 'as', value);
 
     let aliasValue = value.startsWith('${')
       ? new Function('token', 'tokens', 'code', 'hooks', 'index', 'setIndex', value.slice(2, -1))
@@ -210,7 +210,7 @@ function declareAlias(aliases, token) {
     aliases[type][name] = aliasValue;
 
 		if(isPublic){
-			straceLog('==>', 'DECLARATION GLOBALIZED');
+			straceLog('==>', 'INFO Declaration Globalized');
 			execOptions._syntaxAliases[type] = execOptions._syntaxAliases[type] || {};
 			execOptions._syntaxAliases[type][name] = aliasValue;
 		}
@@ -234,11 +234,11 @@ const stdTypes = (isPublic) => {
 	return r;
 };
 const includeFile = (includeContent, options) => {
-	straceLog('INCLUDE()', includeContent);
+	straceLog('include()', includeContent);
 	const dontInclude = includeContent.startsWith('*');
 	if(dontInclude) {
 		includeContent = includeContent.slice(1);
-		straceLog('==> IGNORING OUTPUT', includeContent);
+		straceLog('==> INFO ingoring output', includeContent);
 	};
 	const fp = path.resolve(path.dirname(options.filename || ''), includeContent);
 	let packageName = options.filename ? (existsSync(fp) ? fp : includeContent) : includeContent;
@@ -257,13 +257,13 @@ const includeFile = (includeContent, options) => {
 	if(packageName == 'std'){
 		r = _inc(stdTypes(dontInclude), true);
 	} else if (existsSync(packageName)) {
-		straceLog('==> INCLUDE FILE', packageName);
+		straceLog('==> includeFile(', '"'+packageName+'"', ')');
 		r = _inc(packageName);
 	} else {
 		const packageName = includeContent.match('/') ? includeContent.split('/')[0] : includeContent;
 		const headerFile = includeContent.match('/') ? includeContent.replace(packageName+'/', '') : 'main.h.coffee';
 		const pathname = path.join(CONFIG_PATH, packageName, 'app', headerFile);
-		straceLog('==> INCLUDE PACKAGE', packageName);
+		straceLog('==> includePackage(', '"'+packageName+'"');
 		if(existsSync(pathname)) r = _inc(pathname);
 	}
 	if(dontInclude){
@@ -277,12 +277,12 @@ function useImp(token, options){
 		token.value.startsWith('"#') ||
 		token.value.startsWith("'#")
 	)){
-		straceLog('==> IMP Uses HEADER');
+		straceLog('==> INFO imp() Uses HEADER');
 		const dem = token.value.slice(0, 1);
 		const value = token.value.slice(1, -1);
 		let packageName = value.slice(1);
 		token.value = dem+packageName+dem;
-		straceLog('IMP() with HEADER for', packageName);
+		straceLog('imp() with header for', `"${packageName}"`);
 		return includeFile(packageName !== 'std' ? packageName : '*'+packageName, options); 
 	}
 	return '';
@@ -344,7 +344,7 @@ function insertAt(array, index, ...values) {
 }
 
 function compileRewStuff(content, options) {
-	straceLog('TOKENIZE() for CURRENTFILE');
+	straceLog('tokeinze(currentFile)');
 	const tokens = tokenizeCoffeeScript(content);
 	let result = '';
   let multilineDeclareBuffer = [];
@@ -412,17 +412,17 @@ function compileRewStuff(content, options) {
 		
 		if (token.type === 'COMMENT' && token.value.slice(1).trim().startsWith('@jsx')) {
 			options.jsx = true;
-			straceLog('JSX() ENABLE WITH COMMENTS');
+			straceLog('jsx().with(comments)');
 			if(token.value.split('@jsx')[1].trim()){
 				options.jsxPragma = token.value.split('@jsx')[1].trim();
-				straceLog('JSX() PRAGMA WITH', options.jsxPragma);
+				straceLog('jsx().withPragma(', `"${options.jsxPragma}"`, ')');
 			}
 		}
 		
     if (token.type === 'COMMENT' && token.value.slice(1).trim() === '@cls') {
 			options.cls = true;
-			straceLog('CLI_SYNTAX() ENABLE');
-			straceLog('===> HIGHLY EXPERIMENTAL FEATURE DETECTED');
+			straceLog('cliSyntax::enable()');
+			straceLog('===> WARN: HIGHLY EXPERIMENTAL FEATURE DETECTED');
 		}
 
     if (options.cls && token.type === 'OTHER' && token.value === '-' && nextToken.value == '-' && tokens[i-1]?.type == 'WHITESPACE') {
@@ -442,12 +442,12 @@ function compileRewStuff(content, options) {
 
 		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && token.value === 'export' && !options.keepImports) {
 			token.value = 'pub';
-			straceLog('EXPORT() => TRANSLATING TO pub');
+			straceLog('INFO !TRANSLATE converting export to pub');
 		}
 		
 		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && token.value === 'package' && nextToken.type == 'STRING') {
 			token.value = 'appPackage';
-			straceLog('APP_PACKAGE_CHANGE()');
+			straceLog('changeAppPackage()');
 		}
 
 		if (
@@ -465,7 +465,7 @@ function compileRewStuff(content, options) {
 		}
 
 		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
-			straceLog('USING()');
+			straceLog('!+DIRECTIVE using()');
 			const next = nextToken?.value;
 			if(next in USING_DEFAULT) {
 				const { use } = USING_DEFAULT[next];
@@ -475,7 +475,7 @@ function compileRewStuff(content, options) {
 
 				const { token: nextNextToken } = gnextToken(i, 3, tokens) || {};
 				if(nextNextToken.value == "as") nextNextToken.value = ",";
-			} else straceLog('==> UNKNOWN');
+			} else straceLog('==> !-UNKNOWN');
 		}
 
 		if (token.type === 'IDENTIFIER' && token.value === 'as' && !options.keepImports) {
@@ -493,15 +493,15 @@ function compileRewStuff(content, options) {
 
 		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
-			straceLog('IMPORT()');
-			straceLog('==> WARN: SLOWS DOWN COMPILATION');
+			straceLog('import()');
+			straceLog('==> WARN: Slows compilation');
 			let ind = i + n + 2;
 			let isAs = false;
 			let usedDefault = false;
 
 			let defaultName;
 			if (nextToken.type === 'STRING') {
-				straceLog('==> SIMPLE');
+				straceLog('==> !SIMPLE');
 				if(useImp(nextToken, options)) updateAliases(aliases);
 				result += `inc ${nextToken.value}`;
 				i += n;
@@ -538,7 +538,7 @@ function compileRewStuff(content, options) {
 						.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 						.join(', ');
 					
-					straceLog('==>', exports, 'from', nameToken.value);
+					straceLog('==> !COMPLEX', exports, 'from', nameToken.value);
 
 					if(useImp(nameToken, options)) updateAliases(aliases);
 					result += `{ ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
@@ -550,7 +550,7 @@ function compileRewStuff(content, options) {
 					const nameToken = fnextToken(asToken.ti, tokens, 'STRING');
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
-					straceLog('==>', defaultName, 'from', nameToken.value);
+					straceLog('==> !COMPLEX', defaultName, 'from', nameToken.value);
 					if(useImp(nameToken, options)) updateAliases(aliases);
 					result += `${defaultName} ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = ind + 6;
@@ -570,7 +570,7 @@ function compileRewStuff(content, options) {
 							.flat(1)
 							.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 							.join(', ');
-						straceLog('==>', defaultName, 'and', exports, 'from', nameToken.value);
+						straceLog('==> !COMPLEX', defaultName, 'and', exports, 'from', nameToken.value);
 						if(useImp(nameToken, options)) updateAliases(aliases);
 						result += `{ default: ${defaultName}, ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 						i = closingBraceToken.ti + 4;
@@ -589,7 +589,7 @@ function compileRewStuff(content, options) {
 			if (nextLastToken?.value == 'assert') {
 				result += ', ';
 				const assertionToken = gnextToken(nextLastToken.ti, 2, tokens);
-				straceLog('==> ASSERT', assertionToken);
+				straceLog('==> !ASSERT', assertionToken);
 				if(assertionToken.token.type == 'OTHER' && assertionToken.token.value == '{'){
 					hooks.push({
 						index: assertionToken.token.ti,
@@ -607,7 +607,7 @@ function compileRewStuff(content, options) {
 		}
 
 		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && (token.value === 'imp' || token.value === 'inc')) {
-			straceLog('IMP() Detected');
+			straceLog('!+DIRECTIVE imp()');
 			let { token: t1 } = gnextToken(i, 1, tokens) || {};
 			let { token: t2 } = gnextToken(i, 2, tokens) || {};
 			let r = '';
@@ -634,7 +634,7 @@ function compileRewStuff(content, options) {
 			nextToken.value &&
 			nextToken.value !== 'undefined' && !options.keepImports
 		) {
-			straceLog('PUB() Detected');
+			straceLog('!+DIRECTIVE pub()');
 			let next = {...nextToken}, isClass = false;
 			if(next.value == 'default'){
 				i += 2;
@@ -643,7 +643,7 @@ function compileRewStuff(content, options) {
 				next.value = gnextToken(i, n + 1, tokens)?.token.value || "default";
 				isClass = true;
 			}
-			straceLog('==> PUBLIC', next.value);
+			straceLog('==> !PUBLIC', next.value);
 			hooks.push({
 				index: i + 1,
 				value: `"${next.value}", ${isClass ? `${next.value} = ` : ''}`,
@@ -653,13 +653,13 @@ function compileRewStuff(content, options) {
 		const aliasType = aliases[token.type];
 		// if(token.value == 'sidewest') console.log(aliases, token.value, token.type);
     if (aliasType && Object.keys(aliasType).includes(token.value)) {
-			straceLog('ALIAS()', token.type);
+			straceLog('!+DIRECTIVE alias()', token.type);
       const aliasValue = aliasType[token.value];
       if (typeof aliasValue === 'function') {
-				straceLog('==> EXECUTE ALIAS', token.value);
+				straceLog('==> INFO Execute alias:', token.value);
         result += aliasValue(token, tokens, result, hooks, i, (n) => i = n) || "";
       } else {
-				straceLog('==> LITERAL ALIAS', token.value);
+				straceLog('==> INFO Literal alias:', token.value);
         result += aliasValue;
       }
       continue;
@@ -697,12 +697,12 @@ function compileRewStuff(content, options) {
 }
 
 const compileCivetStuff = (file, options) => {
-	straceLog('COMPILE_CIVET() for CURRENTFILE');
+	straceLog('compileCivet(currentFile)');
 	const preCompileOptions = {
 		filename: file.path,
 		...options
 	};
-	straceLog('OPTION_PREPARE() for CURRENTFILE as', JSON.stringify(preCompileOptions));
+	straceLog('prepareOptions(currentFile).as(', `"${JSON.stringify(preCompileOptions)}"`, ')');
 	
 	if(options?.type == 'js' || file?.path?.endsWith('.js')){
 		return {
@@ -724,7 +724,7 @@ const compileCivetStuff = (file, options) => {
 	};
 
 	let compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
-	straceLog('==> CIVET COMPILE <>');
+	straceLog('==> !COMPILER civetCompile(fileContent)');
 
 	return {
 		compiled,
@@ -745,10 +745,10 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 	compiledCode = result.compiled;
 
 	const babelify = (code, options) => {
-		straceLog('BABEL()');
-		if(doJSX) straceLog('==> WITH JSX');
-		if(doTypes) straceLog('==> WITH TYPES');
-		if(doDecorators) straceLog('==> WITH DECORATORS');
+		straceLog('!COMPILER babel()');
+		if(doJSX) straceLog('==> INFO !-WITH JSX');
+		if(doTypes) straceLog('==> INFO !-WITH Types');
+		if(doDecorators) straceLog('==> INFO !-WITH DECORATORS');
 		return babel.transformSync(code, {
 			presets: [
 				...(doJSX ? [[babelReact, { throwIfNamespace: false, pragmaFrag: options.jsxPragmaFrag || execOptions.jsxPragmaFrag, pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
@@ -782,7 +782,7 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 });
 
 module.exports.compileFile = function (filepath, options = {}) {
-	straceLog('COMPILE() for CURRENTFILE');
+	straceLog('compile(currentFile)');
 	const f = typeof filepath == "object" ? filepath : getFile(filepath);
 	if(typeof filepath == "object") filepath = filepath.path;
 	let qrew = false;
@@ -791,13 +791,13 @@ module.exports.compileFile = function (filepath, options = {}) {
 		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();
 		options.type = f.content.split('\n')[0]?.match(/"initFile (.+)"/)?.[1]?.split('.').pop();
-		straceLog('QREW_DECODE() as', options.type, 'for CURRENTFILE');
+		straceLog('decodeCrew(currentFile).as(', `"${options.type}"`,')');
 	}
 
 	let compiled_code =  cpl(f, { ...options });
 
 	if(options.onlyCompile && !qrew){
-		straceLog('WRITE_AND_QUIT() for COMPILEDATA');
+		straceLog('writeAndQuit(compileData)');
 		if(compiled_code instanceof Promise){
 			compiled_code.then((r) => {
 				console.log(r);

package/lib/rew/modules/context.js

@@ -25,7 +25,7 @@ module.exports.prepareContext = function (
   filepath = "",
   runPath = () => {},
 ) {
-  straceLog('PREPARE() NEW CONTEXT');
+  straceLog('!-NEW context()');
   if (mainFile == "") mainFile = filepath;
   /** @type {Record<string, any>} */
   let context = {
@@ -82,7 +82,7 @@ module.exports.prepareContext = function (
           this['@cb'] = cb;
         }
       });
-    }, out: {...process.stdout, cols: process.stdout.columns, rows: process.stdout.rows, put: (...logs) => context.print(...logs), strace: (...logs) => straceLog('==> STRACE_OUT():', ...logs  ), write: (logs) => context.printf(logs+'\n') }, in: {...process.stdin, read: (...args) => context.input(...args)}, define: (name, object) => {
+    }, out: {...process.stdout, cols: process.stdout.columns, rows: process.stdout.rows, put: (...logs) => context.print(...logs), strace: (...logs) => straceLog('==> !+OUT straceOut(): ', ...logs  ), write: (logs) => context.printf(logs+'\n') }, in: {...process.stdin, read: (...args) => context.input(...args)}, define: (name, object) => {
       if(Array.isArray(name) && name.length == 2 && typeof name[0] == 'string'){
         object = name[1];
         name = name[0];
@@ -242,14 +242,14 @@ module.exports.prepareContext = function (
   if(context.app?.config?.exec?.['auto import']){
     const autoipath = path.join(context.app.path, context.app.config?.exec?.['auto import']);
     if(autoipath !== filepath){
-      straceLog('==> AUTOIMPORT()', autoipath);
+      straceLog('==> !ACTION autoImport()', autoipath);
       const all = context.imp(path.relative(path.dirname(filepath), autoipath));
       for(let i in all) context[i] = all[i];
     }
   }
 
   if(!context.app){
-    straceLog('==> APP NOT FOUND');
+    straceLog('==> WARN: App not found');
     context.appPackage = (packageName) => context.app = { config: { manifest: { package: packageName } } }
   } else {
     context.appPackage = context.mod = (packageName) => context.module.modset = packageName;
@@ -265,7 +265,7 @@ module.exports.prepareContext = function (
     context.module.main ||
     (options.fromMain == true && options.as == "main")
   ) {
-    straceLog('==> RUNTIME() as MAIN for', filepath);
+    straceLog('==> !MAIN', filepath);
     context.opt = {
       set: (key, value) => (execOptions[key] = value),
       get: (key) => execOptions[key],

package/lib/rew/modules/runtime.js

@@ -21,17 +21,17 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 	if(filepath.endsWith('.coffee')) options.type = 'coffee';
 	if(filepath.endsWith('.qrew')) options.type = 'qrew';
 
-	straceLog('RUN() CURRENTFILE = ', filepath, 'as', options.type || 'UNKNOWN');
+	straceLog('!+DECLARE currentFile =', filepath, 'as', options.type || '!UNKNOWN');
 
 	if(options.import?.async) options.async = true;
-	if(options.async) straceLog('ASYNCMODE() for CURRENTFILE');
+	if(options.async) straceLog('==> !ASYNCMODE currentFile::async()');
 	let { compiled_code, file } = compileFile(options.code ? { content: options.code, path: filepath } : filepath, options);
-	straceLog('COMPILE_DONE() with COMPILEDATA');
+	straceLog('==> INFO Compile done with compileData');
 	// context.module.compiled = compiled_code;
 	// context.process.exit = (int) => process.exit(int);
 
 	const doCode = () => {
-		straceLog('RUNCODE() COMPILEDATA');
+		straceLog('runCode(compileData)');
 		const context = options.import?.takeThisContext ? custom_context : prepareContext(custom_context, options, file.path, runPath);
 	
 		if(context.app){
@@ -51,6 +51,7 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 		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'))){
+			straceLog('call(currentFile::mainFn)');
 			const mainFn = context.module.exports.main ?? context.module.exports;
 			let ctx = context;
 			if(mainFn._class){

package/lib/rew/pkgs/serve.app.js

@@ -7,6 +7,14 @@ module.exports = (context) => {
 
   let appOptions = {};
 
+  const additionalParams = {
+    text: svr.prototype.text,
+    html: svr.prototype.html,
+    status: svr.prototype.status,
+    json: svr.prototype.json,
+    error: svr.prototype.error
+  };
+
   const mkRouter = (options = {}) => svr.prototype.router({ type: 'auto', ...appOptions, ...options });
 
   class Events {
@@ -251,7 +259,7 @@ module.exports = (context) => {
     that.controller.register(method, _path, cb, middleWare);
     return cb;
   }
-  const mkReq = (usage) => (req, ctx) => usage.call(req, req, ctx);
+  const mkReq = (usage) => (req, ...args) => usage.call(req, req, ...args);
   class SControllerContext extends Context('controller') {
 
     middleWares = [];
@@ -317,18 +325,21 @@ module.exports = (context) => {
   }
 
   function mkBody(req){
+    if(!req.data) return null;
     const type = req.headers.get('content-type');
     if(type == 'application/json'){
       return req.data.json();
-    } else {
-      try {
-        return req.data.json();
-      } catch(e){
-        return req.data.text();
-      }
+    } else if(type.startsWith('multipart/form-data')){
+      return req.data.multipart();
+    } else if(type == 'multipart/form-data'){
+      return req.data;
+    } else try {
+      return req.data.json();
+    } catch(e){
+      return req.data?.text();
     }
   }
-
+  let f;
   class SController extends Injectable {
 
     constructor(root){
@@ -341,14 +352,9 @@ module.exports = (context) => {
       return async (req, ctx) => {
         let context = {...{
           request: req,
+          params: req.params || {},
           body: mkBody(req)
-        },...ctx, ...(cb.parent || {}), ...{
-          text: svr.prototype.text,
-          html: svr.prototype.html,
-          status: svr.prototype.status,
-          json: svr.prototype.json,
-          error: svr.prototype.error
-        }};
+        },...ctx, ...(cb.parent || {}), ...additionalParams};
         return await cb.call(context, ...Object.keys(context).map(i => context[i]));
       }
     }

package/lib/rew/pkgs/serve.js

@@ -30,7 +30,65 @@ module.exports = (context) => {
     return new Request(url, options);
   }
 
-  function getBody(req){
+
+  function parseMultipart(req, content) {
+    const contentType = req.headers.get('content-type');
+    const boundary = contentType.split('boundary=')[1];
+    if (!boundary) throw new Error('No boundary in multipart/form-data');
+
+    const body = content;
+    const parts = body.split(`--${boundary}`).filter(part => part.trim() !== '--' && part.trim() !== '');
+
+    const fields = {};
+    const files = {};
+
+    parts.forEach(part => {
+      const [headers, ...content] = part.split('\r\n\r\n');
+      const contentBody = content.join('\r\n\r\n').trim();
+      const headerLines = headers.split('\r\n');
+
+      let name, filename, contentType;
+      headerLines.forEach(line => {
+        if (line.startsWith('Content-Disposition')) {
+          const matchName = /name="([^"]+)"/.exec(line);
+          const matchFilename = /filename="([^"]+)"/.exec(line);
+          if (matchName) name = matchName[1];
+          if (matchFilename) filename = matchFilename[1];
+        }
+        if (line.startsWith('Content-Type')) {
+          contentType = line.split(': ')[1];
+        }
+      });
+
+      if (filename) {
+        files[name] = {
+          filename,
+          contentType,
+          ...handleBuffer(Buffer.from(contentBody, 'binary'))
+        };
+      } else {
+        fields[name] = contentBody;
+      }
+    });
+
+    return { ...fields, ...files };
+  }
+
+  function handleBuffer(buffer){
+    return {
+      text(){
+        return buffer.toString();
+      },
+      json(){
+        return JSON.parse(buffer.toString());
+      },
+      buffer(){
+        return buffer;
+      }
+    }
+  }
+
+  function getBody(req, request){
     return new Promise((resolve, reject) => {
       const chunks = [];
 
@@ -41,14 +99,9 @@ module.exports = (context) => {
       req.on('end', () => {
         let buffer = chunks.length ? Buffer.concat(chunks) : null;
         resolve(buffer ? {
-          text(){
-            return buffer.toString();
-          },
-          json(){
-            return JSON.parse(buffer.toString());
-          },
-          buffer(){
-            return buffer;
+          ...handleBuffer(buffer),
+          multipart(){
+            return parseMultipart(request, buffer.toString());
           }
         } : null);
       });
@@ -81,7 +134,7 @@ module.exports = (context) => {
 
         context.getRealRequest = () => req;
 
-        request.data = await getBody(req);
+        request.data = await getBody(req, request);
 
         if(this.options.fetch == 'router'){
           if(!Object.keys(this.options.routers).length) throw new Error('No fetch function nor routers found');

package/package.json

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