@adep/cli 0.4.1 → 0.4.4

package/dist/vite.js

@@ -15,6 +15,8 @@ var DB_RPC = {
   query: "query",
   /** 写路径（CF-013）：`(method=writeQuery, args=[sql, params])` → `{ changes }`。 */
   writeQuery: "writeQuery",
+  /** 通用执行（BUG-4，2026-10-14）：`(method=execute, args=[sql, params?])` → `{ changes }`。 */
+  execute: "execute",
   /** 读取 owned 表变更流（DB-006）：`(method=changes, args=[table, query])`。 */
   changes: "changes",
   /** 开启事务：`begin → txId`。 */
@@ -62,6 +64,30 @@ function normalizeHttpStatus(status) {
 }
 
 // packages/runtime/src/shared/http-envelope.ts
+function coerceAdepHttpEnvelope(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
+  if (isAdepHttpEnvelope(value)) return value;
+  const keys = Object.keys(value);
+  if (keys.length === 0) return null;
+  if (!keys.every((key) => key === "status" || key === "body" || key === "headers")) return null;
+  const candidate = value;
+  const status = candidate.status;
+  if (typeof status !== "number" || !Number.isInteger(status) || status < 100 || status > 599) {
+    return null;
+  }
+  if ("headers" in candidate && candidate.headers !== void 0) {
+    const headers = candidate.headers;
+    if (typeof headers !== "object" || headers === null || Array.isArray(headers)) return null;
+    if (!Object.values(headers).every((headerValue2) => typeof headerValue2 === "string")) return null;
+  }
+  return {
+    __adepHttp: {
+      status,
+      ...candidate.headers === void 0 ? {} : { headers: candidate.headers },
+      body: candidate.body
+    }
+  };
+}
 function isAdepHttpEnvelope(value) {
   if (typeof value !== "object" || value === null) return false;
   const envelope = value.__adepHttp;
@@ -454,6 +480,14 @@ function assertWriteQuery(sql) {
     );
   }
 }
+function classifyStatement(sql) {
+  const head = sqlHead(stripLiterals(sql));
+  if (head.startsWith("SELECT") || head.startsWith("WITH")) return "read";
+  if (head.startsWith("INSERT") || head.startsWith("UPDATE") || head.startsWith("DELETE")) {
+    return "write";
+  }
+  return "ddl";
+}
 
 // packages/runtime/src/database/builder/owned.ts
 var OWNED_PK = "id";
@@ -1006,6 +1040,21 @@ function createCloudDb(driver, options = {}) {
         assertWriteQuery(sql);
         return driver.run(sql, params);
       },
+      async execute(sql, params = []) {
+        if (sql.trim() === "") {
+          throw unsafeOperation("execute \u7684 sql \u4E0D\u80FD\u4E3A\u7A7A");
+        }
+        if (!Array.isArray(params)) {
+          throw unsafeOperation("execute \u7684 params \u5FC5\u987B\u662F\u6570\u7EC4\uFF08\u65E0\u53C2\u53EF\u4E0D\u4F20\uFF09");
+        }
+        guardWrite();
+        const kind = classifyStatement(sql);
+        if (kind === "read") {
+          await driver.all(sql, params);
+          return { changes: 0 };
+        }
+        return driver.run(sql, params);
+      },
       async changes(table, query = {}) {
         return readChanges(driver, table, query);
       }
@@ -1081,6 +1130,10 @@ function createDbCapability(driver, options = {}) {
           const [sql, params] = args;
           return await db.writeQuery(sql, params);
         }
+        case DB_RPC.execute: {
+          const [sql, params] = args;
+          return await db.execute(sql, params ?? []);
+        }
         case DB_RPC.changes: {
           const [table, query] = args;
           return await db.changes(table, query);
@@ -3211,6 +3264,15 @@ function parseAdepConfig(raw) {
       data.environment = rec;
     }
   }
