@dazitech/cli 3.0.0 → 3.0.2

package/README.md

@@ -2,14 +2,16 @@
 
 搭子 v3 终端 CLI 的 **pnpm 可发布包**，与 `dazi-vscode` 扩展使用同一套 `bundled/clis` 产物。
 
+完整说明见：**`dazi/docs/341-dazi-vscode-cli打包和发布指南.md`**。
+
 ## 与 `dazi.ps1` 的关系
 
-| 方式 | 适用 |
-|------|------|
-| `.\scripts\dazi.ps1` | 仅拷贝 `dazi-work`、未装全局 CLI |
-| **`dazi` / `dazi-flow`（本包）** | 开发机全局短命令 |
+| 方式                             | 适用                             |
+| -------------------------------- | -------------------------------- |
+| `dazi`                           | 仅拷贝 `dazi-work`、未装全局 CLI |
+| **`dazi` / `dazi-flow`（本包）** | 开发机全局短命令                 |
 
-二者等价：`dazi flow …` ≈ `.\scripts\dazi.ps1 flow …`。
+二者等价：`dazi flow …` ≈ `dazi flow …`。
 
 ## 研发：准备发布目录
 
@@ -58,15 +60,15 @@ pnpm run publish:cli
 
 **方式 B — Granular Access Token + `.npmrc`（纯文本文件）：**
 
+**推荐**把 token 写在 `%USERPROFILE%\.npmrc`（避免 `pnpm run vsix` 把密钥打进扩展包）：
+
 ```powershell
-cd packages\cli-dist
-copy .npmrc.example .npmrc
-# 用编辑器打开 .npmrc，把 YOUR_NPM_TOKEN_HERE 换成 npm_ 开头的 token
-cd ..\..
+copy packages\cli-dist\.npmrc.example %USERPROFILE%\.npmrc
+notepad %USERPROFILE%\.npmrc
 pnpm run publish:cli
 ```
 
-`.npmrc` 已加入 `.gitignore`，不要提交到 Git。也可放在用户目录 `%USERPROFILE%\.npmrc` 供本机所有项目使用。
+勿在 `packages\cli-dist\.npmrc` 长期保存真实 token。若已泄露，请在 npm 上 Revoke 该 token 并重建。
 
 内网 registry：把 `registry=` 和 token 行改成你们私服地址。
 
@@ -76,7 +78,7 @@ pnpm run publish:cli
 
 ```powershell
 # 全局
-pnpm add -g @dazitech/cli@3.0.0
+pnpm add -g @dazitech/cli@3.0.2
 
 # 确认 PATH（pnpm 全局 bin）
 pnpm bin -g
@@ -98,7 +100,7 @@ dazi flow project status --dir "项目\flow_xxx\流程\MyFlow"
 
 ## 环境变量
 
-| 变量 | 说明 |
-|------|------|
-| `DAZI_BUNDLED_DIR` | 默认：包内 `dist/clis` |
+| 变量                  | 说明                                              |
+| --------------------- | ------------------------------------------------- |
+| `DAZI_BUNDLED_DIR`    | 默认：包内 `dist/clis`                            |
 | `DAZI_WORKSPACE_ROOT` | 默认：从 cwd 向上查找含 `scripts/dazi.ps1` 的目录 |

package/dist/clis/dazi-app.js

@@ -13775,7 +13775,7 @@ function applyPlaceholdersInTree(targetDir, ph, oldAppId = "${appId}") {
   walk(targetDir);
 }
 function replacePlaceholders(text, ph, oldAppId) {
-  return text.split("${appId}").join(ph.appId).split("${spaceId}").join(ph.spaceId).split("${appName}").join(ph.appName).split("space__demo").join(ph.spaceId).split(`/runtime-apps/${oldAppId}`).join(`/runtime-apps/${ph.appId}`).split(oldAppId).join(ph.appId);
+  return text.split('"${spaceId}"').join(JSON.stringify(ph.spaceId)).split("${appId}").join(ph.appId).split("${spaceId}").join(ph.spaceId).split("${appName}").join(ph.appName).split("space__demo").join(ph.spaceId).split(`/runtime-apps/${oldAppId}`).join(`/runtime-apps/${ph.appId}`).split(oldAppId).join(ph.appId);
 }
 function writeContextMd(targetDir, ph) {
   const aiDir = import_node_path9.default.join(targetDir, ".ai");
@@ -13910,6 +13910,34 @@ function parseDataspaceId(permissions) {
   }
   return void 0;
 }
+function resolveManifestSpaceId(manifest) {
+  const fromField = String(manifest.space_id ?? "").trim();
+  if (fromField) return fromField;
+  return parseDataspaceId(manifest.permissions);
+}
+function syncManifestSpace(cwd, spaceId) {
+  const sid = spaceId.trim();
+  if (!sid) throw new Error("spaceId \u4E0D\u80FD\u4E3A\u7A7A");
+  const manifestPath = import_node_path10.default.join(cwd, "manifest.json");
+  const manifest = JSON.parse(
+    import_node_fs11.default.readFileSync(manifestPath, "utf8")
+  );
+  const previous = resolveManifestSpaceId(manifest);
+  const required = `dataspace:${sid}`;
+  const perms = Array.isArray(manifest.permissions) ? manifest.permissions.map((p) => String(p).trim()) : [];
+  const nextPerms = [
+    ...perms.filter((p) => !p.startsWith("dataspace:")),
+    required
+  ];
+  const changed = manifest.space_id !== sid || JSON.stringify(manifest.permissions) !== JSON.stringify(nextPerms);
+  manifest.space_id = sid;
+  manifest.permissions = nextPerms;
+  if (changed) {
+    import_node_fs11.default.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}
+`, "utf8");
+  }
+  return { changed, previous: previous ?? void 0 };
+}
 function validateDataSource(ds, index, projectRoot) {
   const base = `data_sources[${index}]`;
   const issues = [];
@@ -14229,23 +14257,55 @@ function validateManifestRecord(manifest, opts) {
       }
     }
   }
