peachsim 0.1.629 → 0.1.631

package/src/native-firebase-config.ts

@@ -0,0 +1,90 @@
+// the native installer reads Expo's googleServicesFile before Firebase starts.
+// expose only FirebaseOptions, never a partner-specific extra configuration.
+import fs from 'node:fs'
+import { createRequire } from 'node:module'
+import path from 'node:path'
+import { isRecord } from './is-record'
+import { parsePlistSource } from './plist'
+
+export function readNativeFirebaseConfig(projectRoot: string) {
+  const result: Record<string, unknown> = {}
+  if (
+    ![
+      'app.json',
+      'app.config.js',
+      'app.config.ts',
+      'app.config.cjs',
+      'app.config.mjs',
+    ].some((name) => fs.existsSync(path.join(projectRoot, name)))
+  )
+    return result
+  const require = createRequire(path.join(projectRoot, 'package.json'))
+  const configModule: unknown = require('@expo/config')
+  if (!isRecord(configModule) || typeof configModule.getConfig !== 'function') {
+    throw new Error('Expo native configuration is unavailable.')
+  }
+  const resolved: unknown = Reflect.apply(configModule.getConfig, configModule, [
+    projectRoot,
+    { skipSDKVersionRequirement: true },
+  ])
+  const config = isRecord(resolved) && isRecord(resolved.exp) ? resolved.exp : {}
+  for (const platform of ['ios', 'android']) {
+    const native = config[platform]
+    if (!isRecord(native) || typeof native.googleServicesFile !== 'string') continue
+    try {
+      const source = fs.readFileSync(
+        path.resolve(projectRoot, native.googleServicesFile),
+        'utf8',
+      )
+      const parsed: unknown =
+        platform === 'ios' ? parsePlistSource(source) : JSON.parse(source)
+      if (!isRecord(parsed)) throw new Error('Invalid Google services file.')
+      if (platform === 'ios') {
+        result[platform] = {
+          apiKey: parsed.API_KEY,
+          appId: parsed.GOOGLE_APP_ID,
+          projectId: parsed.PROJECT_ID,
+          databaseURL: parsed.DATABASE_URL,
+          gaTrackingId: parsed.TRACKING_ID,
+          storageBucket: parsed.STORAGE_BUCKET,
+          messagingSenderId: parsed.GCM_SENDER_ID,
+          clientId: parsed.CLIENT_ID,
+          androidClientID: parsed.ANDROID_CLIENT_ID,
+          deepLinkUrlScheme: parsed.REVERSED_CLIENT_ID,
+        }
+      } else {
+        const project = isRecord(parsed.project_info) ? parsed.project_info : {}
+        const clients: unknown[] = Array.isArray(parsed.client) ? parsed.client : []
+        const client = clients.find((value) => {
+          if (!isRecord(value) || !isRecord(value.client_info)) return false
+          const android = value.client_info.android_client_info
+          return isRecord(android) && android.package_name === native.package
+        })
+        if (!isRecord(client) || !isRecord(client.client_info))
+          throw new Error('No Google services client matches the Android package.')
+        const apiKeys: unknown[] = Array.isArray(client.api_key) ? client.api_key : []
+        const apiKey = apiKeys.find(
+          (value) => isRecord(value) && typeof value.current_key === 'string',
+        )
+        const oauthClients: unknown[] = Array.isArray(client.oauth_client)
+          ? client.oauth_client
+          : []
+        const oauth = oauthClients.find(
+          (value) => isRecord(value) && value.client_type === 3,
+        )
+        result[platform] = {
+          apiKey: isRecord(apiKey) ? apiKey.current_key : undefined,
+          appId: client.client_info.mobilesdk_app_id,
+          projectId: project.project_id,
+          databaseURL: project.firebase_url,
+          storageBucket: project.storage_bucket,
+          messagingSenderId: project.project_number,
+          clientId: isRecord(oauth) ? oauth.client_id : undefined,
+        }
+      }
+    } catch (error) {
+      result[platform] = { error: error instanceof Error ? error.message : String(error) }
+    }
+  }
+  return result
+}

package/src/screenshots/frame-compose.ts

@@ -19,7 +19,7 @@ import {
   resolveDeviceFrameGeometry,
   type CornerRadii,
   type DeviceModel,
-} from 'peach-engine/settings'
+} from 'peach-engine/settings/devices'
 import { launchReapedChrome } from '../../../../scripts/lib/reap-browser'
 
 const METALLIC_RING_SHADOW =

package/src/screenshots/registry.ts

@@ -6,7 +6,7 @@
 // this module re-exports those tokens plus the composer-specific
 // `FrameComposeSpec` shape.
 
