vxrn 1.26.0 → 1.26.1

package/dist/utils/createNativeDevEngine.native.js

@@ -1,7 +1,8 @@
 import { createHash } from "crypto";
 import { basename, dirname, extname, join, relative, resolve } from "path";
-import { copyFileSync, mkdirSync, readFileSync, readdirSync, realpathSync } from "fs";
+import { copyFileSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync } from "fs";
 import { pathToFileURL } from "url";
+import micromatch from "micromatch";
 import { loadEnv, normalizePath } from "vite";
 import { shouldStripFlow, transformHermesAsync } from "@vxrn/compiler";
 import { DEFAULT_ASSET_EXTS } from "../constants/defaults.native.js";
@@ -145,7 +146,13 @@ function getNativeTransformConfig(platform, dev, root) {
   };
 }
 function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, onAsset) {
-  var sourceMaps = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false;
+  var sourceMaps = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false,
+    userPlugins = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : [];
+  var context = {
+    root,
+    platform,
+    dev
+  };
   return [...(globalThis.__vxrnAddNativePlugins || []), serverFileExclusionPlugin(), environmentGuardPlugin(), hmrClientNoopPlugin(), cssStubPlugin(), viteImportGlobPlugin({
     root
   }), vxrnCompilerPlugin(platform, dev, root, sourceMaps), rnCodegenPlugin({
@@ -155,25 +162,47 @@ function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest,
     platform,
     assetsDest,
     onAsset
-  }), hermesCompatSWCPlugin(dev, sourceMaps), hermesLoopsPlugin(sourceMaps)];
+  }), hermesCompatSWCPlugin(dev, sourceMaps), hermesLoopsPlugin(sourceMaps), ...userPlugins].map(function (plugin) {
+    var _plugin_api;
+    return ((_plugin_api = plugin.api) === null || _plugin_api === void 0 ? void 0 : _plugin_api.vxrnNative) ? plugin.api.vxrnNative(context) : plugin;
+  });
 }
