rnxsim 0.1.520 → 0.1.522

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.520 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.522 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;
@@ -32,7 +32,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/swift.ts
 var swift_exports = {};
 __export(swift_exports, {
-  createSwiftModule: () => createSwiftModule
+  createSwiftModule: () => createSwiftModule,
+  createSwiftView: () => createSwiftView
 });
 module.exports = __toCommonJS(swift_exports);
 
@@ -189,6 +190,20 @@ function pointerExport(exports2, name) {
     return result;
   };
 }
+function maybePointerExport(exports2, name) {
+  const value = exports2[name];
+  if (value === void 0) return void 0;
+  if (typeof value !== "function") {
+    throw new Error(`swift export ${name} is not a function`);
+  }
+  return (...args) => {
+    const result = Reflect.apply(value, void 0, args);
+    if (typeof result !== "number") {
+      throw new Error(`swift export ${name} returned ${typeof result}`);
+    }
+    return result;
+  };
+}
 function voidExport(exports2, name) {
   const fn = rawExport(exports2, name);
   return (...args) => {
@@ -221,6 +236,8 @@ function instantiate(module2) {
   const initialize = voidExport(instance.exports, "_initialize");
   const mainArgv = voidExport(instance.exports, "__main_argc_argv");
   const mount = pointerExport(instance.exports, "rnx_mount");
+  const mountViewExport = maybePointerExport(instance.exports, "rnx_mount_view");
+  const hasViewExport = maybePointerExport(instance.exports, "rnx_has_view");
   const event = pointerExport(instance.exports, "rnx_event");
   const stateExport = pointerExport(instance.exports, "rnx_state_export");
   const stateImport = voidExport(instance.exports, "rnx_state_import");
@@ -244,7 +261,30 @@ function instantiate(module2) {
   initialize();
   mainArgv(0, 0);
   return {
-    mount: () => readTree(readBuffer(mount())),
+    mount: () => {
+      if ((hasViewExport?.() ?? 0) === 1) {
+        throw new Error(
+          "swift package has an RNXPackage entry, not an App entry; mount it as a view or make its @main type conform to App"
+        );
+      }
+      return readTree(readBuffer(mount()));
+    },
+    mountView: (props) => {
+      if (!mountViewExport) {
+        throw new Error(
+          "swift artifact has no rnx_mount_view export; rebuild the swift package"
+        );
+      }
+      if ((hasViewExport?.() ?? 0) !== 1) {
+        throw new Error(
+          "swift package has no RNXPackage entry; its @main type must conform to RNXPackage to mount as a view"
+        );
+      }
+      return readTree(
+        readBuffer(withPayload(props, (ptr, length) => mountViewExport(ptr, length)))
+      );
+    },
+    hasView: () => (hasViewExport?.() ?? 0) === 1,
     deliver: (handlerId2, payload) => readTree(
       readBuffer(
         withPayload(
@@ -628,8 +668,10 @@ function nodeProps(node, deliver) {
     }
     case "BottomSheet": {
       const onDismiss = handlerId(node, "onDismiss");
+      const detents = (node.c ?? []).flatMap((child) => nodeModifiers(child) ?? []).filter((modifier) => modifier.$type === "presentationDetents");
       return {
         isOpened: props.isOpened === true,
+        ...detents.length === 0 ? {} : { modifiers: detents },
         ...onDismiss === void 0 ? {} : { onDismiss: () => deliver(onDismiss, null) }
       };
     }
@@ -1033,6 +1075,26 @@ function NavigationStackHost({ node, deliver }) {
     screen.id
   )) });
 }
+var REGULAR_WIDTH = 768;
+function SplitViewHost({
+  node,
+  deliver,
+  cache
+}) {
+  const { width } = (0, import_react_native.useWindowDimensions)();
+  const screens = (node.c ?? []).filter((child) => child.t === "NavigationScreen");
+  if (width < REGULAR_WIDTH) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: NAVIGATOR_FILL, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NavigationStackHost, { node, deliver }) });
+  }
+  const sidebar = screens[0];
+  const pushed = screens.slice(1);
+  const detailProp = node.p?.detail;
+  const detail = isRecord(detailProp) && detailProp.t === "SplitDetail" ? readNodes(detailProp.c) : [];
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native.View, { style: { flex: 1, flexDirection: "row", alignSelf: "stretch" }, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: { width: 320 }, children: sidebar ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NavigationStackHost, { node: { ...node, c: [sidebar] }, deliver }) : null }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: { flex: 1 }, children: pushed.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NavigationStackHost, { node: { ...node, c: pushed }, deliver }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: detail.map((child) => renderNode(child, deliver, cache)) }) })
+  ] });
+}
 function renderNode(node, deliver, cache) {
   const cached = cache?.entries.get(node.id);
   if (cached && sameNode(cached.node, node)) return cached.element;
@@ -1048,6 +1110,9 @@ function buildNode(node, deliver, cache) {
   if (node.t === "NavigationStack") {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: NAVIGATOR_FILL, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NavigationStackHost, { node, deliver }) }, node.id);
   }
