Solve minor bugs in ts loader related to node port.

Author: viferga

source/loaders/ts_loader/bootstrap/CMakeLists.txt

@@ -52,6 +52,8 @@ if(NOT OPTION_BUILD_GUIX)
 	add_custom_target(${target} ALL
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib
 		COMMAND npm run build
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/lib/node_modules/typescript ${BOOTSTRAP_OUTPUT_PATH}/node_modules/typescript
+		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/build/bootstrap.js ${BOOTSTRAP_OUTPUT_PATH}/bootstrap.ts
 		SOURCES ${sources}
 	)
 

source/loaders/ts_loader/bootstrap/lib/bootstrap.ts

@@ -152,8 +152,9 @@ export const load_from_file = safe(function load_from_file(paths: string[]) {
 			result[fileName] = wrappedExports;
 		});
 	});
-	return result;
-}, {});
+
+	return Object.keys(result).length !== 0 ? result : null;
+}, null);
 
 /** Loads a TypeScript file from memory */
 export const load_from_memory = safe(
@@ -205,7 +206,7 @@ export const load_from_memory = safe(
 		discoverTypes.set(name, exportTypes);
 		return result;
 	},
-	{},
+	null,
 );
 
 /** Unloads a TypeScript file using handle returned from load_from_file / load_from_memory */

source/ports/node_port/CMakeLists.txt

@@ -138,7 +138,7 @@ if(NOT NODEJS_FOUND)
 endif()
 
 add_test(NAME ${target}_node_binary
-COMMAND ${TEST_COMMAND} "${NODEJS_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/node_integration.js | ${GREP_COMMAND} \"NodeJS Integration Test Passed\""
+	COMMAND ${TEST_COMMAND} "${NODEJS_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/node_integration.js | ${GREP_COMMAND} \"NodeJS Integration Test Passed\""
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 test_environment_variables(${target}_node_binary

source/scripts/typescript/templating/source/tsconfig.json

@@ -0,0 +1,10 @@
+{
+	"include": [
+		"templating.tsx"
+	],
+	"compilerOptions": {
+		"target": "es5",
+		"jsx": "react",
+		"lib": ["es2015", "dom"]
+	}
+}

source/tests/metacall_typescript_tsx_test/CMakeLists.txt

@@ -148,6 +148,7 @@ target_link_libraries(${target}
 
 add_test(NAME ${target}
 	COMMAND $<TARGET_FILE:${target}>
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/source/scripts/typescript/templating/source
 )
 
 #