-function getNativeOutputOptions(prelude, sourcemap) {
+function getNativeOutputOptions(prelude, sourcemap, minify) {
   return {
     format: "esm",
     sourcemap,
+    sourcemapPathTransform: function (relativeSourcePath, sourcemapPath) {
+      return normalizePath(resolve(dirname(sourcemapPath), relativeSourcePath));
+    },
     intro: prelude,
     codeSplitting: false,
-    strictExecutionOrder: true
+    strictExecutionOrder: true,
+    minify: minify || "dce-only"
   };
 }
 function normalizeNativeCommonJSInterop(code) {
   return code.replace(/(\b__toESM(?:\$\d+)?\(\s*(?:require[\w$]*\(\)|__rolldown_runtime__\.loadExports\("(?:\\.|[^"\\])*"\))\s*),\s*1(\s*\))/g, "$1$2");
 }
+function blankPreservingLines(match) {
+  var _ref;
+  var _match_match;
+  return "\n".repeat((_ref = (_match_match = match.match(/\n/g)) === null || _match_match === void 0 ? void 0 : _match_match.length) !== null && _ref !== void 0 ? _ref : 0);
+}
+function countLines(code) {
+  var _ref;
+  var _code_match;
+  return ((_ref = (_code_match = code.match(/\n/g)) === null || _code_match === void 0 ? void 0 : _code_match.length) !== null && _ref !== void 0 ? _ref : 0) + 1;
+}
+function assertBundleLinesPreserved(before, after, stage) {
+  var beforeLines = countLines(before);
+  var afterLines = countLines(after);
+  if (beforeLines !== afterLines) throw new Error(`[vxrn] native bundle post-processing (${stage}) changed the line count (${beforeLines} -> ${afterLines}), which invalidates the source map. Every pass after Rolldown emits the map must preserve lines.`);
+}
 function postProcessNativeBundle(code) {
   code = normalizeNativeCommonJSInterop(code);
   code = code.replace(/\btypeof\s+import\.meta\b/g, "\"object\"");
-  code = code.replace(/^\s*export\s*\{[^}]*\}\s*;?\s*$/gm, "");
-  code = code.replace(/^\s*export\s+default\s+([^;\n]+);?\s*$/gm, "$1;");
+  code = code.replace(/^[^\S\n]*export[^\S\n]*\{[^}]*\}[^\S\n]*;?[^\S\n]*$/gm, blankPreservingLines);
+  code = code.replace(/^([^\S\n]*)export[^\S\n]+default[^\S\n]+([^;\n]+);?[^\S\n]*$/gm, "$1$2;");
   code = code.replace(/^if \(import\.meta\.hot\).*$/gm, "");
   var idx = code.indexOf("NativeAnimatedModule_default ?? NativeAnimatedTurboModule_default;");
   if (idx !== -1) {
@@ -185,7 +214,8 @@ function postProcessNativeBundle(code) {
         var afterMarker = code.indexOf("})();", idx);
         if (afterMarker !== -1) {
           var end = afterMarker + 5;
-          code = code.slice(0, beforeMarker) + "NativeAnimatedModule = NativeAnimatedModule_default ?? NativeAnimatedTurboModule_default;" + code.slice(end);
+          var removed = code.slice(beforeMarker, end);
+          code = code.slice(0, beforeMarker) + "NativeAnimatedModule = NativeAnimatedModule_default ?? NativeAnimatedTurboModule_default;" + blankPreservingLines(removed) + code.slice(end);
         }
       }
     }
@@ -195,7 +225,7 @@ function postProcessNativeBundle(code) {
 function wrapNativeBundleModuleScope(code) {
   var idx = code.indexOf("//#region \\0rolldown/runtime.js");
   if (idx === -1) return code;
-  return code.slice(0, idx) + ";(function() {\n" + code.slice(idx) + "\n})();\n";
+  return code.slice(0, idx) + ";(function() {" + code.slice(idx) + "\n})();\n";
 }
 async function downlevelClassFieldsInBundle(code) {
   var _ref, _ref1;
@@ -229,6 +259,19 @@ ${transformedCode}`;
   var linePreservingRuntime = transformed + "\n".repeat(originalNewlines - transformedNewlines);
   return code.slice(0, startIdx) + linePreservingRuntime + code.slice(runtimeEnd);
 }
+function nativeBundlePostProcessPlugin() {
+  return {
+    name: "vxrn:native-post-process",
+    async renderChunk(code) {
+      var processed = await downlevelClassFieldsInBundle(postProcessNativeBundle(code));
+      assertBundleLinesPreserved(code, processed, "production");
+      return {
+        code: processed,
+        map: null
+      };
+    }
+  };
+}
 async function createNativeDevEngine(options) {
   var {
     root,
@@ -256,7 +299,16 @@ async function createNativeDevEngine(options) {
   var bundleReject = null;
   var bundlePromise = null;
   var resolvedHost = host === "0.0.0.0" ? "localhost" : host;
-  var engine = await dev({
+  var virtualEntry = nativeVirtualEntryPlugin(root, {
+    dev: true
+  });
+  var engineWork = Promise.resolve();
+  var queueEngineWork = function (work) {
+    var result = engineWork.then(work, work);
+    engineWork = result.catch(function () {});
+    return result;
+  };
+  var inputOptions = {
     input: VIRTUAL_NATIVE_ENTRY,
     cwd: root,
     platform: "neutral",
@@ -276,74 +328,59 @@ async function createNativeDevEngine(options) {
     moduleTypes: {
       ".js": "jsx"
     },
-    plugins: [nativeVirtualEntryPlugin(root, {
-      dev: true
-    }), ...getNativePlugins(root, platform, viteImportGlobPlugin, true, void 0, assetRegistry.register, false), ...userPlugins]
-  }, {
-    ...getNativeOutputOptions(prelude, false),
+    plugins: [virtualEntry.plugin, ...getNativePlugins(root, platform, viteImportGlobPlugin, true, void 0, assetRegistry.register, true, userPlugins)]
+  };
+  var outputOptions = {
+    ...getNativeOutputOptions(prelude, true, false),
     outro: `
 try {
   var __WS = (init_WebSocket(), __toCommonJS(WebSocket_exports)).default;
   var __hmrUrl = 'ws://${resolvedHost}:${port}/hot?platform=${platform}&clientId=' + encodeURIComponent(__rolldown_runtime__.clientId);
-  var __hmrWS = new __WS(__hmrUrl);
-  __hmrWS.onmessage = function(event) {
-    try {
-      var msg = JSON.parse(event.data);
-      var g = typeof global !== 'undefined' ? global : globalThis;
-      if (msg.type === 'hmr:update' && msg.code) {
-        var applied = __rolldown_runtime__.applyHmrUpdate(msg.code, msg.changedIds, msg.seq);
-        if (!applied) {
-          var updateSettings = g.__turboModuleProxy ? g.__turboModuleProxy('DevSettings') : null;
-          if (updateSettings && updateSettings.reload) updateSettings.reload();
-        }
-      } else if (msg.type === 'hmr:reload') {
-        var ds = g.__turboModuleProxy ? g.__turboModuleProxy('DevSettings') : null;
-        if (ds && ds.reload) ds.reload();
-      }
-    } catch(e) { console.error('[vxrn] HMR eval error:', e); }
+  __rolldown_runtime__.setup(new __WS(__hmrUrl));
+} catch(e) {
+  // a swallowed failure here leaves the app permanently without Fast Refresh and
+  // nothing on screen or in the terminal says so.
+  console.error('[vxrn] HMR client failed to start:', (e && e.message) || e);
+}
+`
   };
-  __hmrWS.onopen = function() {
-    if (typeof __rolldown_runtime__ !== 'undefined' && __rolldown_runtime__.setup) {
-      __rolldown_runtime__.setup(__hmrWS);
-    }
+  var outputProcessed = Promise.resolve();
+  var engine;
+  var rebuildIfNewRoute = async function (files) {
+    var {
+      routeRoot,
+      files: knownRoutes,
+      isRouteFile
+    } = virtualEntry.routes;
+    var routeRootPrefix = `${normalizePath(routeRoot)}/`;
+    if (!files.some(function (file) {
+      var _statSync;
+      var normalized = normalizePath(file);
+      if (isRouteFile(normalized)) return !knownRoutes.has(normalized);
+      return normalized.startsWith(routeRootPrefix) && ((_statSync = statSync(file, {
+        throwIfNoEntry: false
+      })) === null || _statSync === void 0 ? void 0 : _statSync.isDirectory()) === true;
+    })) return false;
+    await queueEngineWork(async function () {
+      engine.triggerFullBuild();
+      await engine.ensureLatestBuildOutput();
+      await outputProcessed;
+    });
+    onHmrUpdate === null || onHmrUpdate === void 0 || onHmrUpdate({
+      type: "hmr:reload"
+    });
+    return true;
   };
-  __hmrWS.onerror = function(e) { console.warn('[vxrn] HMR connection error:', e.message || e); };
-} catch(e) {}
-`
-  }, {
+  engine = await dev(inputOptions, outputOptions, {
     onOutput: async function (result) {
-      if (_instanceof(result, Error)) {
-        console.error("[vxrn] native bundle error:", result.message);
-        if (!currentBundle) {
-          firstBuildError || (firstBuildError = result);
-          if (bundleReject) {
-            var reject = bundleReject;
-            bundleResolve = null;
-            bundleReject = null;
-            bundlePromise = null;
-            reject(firstBuildError);
-          }
-        }
-        return;
-      }
-      var chunk = result.output.find(function (o) {
-        return o.type === "chunk" && o.isEntry;
+      var finishOutput = function () {};
+      outputProcessed = new Promise(function (resolve2) {
+        finishOutput = resolve2;
       });
-      if (chunk && "code" in chunk) {
-        firstBuildError = null;
-        var code = postProcessNativeBundle(chunk.code);
-        code = await downlevelClassFieldsInBundle(code);
-        code = wrapNativeBundleModuleScope(code);
-        currentBundle = {
-          code
-        };
-        console.info(`[vxrn] native bundle ready (${Math.round(code.length / 1024)}KB)`);
-        if (bundleResolve) {
-          bundleResolve(currentBundle);
-          bundleResolve = null;
-          bundleReject = null;
-          bundlePromise = null;
-        }
+      try {
+        await handleOutput(result);
+      } finally {
+        finishOutput();
       }
     },
     onHmrUpdates: async function (result) {
@@ -354,6 +391,7 @@ try {
         });
         return;
       }
+      if (await rebuildIfNewRoute(result.changedFiles)) return;
       var _iteratorNormalCompletion = true,
         _didIteratorError = false,
         _iteratorError = void 0;
@@ -388,11 +426,53 @@ try {
     rebuildStrategy: "never",
     watch: {}
   });
+  async function handleOutput(result) {
+    if (_instanceof(result, Error)) {
+      console.error("[vxrn] native bundle error:", result.message);
+      if (/panic/i.test(result.message)) console.error("[vxrn] rolldown itself panicked. Fast Refresh will full-reload until you restart the dev server.");
+      if (!currentBundle) {
+        firstBuildError || (firstBuildError = result);
+        if (bundleReject) {
+          var reject = bundleReject;
+          bundleResolve = null;
+          bundleReject = null;
+          bundlePromise = null;
+          reject(firstBuildError);
+        }
+      }
+      return;
+    }
+    var chunk = result.output.find(function (o) {
+      return o.type === "chunk" && o.isEntry;
+    });
+    if (chunk && "code" in chunk) {
+      firstBuildError = null;
+      var code = postProcessNativeBundle(chunk.code);
+      code = await downlevelClassFieldsInBundle(code);
+      assertBundleLinesPreserved(chunk.code, code, "dev");
+      code = wrapNativeBundleModuleScope(code);
+      if (!chunk.map) throw new Error("[vxrn] rolldown produced no source map for the dev bundle, so /symbolicate cannot resolve a frame");
+      currentBundle = {
+        code,
+        map: chunk.map.toString()
+      };
+      console.info(`[vxrn] native bundle ready (${Math.round(code.length / 1024)}KB)`);
+      if (bundleResolve) {
+        bundleResolve(currentBundle);
+        bundleResolve = null;
+        bundleReject = null;
+        bundlePromise = null;
+      }
+    }
+  }
   await engine.run();
   return {
     engine,
     async getBundle() {
-      await engine.ensureLatestBuildOutput();
+      await queueEngineWork(async function () {
+        await engine.ensureLatestBuildOutput();
+        await outputProcessed;
+      });
       if (currentBundle) return currentBundle;
       if (firstBuildError) throw firstBuildError;
       if (!bundlePromise) {
@@ -421,6 +501,9 @@ try {
     },
     async close() {
       await engine.close();
+    },
+    async handleAddedFile(file) {
+      await rebuildIfNewRoute([file]);
     }
   };
 }
@@ -434,7 +517,8 @@ async function buildNativeBundle(options) {
     entryFile,
     assetsDest,
     plugins: userPlugins = [],
-    sourcemap = false
+    sourcemap = false,
+    minify = !dev
   } = options;
   var {
     build
@@ -463,16 +547,15 @@ async function buildNativeBundle(options) {
     },
     plugins: [...(entryFile ? [] : [nativeVirtualEntryPlugin(root, {
       dev
-    })]), ...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, void 0, sourcemap), ...userPlugins],
-    output: getNativeOutputOptions(prelude, sourcemap)
+    }).plugin]), ...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, void 0, sourcemap, userPlugins), nativeBundlePostProcessPlugin()],
+    output: getNativeOutputOptions(prelude, sourcemap, minify)
   })).output.find(function (o) {
     return o.type === "chunk" && o.isEntry;
   });
   if (!chunk || !("code" in chunk)) throw new Error("[vxrn] production build produced no output");
-  var code = postProcessNativeBundle(chunk.code);
-  code = await downlevelClassFieldsInBundle(code);
+  if (sourcemap && !chunk.map) throw new Error("[vxrn] a source map was requested but rolldown produced none for the production bundle");
   return {
-    code,
+    code: chunk.code,
     map: sourcemap ? (_chunk_map = chunk.map) === null || _chunk_map === void 0 ? void 0 : _chunk_map.toString() : void 0
   };
 }
