@coze-arch/cli 0.1.5 → 0.1.8-alpha.2ee669

package/README.md

@@ -42,6 +42,20 @@ coze-dev validate  # 读取 dev.validate
 `dev` 和 `build` 在执行前会尝试应用模板补丁；补丁失败会记录调试信息，但不会阻止主命令。
 子进程日志默认写入 `~/.coze-logs/dev.log`，可用 `--log-file <path>` 覆盖。
 
+## Web 云盘开发
+
+Vite、Next.js、Nuxt 的 Unix 开发 wrapper 在 `COZE_DRIVE_ROOT`（默认 `/Coze/Drive`）内通过
+`rsync` 同步源码到本机临时目录 `coze-web-<uid>/<source-path-hash>/`，再安装依赖和执行。
+`prepare/dev` 使用 `dev` 子目录，`validate` 使用独立的 `check` 子目录，避免类型生成干扰热更新。
+依赖和开发编译产物留在本地；只有安装成功且云盘依赖输入未变化时才回写锁文件。所有修复仍在云盘完成。
+dev 的 detached 进程持续同步，框架只监听本地镜像；同步失败或依赖输入变化时停止服务。
+
+本地镜像仅用于 `[dev].build/run/validate`；部署配置、`build.sh` 和 `start.sh` 保持原流程。
+普通本地目录和 Windows PowerShell 入口保持原流程。`rsync` 由开发环境提供，`[dev].deps` 仅作声明。
+存量项目通过 `coze-dev patch --dry-run` / `coze-dev patch` 升级，沿用 patch 总开关。
+仅升级完整匹配旧模板的三个 Unix 开发脚本并保留端口；自定义开发脚本、命令和同名 helper 会跳过。
+只更新开发插件不会替换存量项目脚本。
+
 ## Windows 与 WSL
 
 原生 Windows（`process.platform === "win32"`）优先使用 `.coze` 中非空的 Windows
