@dazitech/cli 3.0.7 → 3.0.8

package/README.md

@@ -78,7 +78,7 @@ pnpm run publish:cli
 
 ```powershell
 # 全局
-pnpm add -g @dazitech/cli@3.0.7
+pnpm add -g @dazitech/cli@3.0.8
 
 # 确认 PATH（pnpm 全局 bin）
 pnpm bin -g

package/dist/clis/dazi-app.js

@@ -13077,7 +13077,7 @@ var {
 } = import_index.default;
 
 // cli/shared/src/version.ts
-var DAZI_VERSION = true ? "3.0.7" : readDevVersion();
+var DAZI_VERSION = true ? "3.0.8" : readDevVersion();
 
 // cli/dazi-app/src/lib/httpClient.ts
 init_config();

package/dist/clis/dazi-flow.js

@@ -4982,7 +4982,7 @@ function resolveWorkspace(cwd = process.cwd()) {
 }
 
 // cli/shared/src/version.ts
-var DAZI_VERSION = true ? "3.0.7" : readDevVersion();
+var DAZI_VERSION = true ? "3.0.8" : readDevVersion();
 
 // cli/dazi-flow/src/commands/flows.ts
 var import_path3 = __toESM(require("path"), 1);

package/dist/clis/dazi-onto.js

@@ -3216,7 +3216,14 @@ function resolveWorkspace(cwd = process.cwd()) {
 }
 
 // cli/shared/src/version.ts
-var DAZI_VERSION = true ? "3.0.7" : readDevVersion();
+var DAZI_VERSION = true ? "3.0.8" : readDevVersion();
+
+// cli/shared/src/ontoWorkspaceAudit.ts
+function ontoItemSubdirForScriptType(scriptType) {
+  const t = (scriptType ?? "").toLowerCase();
+  if (t === "ontology_function" || t === "ontology_action") return "functions";
+  return "setup";
+}
 
 // cli/dazi-onto/src/commands/space.ts
 var import_path3 = __toESM(require("path"), 1);
@@ -3705,9 +3712,36 @@ function makeRuleCommand() {
 // cli/dazi-onto/src/commands/script.ts
 var import_path6 = __toESM(require("path"), 1);
 var import_fs5 = __toESM(require("fs"), 1);
+async function fetchScriptCode(scriptId) {
+  const detail = await apiRequest(`/api/scripts/${encodeURIComponent(scriptId)}`);
+  return detail.code ?? "";
+}
+function scriptOutFileName(s) {
+  const fromPath = s.filePath ? import_path6.default.basename(s.filePath) : "";
+  if (fromPath && fromPath.endsWith(".py")) return fromPath;
+  const stem = (s.name ?? s.id).replace(/\.py$/i, "");
+  return `${stem}.py`;
+}
+function resolveSyncOutDir(opts, ws) {
+  if (opts.targetDir) {
+    return { base: import_path6.default.resolve(opts.targetDir), perItem: true };
+  }
+  return { base: import_path6.default.join(ws.onto, opts.space, "scripts"), perItem: false };
+}
 function inferScriptTypeFromPath(filePath, explicit) {
   if (explicit) return explicit;
   const norm = filePath.replace(/\\/g, "/");
+  if (norm.includes("/\u811A\u672C/")) {
+    console.warn(
+      "[deprecated] \u68C0\u6D4B\u5230\u65E7\u8DEF\u5F84\u300C\u811A\u672C/\u300D\u3002\u8BF7\u8FC1\u81F3 \u9879\u76EE/<\u4E1A\u52A1>/\u672C\u4F53/ontos/<\u5B9E\u73B0\u540D>/setup|functions/"
+    );
+    if (norm.includes("/\u811A\u672C/functions/")) return "ontology_function";
+    if (norm.includes("/\u811A\u672C/setup/")) {
+      const stem = import_path6.default.basename(filePath, ".py").toLowerCase();
+      if (stem.includes("seed")) return "data";
+      return "setup";
+    }
+  }
   if (norm.includes("/functions/")) return "ontology_function";
   if (norm.includes("/setup/")) {
     const stem = import_path6.default.basename(filePath, ".py").toLowerCase();
@@ -3817,29 +3851,46 @@ function makeScriptCommand() {
       handleError(err);
     }
   });
-  cmd.command("sync").description("\u4ECE\u5E73\u53F0\u540C\u6B65\u811A\u672C\u5230\u672C\u5730 onto/<spaceId>/scripts/").requiredOption("--space <spaceId>", "\u7A7A\u95F4 ID").option("--type <scriptType>", "\u811A\u672C\u7C7B\u578B\uFF08\u5982 ontology_function\uFF09").option("--ids <ids>", "\u9017\u53F7\u5206\u9694\u7684\u811A\u672C ID \u5217\u8868").option("--with-docs", "\u540C\u65F6\u540C\u6B65\u5173\u8054\u6587\u6863\u5230 docs/").option("--dry-run", "\u4EC5\u9884\u89C8\uFF0C\u4E0D\u5199\u6587\u4EF6").option("--json", "\u8F93\u51FA JSON").action(async (opts) => {
+  cmd.command("sync").description(
+    "\u4ECE\u5E73\u53F0\u540C\u6B65\u811A\u672C\u5230\u672C\u5730 onto/<spaceId>/scripts/\uFF08legacy\uFF09\uFF1B\u65E5\u5E38\u5F00\u53D1\u8BF7\u7528 \u9879\u76EE/<\u4E1A\u52A1>/\u672C\u4F53/ontos/<\u5B9E\u73B0\u540D>/setup|functions/"
+  ).requiredOption("--space <spaceId>", "\u7A7A\u95F4 ID").option("--type <scriptType>", "\u811A\u672C\u7C7B\u578B\uFF08\u5982 ontology_function\uFF09").option("--ids <ids>", "\u9017\u53F7\u5206\u9694\u7684\u811A\u672C ID \u5217\u8868").option("--target-dir <path>", "\u843D\u76D8\u5230 ontos/<\u5B9E\u73B0\u540D>/ \u76EE\u5F55\uFF08\u6309 setup|functions \u5206\u5B50\u76EE\u5F55\uFF09").option("--with-docs", "\u540C\u65F6\u540C\u6B65\u5173\u8054\u6587\u6863\u5230 docs/").option("--dry-run", "\u4EC5\u9884\u89C8\uFF0C\u4E0D\u5199\u6587\u4EF6").option("--json", "\u8F93\u51FA JSON").action(async (opts) => {
     try {
-      const body = { spaceId: opts.space, dryRun: opts.dryRun ?? false };
-      if (opts.type) body.scriptType = opts.type;
-      if (opts.ids) body.scriptIds = opts.ids.split(",").map((s) => s.trim());
-      if (opts.withDocs) body.withDocs = true;
-      const result = await apiRequest(
-        `/api/scripts?space_id=${opts.space}`,
-        { method: "POST", body }
-      );
-      if (!opts.dryRun) {
-        const ws = resolveWorkspace();
-        const scriptsDir = import_path6.default.join(ws.onto, opts.space, "scripts");
-        if (!import_fs5.default.existsSync(scriptsDir)) import_fs5.default.mkdirSync(scriptsDir, { recursive: true });
-        for (const s of result.scripts ?? []) {
-          if (s.filePath) {
-            const outFile = import_path6.default.join(scriptsDir, import_path6.default.basename(s.filePath));
-            console.log(`  \u2193 ${outFile}`);
-          }
-        }
+      const params = new URLSearchParams({ space_id: opts.space });
+      if (opts.type) params.set("script_type", opts.type);
+      let scripts = await apiRequest(`/api/scripts?${params}`);
+      if (opts.ids) {
+        const idSet = new Set(opts.ids.split(",").map((s) => s.trim()).filter(Boolean));
+        scripts = scripts.filter((s) => idSet.has(s.id));
       }
-      console.log(`${opts.dryRun ? "[dry-run] " : ""}\u540C\u6B65 ${result.scripts?.length ?? 0} \u4E2A\u811A\u672C${opts.withDocs ? ` + ${result.docs?.length ?? 0} \u7BC7\u6587\u6863` : ""}`);
-      ok({ count: result.scripts?.length ?? 0, dryRun: opts.dryRun });
+      const ws = resolveWorkspace();
+      const { base: outBase, perItem } = resolveSyncOutDir(opts, ws);
+      const written = [];
+      for (const s of scripts) {
+        const sub = perItem ? ontoItemSubdirForScriptType(s.scriptType) : "";
+        const outDir = sub ? import_path6.default.join(outBase, sub) : outBase;
+        const outFile = import_path6.default.join(outDir, scriptOutFileName(s));
+        if (opts.dryRun) {
+          console.log(`  [dry-run] \u2193 ${outFile}`);
+          written.push(outFile);
+          continue;
+        }
+        if (!import_fs5.default.existsSync(outDir)) import_fs5.default.mkdirSync(outDir, { recursive: true });
+        const code = s.code?.length ? s.code : await fetchScriptCode(s.id);
+        if (!code.trim()) {
+          console.warn(`  \u26A0 \u8DF3\u8FC7 ${s.id}\uFF1A\u65E0\u811A\u672C\u4EE3\u7801`);
+          continue;
+        }
+        import_fs5.default.writeFileSync(outFile, code, "utf8");
+        console.log(`  \u2193 ${outFile}`);
+        written.push(outFile);
+      }
+      if (opts.withDocs) {
+        console.warn("  --with-docs \u6682\u672A\u5B9E\u73B0\uFF0C\u8BF7\u4F7F\u7528 dazi docs sync");
+      }
+      console.log(
+        `${opts.dryRun ? "[dry-run] " : ""}\u540C\u6B65 ${written.length}/${scripts.length} \u4E2A\u811A\u672C \u2192 ${outBase}`
+      );
+      ok({ count: written.length, total: scripts.length, dryRun: opts.dryRun, targetDir: outBase });
     } catch (err) {
       handleError(err);
     }