@@ -529,13 +612,68 @@ createApp({
   linking: ${JSON.stringify(linking)},
 });
 `;
+  var routeRoot = resolve(root, routerRoot);
+  var stripDot = function (pattern) {
+    return pattern.replace(/^\.\//, "");
+  };
+  var includeGlobs = routeGlobs.filter(function (p) {
+    return !p.startsWith("!");
+  }).map(stripDot);
+  var excludeGlobs = routeGlobs.filter(function (p) {
+    return p.startsWith("!");
+  }).map(function (p) {
+    return stripDot(p.slice(1));
+  });
+  var isRouteFile = function (file) {
+    var relativeToRoot = normalizePath(relative(root, file));
+    return micromatch.isMatch(relativeToRoot, includeGlobs) && !micromatch.isMatch(relativeToRoot, excludeGlobs);
+  };
+  var routes = {
+    routeRoot,
+    files: /* @__PURE__ */new Set(),
+    isRouteFile
+  };
   return {
-    name: "vxrn:native-virtual-entry",
-    resolveId(id) {
-      if (id === VIRTUAL_NATIVE_ENTRY) return resolvedId;
-    },
-    load(id) {
-      if (id === resolvedId) return entryCode;
+    routes,
+    plugin: {
+      name: "vxrn:native-virtual-entry",
+      resolveId(id) {
+        if (id === VIRTUAL_NATIVE_ENTRY) return resolvedId;
+      },
+      load(id) {
+        var _this = this;
+        var _statSync;
+        if (id !== resolvedId) return;
+        routes.files.clear();
+        var walkRouteRoot = function (dir) {
+          _this.addWatchFile(dir);
+          var _iteratorNormalCompletion = true,
+            _didIteratorError = false,
+            _iteratorError = void 0;
+          try {
+            for (var _iterator = readdirSync(dir, {
+                withFileTypes: true
+              })[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+              var entry = _step.value;
+              var child = resolve(dir, entry.name);
+              if (entry.isDirectory()) walkRouteRoot(child);else if (isRouteFile(child)) routes.files.add(normalizePath(child));
+            }
+          } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+            } finally {
+              if (_didIteratorError) throw _iteratorError;
+            }
+          }
+        };
+        if ((_statSync = statSync(routeRoot, {
+          throwIfNoEntry: false
+        })) === null || _statSync === void 0 ? void 0 : _statSync.isDirectory()) walkRouteRoot(routeRoot);else this.addWatchFile(dirname(routeRoot));
+        return entryCode;
+      }
     }
   };
 }
@@ -1328,14 +1466,49 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
     }
   }
 
+  reload() {
+    var proxy = globalThis.__turboModuleProxy
+      ? globalThis.__turboModuleProxy('DevSettings')
+      : globalThis.nativeModuleProxy && globalThis.nativeModuleProxy.DevSettings;
+    if (proxy && proxy.reload) proxy.reload();
+  }
+
   setup(socket) {
     if (this._socket) return;
     this._socket = socket;
+    var runtime = this;
+    // addEventListener rather than socket.onmessage: the bundle's WebSocket is
+    // whatever the host platform provides, and a host that does not honor on*
+    // property assignment would otherwise leave the app permanently without
+    // Fast Refresh and say nothing.
+    socket.addEventListener('message', function(event) {
+      var message;
+      try {
+        message = JSON.parse(event.data);
+      } catch (error) {
+        return;
+      }
+      try {
+        if (message.type === 'hmr:update') {
+          // a patch that cannot be applied in place is the reload signal
+          if (!runtime.applyHmrUpdate(message.code, message.changedIds, message.seq)) {
+            runtime.reload();
+          }
+        } else if (message.type === 'hmr:reload') {
+          runtime.reload();
+        }
+      } catch (error) {
+        console.error('[vxrn HMR]: failed to apply update', error);
+      }
+    });
+    socket.addEventListener('error', function(event) {
+      console.warn('[vxrn HMR]: connection error', (event && event.message) || event);
+    });
   }
 }
 
 globalThis.__rolldown_runtime__ = new ReactNativeDevRuntime();
 `;
 }
-export { buildNativeBundle, createNativeDevAssetRegistry, createNativeDevEngine, getHermesSWCIncludes, getHmrRuntimeSource, getNativeAssetData, getNativeTransformConfig, hermesCompatPlugin, hermesCompatSWCPlugin, hermesLoopsPlugin, hmrClientNoopPlugin, nativeAnimatedGuardPlugin, normalizeNativeCommonJSInterop, vxrnCompilerPlugin, wrapNativeBundleModuleScope };
+export { buildNativeBundle, createNativeDevAssetRegistry, createNativeDevEngine, getHermesSWCIncludes, getHmrRuntimeSource, getNativeAssetData, getNativeTransformConfig, hermesCompatPlugin, hermesCompatSWCPlugin, hermesLoopsPlugin, hmrClientNoopPlugin, nativeAnimatedGuardPlugin, normalizeNativeCommonJSInterop, postProcessNativeBundle, vxrnCompilerPlugin, wrapNativeBundleModuleScope };
 //# sourceMappingURL=createNativeDevEngine.native.js.map