@makano/rew 1.2.88 → 1.2.90

package/lib/rew/const/usage.js

@@ -23,7 +23,7 @@ module.exports.Usage = class Usage {
   constructor(name, trigger, save){
     this.name = name;
     this.trigger = trigger;
-    this.save = save;
+    this.save = name == '' ? false : save;
   }
 
   create(name, trigger, save = true){

package/lib/rew/modules/compiler.js

@@ -139,7 +139,7 @@ function declareAlias(aliases, token) {
 		straceLog('==> DECLARE', name, 'as', value);
 
     let aliasValue = value.startsWith('${')
-      ? new Function('token', 'tokens', 'code', 'hooks', value.slice(2, -1))
+      ? new Function('token', 'tokens', 'code', 'hooks', 'index', 'setIndex', value.slice(2, -1))
       : value;
 		
 
@@ -172,7 +172,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}, ${params.trim()})`;
+					return `${nextToken2.value} = ${token.value} ${args && args !== '(' ? `${args},` : ''} ${params.trim()}, ${args == '(' ? args : ''}`;
 				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
 					nextToken.value = '';
 					if(isDecOnly){
@@ -247,7 +247,7 @@ function useImp(token, options){
 		token.value = dem+packageName+dem;
 		const file = packageName.startsWith('./') || packageName.startsWith('../');
 		if(!(file) && packageName.match('/')) packageName = packageName.split('/').pop();
-		if(file) packageName = packageName.replace(path.extname(packageName), '.h.coffee');
+		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); 
@@ -540,8 +540,6 @@ 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,
@@ -581,8 +579,9 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 				...(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'), {}]] : [])
-			],
+				...(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;
 	}
 

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/package.json

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