fix: worker url resolution with ~ beginning

Author: NathanWalker

NativeScript/runtime/ModuleInternal.mm

@@ -29,6 +29,12 @@ bool IsLikelyOptionalModule(const std::string& moduleName) {
   return false;
 }
 
+// Helper function to check if a file path is an ES module (.mjs) but not a source map (.mjs.map)
+bool IsESModule(const std::string& path) {
+  return path.size() >= 4 && path.compare(path.size() - 4, 4, ".mjs") == 0 &&
+         !(path.size() >= 8 && path.compare(path.size() - 8, 8, ".mjs.map") == 0);
+}
+
 // Helper function to resolve main entry from package.json with proper extension handling
 std::string ResolveMainEntryFromPackageJson(const std::string& baseDir) {
   // Get the main value from package.json
@@ -139,7 +145,7 @@ bool IsLikelyOptionalModule(const std::string& moduleName) {
   }
 
   // Check if this is an ES module (.mjs) and handle it directly
-  if (path.size() >= 4 && path.compare(path.size() - 4, 4, ".mjs") == 0) {
+  if (IsESModule(path)) {
     // For ES modules, use LoadESModule directly instead of require()
     TryCatch tc(isolate);
     Local<Value> moduleNamespace;
@@ -508,7 +514,7 @@ bool IsLikelyOptionalModule(const std::string& moduleName) {
   }
 
   // Check if this is an ES module
-  bool isESM = modulePath.size() >= 4 && modulePath.compare(modulePath.size() - 4, 4, ".mjs") == 0;
+  bool isESM = IsESModule(modulePath);
   std::shared_ptr<Caches> cache = Caches::Get(isolate);
 
   if (isESM) {
@@ -662,7 +668,7 @@ throw NativeScriptException(isolate,
 }
 
 Local<Value> ModuleInternal::LoadScript(Isolate* isolate, const std::string& path) {
-  if (path.size() >= 4 && path.compare(path.size() - 4, 4, ".mjs") == 0) {
+  if (IsESModule(path)) {
     // Treat all .mjs files as standard ES modules.
     return ModuleInternal::LoadESModule(isolate, path);
   }
@@ -1070,7 +1076,8 @@ ScriptOrigin origin(isolate, urlString, 0, 0, false, -1, Local<Value>(), false,
   std::shared_ptr<Caches> cache = Caches::Get(isolate);
   bool isWorkerContext = cache && cache->isWorker;
 
-  if (path.size() >= 4 && path.compare(path.size() - 4, 4, ".mjs") == 0) {
+  // Check if this is an .mjs file but NOT a .mjs.map file
+  if (IsESModule(path)) {
     // Read raw text without wrapping.
     std::string sourceText = tns::ReadText(path);
 

NativeScript/runtime/Worker.mm

@@ -7,6 +7,7 @@
 #include "NativeScriptException.h"
 #include "ObjectManager.h"
 #include "Runtime.h"
+#include "RuntimeConfig.h"
 
 using namespace v8;
 
@@ -110,6 +111,15 @@ throw NativeScriptException(
     std::shared_ptr<Persistent<Value>> poWorker = ObjectManager::Register(context, thiz);
 
     std::function<Isolate*()> func([worker, workerPath]() {
+      // Resolve tilde paths before creating the runtime
+      std::string resolvedPath = workerPath;
+      if (!workerPath.empty() && workerPath[0] == '~') {
+        // Convert ~/path to ApplicationPath/path
+        std::string tail = workerPath.size() >= 2 && workerPath[1] == '/' ? workerPath.substr(2)
+                                                                          : workerPath.substr(1);
+        resolvedPath = RuntimeConfig.ApplicationPath + "/" + tail;
+      }
+
       tns::Runtime* runtime = new tns::Runtime();
       Isolate* isolate = runtime->CreateIsolate();
       v8::Locker locker(isolate);
@@ -121,7 +131,7 @@ throw NativeScriptException(
       TryCatch tc(isolate);
 
       // Debug: Log worker execution
-      // printf("Worker: About to run module: %s\n", workerPath.c_str());
+      // printf("Worker: About to run module: %s\n", resolvedPath.c_str());
 
       // Debug: Check if console exists in worker context
       //      {
@@ -136,7 +146,7 @@ throw NativeScriptException(
       //         }
       //      }
 
-      runtime->RunModule(workerPath);
+      runtime->RunModule(resolvedPath);
 
       if (tc.HasCaught()) {
         Isolate::Scope isolate_scope(isolate);