@makano/rew 1.2.88 → 1.2.89

package/lib/rew/modules/compiler.js

@@ -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); 
@@ -581,8 +581,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.89",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {