@makano/rew 1.2.87 → 1.2.89

package/lib/rew/cli/cli.js

@@ -42,6 +42,11 @@ yargs(hideBin(process.argv))
 					describe: 'Watch the file for changes',
 					type: 'boolean',
 				})
+				.option('strace', {
+					alias: 's',
+					describe: 'Log everything',
+					type: 'boolean',
+				})
 				.option('compile', {
 					alias: 'c',
 					describe: 'Compile and output the javascript',
@@ -49,6 +54,9 @@ yargs(hideBin(process.argv))
 				});
 		},
 		(argv) => {
+			if(argv.strace){
+				process.straceMode = true;
+			}
 			const filePath = path.resolve(process.cwd(), argv.file);
 			if (!existsSync(filePath)) {
 				log('File not found:'.red.bold, argv.file, ':end');

package/lib/rew/cli/utils.js

@@ -371,7 +371,7 @@ module.exports = {
 
 			const appPath = findAppInfo(filePath);
 
-			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(`"initFile ${filePath}"\n${path.basename(content)}`, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
+			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(`"initFile ${path.basename(filePath)}"\n${content}`, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
 			writeCompiledFile(filePath, compiled);
 		}
 

package/lib/rew/const/usage.js

@@ -4,7 +4,7 @@
 const JSX_FRAGMENT_SYMBOL = Symbol('fragment');
 module.exports.USING_DEFAULT = {
   JSX: {
-    param: (param, fragment) => ({ createElement: param, Fragment: fragment || param(JSX_FRAGMENT_SYMBOL, { isFragment: true }), fragmentSymbol: JSX_FRAGMENT_SYMBOL }),
+    param: (param, fragment) => param ? ({ createElement: param, Fragment: fragment || param(JSX_FRAGMENT_SYMBOL, { isFragment: true }), fragmentSymbol: JSX_FRAGMENT_SYMBOL }) : {},
     use:  (options) => options.jsx = true
   },
   TYPES: {

package/lib/rew/functions/import.js

@@ -7,12 +7,14 @@ const conf = require('../pkgs/conf');
 const jsYaml = require('js-yaml');
 const { execOptions } = require('../const/opt');
 const { REW_FILE_TYPE } = require('../const/ext');
+const { straceLog } = require('../misc/strace');
 
 const cachedFiles = [];
 module.exports.cleanCache = () => {
 	while(cachedFiles.length) cachedFiles.pop();
 };
 const lookUpInOtherApps = (fullPath) => {
+	straceLog('===> WARN: LOOKUP SLOWS PROCESS');
 	const con = conf({});
 	const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
 	let dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
@@ -39,7 +41,10 @@ module.exports.imp = function (runPath, context) {
 		let exports,
 			ispkg = findPackage(filename);
 
+		straceLog('IMPORT for', filename, 'as', type);
+
 		if (filename.startsWith('@') && context.app) {
+			straceLog('===> FROM APP ROOT');
 			filename = filename.replace('@', context.app.path);
 		}
 
@@ -47,6 +52,7 @@ module.exports.imp = function (runPath, context) {
 		if(path.extname(filepath) == '.qrew') options.qrew = true;
 
 		const lookUp = () => {
+			straceLog('===> LOOKUP()');
 			const otherPath = lookUpInOtherApps(filename);
 			if (!otherPath) throw new Error('Module "' + filename + '" not found');
 			else filepath = otherPath;
@@ -64,6 +70,7 @@ module.exports.imp = function (runPath, context) {
 					typeof ext == 'string' ? existsSync(filepath + ext) : existsSync(filepath + (ext.ext || '')),
 				);
 				if (resolve) {
+					straceLog('===> RESOLVE()');
 					filepath += typeof resolve == 'string' ? resolve : resolve.ext;
 					if (typeof resolve == 'object' && resolve.options) {
 						if (resolve.options.type) type = resolve.options.type;
@@ -74,6 +81,7 @@ module.exports.imp = function (runPath, context) {
 		}
 
 		const exec = (coptions = {}) => {
+			straceLog('===> EXECUTE() IMPORTFILE');
 			const r = runPath(
 				filepath,
 				{
@@ -95,6 +103,7 @@ module.exports.imp = function (runPath, context) {
 		}
 
 		if (ispkg) {
+			straceLog('===> FIND_PACKAGE()');
 			const pkg = getPackage(filename)(context, options);
 			exports = pkg._onImport ? pkg._onImport() : pkg;
 			if(options.useDefaultForPackages) exports = { default: exports };
@@ -104,16 +113,20 @@ 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()');
 			const f = getFile(filepath);
 			if (type == 'yaml') {
+				straceLog('===> FROM_YAML()');
 				exports = importYaml(f.path, f);
 			} else if (type == 'json') {
+				straceLog('===>');
 				try {
 					exports = JSON.parse(f.content);
 				} catch (e) {
 					exports = {};
 				}
 			} else {
+				straceLog('===> FROM_TEXT');
 				exports = f.content;
 			}
 		}

package/lib/rew/functions/require.js

@@ -28,7 +28,6 @@ module.exports.customRequire = function customRequire(modulePath, filePath, esm)
 	} catch(e){
 		if(e.code === 'ERR_REQUIRE_ESM') {
 			isEsm = true;
-			console.log('Trying with esm');
 			r = get_file();
 		} else {
 			throw e;

package/lib/rew/misc/findAppInfo.js

@@ -2,11 +2,15 @@ const jsYaml = require('js-yaml');
 const { findAppPath } = require('./findAppPath');
 const path = require('path');
 const { readFileSync } = require('fs');
+const { straceLog } = require('./strace');
 
 module.exports.findAppInfo = function (filepath) {
 	const appPath = findAppPath(path.dirname(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);
 		return {
 			path: appPath,
 			config,

package/lib/rew/misc/findAppPath.js

@@ -1,10 +1,14 @@
 const path = require('path'); // Import the 'path' module
 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);
 	const appYamlPath = path.join(currentDir, 'app.yaml');
 	if (fs.existsSync(appYamlPath)) {
+
+		straceLog('==> FOUND PATH', appYamlPath);
 		return currentDir;
 	}
 

package/lib/rew/misc/strace.js

@@ -0,0 +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);
+	}
+}

package/lib/rew/modules/compiler.js

@@ -10,6 +10,8 @@ const { readFileSync, existsSync } = require('fs');
 const { wait } = require('../functions/wait');
 const { REW_FILE_TYPE } = require('../const/ext');
 const { USING_DEFAULT } = require('../const/usage');
+const { CONFIG_PATH } = require('../const/config_path');
+const { straceLog } = require('../misc/strace');
 
 
 
@@ -74,7 +76,7 @@ function tokenizeCoffeeScript(code) {
       } else {
         tokens.push({ type: 'WHITESPACE', value: char });
       }
-    } else if (/[a-zA-Z_$]/.test(char)) {
+    } else if (/[a-zA-Z_$@]/.test(char)) {
       // Identifier
       let identifier = char;
       i++;
@@ -105,7 +107,7 @@ const ValueIfy = (val) => {
 }
 
 const gnextToken = (i, n, tokens) => {
-	return tokens[i + n] ? (tokens[i + n].type == 'WHITESPACE' ? gnextToken(i, n + 1, tokens) : { token: tokens[i + n], n }) : null;
+	return tokens[i + n] ? (tokens[i + n].type == 'WHITESPACE' ? gnextToken(i, n + 1, tokens) : { token: tokens[i + n], n, ti: i + n }) : null;
 };
 
 const fnextToken = (i, tokens, type, value) => {
@@ -126,28 +128,135 @@ 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');
 
   if (match) {
     const isPublic = !!match[1];
     const type = match[2] == "key" ? 'IDENTIFIER' : match[2];
-    const name = match[3];
-    const value = match[4].trim();
+    let name = match[3];
+    let value = match[4].trim();
+		straceLog('==> DECLARE', name, 'as', value);
 
-    const aliasValue = value.startsWith('${')
-      ? new Function('token', 'tokens', 'code', value.slice(2, -1))
+    let aliasValue = value.startsWith('${')
+      ? new Function('token', 'tokens', 'code', 'hooks', value.slice(2, -1))
       : value;
+		
+
+		if(name.startsWith('=')){
+			name = name.slice(1);
+			let isDecOnly = false;
+			if(name.endsWith('*')) {
+				name = name.slice(0, -1);
+				isDecOnly = true;
+			}
+			aliasValue = (token, tokens, code, hooks, index, setIndex) => {
+				const nextToken = tokens[index+1]
+				let nextToken2 = gnextToken(index, 3, tokens);
+				if (nextToken.value == '(' || tokens[index+2]?.value == '(') {
+					let params = '';
+					index += 2;
+					let openBrackets = 1;
+					while (index < tokens.length && openBrackets > 0) {
+						const char = tokens[index].value;
+						if (char === '(') openBrackets++;
+						if (char === ')') openBrackets--;
+						if (openBrackets > 0) params += char;
+						index++;
+					}
+					const { token: nextToken2, n: n2, ti } = gnextToken(index, 1, tokens) || {};
+					let offset = 1;
+					if(tokens[ti+1].type == 'WHITESPACE') offset += 2;
+					if(tokens[ti+3].type == 'WHITESPACE') offset += 1;
+
+					let nextToken = gnextToken(index, offset+1, tokens);
+					const args = nextToken.token.value;
+					setIndex(ti + offset);
+					return `${nextToken2.value} = ${token.value}(${args}, ${params.trim()})`;
+				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
+					nextToken.value = '';
+					if(isDecOnly){
+						nextToken2 = {
+							token: { value: ':' },
+							ti: index+2
+						}
+						value = '= ' + value + '()';
+					}
+					if(nextToken2.token.value == ':') nextToken2.token.value = '=';
+					hooks.push({
+						index: nextToken2.ti,
+						value: ' ' + value
+					})
+					return "";
+				}
+				return token.value;
+			}
+		}
 
     aliases[type] = aliases[type] || {};
     aliases[type][name] = aliasValue;
 
 		if(isPublic){
+			straceLog('==>', 'DECLARATION GLOBALIZED');
 			execOptions._syntaxAliases[type] = execOptions._syntaxAliases[type] || {};
 			execOptions._syntaxAliases[type][name] = aliasValue;
 		}
   }
 }
 
+
+const includeFile = (includeContent, options) => {
+	straceLog('INCLUDE()', includeContent);
+	const dontInclude = includeContent.startsWith('*');
+	if(dontInclude) {
+		includeContent = includeContent.slice(1);
+		straceLog('==> IGNORING OUTPUT', includeContent);
+	};
+	let filename = options.filename ? path.resolve(path.dirname(options.filename), includeContent) : includeContent;
+	const _inc = (filename) => '\n'+ compileRewStuff(readFileSync(filename).toString(), {
+		...options,
+		filename,
+		included: true
+	})+'\n';
+	let r = '';
+	if (existsSync(filename)) {
+		straceLog('==> INCLUDE FILE', filename);
+		r = _inc(filename);
+	} 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', filename);
+		if(existsSync(pathname)) r = _inc(pathname);
+	}
+	if(!dontInclude){
+		return r;	
+	}
+	return "";
+}
+
+function useImp(token, options){
+	if(token.type == 'STRING' && (
+		token.value.startsWith('"#') ||
+		token.value.startsWith("'#")
+	)){
+		straceLog('==> 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;
+		const file = packageName.startsWith('./') || packageName.startsWith('../');
+		if(!(file) && packageName.match('/')) packageName = packageName.split('/').pop();
+		if(file) packageName = path.extname(packageName) ? packageName.replace(path.extname(packageName), '.h.coffee') : packageName;
+		if(file && !packageName.endsWith('.h.coffee')) packageName += '.h.coffee';
+		straceLog('IMP() with HEADER for', packageName);
+		return includeFile(packageName, options); 
+	}
+	return '';
+}
+
 function compileRewStuff(content, options) {
+	straceLog('TOKENIZE() for CURRENTFILE');
 	const tokens = tokenizeCoffeeScript(content);
 	let result = '';
   let multilineDeclareBuffer = [];
@@ -156,7 +265,7 @@ function compileRewStuff(content, options) {
 	let hooks = [];
 
 
-	const aliases = {
+	let aliases = {
 		...execOptions._syntaxAliases
 	}
 
@@ -199,16 +308,42 @@ function compileRewStuff(content, options) {
 				execOptions.jsxPragma = nextLastToken.value.slice(1).slice(0, -1);
 			}
 		}
+		
+		if (token.type === 'IDENTIFIER' && token.value === 'imp') {
+			straceLog('IMP() Detected');
+			let { token: t1 } = gnextToken(i, 1, tokens) || {};
+			let { token: t2 } = gnextToken(i, 2, tokens) || {};
+			let r = '';
+
+			if(t1.value == '('){
+				if(t2.type == 'STRING'){
+					r = useImp(t2, options);
+				}
+			} else if(t1.type == 'STRING'){
+				r = useImp(t1, options);
+			}
+
+			if(r) {
+				aliases = {
+					...aliases,
+					...execOptions._syntaxAliases
+				}
+			}
+		}
 
 		if (token.type === 'COMMENT' && token.value.slice(1).trim().startsWith('@jsx')) {
 			options.jsx = true;
+			straceLog('JSX() ENABLE WITH COMMENTS');
 			if(token.value.split('@jsx')[1].trim()){
 				options.jsxPragma = token.value.split('@jsx')[1].trim();
+				straceLog('JSX() PRAGMA WITH', options.jsxPragma);
 			}
 		}
 		
     if (token.type === 'COMMENT' && token.value.slice(1).trim() === '@cls') {
 			options.cls = true;
+			straceLog('CLITOKENIZATION() ENABLE');
+			straceLog('===> HIGHLY EXPERIMENTAL FEATURE DETECTED');
 		}
 
     if (options.cls && token.type === 'OTHER' && token.value === '-' && nextToken.value == '-' && tokens[i-1]?.type == 'WHITESPACE') {
@@ -228,26 +363,32 @@ function compileRewStuff(content, options) {
 
 		if (token.type === 'IDENTIFIER' && token.value === 'export' && !options.keepImports) {
 			token.value = 'pub';
+			straceLog('EXPORT() => TRANSLATING TO pub');
 		}
 
 		if (token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
+			straceLog('USING()');
 			const next = nextToken.value;
 			if(next in USING_DEFAULT) {
 				const { use } = USING_DEFAULT[next];
 				use?.(options);
+				straceLog('==>', nextToken.value);
 				nextToken.value = `"${nextToken.value}"`
 
 				const { token: nextNextToken } = gnextToken(i, 3, tokens) || {};
 				if(nextNextToken.value == "as") nextNextToken.value = ",";
-			}
+			} else straceLog('==> UNKNOWN');
 		}
 
 		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
+			straceLog('IMPORT()');
+			straceLog('==> WARN: SLOWS DOWN TOKENIZATION');
 			let ind = i + n + 2;
 
 			let defaultName;
 			if (nextToken.type === 'STRING') {
+				straceLog('==> SIMPLE');
 				result += `inc ${nextToken.value}`;
 				i += n;
 			} else if (nextToken.value === '{') {
@@ -261,6 +402,8 @@ function compileRewStuff(content, options) {
 						.flat(1)
 						.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 						.join(', ');
+					
+					straceLog('==>', exports, 'from', nameToken.value);
 
 					result += `{ ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = nameToken.ti;
@@ -271,6 +414,7 @@ function compileRewStuff(content, options) {
 				if (asToken) {
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
+					straceLog('==>', defaultName, 'from', nameToken.value);
 					result += `${defaultName} ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = ind + 6;
 				}
@@ -288,6 +432,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);
 						result += `{ default: ${defaultName}, ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 						i = closingBraceToken.ti + 4;
 					}
@@ -302,6 +447,7 @@ function compileRewStuff(content, options) {
 			if (nextLastToken?.value == 'assert') {
 				result += ', ';
 				const assertionToken = gnextToken(nextLastToken.ti, 2, tokens);
+				straceLog('==> ASSERT', assertionToken);
 				if(assertionToken.token.type == 'OTHER' && assertionToken.token.value == '{'){
 					hooks.push({
 						index: assertionToken.token.ti,
@@ -326,6 +472,7 @@ function compileRewStuff(content, options) {
 			nextToken.value &&
 			nextToken.value !== 'undefined' && !options.keepImports
 		) {
+			straceLog('PUB() Detected');
 			let next = {...nextToken}, isClass = false;
 			if(next.value == 'default'){
 				i += 2;
@@ -334,6 +481,7 @@ function compileRewStuff(content, options) {
 				next.value = gnextToken(i, n + 1, tokens)?.token.value || "default";
 				isClass = true;
 			}
+			straceLog('==> PUBLIC', next.value);
 			hooks.push({
 				index: i + 1,
 				value: `"${next.value}", ${isClass ? `${next.value} = ` : ''}`,
@@ -341,20 +489,20 @@ function compileRewStuff(content, options) {
 		}
 
 		const aliasType = aliases[token.type];
-    if (aliasType && aliasType[token.value]) {
+		// if(token.value == 'sidewest') console.log(aliases, token.value, token.type);
+    if (aliasType && Object.keys(aliasType).includes(token.value)) {
+			straceLog('ALIAS()', token.type);
       const aliasValue = aliasType[token.value];
       if (typeof aliasValue === 'function') {
-        result += aliasValue(token, tokens, result) || "";
+				straceLog('==> EXECUTE ALIAS', token.value);
+        result += aliasValue(token, tokens, result, hooks, i, (n) => i = n) || "";
       } else {
+				straceLog('==> LITERAL ALIAS', token.value);
         result += aliasValue;
       }
       continue;
     }
 
-		// if(token.type === 'TRIPLE_STRING'){
-		// 	token.value = '```'+token.value.slice(3).slice(0, -3).replace(/\#\{/g, '${')+'```';
-		// }
-
 		// process.stdout.write(token.value);
 		result += token.value;
 		if (hooks.length) {
@@ -367,29 +515,33 @@ function compileRewStuff(content, options) {
 		}
 		
 		if (token.type === "COMMENT" && token.value.startsWith('#include')) {
-			const includeContent = token.value.split(' ')[1] || '';
-			const filename = options.filename ? path.resolve(path.dirname(options.filename), includeContent) : includeContent;
-			if (existsSync(filename)) {
-        result += '\n'+ compileRewStuff(readFileSync(filename).toString(), {
-					...options,
-					filename
-				});
-      }
+			const includeContent = token.value.split(' ')[1].trim() || '';
+			const r = includeFile(includeContent, options);
+			if(r){
+				result += r;
+				aliases = {
+					...aliases,
+					...execOptions._syntaxAliases
+				}
+			}
     }
 	}
-
+	// console.log(aliases);
 	// console.log(result);
-
 	return result;
 }
 
 const compileCivetStuff = (file, options) => {
+	straceLog('COMPILE_CIVET() for CURRENTFILE');
 	const preCompileOptions = {
 		filename: file.path,
 		...options
 	};
+	straceLog('OPTION_PREPARE() for CURRENTFILE as', preCompileOptions);
 	const prepared = compileRewStuff(file.content, preCompileOptions);
 
+	// console.log(prepared);
+
 	const compileOptions = {
 		...preCompileOptions,
 		bare: true,
@@ -399,6 +551,7 @@ const compileCivetStuff = (file, options) => {
 	};
 
 	let compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
+	straceLog('==> CIVET COMPILE <>');
 
 	return {
 		compiled,
@@ -418,14 +571,21 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 	options = result.options;
 	compiledCode = result.compiled;
 
-	const babelify = (code, options) => babel.transformSync(code, {
-		presets: [
-			...(doJSX ? [[babelReact, { throwIfNamespace: false, pragmaFrag: options.jsxPragmaFrag || execOptions.jsxPragmaFrag, pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
-		],
-		plugins: [
-			...(doDecorators ? [[require('@babel/plugin-proposal-decorators'), { version: '2023-05' }], [require('@babel/plugin-proposal-class-properties'), { loose: true }], [require('@babel/plugin-transform-class-static-block'), {}]] : [])
-		],
-	}).code;
+	const babelify = (code, options) => {
+		straceLog('BABEL()');
+		if(doJSX) straceLog('==> WITH JSX');
+		if(doTypes) straceLog('==> WITH TYPES');
+		if(doDecorators) straceLog('==> WITH DECORATORS');
+		return babel.transformSync(code, {
+			presets: [
+				...(doJSX ? [[babelReact, { throwIfNamespace: false, pragmaFrag: options.jsxPragmaFrag || execOptions.jsxPragmaFrag, pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
+			],
+			plugins: [
+				...(doDecorators ? [[require('@babel/plugin-proposal-decorators'), { version: '2023-05' }], [require('@babel/plugin-proposal-class-properties'), { loose: true }], [require('@babel/plugin-transform-class-static-block'), {}]] : []),
+				// doJSX ? require('./jsx') : null
+			].filter(Boolean),
+		}).code;
+	}
 
 	const doJSX = execOptions.jsx || options.jsx;
 	const doTypes = execOptions.typescript || options.typescript;
@@ -449,6 +609,7 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 });
 
 module.exports.compileFile = function (filepath, options = {}) {
+	straceLog('COMPILE() for CURRENTFILE');
 	const f = typeof filepath == "object" ? filepath : getFile(filepath);
 	if(typeof filepath == "object") filepath = filepath.path;
 	let qrew = false;
@@ -457,11 +618,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');
 	} 
 
 	let compiled_code =  cpl(f, { ...options });
 
 	if(options.onlyCompile && !qrew){
+		straceLog('WRITE_AND_QUIT() for COMPILEDATA');
 		if(compiled_code instanceof Promise){
 			compiled_code.then((r) => {
 				console.log(r);

package/lib/rew/modules/context.js

@@ -11,6 +11,7 @@ const { findAppInfo } = require("../misc/findAppInfo");
 const { USING_DEFAULT, Usage, Namespace } = require("../const/usage");
 const runtime = require("./runtime");
 const { permission } = require("process");
+const { straceLog } = require("../misc/strace");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -20,6 +21,7 @@ module.exports.prepareContext = function (
   filepath = "",
   runPath = () => {},
 ) {
+  straceLog('PREPARE() NEW CONTEXT');
   if (mainFile == "") mainFile = filepath;
   /** @type {Record<string, any>} */
   let context = {
@@ -97,16 +99,20 @@ module.exports.prepareContext = function (
         throw new Error("");
       return context.imp(package, asserts);
     } catch (e) {
-      let pname = package.startsWith("pkg:") ? package.split("pkg:")[1] : package;
-      if(pname.endsWith('#esm')){
-        pname = pname.slice(0, -4);
-        if(!asserts) asserts = { esm: true };
-        else asserts.esm = true;
+      if(e.message.match('Module') && e.message.match('not found')){
+        let pname = package.startsWith("pkg:") ? package.split("pkg:")[1] : package;
+        if(pname.endsWith('#esm')){
+          pname = pname.slice(0, -4);
+          if(!asserts) asserts = { esm: true };
+          else asserts.esm = true;
+        }
+        return context.require(
+          pname,
+          asserts?.esm
+        );
+      } else {
+        throw e;
       }
-      return context.require(
-        pname,
-        asserts?.esm
-      );
     }
   };
   context.pub = pubFunction(context);
@@ -144,12 +150,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);
       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');
     context.appPackage = (packageName) => context.app = { config: { manifest: { package: packageName } } }
   }
 
@@ -163,6 +171,7 @@ module.exports.prepareContext = function (
     context.module.main ||
     (options.fromMain == true && options.as == "main")
   ) {
+    straceLog('==> RUNTIME() as MAIN for', filepath);
     context.opt = {
       set: (key, value) => (execOptions[key] = value),
       get: (key) => execOptions[key],

package/lib/rew/modules/jsx.js

@@ -0,0 +1,67 @@
+// customJSXIdentifierPlugin.js
+module.exports = function customJSXIdentifierPlugin({ types: t }) {
+  return {
+    visitor: {
+      FunctionDeclaration(path) {
+        if (containsJSXReturn(path.node.body.body, t)) {
+          addJSXReturnFlag(path, path.node.id.name, t);
+        }
+      },
+      FunctionExpression(path) {
+        if (containsJSXReturn(path.node.body.body, t)) {
+          handleFunctionExpressionOrArrow(path, t);
+        }
+      },
+      ArrowFunctionExpression(path) {
+        if (t.isJSXElement(path.node.body) || (t.isBlockStatement(path.node.body) && containsJSXReturn(path.node.body.body, t))) {
+          handleFunctionExpressionOrArrow(path, t);
+        }
+      },
+    }
+  };
+};
+
+function containsJSXReturn(body, t) {
+  return body.some(statement => t.isReturnStatement(statement) && t.isJSXElement(statement.argument));
+}
+
+function addJSXReturnFlag(path, functionName, t) {
+  path.insertAfter(
+    t.expressionStatement(
+      t.assignmentExpression(
+        '=',
+        t.memberExpression(t.identifier(functionName), t.identifier('__returnsJSX')),
+        t.booleanLiteral(true)
+      )
+    )
+  );
+}
+
+function handleFunctionExpressionOrArrow(path, t) {
+  // Check for variable declaration
+  if (t.isVariableDeclarator(path.parent) && t.isIdentifier(path.parent.id)) {
+    const functionName = path.parent.id.name;
+    path.findParent(p => p.isVariableDeclaration()).insertAfter(
+      t.expressionStatement(
+        t.assignmentExpression(
+          '=',
+          t.memberExpression(t.identifier(functionName), t.identifier('__returnsJSX')),
+          t.booleanLiteral(true)
+        )
+      )
+    );
+  }
+  // Check for variable assignment
+  else if (t.isAssignmentExpression(path.parent) && t.isIdentifier(path.parent.left)) {
+    const functionName = path.parent.left.name;
+    path.parentPath.insertAfter(
+      t.expressionStatement(
+        t.assignmentExpression(
+          '=',
+          t.memberExpression(t.identifier(functionName), t.identifier('__returnsJSX')),
+          t.booleanLiteral(true)
+        )
+      )
+    );
+  }
+}

package/lib/rew/modules/runtime.js

@@ -4,6 +4,7 @@ const { prepareContext } = require('./context');
 const { existsSync, readFileSync } = require('fs');
 const { CONFIG_PATH } = require('../const/config_path');
 const path = require('path');
+const { straceLog } = require('../misc/strace');
 
 const preScript = readFileSync(path.join(__dirname, '../const/pre-exec.js'), { encoding: 'utf-8' });
 
@@ -20,12 +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');
+
 	if(options.import?.async) options.async = true;
+	if(options.async) straceLog('ASYNCMODE() for CURRENTFILE');
 	let { compiled_code, file } = compileFile(options.code ? { content: options.code, path: filepath } : filepath, options);
+	straceLog('COMPILE_DONE() with COMPILEDATA');
 	// context.module.compiled = compiled_code;
 	// context.process.exit = (int) => process.exit(int);
 
 	const doCode = () => {
+		straceLog('RUNCODE() COMPILEDATA');
 		const context = options.import?.takeThisContext ? custom_context : prepareContext(custom_context, options, file.path, runPath);
 	
 		if(context.app){

package/package.json

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