+  if (input.db_environment !== void 0) {
+    if (input.db_environment !== "dev" && input.db_environment !== "prod") {
+      errors.push(
+        `db_environment \u53EA\u63A5\u53D7 'dev' \u6216 'prod'\uFF0C\u6536\u5230 ${typeNameOf(input.db_environment)}\uFF08\u6CE8\u610F\u522B\u4E0E environment \u6DF7\u7528\uFF1A\u540E\u8005\u662F\u6CE8\u5165\u51FD\u6570\u8FD0\u884C\u65F6\u7684\u53D8\u91CF\u8868\uFF09`
+      );
+    } else {
+      data.db_environment = input.db_environment;
+    }
+  }
   if (input.runtime !== void 0) {
     const rec = asRecord(input.runtime);
     if (rec === null) {
@@ -4340,7 +4402,9 @@ function errorMessageOf2(error) {
   return String(error);
 }
 async function normalizeResultBody(value) {
-  if (!(value instanceof Response)) return value;
+  if (!(value instanceof Response)) {
+    return coerceAdepHttpEnvelope(value) ?? value;
+  }
   const contentType = value.headers.get("content-type") ?? "";
   const text = await value.text();
   let payload = text;
@@ -4588,7 +4652,7 @@ function createBearerUserResolver(issuer) {
 function isRuntimeSource(name) {
   return (name.endsWith(".ts") || name.endsWith(".js")) && !name.endsWith(".d.ts") && !name.endsWith(".test.ts");
 }
-async function collectFunctions(dir) {
+async function collectFunctions(dir, readImpl = (path) => readFile6(path, "utf8")) {
   const files = {};
   const walk = async (sub, prefix) => {
     let entries;
@@ -4603,7 +4667,8 @@ async function collectFunctions(dir) {
       if (entry.isDirectory()) {
         await walk(full, rel);
       } else if (entry.isFile() && isRuntimeSource(entry.name)) {
-        files[rel] = await readFile6(full, "utf8");
+        const content = await readImpl(full).catch(() => null);
+        if (content !== null) files[rel] = content;
       }
     }
   };
@@ -4679,7 +4744,8 @@ async function loadConfig(cwd) {
     name: config?.name ?? name,
     functionsDir: config?.functionsDir ?? "functions",
     functionsPrefix: config?.functions_prefix ?? "",
-    ...config?.environment === void 0 ? {} : { environment: config.environment }
+    ...config?.environment === void 0 ? {} : { environment: config.environment },
+    ...config?.db_environment === void 0 ? {} : { dbEnvironment: config.db_environment }
   };
 }
 var parseEnvFile = parseEnv;

package/dist/worker-entry.js

@@ -594,6 +594,8 @@ var DB_RPC = {
   query: "query",
   /** 写路径（CF-013）：`(method=writeQuery, args=[sql, params])` → `{ changes }`。 */
   writeQuery: "writeQuery",
+  /** 通用执行（BUG-4，2026-10-14）：`(method=execute, args=[sql, params?])` → `{ changes }`。 */
+  execute: "execute",
   /** 读取 owned 表变更流（DB-006）：`(method=changes, args=[table, query])`。 */
   changes: "changes",
   /** 开启事务：`begin → txId`。 */
@@ -732,6 +734,39 @@ function createChainClient(capability, port, pending, nextId, spec) {
   return makeRoot(void 0);
 }
 
+// packages/runtime/src/shared/http-envelope.ts
+function coerceAdepHttpEnvelope(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
+  if (isAdepHttpEnvelope(value)) return value;
+  const keys = Object.keys(value);
+  if (keys.length === 0) return null;
+  if (!keys.every((key) => key === "status" || key === "body" || key === "headers")) return null;
+  const candidate = value;
+  const status = candidate.status;
+  if (typeof status !== "number" || !Number.isInteger(status) || status < 100 || status > 599) {
+    return null;
+  }
+  if ("headers" in candidate && candidate.headers !== void 0) {
+    const headers = candidate.headers;
+    if (typeof headers !== "object" || headers === null || Array.isArray(headers)) return null;
+    if (!Object.values(headers).every((headerValue2) => typeof headerValue2 === "string")) return null;
+  }
+  return {
+    __adepHttp: {
+      status,
+      ...candidate.headers === void 0 ? {} : { headers: candidate.headers },
+      body: candidate.body
+    }
+  };
+}
+function isAdepHttpEnvelope(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const envelope = value.__adepHttp;
+  if (typeof envelope !== "object" || envelope === null) return false;
+  const status = envelope.status;
+  return typeof status === "number" && Number.isInteger(status) && status >= 100 && status <= 599;
+}
+
 // packages/runtime/src/functions/deps/manifest.ts
 function splitBareSpecifier(request) {
   if (request.startsWith("@")) {
@@ -751,7 +786,9 @@ function errorMessageOf2(error) {
   return String(error);
 }
 async function normalizeResultBody(value) {
-  if (!(value instanceof Response)) return value;
+  if (!(value instanceof Response)) {
+    return coerceAdepHttpEnvelope(value) ?? value;
+  }
   const contentType = value.headers.get("content-type") ?? "";
   const text = await value.text();
   let payload = text;

package/package.json

@@ -7,7 +7,7 @@
   },
   "homepage": "https://adep.top",
   "bugs": "https://gitcode.com/yunqiang_wu/ai-yunke/issues",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {
@@ -30,13 +30,13 @@
     "esbuild": "0.25.12",
     "yaml": "2.9.1",
     "zod": "^4.4.3",
-    "@adep/cf-compat": "0.1.2",
-    "@adep/runtime": "0.3.3",
+    "@adep/cf-compat": "0.1.3",
+    "@adep/runtime": "0.3.4",
     "@adep/crypto": "0.1.1",
     "@adep/vite-plugin": "0.1.9"
   },
   "devDependencies": {
-    "@adep/types": "0.3.1"
+    "@adep/types": "0.3.2"
   },
   "scripts": {
     "test": "vitest run",

package/templates/app-mobile/plugins/adep-bridge/Package.swift

@@ -0,0 +1,48 @@
+// swift-tools-version: 5.9
+//
+// adep-bridge 的 Swift Package Manager 清单（APP-015）。
+//
+// ⚠️ **这是双形态中的一支，不是替代品**：CocoaPods 形态（`ios/AdepBridge.podspec`）**必须同时保留**——
+// Capacitor 官方口径是「插件同时是 CocoaPods 与 SPM 库」；自 Capacitor 8 起 `cap add ios` 默认建 SPM 工程，
+// 没有本文件的插件会被静默跳过（运行时表现为 "plugin is not implemented"）。两支并存，各管一条消费路径。
+//
+// 命名与布局**不能随意改**（改了 Capacitor CLI 就找不到这个包）：
+//   - 本文件必须在 **npm 包根**：`cap sync ios` 按 npm 包根路径写入 `.package(name:path:)`
+//     （`path: ".../node_modules/@adep/bridge"`），落在 `ios/` 下不会被消费。
+//   - `name` / product 名 = `AdepBridge`：由 npm 名 `@adep/bridge` 按官方规则派生
+//     （剥 `@`、`/`→`_`、分段首字母大写）。用别的名字会在 app 侧报
+//     "product 'X' required by package 'capapp-spm' target 'CapApp-SPM' not found"。
+//     与既有 `s.name = 'AdepBridge'`（podspec）、`@objc(AdepBridge)` 一致。
+//   - `path: "ios/Sources"`：既有 Swift 源码就平铺在这（与 podspec 的 `source_files` glob 同一目录），
+//     避免为 SPM 搬目录而牵动 podspec 与 capacitor.plugin.json。
+//
+// 版本与平台下限**两形态必须一致**（本仓判据见 `packages/cli/src/__tests__/adep-bridge-spm.test.ts`）：
+//   - `platforms: [.iOS(.v14)]` ↔ podspec 的 `s.ios.deployment_target = '14.0'`。
+//     Capacitor 7 官方迁移要求把 iOS 下限从 13 抬到 14；两端不一致 = 同一插件对同一消费方给出不同平台约束。
+//   - `capacitor-swift-pm` 用 `from: "7.0.0"`（区间）：app 侧按自己装的 `@capacitor/ios` 钉 exact 版本，
+//     这里给区间让 SPM 能同时解析两者；写 `branch:` / `exact:` 会与 app 侧冲突。
+//     与 podspec 的 `s.dependency 'Capacitor'`（无版本约束）对应——语义都是「跟随消费方的 Capacitor 版本」。
+//   - `Capacitor` **与** `Cordova` 两个 product 都要声明：只写 `Capacitor` 会报
+//     `fatal error: module 'Cordova' not found`（Capacitor.framework 的头文件里 `@_exported import Cordova`）。
+import PackageDescription
+
+let package = Package(
+    name: "AdepBridge",
+    platforms: [.iOS(.v14)],
+    products: [
+        .library(name: "AdepBridge", targets: ["AdepBridge"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
+    ],
+    targets: [
+        .target(
+            name: "AdepBridge",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm"),
+            ],
+            path: "ios/Sources"
+        )
+    ]
+)

package/templates/app-mobile/plugins/adep-bridge/ios/AdepBridge.podspec

@@ -7,7 +7,10 @@ Pod::Spec.new do |s|
   s.license = 'MIT'
   s.author = 'AgentDeploy'
   s.source = { :git => 'https://adep.top/adep-bridge.git', :tag => s.version.to_s }
-  s.ios.deployment_target = '13.0'
+  # iOS 下限与 SPM 形态（包根 Package.swift 的 platforms）**必须一致**：
+  # Capacitor 7 官方迁移要求抬到 14（原 13）。两端不一致 = 同一插件对两条消费路径给出不同平台约束。
+  # 一致性由 packages/cli/src/__tests__/adep-bridge-spm.test.ts 钉住。
+  s.ios.deployment_target = '14.0'
   s.source_files = 'Sources/**/*.swift'
   s.swift_version = '5.1'
   s.dependency 'Capacitor'