peachsim 0.1.939 → 0.1.1399

package/src/swiftContract.ts

@@ -1,10 +1,128 @@
+import { isSwiftImageVariants } from './assetCatalogContract.ts'
 import type {
   AppCatalogColor,
   SfSymbolVector,
-  SwiftImageSource,
+  SwiftImageResources,
 } from './assetCatalogContract'
 import type { ComponentType } from 'react'
 
+export interface SwiftMetalSource {
+  url: string
+  sha256: string
+}
+
+export interface SwiftResourceBundle {
+  target: string
+  sourcePath: string
+  path: string
+}
+
+export interface SwiftMetalLibrarySource extends SwiftMetalSource {
+  bundlePath: string
+}
+
+export function isSwiftResourcePath(value: unknown): value is string {
+  return (
+    typeof value === 'string' &&
+    value.length <= 4096 &&
+    !value.startsWith('/') &&
+    !value.includes('\\') &&
+    !value.includes('\0') &&
+    value.split('/').every((part) => part !== '' && part !== '.' && part !== '..')
+  )
+}
+
+export function isSwiftBundlePath(value: unknown): value is string {
+  return (
+    typeof value === 'string' &&
+    (value === '.' || (isSwiftResourcePath(value) && /\.(bundle|framework)$/.test(value)))
+  )
+}
+
+export function swiftRelativeBundlePath(
+  resourceRoot: string,
+  bundlePath: string,
+): string {
+  const relative =
+    bundlePath === resourceRoot ? '.' : bundlePath.slice(resourceRoot.length + 1)
+  if (
+    (bundlePath !== resourceRoot && !bundlePath.startsWith(`${resourceRoot}/`)) ||
+    !isSwiftBundlePath(relative)
+  )
+    throw new Error(`swift image bundle ${bundlePath} is outside ${resourceRoot}`)
+  return relative
+}
+
+export function isSwiftImageResources(value: unknown): value is SwiftImageResources {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    !Array.isArray(value) &&
+    Object.entries(value).every(
+      ([bundlePath, images]) =>
+        isSwiftBundlePath(bundlePath) &&
+        typeof images === 'object' &&
+        images !== null &&
+        !Array.isArray(images) &&
+        Object.entries(images).every(
+          ([name, image]) => isSwiftResourcePath(name) && isSwiftImageVariants(image),
+        ),
+    )
+  )
+}
+
+export function isSwiftResourceBundles(value: unknown): value is SwiftResourceBundle[] {
+  return (
+    Array.isArray(value) &&
+    value.length <= 128 &&
+    value.every(
+      (bundle) =>
+        typeof bundle === 'object' &&
+        bundle !== null &&
+        typeof bundle.target === 'string' &&
+        /^[A-Za-z_][A-Za-z0-9_-]*$/.test(bundle.target) &&
+        (bundle.sourcePath === '.' || isSwiftResourcePath(bundle.sourcePath)) &&
+        isSwiftBundlePath(bundle.path),
+    ) &&
+    new Set(value.map((bundle) => bundle.target)).size === value.length &&
+    new Set(value.map((bundle) => bundle.path)).size === value.length
+  )
+}
+
+export function isSwiftMetalSources(
+  value: unknown,
+): value is Record<string, SwiftMetalSource> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    !Array.isArray(value) &&
+    Object.entries(value).every(
+      ([file, source]) =>
+        file.endsWith('.metal') &&
+        isSwiftResourcePath(file) &&
+        typeof source === 'object' &&
+        source !== null &&
+        !Array.isArray(source) &&
+        'url' in source &&
+        typeof source.url === 'string' &&
+        'sha256' in source &&
+        typeof source.sha256 === 'string' &&
+        /^[a-f0-9]{64}$/.test(source.sha256),
+    )
+  )
+}
+
+export function isSwiftMetalLibrarySources(
+  value: unknown,
+): value is Record<string, SwiftMetalLibrarySource> {
+  return (
+    isSwiftMetalSources(value) &&
+    Object.values(value).every(
+      (source) => 'bundlePath' in source && isSwiftBundlePath(source.bundlePath),
+    )
+  )
+}
+
 export interface SwiftModuleOptions {
   // the host serves the artifact, icu data and named image bytes.
   url: string
@@ -12,16 +130,21 @@ export interface SwiftModuleOptions {
   hash: string
   icuUrl?: string
   exports?: readonly string[]
-  resources?: Record<string, SwiftImageSource>
-  // main-bundle files are base64 bytes exposed to wasm through its read-only /res.
+  resources?: SwiftImageResources
+  // bundle paths map to base64 bytes exposed to wasm through its read-only /res.
   bundleFiles?: Record<string, string>
   colors?: Record<string, AppCatalogColor>
   symbols?: Record<string, SfSymbolVector>
+  // original target-relative metal sources, fetched only by the shader path.
+  metalSources?: Record<string, SwiftMetalLibrarySource>
 }
 
 export interface SwiftEntryOptions extends SwiftModuleOptions {
   // only the standalone preview owns the app bundle; imports retain the host catalog.
   mainBundle?: boolean
+  // One typed views mount through the same package instance as module calls.
+  view?: string
+  contractHash?: string
   // the package/source path keeps a root's identity across module reloads.
   rootId?: string
 }

package/src/vite-plugin-one.ts

@@ -1,14 +1,14 @@
-// sootsim plugin for One/Vite — serves the installed sootsim runtime at /__soot/
+// peach plugin for One/Vite: serves the installed peach runtime at /__peachsim/
 // from ~/.peach/runtimes/<version>. version-owned localhost origins remain
 // bound to that directory across an active-runtime update.
 //
 // usage in vite.config.ts:
-//   import { rnxPlugin } from 'peachsim/vite'
-//   export default { plugins: [one(), rnxPlugin()] }
+//   import { peachPlugin } from 'peachsim/vite'
+//   export default { plugins: [one(), peachPlugin()] }
 
 import fs from 'fs'
 import { randomUUID } from 'node:crypto'
-import { createRequire } from 'node:module'
+import { fileURLToPath } from 'node:url'
 import path from 'path'
 import { WebSocket, WebSocketServer } from 'ws'
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from './bridge-constants'
@@ -45,8 +45,8 @@ const KOTLIN_ROUTE_PREFIX = '/__peach/kotlin'
 let kotlinHost: Promise<typeof import('peachsim/kotlin-host')> | undefined
 const loadKotlinHost = () => (kotlinHost ??= import('peachsim/kotlin-host'))
 
-export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
-  const prefix = options.prefix || '/__soot'
+export function peachPlugin(options: PeachPluginOptions = {}): Plugin {
+  const prefix = options.prefix || '/__peachsim'
 
   return {
     name: 'sootsim-one',
@@ -72,12 +72,10 @@ export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
       let swiftModuleRoot: string | null | undefined
       const moduleRootFor = (): string | undefined => {
         if (swiftModuleRoot === undefined) {
-          const peachsimPackage = createRequire(
-            path.join(server.config.root, 'package.json'),
-          ).resolve('peachsim/package.json')
+          // src/ or dist-lib/ → .. is peachsim; the module sits beside it
           const moduleRoot = path.resolve(
-            path.dirname(peachsimPackage),
-            '../sootsim-swift',
+            path.dirname(fileURLToPath(import.meta.url)),
+            '../../sootsim-swift',
           )
           swiftModuleRoot = fs.existsSync(path.join(moduleRoot, 'toolchain.json'))
             ? moduleRoot
@@ -178,7 +176,7 @@ export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
         loadKotlinHost()
           .then(async (host) => {
             if (!kotlinModuleRoot) {
-              kotlinModuleRoot = host.peachKotlinModuleRoot(server.config.root)
+              kotlinModuleRoot = host.peachKotlinModuleRoot()
               server.watcher.add(path.join(kotlinModuleRoot, 'Sources'))
             }
             const served = await host.serveKotlinRequest(pathname, res, {
@@ -346,7 +344,7 @@ export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
       })
 
       // serve a minimal /__server-scan describing THIS vite dev server, so a
-      // sootsim shell loaded from <port>/__soot can resolve this app's native
+      // sootsim shell loaded from <port>/__peachsim can resolve this app's native
       // bundle. dev-bundle-resolution's resolvePortViaServerScan fetches
       // `/__server-scan` RELATIVE to the shell origin; when the shell is loaded
       // from this target origin, that hits here. without it the request SPA-
@@ -437,7 +435,7 @@ export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
           return
         }
 
-        // serve runtime files under /__soot/*.
+        // serve runtime files under /__peachsim/*.
         if (pathname.startsWith(prefix + '/')) {
           const fullPath = resolveRuntimeFilePath(
             runtimeRoot,
@@ -477,5 +475,4 @@ export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
   }
 }
 
-export const sootsimPlugin = rnxPlugin
-export default rnxPlugin
+export default peachPlugin

package/src/vite-plugin-swift.ts

@@ -1,6 +1,7 @@
 // vite adapts the common Swift package host to native source imports.
 import fs from 'node:fs'
 import path from 'node:path'
+import { resolveSwiftImageResourceUrls } from '../../sootsim-swift/src/bundleAssets'
 import { swiftEntryModuleEsm } from '../../sootsim-swift/src/entryModule'
 import { swiftModuleInputFiles } from './swift-compile'
 import {
@@ -158,11 +159,9 @@ export function swiftPlugin(options: SwiftPluginOptions = {}): Plugin {
         this.warn(error instanceof Error ? error.message : String(error))
         artifact = project.artifact
       }
-      const resources = Object.fromEntries(
-        Object.entries(artifact.package.resources.table).map(([name, image]) => [
-          name,
-          { ...image, uri: `${serverOrigin()}${image.uri}` },
-        ]),
+      const resources = resolveSwiftImageResourceUrls(
+        artifact.package.resources.table,
+        serverOrigin(),
       )
       for (const watched of [
         ...artifact.package.resources.watched,