@adep/cli 0.1.0 → 0.1.1

package/dist/vite.js

@@ -1,14 +1,13 @@
-// src/vite.ts
-import { request as httpRequest } from "node:http";
-import { resolve as resolve3 } from "node:path";
+// packages/cli/src/vite.ts
+import { adepPlugin } from "@adep/vite-plugin";
 
-// src/dev.ts
+// packages/cli/src/dev.ts
 import { createServer } from "node:http";
 import { watch } from "node:fs";
 import { mkdir as mkdir3, readdir as readdir2, readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
 import { basename, join as join7, resolve as resolve2 } from "node:path";
 
-// ../runtime/src/shared/capability-keys.ts
+// packages/runtime/src/shared/capability-keys.ts
 var RPC_CAPABILITY_KEY = "__adepRpc";
 var CHAIN_CAPABILITY_KEY = "__adepChain";
 var DB_RPC = {
@@ -40,7 +39,7 @@ var REALTIME_CAPABILITY_METHODS = [
   "unsubscribe"
 ];
 
-// ../runtime/src/shared/executor-runtime.ts
+// packages/runtime/src/shared/executor-runtime.ts
 var ExecutorError = class extends Error {
   constructor(status, code, message) {
     super(message);
@@ -60,19 +59,19 @@ function normalizeHttpStatus(status) {
   return isHttpStatus(status) ? status : 500;
 }
 
-// ../runtime/src/functions/runtime/worker-executor.ts
+// packages/runtime/src/functions/runtime/worker-executor.ts
 import { readFileSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { dirname, join } from "node:path";
 import { Worker } from "node:worker_threads";
 
-// ../runtime/src/functions/deps/resolve.ts
+// packages/runtime/src/functions/deps/resolve.ts
 import { resolve } from "node:path";
 
-// ../runtime/src/functions/deps/manifest.ts
+// packages/runtime/src/functions/deps/manifest.ts
 import { createHash } from "node:crypto";
 
-// ../runtime/src/functions/domain.ts
+// packages/runtime/src/functions/domain.ts
 var MAX_TOTAL_SOURCE_BYTES = 256 * 1024;
 var FnError = class extends Error {
   status;
@@ -85,7 +84,7 @@ var FnError = class extends Error {
   }
 };
 
-// ../runtime/src/functions/deps/manifest.ts
+// packages/runtime/src/functions/deps/manifest.ts
 var PACKAGE_NAME_PATTERN = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-._~]+$/;
 var COMPARATOR_PATTERN = /^(?:\^|~|>=|<=|>|<|=)?\d+(?:\.(?:\d+|x|X|\*)){0,2}(?:-[\w.-]+)?(?:\+[\w.-]+)?$/;
 var MANIFEST_MAX_DEPS = 100;
@@ -167,7 +166,7 @@ function depsKeyOf(dependencies) {
   return createHash("sha256").update(canonical).digest("hex").slice(0, 16);
 }
 
-// ../runtime/src/functions/deps/resolve.ts
+// packages/runtime/src/functions/deps/resolve.ts
 function resolveExecutionDeps(config, projectId, manifestContent) {
   const manifest = tryParseManifestDependencies(manifestContent);
   const { customDeps } = classifyDependencies(manifest, config.builtin);
@@ -180,7 +179,7 @@ function resolveExecutionDeps(config, projectId, manifestContent) {
   };
 }
 
-// ../runtime/src/functions/runtime/worker-executor.ts
+// packages/runtime/src/functions/runtime/worker-executor.ts
 function resolveWorkerEntry(baseDir = fileURLToPath(new URL(".", import.meta.url))) {
   const candidates = [
     join(baseDir, "worker-entry.js"),
@@ -230,7 +229,7 @@ var WorkerFunctionExecutor = class {
     const entry = input.entry ?? "index.ts";
     const deps = this.depsConfig === void 0 ? void 0 : resolveExecutionDeps(this.depsConfig, input.project.id, input.files["package.json"]);
     const logs = [];
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve3, reject) => {
       let worker;
       try {
         worker = new Worker(resolveWorkerEntry(), {
@@ -292,7 +291,7 @@ var WorkerFunctionExecutor = class {
           if (message.type === "result") {
             clearTimeout(timer);
             void worker.terminate();
-            resolve4({ body: message.body, logs });
+            resolve3({ body: message.body, logs });
             return;
           }
           if (message.type === "error") {
@@ -325,11 +324,11 @@ var WorkerFunctionExecutor = class {
   }
 };
 
-// src/sim/runtime.ts
+// packages/cli/src/sim/runtime.ts
 import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname3, join as join4 } from "node:path";
 
-// ../runtime/src/database/builder/dialect.ts
+// packages/runtime/src/database/builder/dialect.ts
 var sqliteDialect = {
   name: "sqlite",
   placeholder: () => "?",
@@ -348,7 +347,7 @@ function dialectFor(driver) {
   return driver.engine === "pg" ? postgresDialect : sqliteDialect;
 }
 
-// ../runtime/src/database/provision/identifier.ts
+// packages/runtime/src/database/provision/identifier.ts
 var DbError = class extends Error {
   constructor(status, code, message) {
     super(message);
@@ -372,7 +371,7 @@ function quoteIdentifier(name) {
   return `"${name.replace(/"/g, '""')}"`;
 }
 
-// ../runtime/src/database/builder/guards.ts
+// packages/runtime/src/database/builder/guards.ts
 function unsafeOperation(message) {
   return new DbError(400, "DB_UNSAFE_OP", message);
 }
@@ -396,7 +395,7 @@ function assertReadOnlyQuery(sql) {
   }
 }
 
-// ../runtime/src/database/builder/owned.ts
+// packages/runtime/src/database/builder/owned.ts
 var OWNED_PK = "id";
 var OWNED_OWNER_KEY = "__owner_key";
 var CHANGE_LOG_PREFIX = "_adep_changes_";
@@ -509,7 +508,7 @@ async function readChanges(driver, table, query = {}) {
   return rows.map(parseChange);
 }
 
-// ../runtime/src/database/builder/ulid.ts
+// packages/runtime/src/database/builder/ulid.ts
 var ENCODING = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
 var TIME_LEN = 10;
 var RANDOM_LEN = 16;
@@ -575,7 +574,7 @@ function ulid(now = Date.now()) {
   return time + random;
 }
 
-// ../runtime/src/database/builder/table.ts
+// packages/runtime/src/database/builder/table.ts
 var OPERATORS = /* @__PURE__ */ new Set([
   "=",
   "!=",
@@ -894,7 +893,7 @@ function createTableBuilder(table, driver, dialect, options = {}) {
   return build(initialState);
 }
 
-// ../runtime/src/database/builder/index.ts
+// packages/runtime/src/database/builder/index.ts
 var TX_STATES = /* @__PURE__ */ new WeakMap();
 function createCloudDb(driver, options = {}) {
   const dialect = options.dialect ?? dialectFor(driver);
@@ -948,7 +947,7 @@ function createCloudDb(driver, options = {}) {
   return makeHandle({ allowWriteDuringTx: false });
 }
 
-// ../runtime/src/database/sdk/cloud.ts
+// packages/runtime/src/database/sdk/cloud.ts
 var CLOUD_DB_SPEC = {
   kind: "cloud-db",
   rootMethod: "table",
@@ -1052,7 +1051,7 @@ function createDbCapability(driver, options = {}) {
   };
 }
 
-// src/sim/sql-engine.ts
+// packages/cli/src/sim/sql-engine.ts
 var SimDbError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -1470,7 +1469,7 @@ function project(rows, selectRaw) {
   });
 }
 
-// src/sim/db.ts
+// packages/cli/src/sim/db.ts
 function toProjectDriver(engine) {
   return {
     engine: "sqlite",
@@ -1490,10 +1489,10 @@ function createSimDbCapability(options = {}) {
   return { bundle, engine, driver };
 }
 
-// src/sim/storage.ts
+// packages/cli/src/sim/storage.ts
 import { join as join3 } from "node:path";
 
-// ../runtime/src/storage/driver.ts
+// packages/runtime/src/storage/driver.ts
 var PROJECT_QUOTA_BYTES = 1024 * 1024 * 1024;
 var StorageError = class extends Error {
   constructor(status, code, message) {
@@ -1534,7 +1533,7 @@ function assertSafeStoragePath(path) {
   return path;
 }
 
-// ../runtime/src/storage/hmac-sha256.ts
+// packages/runtime/src/storage/hmac-sha256.ts
 var K = new Uint32Array([
   1116352408,
   1899447441,
@@ -1695,7 +1694,7 @@ function hmacSha256Hex(key, message) {
   return [...hmacSha256(key, message)].map((b) => b.toString(16).padStart(2, "0")).join("");
 }
 
-// ../runtime/src/storage/signature.ts
+// packages/runtime/src/storage/signature.ts
 var DEFAULT_SIGN_TTL_SECONDS = 15 * 60;
 var SIGN_EXPIRES_KEY = "x-expires";
 var SIGN_SIGNATURE_KEY = "x-signature";
@@ -1710,7 +1709,7 @@ function signDownloadUrl(config, projectId, path, ttlSeconds = DEFAULT_SIGN_TTL_
   return `${base}?${SIGN_EXPIRES_KEY}=${expires}&${SIGN_SIGNATURE_KEY}=${signature}`;
 }
 
-// ../runtime/src/storage/cloud.ts
+// packages/runtime/src/storage/cloud.ts
 var DEFAULT_VISIBILITY = "private";
 function asBytes(data) {
   if (typeof data === "string") return new TextEncoder().encode(data);
@@ -1769,7 +1768,7 @@ function createStorageCapability(driver, signer, projectId) {
   };
 }
 
-// ../runtime/src/storage/driver/local.ts
+// packages/runtime/src/storage/driver/local.ts
 import { mkdir, readFile, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname as dirname2, join as join2 } from "node:path";
 var META_SUFFIX = ".adep-meta.json";
@@ -1976,7 +1975,7 @@ function createLocalStorageDriver(options) {
   };
 }
 
-// src/sim/storage.ts
+// packages/cli/src/sim/storage.ts
 function createSimStorageCapability(options) {
   const dir = join3(options.cwd, ".adep", "sim", "storage");
   const driver = createLocalStorageDriver({ dir });
@@ -1988,7 +1987,7 @@ function createSimStorageCapability(options) {
   return { bundle, driver };
 }
 
-// src/sim/realtime.ts
+// packages/cli/src/sim/realtime.ts
 var SimRealtime = class {
   seq = 0;
   subscribers = /* @__PURE__ */ new Map();
@@ -2110,7 +2109,7 @@ function createSimRealtimeCapability() {
   };
 }
 
-// src/sim/runtime.ts
+// packages/cli/src/sim/runtime.ts
 function simDir(cwd) {
   return join4(cwd, ".adep", "sim");
 }
@@ -2173,7 +2172,7 @@ async function createSimRuntime(options) {
   };
 }
 
-// src/sim/env.ts
+// packages/cli/src/sim/env.ts
 import { readFile as readFile3 } from "node:fs/promises";
 import { join as join5 } from "node:path";
 function parseEnv(content) {
@@ -2206,7 +2205,7 @@ async function loadSimEnv(cwd, config = {}) {
   return merged;
 }
 
-// src/sim/invoke.ts
+// packages/cli/src/sim/invoke.ts
 function resolveFunctionEntry(files, fnName) {
   const flat = `${fnName}.ts`;
   if (files[flat] !== void 0) return flat;
@@ -2247,7 +2246,7 @@ function createSimInvokeHandler(options) {
   };
 }
 
-// src/sim/boundary.ts
+// packages/cli/src/sim/boundary.ts
 var SIM_BOUNDARIES = [
   {
     kind: "capability",
@@ -2276,11 +2275,11 @@ var SIM_BOUNDARIES = [
   }
 ];
 
-// src/ts-config.ts
+// packages/cli/src/ts-config.ts
 import { stat as stat2, readFile as readFile4 } from "node:fs/promises";
 import { join as join6 } from "node:path";
 
-// ../../shared/sdk/adep-config.ts
+// shared/sdk/adep-config.ts
 var DEFAULT_ADEP_CONFIG = {
   functionsDir: "functions",
   functions_prefix: "/api"
@@ -2366,7 +2365,7 @@ function parseAdepConfig(raw) {
   return { ok: true, data };
 }
 
-// src/ts-config.ts
+// packages/cli/src/ts-config.ts
 async function loadAdepConfigModule(cwd) {
   const configPath = join6(cwd, "adep.config.ts");
   try {
@@ -2410,7 +2409,7 @@ ${result.errors.map((e) => `  - ${e}`).join("\n")}`;
   return result.data;
 }
 
-// src/dev.ts
+// packages/cli/src/dev.ts
 async function loadConfig(cwd) {
   const name = basename(resolve2(cwd));
   const config = await loadAdepConfigModule(cwd);
@@ -2693,126 +2692,28 @@ async function startDevServer(options) {
   };
 }
 
-// src/vite.ts
-function normalizeFunctionPrefix(raw) {
-  const value = (raw ?? "").trim();
-  if (value.length === 0 || value === "/") return "";
-  return value.replace(/^\/+|\/+$/g, "");
-}
-function isAddrInUse(error) {
-  return typeof error === "object" && error !== null && "code" in error && error.code === "EADDRINUSE";
-}
-function createAdepProxyMiddleware(prefix, targetBase) {
-  const normalized = normalizeFunctionPrefix(prefix);
-  const prefixPath = normalized === "" ? "" : `/${normalized}`;
-  return (req, res, next) => {
-    if (prefixPath === "") return next();
-    const url = new URL(req.url ?? "/", "http://127.0.0.1");
-    if (url.pathname !== prefixPath && !url.pathname.startsWith(`${prefixPath}/`)) {
-      return next();
-    }
-    const target = new URL(url.pathname + url.search, targetBase);
-    const proxyReq = httpRequest(
-      target,
-      { method: req.method, headers: { ...req.headers, host: target.host } },
-      (proxyRes) => {
-        res.writeHead(proxyRes.statusCode ?? 502, proxyRes.headers);
-        proxyRes.pipe(res);
-      }
-    );
-    proxyReq.on("error", (error) => {
-      if (!res.headersSent) {
-        res.writeHead(502, { "content-type": "application/json" });
-      }
-      res.end(
-        JSON.stringify({
-          error: {
-            code: "ADEP_DEV_UNAVAILABLE",
-            message: `\u4E91\u51FD\u6570\u4EE3\u7406\u5931\u8D25\uFF08adep dev server \u4E0D\u53EF\u8FBE\uFF09\uFF1A${error.message}`
-          }
-        })
-      );
-    });
-    req.pipe(proxyReq);
-  };
-}
+// packages/cli/src/vite.ts
+import {
+  createAdepFnProxyScriptMiddleware,
+  createAdepProxyMiddleware,
+  FN_FETCH_INTERCEPTOR_SCRIPT,
+  injectFnProxyScriptTag,
+  isAddrInUse,
+  normalizeFunctionPrefix
+} from "@adep/vite-plugin";
+var createDevServer = (opts) => startDevServer({ cwd: opts.cwd, port: opts.port, prefix: opts.prefix, log: opts.log });
+var loadConfig2 = (cwd) => loadAdepConfigModule(cwd);
 function adepVitePlugin(options = {}) {
-  const cwd = resolve3(options.cwd ?? process.cwd());
-  let dev;
-  let prefix = normalizeFunctionPrefix(options.prefix);
-  let prefixPath = "";
-  let startPromise;
-  const startAdepDev = async (log) => {
-    if (startPromise !== void 0) return startPromise;
-    startPromise = (async () => {
-      if (prefix === "") {
-        const config = await loadAdepConfigModule(cwd);
-        prefix = normalizeFunctionPrefix(config?.functions_prefix);
-        if (prefix === "") {
-          log("[adep] adep.config.ts \u672A\u914D\u7F6E functions_prefix\uFF0C\u4E91\u51FD\u6570\u4EE3\u7406\u524D\u7F00\u9ED8\u8BA4 /api");
-          prefix = "api";
-        }
-      }
-      prefixPath = `/${prefix}`;
-      const targetPort = options.port ?? 8787;
-      try {
-        dev = await startDevServer({ cwd, port: targetPort, prefix, log });
-      } catch (error) {
-        if (isAddrInUse(error)) {
-          log(`[adep] \u7AEF\u53E3 ${targetPort} \u88AB\u5360\u7528\uFF0C\u6539\u7528\u968F\u673A\u7AEF\u53E3`);
-          dev = await startDevServer({ cwd, port: 0, prefix, log });
-        } else {
-          log(
-            `[adep] \u4E91\u51FD\u6570 dev server \u542F\u52A8\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}\uFF08vite \u524D\u7AEF\u7167\u5E38\uFF0C\u51FD\u6570\u4EE3\u7406\u4E0D\u53EF\u7528\uFF09`
-          );
-        }
-      }
-      if (dev !== void 0) {
-        log(
-          `[adep] \u4E91\u51FD\u6570\u5DF2\u5C31\u7EEA\uFF1A${dev.baseUrl}${prefixPath}/<fn>\uFF08vite \u4EE3\u7406 ${prefixPath}/* \u2192 \u4E91\u51FD\u6570\uFF09`
-        );
-      }
-    })();
-    try {
-      await startPromise;
-    } finally {
-      startPromise = void 0;
-    }
-  };
-  const disposeAdepDev = async () => {
-    if (dev === void 0) return;
-    const target = dev;
-    dev = void 0;
-    await target.close();
-  };
-  const attachProxy = (server) => {
-    if (dev === void 0 || prefixPath === "") return;
-    server.middlewares.use(createAdepProxyMiddleware(prefixPath, dev.baseUrl));
-  };
-  return {
-    name: "adep-cloud-functions",
-    async configureServer(server) {
-      const log = (line) => server.config.logger.info(line);
-      await startAdepDev(log);
-      attachProxy(server);
-      server.httpServer?.on("close", () => {
-        void disposeAdepDev();
-      });
-    },
-    async configurePreviewServer(server) {
-      const log = (line) => server.config.logger.info(line);
-      await startAdepDev(log);
-      attachProxy(server);
-    },
-    async closeBundle() {
-      await disposeAdepDev();
-    }
-  };
+  return adepPlugin({ ...options, createDevServer, loadConfig: loadConfig2 });
 }
 var vite_default = adepVitePlugin;
 export {
+  FN_FETCH_INTERCEPTOR_SCRIPT,
   adepVitePlugin,
+  createAdepFnProxyScriptMiddleware,
   createAdepProxyMiddleware,
   vite_default as default,
+  injectFnProxyScriptTag,
+  isAddrInUse,
   normalizeFunctionPrefix
 };

package/dist/worker-entry.js

@@ -1,9 +1,9 @@
-// ../runtime/src/functions/runtime/worker-entry.ts
+// packages/runtime/src/functions/runtime/worker-entry.ts
 import { parentPort, workerData } from "node:worker_threads";
 import { createRequire } from "node:module";
 import { join } from "node:path";
 
-// ../runtime/src/functions/runtime/cloud-container.ts
+// packages/runtime/src/functions/runtime/cloud-container.ts
 var KNOWN_CAPABILITY_HINTS = {
   db: {
     code: "DB_NOT_PROVISIONED",
@@ -79,11 +79,11 @@ function createCloudContainer() {
   };
 }
 
-// ../runtime/src/functions/runtime/sandbox.ts
+// packages/runtime/src/functions/runtime/sandbox.ts
 import vm from "node:vm";
 import * as nodeModule from "node:module";
 
-// ../runtime/src/functions/runtime/exports.ts
+// packages/runtime/src/functions/runtime/exports.ts
 function transformModule(code) {
   let out = code;
   const named = [];
@@ -125,7 +125,7 @@ function transformModule(code) {
   return out;
 }
 
-// ../runtime/src/functions/runtime/sandbox.ts
+// packages/runtime/src/functions/runtime/sandbox.ts
 var bunTranspiler;
 function transpile(code) {
   const bun = globalThis["Bun"];
@@ -231,7 +231,7 @@ function loadFunctionModule(files, entry, sandboxGlobals, resolveBare) {
   return { handler };
 }
 
-// ../runtime/src/functions/runtime/sandbox-fetch.ts
+// packages/runtime/src/functions/runtime/sandbox-fetch.ts
 var SandboxFetchError = class extends Error {
   code;
   constructor(code, message) {
@@ -410,7 +410,7 @@ function createSandboxFetch(options) {
   };
 }
 
-// ../runtime/src/shared/capability-keys.ts
+// packages/runtime/src/shared/capability-keys.ts
 var RPC_CAPABILITY_KEY = "__adepRpc";
 var CHAIN_CAPABILITY_KEY = "__adepChain";
 var DB_RPC = {
@@ -428,7 +428,7 @@ var DB_RPC = {
   chain: "chain"
 };
 
-// ../runtime/src/functions/runtime/chain.ts
+// packages/runtime/src/functions/runtime/chain.ts
 function isChainCapability(value) {
   if (typeof value !== "object" || value === null) return false;
   const spec = value[CHAIN_CAPABILITY_KEY];
@@ -499,7 +499,7 @@ function createChainClient(capability, port, pending, nextId, spec) {
   return makeRoot(void 0);
 }
 
-// ../runtime/src/functions/deps/manifest.ts
+// packages/runtime/src/functions/deps/manifest.ts
 function splitBareSpecifier(request) {
   if (request.startsWith("@")) {
     const segments = request.split("/");
@@ -508,7 +508,7 @@ function splitBareSpecifier(request) {
   return request.split("/")[0];
 }
 
-// ../runtime/src/functions/runtime/worker-entry.ts
+// packages/runtime/src/functions/runtime/worker-entry.ts
 function isRpcCapability(value) {
   return typeof value === "object" && value !== null && value[RPC_CAPABILITY_KEY] === true;
 }

package/package.json

@@ -1,49 +1,34 @@
 {
   "name": "@adep/cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {
-    "adep": "./src/index.ts"
+    "adep": "./dist/index.js"
   },
   "exports": {
     ".": {
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "default": "./dist/index.js"
     },
     "./vite": {
-      "types": "./src/vite.ts",
-      "default": "./src/vite.ts"
+      "default": "./dist/vite.js"
     }
   },
   "files": [
     "dist"
   ],
-  "scripts": {
-    "test": "vitest run",
-    "init": "bun run src/index.ts init --template fullstack example1",
-    "build": "bun run ../../scripts/build-package.ts cli"
-  },
   "dependencies": {
     "commander": "14.0.2",
-    "esbuild": "0.25.12"
+    "esbuild": "0.25.12",
+    "@adep/vite-plugin": "0.1.1"
   },
   "devDependencies": {
-    "@adep/runtime": "0.2.0",
-    "@adep/types": "0.2.0"
-  },
-  "publishConfig": {
-    "bin": {
-      "adep": "./dist/index.js"
-    },
-    "exports": {
-      ".": {
-        "default": "./dist/index.js"
-      },
-      "./vite": {
-        "default": "./dist/vite.js"
-      }
-    }
+    "@adep/runtime": "0.2.1",
+    "@adep/types": "0.2.1"
   },
-  "gitHead": "9c29cbb2a942afe4d4c7ae2987bcc229f6b99f9b"
-}
+  "scripts": {
+    "test": "vitest run",
+    "init": "bun run src/index.ts init --template fullstack example1",
+    "build": "bun run ../../scripts/build-package.ts cli"
+  }
+}

package/src/index.ts

@@ -1,8 +0,0 @@
-#!/usr/bin/env bun
-/**
- * adep bin 入口（CLI-001）。Bun 直接运行 TS；npm 发布与独立二进制打包归 CLI-003 / 后续任务。
- */
-import { buildProgram } from './cli'
-
-const program = buildProgram()
-await program.parseAsync(process.argv)