+  const declaredSpace = String(manifest.space_id ?? "").trim();
   const perms = manifest.permissions;
-  if (!Array.isArray(perms) || perms.length === 0) {
+  const permSpace = parseDataspaceId(perms);
+  if (!declaredSpace && !permSpace) {
     issues.push(
       issue(
         "error",
-        "PERMISSIONS_REQUIRED",
-        "permissions",
-        "\u81F3\u5C11\u58F0\u660E permissions\uFF08\u5982 dataspace:<spaceId>\uFF09"
+        "SPACE_ID_REQUIRED",
+        "space_id",
+        "\u987B\u914D\u7F6E space_id\uFF08\u63A8\u8350\uFF09\u6216 permissions \u4E2D\u7684 dataspace:<\u7A7A\u95F4Id>"
       )
     );
-  } else if (!parseDataspaceId(perms)) {
+  } else if (declaredSpace && permSpace && declaredSpace !== permSpace) {
+    issues.push(
+      issue(
+        "error",
+        "SPACE_ID_MISMATCH",
+        "space_id",
+        `space_id=${JSON.stringify(declaredSpace)} \u4E0E permissions dataspace:${permSpace} \u4E0D\u4E00\u81F4`
+      )
+    );
+  }
+  if (!Array.isArray(perms) || perms.length === 0) {
+    if (!declaredSpace) {
+      issues.push(
+        issue(
+          "error",
+          "PERMISSIONS_REQUIRED",
+          "permissions",
+          "\u81F3\u5C11\u58F0\u660E permissions\uFF08\u5982 dataspace:<spaceId>\uFF09\u6216\u914D\u7F6E space_id"
+        )
+      );
+    } else {
+      issues.push(
+        issue(
+          "warning",
+          "PERMISSIONS_DATASPACE",
+          "permissions",
+          `upload \u65F6\u5C06\u81EA\u52A8\u8865\u9F50 dataspace:${declaredSpace}`
+        )
+      );
+    }
+  } else if (!permSpace && !declaredSpace) {
     issues.push(
       issue(
         "warning",
         "PERMISSIONS_DATASPACE",
         "permissions",
-        "\u672A\u627E\u5230 dataspace:<id>\uFF0Cupload \u65F6\u9700 --space \u6216\u8865\u5168 permissions"
+        "\u672A\u627E\u5230 dataspace:<id>\uFF1B\u8BF7\u914D\u7F6E manifest.space_id"
       )
     );
   }
@@ -14409,7 +14469,7 @@ function validateManifest(cwd, opts = {}) {
     manifestPath,
     appId: String(manifest.appId ?? "").trim() || void 0,
     version: String(manifest.version ?? "").trim() || void 0,
-    spaceId: parseDataspaceId(manifest.permissions),
+    spaceId: resolveManifestSpaceId(manifest),
     dataSourceKeys,
     kinds: [...kindSet],
     issues,
@@ -14564,6 +14624,22 @@ function registerUpload(program3) {
   program3.command("upload").description("\u6253\u5305\u5E76\u4E0A\u4F20\u5230 Registry\uFF08\u65E0 app \u5219\u5148 create\uFF09").option("--cwd <dir>", "DRAP \u9879\u76EE\u76EE\u5F55\uFF08\u9ED8\u8BA4\u81EA\u52A8\u8BC6\u522B\uFF1Ashell \u76EE\u5F55\u6216\u542B manifest.json \u7684\u7956\u5148\uFF09").option("--space <id>", "\u6570\u636E\u7A7A\u95F4 id\uFF08\u5FC5\u586B\uFF0C\u9996\u6B21 create\uFF09").option("--activate", "\u4E0A\u4F20\u540E\u6FC0\u6D3B", false).option("--changelog <text>", "\u53D8\u66F4\u8BF4\u660E").option("--file <path>", "\u5DF2\u6709 .dazi-app\uFF0C\u8DF3\u8FC7 package").option("--skip-validate", "\u8DF3\u8FC7 manifest \u6821\u9A8C\uFF08\u4E0D\u63A8\u8350\uFF09").option("--no-source", "\u4E0D\u4E0A\u4F20\u6E90\u7801\u5FEB\u7167\uFF08\u9ED8\u8BA4\u4E0A\u4F20\uFF0C\u4F9B release \u8F6C\u6A21\u677F\uFF09").option("--json").action(async (opts) => {
     if (!loadAuth()) throw new Error("\u8BF7\u5148 dazi-app auth login");
     const cwd = requireProjectCwd(opts.cwd);
+    const manifestEarly = JSON.parse(
+      import_node_fs13.default.readFileSync(import_node_path12.default.join(cwd, "manifest.json"), "utf8")
+    );
+    const uploadSpaceId = String(opts.space || "").trim() || resolveManifestSpaceId(manifestEarly) || "";
+    if (!uploadSpaceId) {
+      throw new Error(
+        "manifest \u987B\u914D\u7F6E space_id\uFF0C\u6216 permissions \u542B dataspace:<\u7A7A\u95F4Id>\uFF1B\u4E5F\u53EF upload --space <id>"
+      );
+    }
+    const sync = syncManifestSpace(cwd, uploadSpaceId);
+    if (sync.changed && !opts.json) {
+      const prev = sync.previous ? `\uFF08\u539F ${sync.previous}\uFF09` : "";
+      console.warn(
+        `\u5DF2\u540C\u6B65 manifest space_id / permissions \u2192 ${uploadSpaceId}${prev}`
+      );
+    }
     if (!opts.skipValidate) {
       const vr = validateManifest(cwd, { scanSrc: true });
       if (!vr.ok) {
@@ -14907,9 +14983,9 @@ function formatAppCliCommands(opts) {
   if (work) {
     lines.push(
       `# \u5728 dazi-work \u6839\u6267\u884C\uFF08\u63A8\u8350\uFF0C\u81EA\u52A8 bundled CLI\uFF09`,
-      `.\\scripts\\dazi.ps1 app manifest validate --cwd ${work.cwdRel} --scan-src`,
-      `.\\scripts\\dazi.ps1 app doctor --cwd ${work.cwdRel}`,
-      `.\\scripts\\dazi.ps1 app upload --cwd ${work.cwdRel} --space ${opts.spaceId} --activate`
+      `dazi app manifest validate --cwd ${work.cwdRel} --scan-src`,
+      `dazi app doctor --cwd ${work.cwdRel}`,
+      `dazi app upload --cwd ${work.cwdRel} --space ${opts.spaceId} --activate`
     );
     return lines.join("\n");
   }
@@ -14936,8 +15012,8 @@ function buildInitNextSteps(outDir, spaceId, installOk, workspaceRoot) {
       "pnpm run dev",
       "pnpm run build",
       `# \u5728 dazi-work \u6839\uFF1A`,
-      `.\\scripts\\dazi.ps1 app doctor --cwd ${work.cwdRel}`,
-      `.\\scripts\\dazi.ps1 app upload --cwd ${work.cwdRel} --space ${spaceId} --activate`
+      `dazi app doctor --cwd ${work.cwdRel}`,
+      `dazi app upload --cwd ${work.cwdRel} --space ${spaceId} --activate`
     ];
   }
   return [
@@ -15416,10 +15492,13 @@ function registerInit(program3) {
     const manifest = JSON.parse(import_node_fs22.default.readFileSync(manifestPath, "utf8"));
     manifest.appId = appId;
     manifest.name = appName;
+    manifest.space_id = spaceId;
     if (Array.isArray(manifest.permissions)) {
       manifest.permissions = manifest.permissions.map(
         (p) => p.startsWith("dataspace:") ? `dataspace:${spaceId}` : p
       );
+    } else {
+      manifest.permissions = [`dataspace:${spaceId}`];
     }
     import_node_fs22.default.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n", "utf8");
     patchPackageJsonForApp(outDir, appId, appName);
@@ -16672,7 +16751,9 @@ function registerLegacyCompatCommands(program3) {
 
 // cli/dazi-app/src/index.ts
 var program2 = new Command();
-program2.name("dazi-app").description("\u642D\u5B50 App CLI \u2014 DRAP \u524D\u7AEF\u5E94\u7528\uFF08manifest / build / upload / preview\uFF09").version("3.0.0", "-v, --version");
+program2.name("dazi-app").description(
+  "\u642D\u5B50 App CLI \u2014 DRAP \u524D\u7AEF\u5E94\u7528\uFF08manifest / build / upload / preview\uFF09"
+).version("3.0.2", "-v, --version");
 registerAuth(program2);
 registerBuild(program2);
 registerDev(program2);