Merge pull request #338 from rxbryan/node-feat1

feat: change js parser from cherow to espree

Author: giarve

source/loaders/node_loader/bootstrap/CMakeLists.txt

@@ -52,7 +52,7 @@ if(NOT OPTION_BUILD_GUIX)
 		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/package-lock.json ${CMAKE_CURRENT_BINARY_DIR}
 		COMMAND ${NPM_EXECUTABLE} --prefix ${CMAKE_CURRENT_BINARY_DIR} install ${CMAKE_CURRENT_BINARY_DIR}
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_OUTPUT_DIR}/node_modules
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/cherow ${PROJECT_OUTPUT_DIR}/node_modules/cherow
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/espree ${PROJECT_OUTPUT_DIR}/node_modules/espree
 		COMMAND ${CMAKE_COMMAND} -E echo "${target} dependencies copied from ${CMAKE_CURRENT_BINARY_DIR}/node_modules to ${PROJECT_OUTPUT_DIR}/node_modules"
 		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/package.json ${CMAKE_CURRENT_SOURCE_DIR}/lib/package-lock.json
 	)
@@ -66,14 +66,14 @@ if(NOT OPTION_BUILD_GUIX)
 	add_dependencies(${target} ${target}_depends)
 
 	install(DIRECTORY
-		${CMAKE_CURRENT_BINARY_DIR}/node_modules/cherow
+		${CMAKE_CURRENT_BINARY_DIR}/node_modules/espree
 		DESTINATION ${INSTALL_LIB}/node_modules
 		COMPONENT runtime
 	)
 else()
-	# Guix stores cherow dependency previously to the build in the output directory
+	# Guix stores espree dependency previously to the build in the output directory
 	install(DIRECTORY
-		${PROJECT_OUTPUT_DIR}/node_modules/cherow
+		${PROJECT_OUTPUT_DIR}/node_modules/espree
 		DESTINATION ${INSTALL_LIB}/node_modules
 		COMPONENT runtime
 	)

source/loaders/node_loader/bootstrap/lib/bootstrap.js

@@ -7,7 +7,7 @@ const util = require('util');
 const fs = require('fs');
 
 /* Require the JavaScript parser */
-const cherow = require(path.join(__dirname, 'node_modules', 'cherow'));
+const espree = require(path.join(__dirname, 'node_modules', 'espree'));
 
 const node_require = Module.prototype.require;
 const node_resolve = require.resolve;
@@ -48,7 +48,8 @@ function node_loader_trampoline_is_callable(value) {
 
 function node_loader_trampoline_is_valid_symbol(node) {
 	// TODO: Enable more function types
-	return node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression';
+	return node.type === 'FunctionDeclaration'
+	 || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression';
 }
 
 function node_loader_trampoline_module(m) {
@@ -265,17 +266,15 @@ function node_loader_trampoline_discover_function(func) {
 		if (node_loader_trampoline_is_callable(func)) {
 			// Cherow can't parse native code functions so we can do a workaround
 			const str = func.toString().replace('{ [native code] }', '{}');
-
-			const ast = cherow.parse(`(${str})`, {
-				module: false,
-				skipShebang: true,
-			}).body[0];
-
-			const node = ast.expression;
+			const ast = espree.parse(str, {
+				ecmaVersion: 13
+			});
+			
+			const node = (ast.body[0].type === 'ExpressionStatement') ?
+			 ast.body[0].expression : ast.body[0];
 
 			if (node_loader_trampoline_is_valid_symbol(node)) {
 				const args = node_loader_trampoline_discover_arguments(node);
-
 				const discover = {
 					ptr: func,
 					signature: args,
@@ -285,7 +284,7 @@ function node_loader_trampoline_discover_function(func) {
 				if (node.id && node.id.name) {
 					discover['name'] = node.id.name;
 				}
-
+								
 				return discover;
 			}
 		}

source/loaders/node_loader/bootstrap/lib/package-lock.json

@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "cherow": "^1.6.9"
+    "espree": "^9.4.0"
   }
 }