+  if (node.t === "NavigationSplitView") {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SplitViewHost, { node, deliver, cache }, node.id);
+  }
   if (node.t === "NavigationLink") {
     return (0, import_react.createElement)(
       import_ui.Button,
@@ -1085,7 +1150,9 @@ function SwiftTree({
       import_ui.Host,
       {
         style: { flex: 1 },
-        ignoreSafeArea: tree.some((node) => node.t === "NavigationStack"),
+        ignoreSafeArea: tree.some(
+          (node) => node.t === "NavigationStack" || node.t === "NavigationSplitView"
+        ),
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_native.NavigationIndependentTree, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_native.NavigationContainer, { children: tree.map((node) => renderNode(node, deliver, cache)) }) })
       }
     )
@@ -1099,9 +1166,18 @@ function rootRegistry() {
   Reflect.set(globalThis, ROOT_KEY, created);
   return created;
 }
-function createRoot() {
+function slotFor(rootId, mountTree, props) {
+  const registry = rootRegistry();
+  const existing = registry.get(rootId);
+  if (existing) return existing;
+  const created = { root: createRoot(mountTree, props), props };
+  registry.set(rootId, created);
+  return created;
+}
+function createRoot(mountTree, props) {
   let instance = null;
   let source = null;
+  let refresh;
   let state = { tree: null, error: null };
   let swap = Promise.resolve();
   const listeners = /* @__PURE__ */ new Set();
@@ -1116,7 +1192,7 @@ function createRoot() {
     if (carried !== null) created.importState(carried);
     if (source !== options) return;
     instance = created;
-    publish({ tree: created.mount(), error: null });
+    publish({ tree: mountTree(created, props.current), error: null });
   };
   const component = function SwiftRoot() {
     const rendered = (0, import_react.useSyncExternalStore)(
@@ -1136,10 +1212,11 @@ function createRoot() {
   };
   return {
     component,
-    use(options) {
-      const changed = source === null || source.hash !== options.hash || source.url !== options.url;
+    use(options, refreshKey) {
+      const changed = source === null || source.hash !== options.hash || source.url !== options.url || refreshKey !== void 0 && refreshKey !== refresh;
       if (changed) {
         source = options;
+        refresh = refreshKey;
         swap = swap.then(
           () => apply(options),
           () => apply(options)
@@ -1157,13 +1234,41 @@ function createRoot() {
 }
 function createSwiftModule(options) {
   const rootId = options.rootId ?? "root";
-  const registry = rootRegistry();
-  const existing = registry.get(rootId);
-  const root = existing ?? createRoot();
-  if (!existing) registry.set(rootId, root);
-  return root.use(options);
+  const slot = slotFor(rootId, (instance) => instance.mount(), { current: {} });
+  return slot.root.use(options);
+}
+function propsSignature(props) {
+  try {
+    return JSON.stringify(props, (_key, value) => {
+      if (typeof value === "function" || typeof value === "symbol" || typeof value === "bigint") {
+        throw new Error(`swift view props must be json; found ${typeof value}`);
+      }
+      return value;
+    }) ?? "null";
+  } catch (error) {
+    if (error instanceof Error && error.message.startsWith("swift view props"))
+      throw error;
+    throw new Error(
+      `swift view props must be json: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+function createSwiftView(options) {
+  const rootId = options.rootId ?? "view";
+  const slot = slotFor(rootId, (instance, props) => instance.mountView(props), {
+    current: {}
+  });
+  return function SwiftView(props) {
+    if (props.children !== void 0) {
+      throw new Error("swift views take data props, not children");
+    }
+    slot.props.current = props;
+    const component = slot.root.use(options, propsSignature(props));
+    return (0, import_react.createElement)(component);
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createSwiftModule
+  createSwiftModule,
+  createSwiftView
 });

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.520 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.522 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;
@@ -765,7 +765,8 @@ var import_node_util = require("node:util");
 
 // ../sootsim-swift/toolchain.json
 var toolchain_default = {
-  release: "swift-6.3-RELEASE"
+  release: "swift-6.3-RELEASE",
+  wasmSdkChecksum: "9fa4016ee632c7e9e906608ec3b55cf13dfc4dff44e47574c5af58064dc33fd9"
 };
 
 // src/vite-plugin-swift.ts
@@ -787,30 +788,50 @@ function projectFor(packagePath) {
   projects.set(packagePath, created);
   return created;
 }
-function rootFor(file) {
-  return devServer?.config.root ?? import_node_path4.default.dirname(file);
-}
-function sourceFiles(packagePath) {
+function sourceFiles(root) {
   const found = [];
   const walk = (dir) => {
     for (const entry of import_node_fs3.default.readdirSync(dir, { withFileTypes: true })) {
       if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
       const full = import_node_path4.default.join(dir, entry.name);
-      if (entry.isDirectory()) walk(full);
-      else if (entry.name.endsWith(".swift")) found.push(full);
+      if (entry.isDirectory()) {
+        if (full !== root && import_node_fs3.default.existsSync(import_node_path4.default.join(full, "Package.swift"))) continue;
+        walk(full);
+      } else if (entry.name.endsWith(".swift")) found.push(full);
     }
   };
-  walk(packagePath);
+  walk(root);
   return found;
 }
+function linkedModuleRoots(packagePath) {
+  let manifest;
+  try {
+    manifest = import_node_fs3.default.readFileSync(import_node_path4.default.join(packagePath, "Package.swift"), "utf8");
+  } catch {
+    return [];
+  }
+  const roots = /* @__PURE__ */ new Set();
+  const dependency = /\.package\(\s*path:\s*"([^"]+)"\s*\)/g;
+  for (const match of manifest.replace(/^\s*\/\/.*$/gm, "").matchAll(dependency)) {
+    const root = import_node_path4.default.resolve(packagePath, match[1]);
+    if (import_node_fs3.default.existsSync(import_node_path4.default.join(root, "Package.swift"))) roots.add(root);
+  }
+  return [...roots].sort();
+}
 function sourceStamp(packagePath) {
   const hash = (0, import_node_crypto2.createHash)("sha256");
-  for (const file of sourceFiles(packagePath).sort()) {
-    hash.update(import_node_path4.default.relative(packagePath, file));
-    hash.update(String(import_node_fs3.default.statSync(file).mtimeMs));
+  for (const root of [packagePath, ...linkedModuleRoots(packagePath)]) {
+    hash.update(root);
+    for (const file of sourceFiles(root).sort()) {
+      hash.update(import_node_path4.default.relative(root, file));
+      hash.update(String(import_node_fs3.default.statSync(file).mtimeMs));
+    }
   }
   return hash.digest("hex").slice(0, 16);
 }
+function viewRootId(packagePath, file) {
+  return import_node_path4.default.join(packagePath, import_node_path4.default.relative(packagePath, file));
+}
 function artifactUrl(project, artifact) {
   const address = devServer?.httpServer?.address();
   const port = address && typeof address === "object" ? address.port : devServer?.config.server.port;
@@ -827,6 +848,11 @@ function builtArtifact(packagePath) {
   }
   return import_node_path4.default.join(binDir, artifacts[0]);
 }
+function streamText(value) {
+  if (typeof value === "string") return value.trim();
+  if (Buffer.isBuffer(value)) return value.toString("utf8").trim();
+  return "";
+}
 async function compile(packagePath, stamp) {
   const swift = import_node_path4.default.join(TOOLCHAIN_BIN, "swift");
   if (!import_node_fs3.default.existsSync(swift)) {
@@ -851,10 +877,13 @@ async function compile(packagePath, stamp) {
       { maxBuffer: 64 * 1024 * 1024 }
     );
   } catch (error) {
-    throw new Error(
-      `swift build failed for ${packagePath}
-${error instanceof Error ? error.message : String(error)}`
-    );
+    const streams = error && typeof error === "object" ? [
+      streamText(Reflect.get(error, "stdout")),
+      streamText(Reflect.get(error, "stderr"))
+    ].filter(Boolean) : [];
+    const detail = streams.length > 0 ? streams.join("\n") : error instanceof Error ? error.message : String(error);
+    throw new Error(`swift build failed for ${packagePath}
+${detail}`);
   }
   const bytes = import_node_fs3.default.readFileSync(builtArtifact(packagePath));
   return {
@@ -866,7 +895,13 @@ ${error instanceof Error ? error.message : String(error)}`
 function artifactFor(project) {
   const stamp = sourceStamp(project.packagePath);
   if (project.artifact?.stamp === stamp) return Promise.resolve(project.artifact);
-  project.building ??= compile(project.packagePath, stamp).then(
+  if (project.building) {
+    const running = project.building;
+    if (running.stamp === stamp) return running.promise;
+    const again = () => artifactFor(project);
+    return running.promise.then(again, again);
+  }
+  const promise = compile(project.packagePath, stamp).then(
     (artifact) => {
       project.artifact = artifact;
       project.building = null;
@@ -877,10 +912,30 @@ function artifactFor(project) {
       throw error;
     }
   );
-  return project.building;
+  project.building = { stamp, promise };
+  return promise;
+}
+function packageFor(file) {
+  let dir = import_node_path4.default.dirname(file);
+  const stop = devServer?.config.root;
+  for (; ; ) {
+    if (import_node_fs3.default.existsSync(import_node_path4.default.join(dir, "Package.swift"))) return dir;
+    if (stop !== void 0 && dir === stop || import_node_path4.default.dirname(dir) === dir) break;
+    dir = import_node_path4.default.dirname(dir);
+  }
+  throw new Error(
+    `no Package.swift above ${file}${stop === void 0 ? "" : ` (searched up to ${stop})`}; a .swift import needs a swiftpm package like the one in packages/sootsim-swift/example`
+  );
+}
+function isViewPackage(packagePath) {
+  const main = /@main\s+(?:\w+\s+)*(?:struct|class|enum|actor)\s+\w+[^{]*:\s*[^{]*\bRNXPackage\b/;
+  for (const file of sourceFiles(packagePath)) {
+    const text = import_node_fs3.default.readFileSync(file, "utf8").replace(/^\s*\/\/.*$/gm, "");
+    if (main.test(text)) return true;
+  }
+  return false;
 }
 function swiftPlugin(options = {}) {
-  const packagePathFor = (file) => options.packagePath ?? rootFor(file);
   return {
     name: "rnx-swift",
     enforce: "pre",
@@ -897,9 +952,14 @@ function swiftPlugin(options = {}) {
     },
     async load(id) {
       if (!id.startsWith(VIRTUAL_PREFIX)) return null;
-      const packagePath = packagePathFor(id.slice(VIRTUAL_PREFIX.length));
+      const file = id.slice(VIRTUAL_PREFIX.length);
+      if (!import_node_fs3.default.existsSync(file)) throw new Error(`swift source ${file} no longer exists`);
+      const packagePath = options.packagePath ?? packageFor(file);
       const project = projectFor(packagePath);
       for (const source of sourceFiles(packagePath)) this.addWatchFile(source);
+      for (const root of linkedModuleRoots(packagePath)) {
+        for (const source of sourceFiles(root)) this.addWatchFile(source);
+      }
       let artifact;
       try {
         artifact = await artifactFor(project);
@@ -908,6 +968,14 @@ function swiftPlugin(options = {}) {
         this.warn(error instanceof Error ? error.message : String(error));
         artifact = project.artifact;
       }
+      if (isViewPackage(packagePath)) {
+        const rootId = viewRootId(packagePath, file);
+        return [
+          `import { createSwiftView } from 'rnxsim/swift'`,
+          `export default createSwiftView({ url: ${JSON.stringify(artifactUrl(project, artifact))}, hash: ${JSON.stringify(artifact.hash)}, rootId: ${JSON.stringify(rootId)} })`,
+          ""
+        ].join("\n");
+      }
       return [
         `import { createSwiftModule } from 'rnxsim/swift'`,
         `export default createSwiftModule({ url: ${JSON.stringify(artifactUrl(project, artifact))}, hash: ${JSON.stringify(artifact.hash)} })`,
@@ -916,30 +984,23 @@ function swiftPlugin(options = {}) {
     },
     configureServer(server) {
       devServer = server;
-      const packagePath = packagePathFor("");
       server.middlewares.use((req, res, next) => {
         const url = (req.url ?? "").split("?")[0];
         if (!url.startsWith(ARTIFACT_PATH)) {
           next();
           return;
         }
-        const project = projectFor(packagePath);
-        void artifactFor(project).then(
-          (artifact) => {
-            if (url !== `${ARTIFACT_PATH}${artifact.hash}.wasm`) {
-              res.statusCode = 404;
-              res.end("swift artifact is stale");
-              return;
-            }
+        for (const project of projects.values()) {
+          const artifact = project.artifact;
+          if (artifact && url === `${ARTIFACT_PATH}${artifact.hash}.wasm`) {
             res.setHeader("access-control-allow-origin", "*");
             res.setHeader("content-type", "application/wasm");
             res.end(artifact.bytes);
-          },
-          (error) => {
-            res.statusCode = 500;
-            res.end(error instanceof Error ? error.message : String(error));
+            return;
           }
-        );
+        }
+        res.statusCode = 404;
+        res.end("swift artifact is stale");
       });
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rnxsim",
-  "version": "0.1.520",
+  "version": "0.1.522",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for rnx.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/src/bridge-contract-input.ts

@@ -435,9 +435,19 @@ export function parseResetOptions(value: unknown): ResetOptions {
   if (strategy !== 'data' && strategy !== 'full') {
     return validationFailure('reset.strategy', 'must be data or full')
   }
+  // the shape check only; the simulator service re-validates the id against
+  // its own strict pattern and the caller's account before touching storage.
+  const from = input.from
+  if (
+    from !== undefined &&
+    (typeof from !== 'string' || from.length === 0 || from.length > 64)
+  ) {
+    return validationFailure('reset.from', 'must name a simulator')
+  }
   return {
     strategy,
     relaunch: optionalBoolean(input, 'relaunch', 'reset') ?? true,
+    ...(from === undefined ? {} : { from }),
   }
 }
 

package/src/bridge-contract.ts

@@ -502,6 +502,11 @@ export interface ResetOptions extends Pick<
   strategy?: ResetStrategy
   // relaunch the app after wiping. default true.
   relaunch?: boolean
+  // boot the wiped simulator on a live copy of another simulator's storage
+  // instead of empty stores: the cheap clean-but-not-cold seam. the id names
+  // a simulator on the same account; runtimes that cannot reach another
+  // simulator's storage refuse it by name rather than wiping without forking.
+  from?: string
 }
 
 export interface ResetResult {

package/src/cloud.ts

@@ -93,7 +93,12 @@ export interface RnxCommands {
   // a `data:image/png;base64,` url, assembled by the service from the frame
   screenshot(options?: { layers?: 'full' | 'tenant' | 'shell' }): Promise<string>
   capture(): Promise<RnxScreenCapture>
-  reset(): Promise<unknown>
+  // data wipes the app's stores and cold-remounts, keeping install-scoped
+  // credentials; full clears those too. from boots the wiped simulator on a
+  // wholesale live copy of another simulator's storage instead of empty
+  // stores. the bundle itself is never reinstalled: artifacts are immutable
+  // and sha-addressed, so there is no install to redo.
+  reset(options?: { strategy?: 'data' | 'full'; from?: string }): Promise<unknown>
   // the one-call read: screenshot, tree, route, and recent errors together.
   state(options?: SimStateOptions): Promise<unknown>
 }
@@ -433,7 +438,34 @@ export class RemoteSimulator {
         }
         return result
       },
-      reset: () => this.sendCommand({ type: 'reset' }),
+      reset: (options) => {
+        if (
+          options?.strategy !== undefined &&
+          options.strategy !== 'data' &&
+          options.strategy !== 'full'
+        ) {
+          throw new Error('RNX Cloud reset strategy must be data or full')
+        }
+        if (
+          options?.from !== undefined &&
+          (typeof options.from !== 'string' || options.from.length === 0)
+        ) {
+          throw new Error('RNX Cloud reset from must name a simulator')
+        }
+        return this.sendCommand(
+          options === undefined
+            ? { type: 'reset' }
+            : {
+                type: 'reset',
+                resetOptions: {
+                  ...(options.strategy === undefined
+                    ? {}
+                    : { strategy: options.strategy }),
+                  ...(options.from === undefined ? {} : { from: options.from }),
+                },
+              },
+        )
+      },
       state: (options) =>
         this.sendCommand(
           options === undefined

package/src/swift.ts

@@ -2,5 +2,7 @@
 // implementation lives beside the toolchain it drives, in sootsim-swift.
 export {
   createSwiftModule,
+  createSwiftView,
   type SwiftModuleOptions,
+  type SwiftViewOptions,
 } from '../../sootsim-swift/src/mount.tsx'