Tracked endless loop loading and refactored ts loader files and examples, solved properly, it was in the monkey patch of node loader when guessing the modules.

viferga · viferga · commit 378dfa7e782d · 2021-04-30T11:44:16.000+02:00
diff --git a/source/cli/metacallcli/CMakeLists.txt b/source/cli/metacallcli/CMakeLists.txt
@@ -333,10 +333,18 @@ endif()
 if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_TS AND OPTION_BUILD_SCRIPTS AND OPTION_BUILD_SCRIPTS_TS)
 	add_test(NAME ${target}-ts
 		COMMAND ${TEST_COMMAND} "echo 'load ts typedfunc.ts\ninspect\ncall typed_sum(4, 5)\nexit' | $<TARGET_FILE:${target}> | ${GREP_COMMAND} \"9.0\""
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+		WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/typedfunc
 	)
 	test_environment_variables(${target}-ts
 		""
 		${TESTS_ENVIRONMENT_VARIABLES}
 	)
+	add_test(NAME ${target}-tsx-loop-fail
+		COMMAND ${TEST_COMMAND} "$<TARGET_FILE:${target}> loopfail.tsx | ${GREP_COMMAND} \"Error: Cannot find module 'yeet-oof/whatever'\""
+		WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/loopfail
+	)
+	test_environment_variables(${target}-tsx-loop-fail
+		""
+		${TESTS_ENVIRONMENT_VARIABLES}
+	)
 endif()