@@ -106,3 +120,7 @@ npm run build
 ```
 
 端到端模板验证使用 `npm run test:e2e`，会真实安装模板依赖并启动服务。发布前需完成该验证。
+
+Web 镜像集成测试使用 `npm run test:integration:web`，依赖 Node.js、bash、rsync 和临时
+loopback 监听权限；包管理器和框架命令使用替身，验证目录、同步、锁文件与进程生命周期，
+不替代真实框架 E2E。

package/docs/deploy.md

@@ -57,7 +57,7 @@ coze-dev deploy app rename <name> --app-id <app_id> --yes
 coze-dev deploy app delete --app-id <app_id> --yes
 coze-dev deploy app analytics|metrics --app-id <app_id> [--time-range <range>]
 coze-dev deploy app usage --app-id <app_id> --bill-month <YYYY-MM>
-coze-dev deploy [--lane <ppe_lane>] [--source-root <directory>] [--app-id <app_id>] [--application-type <type>] [--name <name>] [--connector-id <id>]
+coze-dev deploy [--lane <ppe_lane>] [--source-root <directory>] [--app-id <app_id>] [--application-type <type>] [--name <name>] [--deploy-config <json>] [--connector-id <id>]
 coze-dev deploy status|list|online|rollback-check|cancel|rollback|stop|resume|pause
 coze-dev deploy logs|log-count|count|build-log|config
 coze-dev deploy domain list [--unit-type dev|prod]
@@ -76,6 +76,17 @@ coze-dev deploy mini-program status|bind|submit-code|unbind|auth|preview
 Application；类型不一致时创建新 Application、覆盖 `app_id` 并提示。也可用 `--project-id`
 或 `--app-id` 显式指定已有资源，显式指定时不会额外创建 Project。
 
+部署预检默认返回服务端给出的 `deploy_config`。需要调整部署规格时，传入包含完整四个字段的
+`--deploy-config` JSON；预检会返回覆盖后的最终配置，确认部署时必须原样复用该参数：
+
+```bash
+coze-dev deploy --source-root . \
+  --deploy-config '{"cpu":4,"memory_mb":8192,"max_instance":2,"max_concurrency":100}'
+```
+
+CPU 与内存必须使用固定组合：`1/2048`、`4/8192`、`8/16384`、`16/32768`；
+`max_instance` 为 1–100，`max_concurrency` 为 10–1000。四个值均为整数。
+
 首次部署的应用名称可通过 `--name` 指定；显式参数优先于 `.coze` 的
 `[project].name`。Pages 部署没有 `.coze` 时，CLI 会先生成最小配置再写入绑定。
 

package/lib/__templates__/expo/.cozeproj/scripts/dev_build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ -z "${BASH_VERSION:-}" ]; then exec /usr/bin/env bash "$0" "$@"; fi
 set -euo pipefail
-ROOT_DIR="$(pwd)"
+ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 PREVIEW_DIR="/source/preview"
 SOURCE_DIR="/source"
 
@@ -34,8 +34,8 @@ echo "==================== 安装项目依赖 ===================="
 if [ ! -f "package.json" ]; then
   echo "项目目录下无 package.json，不是合法的 Node.js 项目"
 fi
-# 步骤 2.1/2.2：安装项目依赖
-pnpm install --registry=https://registry.npmmirror.com || echo "Expo 项目依赖安装失败（pnpm 执行出错）"
+# 步骤 2.1/2.2：通过受管入口安装项目依赖
+bash "$ROOT_DIR/.cozeproj/scripts/prepare-node-modules.sh" --registry=https://registry.npmmirror.com
 
 echo "检查根目录 post_install.py"
 if [ -f "$PREVIEW_DIR/post_install.py" ]; then

package/lib/__templates__/expo/.cozeproj/scripts/dev_run.sh

@@ -123,11 +123,15 @@ wait_port_connectable() {
 }
 
 # detached 出去的进程没人负责回收，超过这个时长就自己退出，避免端口与内存长期泄露。
-MAX_RUNTIME_SECONDS=1200
+MAX_RUNTIME_SECONDS=3600
+
+timeout_watchdog_enabled() {
+  [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]
+}
 
 # 真正被 detach 的是这层 bash wrapper：它是进程组 leader，组内 watchdog 到点回收整组
 # （wrapper -> pnpm -> expo/node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -135,6 +139,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -142,6 +147,7 @@ child_pid=$!
   sleep 5
   kill -KILL -- "-$$" 2>/dev/null || true
 ) &
+fi
 
 wait "${child_pid}"
 kill -KILL -- "-$$" 2>/dev/null || true
@@ -290,7 +296,9 @@ if [ -z "${EXPO_PID}" ]; then
 fi
 
 echo "所有服务已启动。Server PID: ${SERVER_PID}, Expo PID: ${EXPO_PID}"
-echo "两个服务均在 ${MAX_RUNTIME_SECONDS}s 后自动退出。"
+if timeout_watchdog_enabled; then
+  echo "两个服务均在 ${MAX_RUNTIME_SECONDS}s 后自动退出。"
+fi
 
 echo "检查 Server 服务端口：$SERVER_HOST:$SERVER_PORT"
 if wait_port_connectable "$SERVER_HOST" "$SERVER_PORT" 10 2; then

package/lib/__templates__/expo/.cozeproj/scripts/prepare-node-modules.sh

@@ -0,0 +1,380 @@
+#!/usr/bin/env bash
+# Install dependencies on local disk and expose them to the source tree by symlink.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+if [ "$(basename "$(dirname "$SCRIPT_DIR")")" = ".cozeproj" ]; then
+  PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd -P)"
+else
+  PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
+fi
+
+command -v pnpm >/dev/null 2>&1 || {
+  echo "[node_modules] pnpm is required" >&2
+  exit 1
+}
+
+DRIVE_ROOT="${COZE_DRIVE_ROOT:-/Coze/Drive}"
+if [ -d "$DRIVE_ROOT" ]; then
+  DRIVE_ROOT="$(cd "$DRIVE_ROOT" && pwd -P)"
+else
+  DRIVE_ROOT="${DRIVE_ROOT%/}"
+fi
+case "$PROJECT_ROOT" in
+  "$DRIVE_ROOT"|"$DRIVE_ROOT"/*) ;;
+  *)
+    (cd "$PROJECT_ROOT" && pnpm install "$@")
+    exit 0
+    ;;
+esac
+
+NM_ROOT="/tmp/nm"
+PROJECT_ID="$(basename "$PROJECT_ROOT")-$(printf '%s' "$PROJECT_ROOT" | cksum | awk '{print $1}')"
+mkdir -p "$NM_ROOT"
+WORK_DIR="$NM_ROOT/$PROJECT_ID"
+case "$WORK_DIR" in
+  "$DRIVE_ROOT"|"$DRIVE_ROOT"/*)
+    echo "[node_modules] local dependency directory must not be on Coze Drive: $WORK_DIR" >&2
+    exit 1
+    ;;
+esac
+
+LOCK_DIR="$NM_ROOT/$PROJECT_ID.lock"
+LOCK_TIMEOUT_SECONDS="${COZE_NODE_MODULES_LOCK_TIMEOUT_SECONDS:-120}"
+case "$LOCK_TIMEOUT_SECONDS" in
+  ''|*[!0-9]*|0)
+    echo "[node_modules] COZE_NODE_MODULES_LOCK_TIMEOUT_SECONDS must be a positive integer" >&2
+    exit 1
+    ;;
+esac
+
+lock_owner_is_alive() {
+  local owner_pid=""
+  [ -f "$LOCK_DIR/pid" ] || return 1
+  IFS= read -r owner_pid < "$LOCK_DIR/pid" || return 1
+  case "$owner_pid" in
+    ''|*[!0-9]*) return 1 ;;
+  esac
+  kill -0 "$owner_pid" 2>/dev/null
+}
+
+release_lock() {
+  local owner_pid=""
+  [ -f "$LOCK_DIR/pid" ] || return 0
+  IFS= read -r owner_pid < "$LOCK_DIR/pid" || true
+  if [ "$owner_pid" = "$$" ]; then
+    rm -f "$LOCK_DIR/pid"
+    rmdir "$LOCK_DIR" 2>/dev/null || true
+  fi
+}
+
+lock_started_at="$(date +%s)"
+missing_owner_checks=0
+while ! mkdir "$LOCK_DIR" 2>/dev/null; do
+  if lock_owner_is_alive; then
+    missing_owner_checks=0
+  else
+    missing_owner_checks=$((missing_owner_checks + 1))
+    if [ "$missing_owner_checks" -ge 2 ]; then
+      stale_lock_dir="$LOCK_DIR.stale.$$"
+      if mv "$LOCK_DIR" "$stale_lock_dir" 2>/dev/null; then
+        echo "[node_modules] Recovering stale dependency preparation lock."
+        rm -rf "$stale_lock_dir"
+      fi
+      missing_owner_checks=0
+      continue
+    fi
+  fi
+
+  lock_now="$(date +%s)"
+  if [ $((lock_now - lock_started_at)) -ge "$LOCK_TIMEOUT_SECONDS" ]; then
+    echo "[node_modules] Timed out waiting ${LOCK_TIMEOUT_SECONDS}s for dependency preparation lock: $LOCK_DIR" >&2
+    exit 1
+  fi
+  echo "[node_modules] Waiting for another dependency preparation for this project..."
+  sleep 1
+done
+printf '%s\n' "$$" > "$LOCK_DIR/pid"
+trap release_lock EXIT
+
+mkdir -p "$WORK_DIR"
+INSTALL_STATE_FILE="$WORK_DIR/.install-state"
+
+# Previous versions mirrored the whole project into WORK_DIR. That gives pnpm
+# and framework dev servers two paths for the same source tree, which breaks
+# file watching and on-demand compilation. Keep only managed local outputs.
+cleanup_legacy_workspace() {
+  local workspace_dir="$1" entry name
+  if [ -L "$workspace_dir" ] || { [ -e "$workspace_dir" ] && [ ! -d "$workspace_dir" ]; }; then
+    rm -rf "$workspace_dir"
+    return
+  fi
+  if [ ! -d "$workspace_dir" ]; then
+    return 0
+  fi
+
+  while IFS= read -r -d '' entry; do
+    name="$(basename "$entry")"
+    [ "$name" = "node_modules" ] || rm -rf "$entry"
+  done < <(find "$workspace_dir" -mindepth 1 -maxdepth 1 -print0)
+}
+
+# Preserve existing project caches during dependency preparation.
+cleanup_legacy_shadow_project() {
+  local entry name
+  while IFS= read -r -d '' entry; do
+    name="$(basename "$entry")"
+    case "$name" in
+      node_modules|client|server|caches|.install-state) continue ;;
+    esac
+    rm -rf "$entry"
+  done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
+
+  for workspace in client server; do
+    cleanup_legacy_workspace "$WORK_DIR/$workspace"
+  done
+}
+
+link_install_entry() {
+  local source_path="$1" target_path="$2"
+  rm -rf "$target_path"
+  if [ -e "$source_path" ]; then
+    ln -s "$source_path" "$target_path"
+  fi
+}
+
+hash_install_input() {
+  if command -v sha256sum >/dev/null 2>&1; then
+    sha256sum | awk '{print $1}'
+  elif command -v shasum >/dev/null 2>&1; then
+    shasum -a 256 | awk '{print $1}'
+  else
+    cksum | awk '{print $1 "-" $2}'
+  fi
+}
+
+append_file_to_install_fingerprint() {
+  local relative_path="$1"
+  local source_path="$PROJECT_ROOT/$relative_path"
+  printf 'path=%s\n' "$relative_path"
+  if [ -f "$source_path" ]; then
+    cat "$source_path"
+  else
+    printf '<missing>\n'
+  fi
+}
+
+append_directory_to_install_fingerprint() {
+  local relative_path="$1"
+  local source_path="$PROJECT_ROOT/$relative_path"
+  local file
+  printf 'path=%s\n' "$relative_path"
+  if [ ! -d "$source_path" ]; then
+    printf '<missing>\n'
+    return
+  fi
+
+  while IFS= read -r file; do
+    printf 'file=%s\n' "${file#"${PROJECT_ROOT}/"}"
+    cat "$file"
+  done < <(find -P "$source_path" -type f -print | LC_ALL=C sort)
+}
+
+# Everything that can change the resolved dependency tree. The leading version marker
+# invalidates every stored state when this scheme itself changes.
+calculate_install_fingerprint() {
+  local filename workspace argument
+  {
+    printf 'prepare-node-modules-install-state=1\n'
+    printf 'node-version=%s\n' "$(node --version)"
+    printf 'pnpm-version=%s\n' "$(pnpm --version)"
+    printf 'node-env=%s\n' "${NODE_ENV:-}"
+    printf 'npm-config-production=%s\n' "${npm_config_production:-}"
+    printf 'npm-config-production-upper=%s\n' "${NPM_CONFIG_PRODUCTION:-}"
+    printf 'pnpm-config-production=%s\n' "${PNPM_CONFIG_PRODUCTION:-}"
+    for argument in "$@"; do
+      printf 'install-argument=%s\n' "$argument"
+    done
+    for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+      append_file_to_install_fingerprint "$filename"
+    done
+    for workspace in client server; do
+      append_file_to_install_fingerprint "$workspace/package.json"
+    done
+    append_directory_to_install_fingerprint patches
+  } | hash_install_input
+}
+
+install_requires_refresh() {
+  local argument
+  for argument in "$@"; do
+    case "$argument" in
+      --force|-f|--lockfile-only|--fix-lockfile) return 0 ;;
+    esac
+  done
+  return 1
+}
+
+# Reuse skips pnpm install entirely, so it must not skip side effects that live outside
+# node_modules. preinstall is exempt: it only guards which package manager may run, and
+# there is no install to guard when the tree is already in place.
+package_has_install_lifecycle() {
+  local package_path="$1"
+  node - "$package_path" <<'NODE'
+const fs = require('node:fs');
+const [packagePath] = process.argv.slice(2);
+
+try {
+  const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+  const scripts = packageJson && typeof packageJson.scripts === 'object' && packageJson.scripts
+    ? packageJson.scripts
+    : {};
+  const hasLifecycle = ['install', 'postinstall', 'prepare'].some(
+    name => typeof scripts[name] === 'string' && scripts[name].trim() !== '',
+  );
+
+  process.exit(hasLifecycle ? 0 : 1);
+} catch {
+  process.exit(0);
+}
+NODE
+}
+
+install_reuse_is_safe() {
+  local workspace package_path
+  for package_path in "$PROJECT_ROOT/.pnpmfile.cjs" "$PROJECT_ROOT/.pnpmfile.js"; do
+    if [ -e "$package_path" ]; then
+      echo "[node_modules] Reinstalling because pnpm hooks are present: $package_path"
+      return 1
+    fi
+  done
+
+  if [ -f "$PROJECT_ROOT/.npmrc" ] && grep -Eq '^[[:space:]]*pnpmfile[[:space:]]*=' "$PROJECT_ROOT/.npmrc"; then
+    echo "[node_modules] Reinstalling because .npmrc configures a pnpm hook."
+    return 1
+  fi
+
+  for workspace in . client server; do
+    package_path="$PROJECT_ROOT/$workspace/package.json"
+    [ -f "$package_path" ] || continue
+    if package_has_install_lifecycle "$package_path"; then
+      echo "[node_modules] Reinstalling because $package_path has an install lifecycle script."
+      return 1
+    fi
+  done
+  return 0
+}
+
+dependencies_are_ready() {
+  local workspace
+  [ -f "$WORK_DIR/node_modules/.modules.yaml" ] || return 1
+  for workspace in client server; do
+    if [ -f "$PROJECT_ROOT/$workspace/package.json" ] &&
+      [ ! -f "$WORK_DIR/$workspace/node_modules/.modules.yaml" ]; then
+      return 1
+    fi
+  done
+  return 0
+}
+
+# 判断顺序按代价从小到大排。指纹要读云盘上的 lockfile 和整个 patches/，所以放最后：只有其余
+# 条件都满足、确实可能复用时才付这份开销。build.sh 和 prepare.sh 不设开关，第一行就返回了。
+install_can_be_reused() {
+  local installed_fingerprint=""
+
+  [ "${COZE_REUSE_NODE_MODULES:-}" = "1" ] || return 1
+  install_requires_refresh "$@" && return 1
+  [ -f "$INSTALL_STATE_FILE" ] || return 1
+  IFS= read -r installed_fingerprint < "$INSTALL_STATE_FILE" || return 1
+  dependencies_are_ready || return 1
+  install_reuse_is_safe || return 1
+  [ "$installed_fingerprint" = "$(calculate_install_fingerprint "$@")" ] || return 1
+  return 0
+}
+
+write_install_state() {
+  local fingerprint="$1" temporary_state
+  temporary_state="$(mktemp "$WORK_DIR/.install-state.XXXXXX")"
+  printf '%s\n' "$fingerprint" > "$temporary_state"
+  mv -f "$temporary_state" "$INSTALL_STATE_FILE"
+}
+
+copy_install_metadata() {
+  local filename source_file target_file workspace
+  for filename in pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+    source_file="$PROJECT_ROOT/$filename"
+    target_file="$WORK_DIR/$filename"
+    rm -f "$target_file"
+    if [ -f "$source_file" ]; then
+      cp "$source_file" "$target_file"
+    fi
+  done
+
+  link_install_entry "$PROJECT_ROOT/package.json" "$WORK_DIR/package.json"
+  link_install_entry "$PROJECT_ROOT/patches" "$WORK_DIR/patches"
+  link_install_entry "$PROJECT_ROOT/scripts" "$WORK_DIR/scripts"
+
+  for workspace in client server; do
+    if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
+      mkdir -p "$WORK_DIR/$workspace"
+      link_install_entry "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      link_install_entry "$PROJECT_ROOT/$workspace/scripts" "$WORK_DIR/$workspace/scripts"
+    else
+      rm -rf "$WORK_DIR/$workspace"
+    fi
+  done
+}
+
+link_node_modules() {
+  local source_dir="$1" target_dir="$2"
+  local current=""
+  mkdir -p "$target_dir"
+  if [ -L "$source_dir/node_modules" ]; then
+    current="$(readlink "$source_dir/node_modules")"
+    case "$current" in
+      "$NM_ROOT"/*/node_modules|"$NM_ROOT"/*/*/node_modules) ;;
+      *)
+        echo "[node_modules] refusing to replace unmanaged symlink: $source_dir/node_modules" >&2
+        exit 1
+        ;;
+    esac
+    rm "$source_dir/node_modules"
+  elif [ -e "$source_dir/node_modules" ]; then
+    rm -rf "$source_dir/node_modules"
+  fi
+  ln -s "$target_dir" "$source_dir/node_modules"
+}
+
+cleanup_legacy_shadow_project
+copy_install_metadata
+
+if install_can_be_reused "$@"; then
+  echo "[node_modules] Reusing unchanged dependencies in $WORK_DIR"
+else
+  # A stale state file must not survive a failed install.
+  rm -f "$INSTALL_STATE_FILE"
+  echo "[node_modules] Installing dependencies in $WORK_DIR"
+  if ! (cd "$WORK_DIR" && pnpm install "$@"); then
+    exit 1
+  fi
+
+  if [ -f "$WORK_DIR/pnpm-lock.yaml" ]; then
+    temporary_lockfile="$(mktemp "$PROJECT_ROOT/.pnpm-lock.yaml.XXXXXX")"
+    cp "$WORK_DIR/pnpm-lock.yaml" "$temporary_lockfile"
+    chmod 0644 "$temporary_lockfile"
+    mv -f "$temporary_lockfile" "$PROJECT_ROOT/pnpm-lock.yaml"
+  fi
+
+  # pnpm may have rewritten the lockfile, so record the fingerprint of the tree as it
+  # now stands. Otherwise the next run would see a changed input and reinstall.
+  write_install_state "$(calculate_install_fingerprint "$@")"
+fi
+
+link_node_modules "$PROJECT_ROOT" "$WORK_DIR/node_modules"
+for workspace in client server; do
+  if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
+    link_node_modules "$PROJECT_ROOT/$workspace" "$WORK_DIR/$workspace/node_modules"
+  fi
+done
+
+echo "[node_modules] Dependencies ready"

package/lib/__templates__/expo/.cozeproj/scripts/prod_build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ -z "${BASH_VERSION:-}" ]; then exec /usr/bin/env bash "$0" "$@"; fi
 set -euo pipefail
-ROOT_DIR="$(pwd)"
+ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 
 # ==================== 工具函数 ====================
 info() {
@@ -32,8 +32,8 @@ info "==================== 安装 Node 依赖 ===================="
 info "开始安装 Node 依赖"
 if [ -f "$ROOT_DIR/package.json" ]; then
   info "进入目录：$ROOT_DIR"
-  info "正在执行：pnpm install"
-  (cd "$ROOT_DIR" && pnpm install --registry=https://registry.npmmirror.com) || error "Node 依赖安装失败"
+  info "正在执行受管依赖准备入口"
+  bash "$ROOT_DIR/.cozeproj/scripts/prepare-node-modules.sh" --registry=https://registry.npmmirror.com || error "Node 依赖安装失败"
 else
   warn "未找到 $ROOT_DIR/package.json 文件，请检查路径是否正确"
 fi

package/lib/__templates__/expo/client/components/Screen.tsx

@@ -6,13 +6,19 @@ import {
   View,
   TouchableWithoutFeedback,
   Keyboard,
-  ViewStyle,
+  type ViewStyle,
   FlatList,
+  type FlatListProps,
   SectionList,
+  type SectionListProps,
+  type ScrollViewProps,
   Modal,
 } from 'react-native';
 import { withUniwind } from 'uniwind';
-import { useSafeAreaInsets, Edge } from 'react-native-safe-area-context';
+import {
+  useSafeAreaInsets,
+  type Edge,
+} from 'react-native-safe-area-context';
 import { StatusBar } from 'expo-status-bar';
 // 引入 KeyboardAware 系列组件
 import {
@@ -86,58 +92,92 @@ type KeyboardAwareProps = {
   contentInsetBehaviorIOS: 'automatic' | 'never';
 };
 
+type NativeScrollableProps = Pick<
+  ScrollViewProps,
+  | 'contentContainerStyle'
+  | 'keyboardShouldPersistTaps'
+  | 'keyboardDismissMode'
+  | 'contentInsetAdjustmentBehavior'
+>;
+
 const KeyboardAwareScrollable = ({
   element,
   extraPadding,
   contentInsetBehaviorIOS,
 }: KeyboardAwareProps) => {
-  // 获取原始组件的 props
-  const childAttrs = ((element as React.ReactElement).props ?? {}) as Record<string, unknown>;
-  const originStyle = childAttrs['contentContainerStyle'];
-  const styleArray = Array.isArray(originStyle) ? originStyle : originStyle ? [originStyle] : [];
-  const merged = Object.assign({}, ...styleArray);
-  const currentPB = typeof merged.paddingBottom === 'number' ? merged.paddingBottom : 0;
+  const createEnhancedContentStyle = (
+    contentContainerStyle: ScrollViewProps['contentContainerStyle'],
+  ) => {
+    const mergedStyle = StyleSheet.flatten(contentContainerStyle) ?? {};
+    const currentPaddingBottom =
+      typeof mergedStyle.paddingBottom === 'number'
+        ? mergedStyle.paddingBottom
+        : 0;
 
-  // 合并 paddingBottom (安全区 + 额外留白)
-  const enhancedContentStyle = [{ ...merged, paddingBottom: currentPB + extraPadding }];
+    return [
+      {
+        ...mergedStyle,
+        paddingBottom: currentPaddingBottom + extraPadding,
+      },
+    ];
+  };
 
-  // 基础配置 props，用于传递给 KeyboardAware 组件
-  const commonProps = {
-    ...childAttrs,
-    contentContainerStyle: enhancedContentStyle,
-    keyboardShouldPersistTaps: childAttrs['keyboardShouldPersistTaps'] ?? 'handled',
-    keyboardDismissMode: childAttrs['keyboardDismissMode'] ?? 'on-drag',
+  const createKeyboardAwareProps = <Props extends NativeScrollableProps>(
+    childProps: Props,
+  ) => ({
+    ...childProps,
+    contentContainerStyle: createEnhancedContentStyle(
+      childProps.contentContainerStyle,
+    ),
+    keyboardShouldPersistTaps:
+      childProps.keyboardShouldPersistTaps ?? 'handled',
+    keyboardDismissMode: childProps.keyboardDismissMode ?? 'on-drag',
     enableOnAndroid: true,
     // 类似于原代码中的 setTimeout/scrollToEnd 逻辑，这里设置额外的滚动高度确保输入框可见
     extraHeight: 100,
     // 禁用自带的 ScrollView 自动 inset，由外部 padding 控制
     enableAutomaticScroll: true,
     ...(Platform.OS === 'ios'
-      ? { contentInsetAdjustmentBehavior: childAttrs['contentInsetAdjustmentBehavior'] ?? contentInsetBehaviorIOS }
+      ? {
+          contentInsetAdjustmentBehavior:
+            childProps.contentInsetAdjustmentBehavior ??
+            contentInsetBehaviorIOS,
+        }
       : {}),
-  };
+  });
 
-  const t = (element as React.ReactElement).type;
+  const t = element.type;
 
   // 根据组件类型返回对应的 KeyboardAware 版本
   // 注意：不再使用 KeyboardAvoidingView，直接替换为增强版 ScrollView
   if (t === ScrollView) {
-    return <KeyboardAwareScrollView {...commonProps} />;
+    const childProps = element.props as ScrollViewProps;
+    return (
+      <KeyboardAwareScrollView {...createKeyboardAwareProps(childProps)} />
+    );
   }
 
   if (t === FlatList) {
-    return <KeyboardAwareFlatList {...commonProps} />;
+    const childProps = element.props as FlatListProps<unknown>;
+    return <KeyboardAwareFlatList {...createKeyboardAwareProps(childProps)} />;
   }
 
   if (t === SectionList) {
-    return <KeyboardAwareSectionList {...commonProps} />;
+    const childProps = element.props as SectionListProps<unknown>;
+    return (
+      <KeyboardAwareSectionList {...createKeyboardAwareProps(childProps)} />
+    );
   }
 
   // 理论上不应运行到这里，如果是非标准组件则原样返回，仅修改样式
+  const childProps = element.props as NativeScrollableProps;
   return React.cloneElement(element, {
-    contentContainerStyle: enhancedContentStyle,
-    keyboardShouldPersistTaps: childAttrs['keyboardShouldPersistTaps'] ?? 'handled',
-    keyboardDismissMode: childAttrs['keyboardDismissMode'] ?? 'on-drag',
+    contentContainerStyle: createEnhancedContentStyle(
+      childProps.contentContainerStyle,
+    ),
+    keyboardShouldPersistTaps:
+      childProps.keyboardShouldPersistTaps ?? 'handled',
+    keyboardDismissMode: childProps.keyboardDismissMode ?? 'on-drag',
   });
 };
 

package/lib/__templates__/expo/client/heroui/components/toast/toast.tsx

@@ -1,5 +1,9 @@
 import React, { forwardRef, useMemo } from 'react';
-import { View, Text as RNText } from 'react-native';
+import {
+  type GestureResponderEvent,
+  View,
+  Text as RNText,
+} from 'react-native';
 import { GestureDetector } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
 import { useThemeColor } from '../../helpers/external/hooks';
@@ -339,7 +343,7 @@ const ToastClose = forwardRef<View, ToastCloseProps>((props, ref) => {
    * If hide and id are available from context, use them to hide the toast
    * Otherwise, use the provided onPress handler
    */
-  const handlePress = (event: Parameters<NonNullable<React.ComponentProps<typeof Button>['onPress']>>[0]) => {
+  const handlePress = (event: GestureResponderEvent) => {
     if (hide && id) {
       hide(id);
     }