-import type { DeviceModel } from 'peach-engine/settings'
+import type { DeviceModel } from 'peach-engine/settings/devices'
 
 export {
   BACKGROUND_PRESETS,

package/src/screenshots/schema.ts

@@ -1,7 +1,8 @@
 import { readFileSync } from 'fs'
 import path from 'path'
-import { devices, type DeviceModel } from 'peach-engine/settings'
+import { devices, type DeviceModel } from 'peach-engine/settings/devices'
 import yaml from 'yaml'
+import { isRecord } from '../is-record'
 import {
   cloneBackgroundSpec,
   DEFAULT_FRAME_SHADOW,
@@ -16,7 +17,6 @@ import {
   type PosePresetName,
   type TextPresetName,
 } from './registry'
-import { isRecord } from '../is-record'
 
 export type CaptureMode = 'raw' | 'framed' | 'raw+framed'
 export type CapturePathMode = 'auto' | 'plan' | 'flow'

package/src/vite-plugin-one.ts

@@ -41,8 +41,8 @@ const loadSwiftHost = () => (swiftHost ??= import('peachsim/vite-swift'))
 // the Kotlin host (toolchain fetch, compile, artifact serving) loads the same
 // way, on the first /__peach/kotlin request from an Android device
 const KOTLIN_ROUTE_PREFIX = '/__peach/kotlin'
-let kotlinHost: Promise<typeof import('peachsim/vite-kotlin')> | undefined
-const loadKotlinHost = () => (kotlinHost ??= import('peachsim/vite-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'
@@ -140,34 +140,17 @@ export function rnxPlugin(options: PeachPluginOptions = {}): Plugin {
         if (!pathname.startsWith(KOTLIN_ROUTE_PREFIX)) return next()
         loadKotlinHost()
           .then(async (host) => {
-            if (host.serveKotlinArtifact(pathname, res)) return
-            if (pathname !== '/__peach/kotlin-package') return next()
             if (!kotlinModuleRoot) {
-              const moduleRoot = path.join(
-                path.dirname(
-                  createRequire(path.join(server.config.root, 'package.json')).resolve(
-                    'peachsim/package.json',
-                  ),
-                ),
-                'kotlin',
-              )
-              kotlinModuleRoot = moduleRoot
-              server.watcher.add(path.join(moduleRoot, 'Sources'))
-            }
-            try {
-              const artifact = await host.kotlinArtifact(
-                server.config.root,
-                kotlinModuleRoot,
-                devOrigin(),
-              )
-              res.setHeader('access-control-allow-origin', '*')
-              res.setHeader('content-type', 'application/json')
-              res.end(JSON.stringify({ ...artifact, hmrPath }))
-            } catch (error) {
-              res.statusCode = 500
-              res.setHeader('access-control-allow-origin', '*')
-              res.end(error instanceof Error ? error.message : String(error))
+              kotlinModuleRoot = host.peachKotlinModuleRoot(server.config.root)
+              server.watcher.add(path.join(kotlinModuleRoot, 'Sources'))
             }
+            const served = await host.serveKotlinRequest(pathname, res, {
+              root: server.config.root,
+              moduleRoot: kotlinModuleRoot,
+              origin: devOrigin(),
+              hmrPath,
+            })
+            if (!served) next()
           })
           .catch(next)
       })

package/src/vite-plugin.ts

@@ -1682,6 +1682,7 @@ export function workletsBabelTransform(
 // scripts/build/bundler-deps.ts so esbuild-based dep prebundles stay in sync.
 let flowBabel: typeof import('@babel/core') | null = null
 let flowStripPlugin: import('@babel/core').PluginItem | null = null
+let hermesParserPlugin: import('@babel/core').PluginItem | null = null
 let jsxSyntaxPlugin: import('@babel/core').PluginItem | null = null
 function loadFlowBabel(): void {
   if (flowBabel) return
@@ -1689,6 +1690,10 @@ function loadFlowBabel(): void {
   flowStripPlugin = sootsimPluginRequire(
     '@babel/plugin-transform-flow-strip-types',
   ) as import('@babel/core').PluginItem
+  // react native uses Hermes to parse current Flow syntax, including `as` casts.
+  hermesParserPlugin = sootsimPluginRequire(
+    'babel-plugin-syntax-hermes-parser',
+  ) as import('@babel/core').PluginItem
   jsxSyntaxPlugin = sootsimPluginRequire(
     '@babel/plugin-syntax-jsx',
   ) as import('@babel/core').PluginItem
@@ -1708,7 +1713,7 @@ function flowStripTransform(): Plugin {
           filename: id,
           babelrc: false,
           configFile: false,
-          plugins: [flowStripPlugin!, jsxSyntaxPlugin!],
+          plugins: [hermesParserPlugin!, flowStripPlugin!, jsxSyntaxPlugin!],
           sourceMaps: true,
           compact: false,
         })