diff --git a/source/ports/node_port/index.js b/source/ports/node_port/index.js
@@ -261,9 +261,13 @@ mod.prototype.require = function (name) {
 		/* If it is not a NodeJS module, try to guess the runtime */
 		const loaders = new Set(Object.values(tags));
 
-		/* Mock and node loaders are not included */
+		/* Mock, node and ts loaders are not included, Mock will always load
+		* so it's not an option, Node and TypeScript will enter in a endless loop
+		* in some cases, because it will hit the monkey patched require again
+		* and also you usually do not publish ts packages without the js into npm */
 		loaders.delete('mock');
 		loaders.delete('node');
+		loaders.delete('ts');
 
 		for (let it = loaders.values(), tag = null; tag = it.next().value; ) {
 			try {
diff --git a/source/scripts/typescript/CMakeLists.txt b/source/scripts/typescript/CMakeLists.txt
@@ -15,3 +15,4 @@ include(TypeScriptProject)
 
 add_subdirectory(typedfunc)
 add_subdirectory(templating)
+add_subdirectory(loopfail)
diff --git a/source/scripts/typescript/loopfail/CMakeLists.txt b/source/scripts/typescript/loopfail/CMakeLists.txt
@@ -0,0 +1,5 @@
+#
+# Configure typescript project
+#
+
+ts_project(loopfail 0.1.0)
diff --git a/source/scripts/typescript/loopfail/source/loopfail/loopfail.tsx b/source/scripts/typescript/loopfail/source/loopfail/loopfail.tsx
@@ -0,0 +1,3 @@
+const { renderToString } = require('yeet-oof/whatever');
+
+console.log(renderToString);
diff --git a/source/scripts/typescript/loopfail/source/loopfail/tsconfig.json b/source/scripts/typescript/loopfail/source/loopfail/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "include": [
+    "loopfail.tsx"
+  ],
+  "compilerOptions": {
+    "target": "es5",
+    "jsx": "react",
+    "lib": ["es2015", "dom"]
+  }
+}
diff --git a/source/scripts/typescript/templating/source/templating/templating.tsx b/source/scripts/typescript/templating/source/templating/templating.tsx
diff --git a/source/scripts/typescript/templating/source/templating/tsconfig.json b/source/scripts/typescript/templating/source/templating/tsconfig.json
diff --git a/source/scripts/typescript/typedfunc/source/typedfunc/typedfunc.ts b/source/scripts/typescript/typedfunc/source/typedfunc/typedfunc.ts
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
@@ -186,6 +186,7 @@ add_subdirectory(metacall_typescript_test)
 add_subdirectory(metacall_typescript_node_test)
 add_subdirectory(metacall_typescript_call_map_test)
 #add_subdirectory(metacall_typescript_tsx_test) # TODO: Download react dependencies locally instead of globally
+add_subdirectory(metacall_typescript_tsx_loop_fail_test)
 add_subdirectory(metacall_lua_test)
 add_subdirectory(metacall_rpc_test)
 # add_subdirectory(metacall_csharp_function_test) # TODO: C# 9.0 seems not to work so top level expressions do not work
diff --git a/source/tests/metacall_node_typescript_test/CMakeLists.txt b/source/tests/metacall_node_typescript_test/CMakeLists.txt
@@ -139,6 +139,7 @@ add_dependencies(${target}
 
 set_property(TEST ${target}
 	PROPERTY LABELS ${target}
+	WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/typedfunc
 )
 
 include(TestEnvironmentVariables)
diff --git a/source/tests/metacall_typescript_call_map_test/CMakeLists.txt b/source/tests/metacall_typescript_call_map_test/CMakeLists.txt
@@ -139,6 +139,7 @@ add_dependencies(${target}
 
 set_property(TEST ${target}
 	PROPERTY LABELS ${target}
+	WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/typedfunc
 )
 
 include(TestEnvironmentVariables)
diff --git a/source/tests/metacall_typescript_node_test/CMakeLists.txt b/source/tests/metacall_typescript_node_test/CMakeLists.txt
@@ -139,6 +139,7 @@ add_dependencies(${target}
 
 set_property(TEST ${target}
 	PROPERTY LABELS ${target}
+	WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/typedfunc
 )
 
 include(TestEnvironmentVariables)
diff --git a/source/tests/metacall_typescript_test/CMakeLists.txt b/source/tests/metacall_typescript_test/CMakeLists.txt
@@ -139,6 +139,7 @@ add_dependencies(${target}
 
 set_property(TEST ${target}
 	PROPERTY LABELS ${target}
+	WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/typedfunc
 )
 
 include(TestEnvironmentVariables)
diff --git a/source/tests/metacall_typescript_tsx_loop_fail_test/CMakeLists.txt b/source/tests/metacall_typescript_tsx_loop_fail_test/CMakeLists.txt
@@ -0,0 +1,150 @@
+# Check if this loader is enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD_LOADERS_TS
+	OR NOT OPTION_BUILD_SCRIPTS OR NOT OPTION_BUILD_SCRIPTS_NODE OR NOT OPTION_BUILD_SCRIPTS_TS)
+	return()
+endif()
+
+#
+# Executable name and options
+#
+
+# Target name
+set(target metacall-typescript-tsx-loop-fail-test)
+message(STATUS "Test ${target}")
+
+#
+# Compiler warnings
+#
+
+include(Warnings)
+
+#
+# Compiler security
+#
+
+include(SecurityFlags)
+
+#
+# Sources
+#
+
+set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
+set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
+
+set(sources
+	${source_path}/main.cpp
+	${source_path}/metacall_typescript_tsx_loop_fail_test.cpp
+)
+
+# Group source files
+set(header_group "Header Files (API)")
+set(source_group "Source Files")
+source_group_by_path(${include_path} "\\\\.h$|\\\\.hpp$"
+	${header_group} ${headers})
+source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
+	${source_group} ${sources})
+
+#
+# Create executable
+#
+
+# Build executable
+add_executable(${target}
+	${sources}
+)
+
+# Create namespaced alias
+add_executable(${META_PROJECT_NAME}::${target} ALIAS ${target})
+
+#
+# Project options
+#
+
+set_target_properties(${target}
+	PROPERTIES
+	${DEFAULT_PROJECT_OPTIONS}
+	FOLDER "${IDE_FOLDER}"
+)
+
+#
+# Include directories
+#
+
+target_include_directories(${target}
+	PRIVATE
+	${DEFAULT_INCLUDE_DIRECTORIES}
+	${PROJECT_BINARY_DIR}/source/include
+)
+
+#
+# Libraries
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LIBRARIES}
+
+	GTest
+
+	${META_PROJECT_NAME}::metacall
+)
+
+#
+# Compile definitions
+#
+
+target_compile_definitions(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_DEFINITIONS}
+)
+
+#
+# Compile options
+#
+
+target_compile_options(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_OPTIONS}
+)
+
+#
+# Linker options
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LINKER_OPTIONS}
+)
+
+#
+# Define test
+#
+
+add_test(NAME ${target}
+	COMMAND $<TARGET_FILE:${target}>
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/source/scripts/typescript/templating/source
+)
+
+#
+# Define dependencies
+#
+
+add_dependencies(${target}
+	node_loader
+	ts_loader
+)
+
+#
+# Define test properties
+#
+
+set_property(TEST ${target}
+	PROPERTY LABELS ${target}
+)
+
+include(TestEnvironmentVariables)
+
+test_environment_variables(${target}
+	""
+	${TESTS_ENVIRONMENT_VARIABLES}
+)
diff --git a/source/tests/metacall_typescript_tsx_loop_fail_test/source/main.cpp b/source/tests/metacall_typescript_tsx_loop_fail_test/source/main.cpp
@@ -0,0 +1,28 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+int main(int argc, char *argv[])
+{
+	::testing::InitGoogleTest(&argc, argv);
+
+	return RUN_ALL_TESTS();
+}
diff --git a/source/tests/metacall_typescript_tsx_loop_fail_test/source/metacall_typescript_tsx_loop_fail_test.cpp b/source/tests/metacall_typescript_tsx_loop_fail_test/source/metacall_typescript_tsx_loop_fail_test.cpp
@@ -0,0 +1,72 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+#include <metacall/metacall.h>
+#include <metacall/metacall_loaders.h>
+#include <metacall/metacall_value.h>
+
+class metacall_tsx_loop_fail_test : public testing::Test
+{
+public:
+};
+
+TEST_F(metacall_tsx_loop_fail_test, DefaultConstructor)
+{
+	metacall_print_info();
+
+	ASSERT_EQ((int)0, (int)metacall_initialize());
+
+/* TypeScript */
+#if defined(OPTION_BUILD_LOADERS_TS)
+	{
+		const char *tsx_scripts[] = {
+			"loopfail.tsx"
+		};
+
+		/* Load scripts */
+		EXPECT_EQ((int)1, (int)metacall_load_from_file("ts", tsx_scripts, sizeof(tsx_scripts) / sizeof(tsx_scripts[0]), NULL));
+	}
+#endif /* OPTION_BUILD_LOADERS_TS */
+
+	/* Print inspect information */
+	{
+		size_t size = 0;
+
+		struct metacall_allocator_std_type std_ctx = { &std::malloc, &std::realloc, &std::free };
+
+		void *allocator = metacall_allocator_create(METACALL_ALLOCATOR_STD, (void *)&std_ctx);
+
+		char *inspect_str = metacall_inspect(&size, allocator);
+
+		EXPECT_NE((char *)NULL, (char *)inspect_str);
+
+		EXPECT_GT((size_t)size, (size_t)0);
+
+		std::cout << inspect_str << std::endl;
+
+		metacall_allocator_free(allocator, inspect_str);
+
+		metacall_allocator_destroy(allocator);
+	}
+
+	EXPECT_EQ((int)0, (int)metacall_destroy());
+}
diff --git a/source/tests/metacall_typescript_tsx_test/CMakeLists.txt b/source/tests/metacall_typescript_tsx_test/CMakeLists.txt
@@ -148,7 +148,7 @@ target_link_libraries(${target}
 
 add_test(NAME ${target}
 	COMMAND $<TARGET_FILE:${target}>
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/source/scripts/typescript/templating/source
+	WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/templating
 )
 
 #

Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ include(TypeScriptProject)`
`15`	`15`
`16`	`16`	`add_subdirectory(typedfunc)`
`17`	`17`	`add_subdirectory(templating)`
	`18`	`+add_subdirectory(loopfail)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +#
 +# Configure typescript project
 +#
++
 +ts_project(loopfail 0.1.0)
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const { renderToString } = require('yeet-oof/whatever');`
	`2`	`+`
	`3`	`+console.log(renderToString);`