@adep/cli 0.0.4 → 0.0.5

package/dist/index.js

@@ -2915,6 +2915,25 @@ var init_env = __esm({
 });
 
 // packages/cli/src/sim/invoke.ts
+function resolveFunctionEntry(files, fnName) {
+  const flat = `${fnName}.ts`;
+  if (files[flat] !== void 0) return flat;
+  const directory = `${fnName}/index.ts`;
+  if (files[directory] !== void 0) return directory;
+  return void 0;
+}
+function listFunctionNames(files) {
+  const names = /* @__PURE__ */ new Set();
+  for (const key of Object.keys(files)) {
+    const parts = key.split("/");
+    if (parts.length === 1 && parts[0]?.endsWith(".ts")) {
+      names.add(parts[0].slice(0, -3));
+    } else if (parts.length === 2 && parts[1] === "index.ts") {
+      names.add(parts[0]);
+    }
+  }
+  return [...names];
+}
 function createSimInvokeHandler(options) {
   return async (method, args) => {
     if (method !== "invoke") {
@@ -2924,7 +2943,10 @@ function createSimInvokeHandler(options) {
     if (typeof input?.name !== "string" || input.name.length === 0) {
       throw new Error("cloud.invoke \u9700\u8981\u76EE\u6807\u51FD\u6570\u540D\uFF08InvokeInput.name\uFF09");
     }
-    const targetEntry = `${input.name}.ts`;
+    const targetEntry = resolveFunctionEntry(options.files, input.name);
+    if (targetEntry === void 0) {
+      throw new Error(`\u76EE\u6807\u51FD\u6570 "${input.name}" \u4E0D\u5B58\u5728`);
+    }
     const executeInput = {
       project: { id: "local", slug: "local" },
       fn: { id: input.name, name: input.name },
@@ -3130,7 +3152,7 @@ async function startDevServer(options) {
   } catch {
     watcher = void 0;
   }
-  const buildInput = async (fnName, url, req) => {
+  const buildInput = async (fnName, entry, url, req) => {
     const query = {};
     for (const key of new Set(url.searchParams.keys())) {
       const values = url.searchParams.getAll(key);
@@ -3146,7 +3168,7 @@ async function startDevServer(options) {
       project: { id: "local", slug: config.name },
       fn: { id: fnName, name: fnName },
       files,
-      entry: `${fnName}.ts`,
+      entry,
       request: {
         method: req.method ?? "GET",
         path: url.pathname,
@@ -3173,14 +3195,13 @@ async function startDevServer(options) {
       });
       return;
     }
-    const entry = `${fnName}.ts`;
-    const source = files[entry];
-    if (source === void 0) {
+    const entry = resolveFunctionEntry(files, fnName);
+    if (entry === void 0) {
       log(`[adep] ${req.method ?? "GET"} /${fnName} -> 404\uFF08\u51FD\u6570\u4E0D\u5B58\u5728\uFF09`);
       writeJson(res, 404, { error: { code: "FN_NOT_FOUND", message: `\u51FD\u6570 "${fnName}" \u4E0D\u5B58\u5728` } });
       return;
     }
-    const input = await buildInput(fnName, url, req);
+    const input = await buildInput(fnName, entry, url, req);
     const startedAt = performance.now();
     try {
       const result = await executor.execute(input);
@@ -3655,7 +3676,7 @@ async function startServeServer(options) {
     hasStatic = false;
   }
   const files = await collectFunctions2(functionsDir);
-  const functionNames = Object.keys(files).filter((f) => f.endsWith(".ts")).map((f) => f.slice(0, -3));
+  const functionNames = listFunctionNames(files);
   const envText = await readFile7(join11(cwd, ".env.local"), "utf8").catch(() => "");
   const env = parseEnvFile(envText);
   const simEnv = await loadSimEnv(cwd).catch(() => ({}));
@@ -3668,7 +3689,7 @@ async function startServeServer(options) {
   const executor = new WorkerFunctionExecutor();
   const dbBundle = runtime.bundle;
   const invokeHandler = createSimInvokeHandler({ executor, files });
-  const buildInput = async (fnName, url, req) => {
+  const buildInput = async (fnName, entry, url, req) => {
     const query = {};
     for (const key of new Set(url.searchParams.keys())) {
       const values = url.searchParams.getAll(key);
@@ -3685,7 +3706,7 @@ async function startServeServer(options) {
       project: { id: "local", slug: config.name },
       fn: { id: fnName, name: fnName },
       files,
-      entry: `${fnName}.ts`,
+      entry,
       request: {
         method: req.method ?? "GET",
         path: url.pathname,
@@ -3742,14 +3763,13 @@ async function startServeServer(options) {
         });
         return;
       }
-      const entry = `${fnName}.ts`;
-      const source = files[entry];
-      if (source === void 0) {
+      const entry = resolveFunctionEntry(files, fnName);
+      if (entry === void 0) {
         log(`[serve] ${req.method ?? "GET"} ${pathname} -> 404\uFF08\u51FD\u6570\u4E0D\u5B58\u5728\uFF09`);
         writeJson2(res, 404, { error: { code: "FN_NOT_FOUND", message: `\u51FD\u6570 "${fnName}" \u4E0D\u5B58\u5728` } });
         return;
       }
-      const input = await buildInput(fnName, url, req);
+      const input = await buildInput(fnName, entry, url, req);
       const startedAt = performance.now();
       try {
         const result = await executor.execute(input);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adep/cli",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002",
   "bin": {