rnxsim 0.1.522 → 0.1.524

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.522 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.524 | (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,8 +32,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/swift.ts
 var swift_exports = {};
 __export(swift_exports, {
-  createSwiftModule: () => createSwiftModule,
-  createSwiftView: () => createSwiftView
+  createSwiftEntry: () => createSwiftEntry
 });
 module.exports = __toCommonJS(swift_exports);
 
@@ -45,6 +44,17 @@ var import_ui = require("contrast-kit/ui");
 var import_react = require("react");
 var import_react_native = require("react-native");
 var import_react_native_bottom_tabs = __toESM(require("react-native-bottom-tabs"), 1);
+
+// ../sootsim-swift/src/bundleAssets.ts
+function resolveImageSource(source, table, onMiss) {
+  if (typeof source !== "string") return source;
+  const url = table[source];
+  if (typeof url === "string") return { uri: url };
+  onMiss(source);
+  return source;
+}
+
+// ../sootsim-swift/src/mount.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function isRecord(value) {
   return typeof value === "object" && value !== null;
@@ -190,20 +200,6 @@ 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) => {
@@ -236,13 +232,35 @@ 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 mountViewExport = pointerExport(instance.exports, "rnx_mount_view");
+  const hasViewExport = pointerExport(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");
   const alloc = pointerExport(instance.exports, "rnx_alloc");
   const free = voidExport(instance.exports, "rnx_free");
+  const openURLDrain = typeof instance.exports.rnx_open_url_drain === "function" ? pointerExport(instance.exports, "rnx_open_url_drain") : null;
+  const drainOpenURLs = () => {
+    if (!openURLDrain) return;
+    let urls;
+    try {
+      urls = JSON.parse(readBuffer(openURLDrain()));
+    } catch {
+      return;
+    }
+    if (!Array.isArray(urls)) return;
+    for (const url of urls) {
+      if (typeof url !== "string") continue;
+      import_react_native.Linking.canOpenURL(url).then(
+        (open) => {
+          if (open) import_react_native.Linking.openURL(url).catch(() => {
+          });
+        },
+        () => {
+        }
+      );
+    }
+  };
   const readBuffer = (ptr) => {
     const view = new DataView(requireMemory().buffer);
     const length = view.getUint32(ptr, true);
@@ -262,41 +280,44 @@ function instantiate(module2) {
   mainArgv(0, 0);
   return {
     mount: () => {
-      if ((hasViewExport?.() ?? 0) === 1) {
+      if (hasViewExport() === 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()));
+      const tree = readTree(readBuffer(mount()));
+      drainOpenURLs();
+      return tree;
     },
     mountView: (props) => {
-      if (!mountViewExport) {
-        throw new Error(
-          "swift artifact has no rnx_mount_view export; rebuild the swift package"
-        );
-      }
-      if ((hasViewExport?.() ?? 0) !== 1) {
+      if (hasViewExport() !== 1) {
         throw new Error(
           "swift package has no RNXPackage entry; its @main type must conform to RNXPackage to mount as a view"
         );
       }
-      return readTree(
+      const tree = readTree(
         readBuffer(withPayload(props, (ptr, length) => mountViewExport(ptr, length)))
       );
+      drainOpenURLs();
+      return tree;
     },
-    hasView: () => (hasViewExport?.() ?? 0) === 1,
-    deliver: (handlerId2, payload) => readTree(
-      readBuffer(
-        withPayload(
-          payload,
-          (ptr, length) => (
-            // handler ids are opaque to the tenant: they come from the tree
-            // this instance just returned and they are only meaningful to it
-            event(handlerId2, ptr, length)
+    hasView: () => hasViewExport() === 1,
+    deliver: (handlerId2, payload) => {
+      const tree = readTree(
+        readBuffer(
+          withPayload(
+            payload,
+            (ptr, length) => (
+              // handler ids are opaque to the tenant: they come from the tree
+              // this instance just returned and they are only meaningful to it
+              event(handlerId2, ptr, length)
+            )
           )
         )
-      )
-    ),
+      );
+      drainOpenURLs();
+      return tree;
+    },
     exportState: () => readBuffer(stateExport()),
     importState: (state) => {
       withPayload(JSON.parse(state), (ptr, length) => {
@@ -378,6 +399,18 @@ function resolveModifier(modifier) {
   }
   return { ...modifier, color: resolveColor(color) };
 }
+var SwiftResourcesContext = (0, import_react.createContext)(void 0);
+function SwiftImage(props) {
+  const table = (0, import_react.useContext)(SwiftResourcesContext);
+  const { source, ...rest } = props ?? {};
+  const resolved = resolveImageSource(source, table ?? {}, (name) => {
+    console.error(`swift: no bundle asset named '${name}' in this mount's resources`);
+  });
+  return (0, import_react.createElement)(import_ui.Image, {
+    ...rest,
+    ...source === void 0 ? {} : { source: resolved }
+  });
+}
 var NODE_COMPONENTS = {
   Alert: SwiftAlert,
   BottomSheet: import_ui.BottomSheet,
@@ -390,14 +423,17 @@ var NODE_COMPONENTS = {
   Divider: import_ui.Divider,
   Ellipse: import_ui.Ellipse,
   Form: import_ui.Form,
+  GeometryReader: import_ui.GeometryReader,
   GlassEffectContainer: import_ui.GlassEffectContainer,
   Group: import_ui.Group,
   HStack: import_ui.HStack,
-  Image: import_ui.Image,
+  Image: SwiftImage,
   Label: import_ui.Label,
   LazyVStack: import_ui.LazyVStack,
+  LinearGradient: import_ui.LinearGradient,
   List: import_ui.List,
   Menu: import_ui.Menu,
+  Path: import_ui.Path,
   Picker: import_ui.Picker,
   ProgressView: import_ui.ProgressView,
   Rectangle: import_ui.Rectangle,
@@ -613,6 +649,12 @@ function nodeProps(node, deliver) {
       const size = typeof font?.size === "number" ? font.size : void 0;
       return {
         ...typeof props.systemName === "string" ? { systemName: props.systemName } : {},
+        // a bundle asset name rides as the kit image source; the kit paints
+        // resolved { uri } sources and keeps its placeholder for names the
+        // table could not resolve.
+        ...typeof props.name === "string" ? { source: props.name } : {},
+        ...props.resizable === true ? { resizable: true } : {},
+        ...typeof props.renderingMode === "string" ? { renderingMode: props.renderingMode } : {},
         ...size === void 0 ? {} : { size },
         ...pressProps(node, deliver)
       };
@@ -1095,10 +1137,26 @@ function SplitViewHost({
     /* @__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 SwiftAppear({
+  node,
+  deliver,
+  children
+}) {
+  const onAppear = handlerId(node, "onAppear");
+  const onDisappear = handlerId(node, "onDisappear");
+  (0, import_react.useEffect)(() => {
+    if (onAppear !== void 0) deliver(onAppear, null);
+    return () => {
+      if (onDisappear !== void 0) deliver(onDisappear, null);
+    };
+  }, []);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
+}
 function renderNode(node, deliver, cache) {
   const cached = cache?.entries.get(node.id);
   if (cached && sameNode(cached.node, node)) return cached.element;
-  const element = buildNode(node, deliver, cache);
+  const built = buildNode(node, deliver, cache);
+  const element = node.h?.onAppear !== void 0 || node.h?.onDisappear !== void 0 ? (0, import_react.createElement)(SwiftAppear, { key: node.id, node, deliver }, built) : built;
   cache?.entries.set(node.id, { node, element });
   return element;
 }
@@ -1140,20 +1198,29 @@ function buildNode(node, deliver, cache) {
 function SwiftTree({
   tree,
   deliver,
-  cache
+  cache,
+  resources
 }) {
   return (
     // a navigation stack at the root lays its own bar out under the status
     // bar and insets each screen itself, so the host must not also pad it
     // down: that pad would move the whole stack a status bar lower
+    // a swiftui scene is opaque: the window behind every screen is
+    // systemBackground, and lists paint their grouped fill over it (the kit's
+    // grouped container already does). without this a listless screen shows
+    // whatever sits beneath the mount. RAN on the safeArea probe (iphone 17
+    // pro): (600,1300) reads #ffffff ios against #f2f2f7 rnx, 99.92% of the
+    // frame; dark matches on both legs (the oracle's falsifier: the two
+    // fills coincide there). PlatformColor is this lane's spelling for a
+    // semantic color.
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       import_ui.Host,
       {
-        style: { flex: 1 },
+        style: { flex: 1, backgroundColor: (0, import_react_native.PlatformColor)("systemBackground") },
         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)) }) })
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_native.NavigationIndependentTree, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_native.NavigationContainer, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SwiftResourcesContext.Provider, { value: resources, children: tree.map((node) => renderNode(node, deliver, cache)) }) }) })
       }
     )
   );
@@ -1166,19 +1233,19 @@ function rootRegistry() {
   Reflect.set(globalThis, ROOT_KEY, created);
   return created;
 }
-function slotFor(rootId, mountTree, props) {
+function slotFor(rootId, mountTree) {
   const registry = rootRegistry();
   const existing = registry.get(rootId);
   if (existing) return existing;
-  const created = { root: createRoot(mountTree, props), props };
+  const created = { root: createRoot(mountTree) };
   registry.set(rootId, created);
   return created;
 }
-function createRoot(mountTree, props) {
+function createRoot(mountTree) {
   let instance = null;
   let source = null;
   let refresh;
-  let state = { tree: null, error: null };
+  let state = { tree: null, isView: false, error: null };
   let swap = Promise.resolve();
   const listeners = /* @__PURE__ */ new Set();
   const cache = { entries: /* @__PURE__ */ new Map() };
@@ -1186,13 +1253,14 @@ function createRoot(mountTree, props) {
     state = next;
     for (const listener of listeners) listener();
   };
-  const apply = async (options) => {
+  const apply = async (options, props) => {
     const carried = instance?.exportState() ?? null;
     const created = instantiate(await compile(options.url));
     if (carried !== null) created.importState(carried);
     if (source !== options) return;
     instance = created;
-    publish({ tree: mountTree(created, props.current), error: null });
+    const mounted = mountTree(created, props);
+    publish({ tree: mounted.tree, isView: mounted.isView, error: null });
   };
   const component = function SwiftRoot() {
     const rendered = (0, import_react.useSyncExternalStore)(
@@ -1206,24 +1274,41 @@ function createRoot(mountTree, props) {
     if (!rendered.tree) return null;
     const deliver = (handlerId2, payload) => {
       if (!instance) throw new Error("swift app received an event before it mounted");
-      publish({ tree: instance.deliver(handlerId2, payload), error: null });
+      publish({
+        tree: instance.deliver(handlerId2, payload),
+        isView: rendered.isView,
+        error: null
+      });
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SwiftTree, { tree: rendered.tree, deliver, cache });
+    const resources = source?.resources;
+    if (rendered.isView)
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SwiftResourcesContext.Provider, { value: resources, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: rendered.tree.map((node) => renderNode(node, deliver, cache)) }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      SwiftTree,
+      {
+        tree: rendered.tree,
+        deliver,
+        cache,
+        resources
+      }
+    );
   };
   return {
     component,
-    use(options, refreshKey) {
-      const changed = source === null || source.hash !== options.hash || source.url !== options.url || refreshKey !== void 0 && refreshKey !== refresh;
+    use(options, refreshKey, props) {
+      const changed = source === null || source.hash !== options.hash || source.url !== options.url || JSON.stringify(source.resources ?? null) !== JSON.stringify(options.resources ?? null) || refreshKey !== void 0 && refreshKey !== refresh;
       if (changed) {
         source = options;
         refresh = refreshKey;
+        const next = props ?? {};
         swap = swap.then(
-          () => apply(options),
-          () => apply(options)
+          () => apply(options, next),
+          () => apply(options, next)
         );
         swap.catch((error) => {
           publish({
             tree: null,
+            isView: false,
             error: error instanceof Error ? error : new Error(String(error))
           });
         });
@@ -1232,11 +1317,6 @@ function createRoot(mountTree, props) {
     }
   };
 }
-function createSwiftModule(options) {
-  const rootId = options.rootId ?? "root";
-  const slot = slotFor(rootId, (instance) => instance.mount(), { current: {} });
-  return slot.root.use(options);
-}
 function propsSignature(props) {
   try {
     return JSON.stringify(props, (_key, value) => {
@@ -1253,22 +1333,21 @@ function propsSignature(props) {
     );
   }
 }
-function createSwiftView(options) {
-  const rootId = options.rootId ?? "view";
-  const slot = slotFor(rootId, (instance, props) => instance.mountView(props), {
-    current: {}
-  });
-  return function SwiftView(props) {
+function createSwiftEntry(options) {
+  const rootId = options.rootId ?? "root";
+  const slot = slotFor(
+    rootId,
+    (instance, props) => instance.hasView() ? { tree: instance.mountView(props), isView: true } : { tree: instance.mount(), isView: false }
+  );
+  return function SwiftEntry(props) {
     if (props.children !== void 0) {
-      throw new Error("swift views take data props, not children");
+      throw new Error("swift entries take data props, not children");
     }
-    slot.props.current = props;
-    const component = slot.root.use(options, propsSignature(props));
+    const component = slot.root.use(options, propsSignature(props), props);
     return (0, import_react.createElement)(component);
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createSwiftModule,
-  createSwiftView
+  createSwiftEntry
 });

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.522 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.524 | (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;
@@ -763,6 +763,75 @@ var import_node_os2 = __toESM(require("node:os"), 1);
 var import_node_path4 = __toESM(require("node:path"), 1);
 var import_node_util = require("node:util");
 
+// ../sootsim-swift/src/bundleAssets.ts
+var RASTER_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".avif",
+  ".bmp",
+  ".gif",
+  ".ico",
+  ".jpeg",
+  ".jpg",
+  ".png",
+  ".webp"
+]);
+function extOf(file) {
+  const dot = file.lastIndexOf(".");
+  return dot < 0 ? "" : file.slice(dot).toLowerCase();
+}
+function baseOf(file) {
+  const slash = file.lastIndexOf("/");
+  return slash < 0 ? file : file.slice(slash + 1);
+}
+function pickImagesetFile(images) {
+  const rasters = images.filter(
+    (image) => typeof image.filename === "string" && RASTER_EXTENSIONS.has(extOf(image.filename))
+  );
+  if (rasters.length === 0) return null;
+  const rank = (scale) => scale === "2x" ? 0 : scale === "3x" ? 1 : scale === "1x" ? 2 : 3;
+  return [...rasters].sort((a, b) => rank(a.scale) - rank(b.scale))[0].filename;
+}
+function imagesetName(contentsPath) {
+  const dir = contentsPath.split("/").slice(0, -1).join("/");
+  const leaf = baseOf(dir);
+  if (!leaf.endsWith(".imageset")) return null;
+  return leaf.slice(0, -".imageset".length) || null;
+}
+function isFlatResourceImage(path7) {
+  return path7.split("/").includes("Resources") && RASTER_EXTENSIONS.has(extOf(path7));
+}
+function enumerateBundleImages(paths, readText) {
+  const table = [];
+  const seen = /* @__PURE__ */ new Set();
+  const catalogs = paths.filter((path7) => baseOf(path7) === "Contents.json");
+  for (const contentsPath of catalogs) {
+    const name = imagesetName(contentsPath);
+    if (name === null || seen.has(name)) continue;
+    let parsed;
+    try {
+      const text = readText(contentsPath);
+      if (text === null) continue;
+      parsed = JSON.parse(text);
+    } catch {
+      continue;
+    }
+    const images = parsed?.images;
+    if (!Array.isArray(images)) continue;
+    const dir = contentsPath.split("/").slice(0, -1).join("/");
+    const file = pickImagesetFile(images);
+    if (file === null || file.includes("/") || file.includes("\\")) continue;
+    seen.add(name);
+    table.push({ name, file: `${dir}/${file}` });
+  }
+  for (const path7 of paths) {
+    if (!isFlatResourceImage(path7)) continue;
+    const name = baseOf(path7).slice(0, -extOf(path7).length);
+    if (name === "" || seen.has(name)) continue;
+    seen.add(name);
+    table.push({ name, file: path7 });
+  }
+  return table;
+}
+
 // ../sootsim-swift/toolchain.json
 var toolchain_default = {
   release: "swift-6.3-RELEASE",
@@ -778,13 +847,19 @@ var TOOLCHAIN_BIN = import_node_path4.default.join(
 var WASM_SDK = `${toolchain_default.release}_wasm`;
 var WASM_TRIPLE = "wasm32-unknown-wasip1";
 var ARTIFACT_PATH = "/__rnx/swift/";
+var RESOURCE_PATH = "/__rnx/swift-res/";
 var VIRTUAL_PREFIX = "\0rnx-swift:";
 var projects = /* @__PURE__ */ new Map();
 var devServer;
 function projectFor(packagePath) {
   const existing = projects.get(packagePath);
   if (existing) return existing;
-  const created = { packagePath, artifact: null, building: null };
+  const created = {
+    packagePath,
+    artifact: null,
+    building: null,
+    resourceFiles: /* @__PURE__ */ new Map()
+  };
   projects.set(packagePath, created);
   return created;
 }
@@ -803,6 +878,84 @@ function sourceFiles(root) {
   walk(root);
   return found;
 }
+function resourceCandidateFiles(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" || entry.name === ".build")
+        continue;
+      const full = import_node_path4.default.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (full !== root && import_node_fs3.default.existsSync(import_node_path4.default.join(full, "Package.swift"))) continue;
+        walk(full);
+      } else {
+        found.push(full);
+      }
+    }
+  };
+  walk(root);
+  return found;
+}
+var RESOURCE_CONTENT_TYPES = {
+  ".avif": "image/avif",
+  ".bmp": "image/bmp",
+  ".gif": "image/gif",
+  ".ico": "image/x-icon",
+  ".jpeg": "image/jpeg",
+  ".jpg": "image/jpeg",
+  ".png": "image/png",
+  ".webp": "image/webp"
+};
+function buildSwiftResourceTable(project, baseUrl) {
+  const absolute = resourceCandidateFiles(project.packagePath);
+  const relative2 = absolute.map(
+    (file) => import_node_path4.default.relative(project.packagePath, file).split(import_node_path4.default.sep).join(import_node_path4.default.posix.sep)
+  );
+  const byRelative = new Map(absolute.map((file, index) => [relative2[index], file]));
+  const found = enumerateBundleImages(relative2, (candidate) => {
+    const file = byRelative.get(candidate);
+    if (!file || import_node_path4.default.basename(file) !== "Contents.json") return null;
+    try {
+      return import_node_fs3.default.readFileSync(file, "utf8");
+    } catch {
+      return null;
+    }
+  });
+  const table = {};
+  const watched = [];
+  const registered = /* @__PURE__ */ new Map();
+  for (const { name, file } of found) {
+    const disk = byRelative.get(file);
+    if (!disk) continue;
+    let bytes;
+    try {
+      bytes = import_node_fs3.default.readFileSync(disk);
+    } catch {
+      continue;
+    }
+    const hash = (0, import_node_crypto2.createHash)("sha256").update(bytes).digest("hex").slice(0, 16);
+    const ext = import_node_path4.default.posix.extname(file).toLowerCase();
+    table[name] = `${baseUrl}${RESOURCE_PATH}${hash}${ext}`;
+    watched.push(file);
+    const contents = file.replace(/\/[^/]+$/, "/Contents.json");
+    if (byRelative.has(contents)) watched.push(contents);
+    registered.set(`${hash}${ext}`, disk);
+  }
+  project.resourceFiles = registered;
+  return { table, watched };
+}
+function serveSwiftResource(project, key) {
+  const disk = project.resourceFiles.get(key);
+  if (!disk) return null;
+  try {
+    return {
+      bytes: import_node_fs3.default.readFileSync(disk),
+      contentType: RESOURCE_CONTENT_TYPES[import_node_path4.default.extname(disk).toLowerCase()] ?? "application/octet-stream"
+    };
+  } catch {
+    return null;
+  }
+}
 function linkedModuleRoots(packagePath) {
   let manifest;
   try {
@@ -829,14 +982,18 @@ function sourceStamp(packagePath) {
   }
   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 entryRootId(packagePath, file) {
+  const relative2 = import_node_path4.default.relative(packagePath, file).split(import_node_path4.default.sep).join(import_node_path4.default.posix.sep);
+  return `${import_node_path4.default.basename(packagePath)}${import_node_path4.default.posix.sep}${relative2}`;
 }
-function artifactUrl(project, artifact) {
+function serverOrigin() {
   const address = devServer?.httpServer?.address();
   const port = address && typeof address === "object" ? address.port : devServer?.config.server.port;
-  if (!port) throw new Error("the swift artifact url needs the dev server port");
-  return `http://localhost:${port}${ARTIFACT_PATH}${artifact.hash}.wasm`;
+  if (!port) throw new Error("the swift urls need the dev server port");
+  return `http://localhost:${port}`;
+}
+function artifactUrl(project, artifact) {
+  return `${serverOrigin()}${ARTIFACT_PATH}${artifact.hash}.wasm`;
 }
 function builtArtifact(packagePath) {
   const binDir = import_node_path4.default.join(packagePath, ".build", WASM_TRIPLE, "release");
@@ -927,14 +1084,6 @@ function packageFor(file) {
     `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 = {}) {
   return {
     name: "rnx-swift",
@@ -968,17 +1117,19 @@ 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");
+      let resources = {};
+      try {
+        const built = buildSwiftResourceTable(project, serverOrigin());
+        resources = built.table;
+        for (const watched of built.watched) this.addWatchFile(watched);
+      } catch (error) {
+        this.warn(
+          `swift resources for ${packagePath}: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
       return [
-        `import { createSwiftModule } from 'rnxsim/swift'`,
-        `export default createSwiftModule({ url: ${JSON.stringify(artifactUrl(project, artifact))}, hash: ${JSON.stringify(artifact.hash)} })`,
+        `import { createSwiftEntry } from 'rnxsim/swift'`,
+        `export default createSwiftEntry({ url: ${JSON.stringify(artifactUrl(project, artifact))}, hash: ${JSON.stringify(artifact.hash)}, rootId: ${JSON.stringify(entryRootId(packagePath, file))}, resources: ${JSON.stringify(resources)} })`,
         ""
       ].join("\n");
     },
@@ -986,6 +1137,20 @@ function swiftPlugin(options = {}) {
       devServer = server;
       server.middlewares.use((req, res, next) => {
         const url = (req.url ?? "").split("?")[0];
+        if (url.startsWith(RESOURCE_PATH)) {
+          for (const project of projects.values()) {
+            const served = serveSwiftResource(project, url.slice(RESOURCE_PATH.length));
+            if (served) {
+              res.setHeader("access-control-allow-origin", "*");
+              res.setHeader("content-type", served.contentType);
+              res.end(served.bytes);
+              return;
+            }
+          }
+          res.statusCode = 404;
+          res.end("swift resource is stale");
+          return;
+        }
         if (!url.startsWith(ARTIFACT_PATH)) {
           next();
           return;

package/package.json

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