@freelog-cli/cli2 0.5.4 → 0.5.5

package/dist/bin/index.js

@@ -25006,13 +25006,18 @@ function supportsResourceSubject(subjectType) {
 function hasChildren(node) {
   return Array.isArray(node.children) && node.children.length > 0;
 }
-function flattenLeaves(nodes2, acc = []) {
+function flattenLeaves(nodes2, ancestors = [], acc = []) {
   for (const node of nodes2) {
+    const path20 = [...ancestors, node];
     if (hasChildren(node)) {
-      flattenLeaves(node.children, acc);
+      flattenLeaves(node.children, path20, acc);
     }
     if (isEnabledResourceLeafCandidate(node)) {
-      acc.push(node);
+      const names = path20.map((item) => item.name.trim());
+      if (names.some((name) => !name)) {
+        throw new CliError("\u5E73\u53F0\u7C7B\u578B\u94FE\u5B58\u5728\u7F3A\u5931\u540D\u79F0\uFF0C\u65E0\u6CD5\u5C55\u793A\u5B8C\u6574\u5C42\u7EA7", "TYPE_HIERARCHY_INVALID");
+      }
+      acc.push({ ...node, nameChain: names.join(" / ") });
     }
   }
   return acc;
@@ -25050,12 +25055,30 @@ async function listLeafTypes(apis = {}) {
 async function searchLeafTypes(keyword, apis = {}) {
   assertPlatformAllowed();
   const request2 = apis.searchLeaves ?? ((params) => service_API_default.Resource.ListSimpleByParentCode(params));
-  return unwrapList(await request2({
-    nameChain: keyword,
-    isTerminate: true,
-    status: 1,
-    subjectType: 1
-  })).filter(isEnabledResourceLeaf);
+  const [tree, response] = await Promise.all([
+    resourceTypeTree(apis),
+    request2({
+      category: 1,
+      nameChain: keyword,
+      isTerminate: true,
+      status: 1,
+      subjectType: 1
+    })
+  ]);
+  const codes = /* @__PURE__ */ new Set();
+  return unwrapList(response).flatMap((item) => {
+    if (!item.code || codes.has(item.code)) return [];
+    codes.add(item.code);
+    const path20 = findTypePath(tree, item.code);
+    if (!path20) return [];
+    const leaf = path20[path20.length - 1];
+    if (!isEnabledResourceLeafCandidate(leaf)) return [];
+    const names = path20.map((node) => node.name.trim());
+    if (names.some((name) => !name)) {
+      throw new CliError("\u5E73\u53F0\u7C7B\u578B\u94FE\u5B58\u5728\u7F3A\u5931\u540D\u79F0\uFF0C\u65E0\u6CD5\u5C55\u793A\u5B8C\u6574\u5C42\u7EA7", "TYPE_HIERARCHY_INVALID");
+    }
+    return [{ ...leaf, nameChain: names.join(" / ") }];
+  });
 }
 async function getTypeInfo(code, apis = {}) {
   const normalized = code.trim();
@@ -25129,12 +25152,35 @@ async function chooseLeafType(apis = {}) {
   }
   throw new CliError("\u5DF2\u53D6\u6D88\u8D44\u6E90\u7C7B\u578B\u9009\u62E9", "TYPE_PICK_CANCELLED");
 }
+var TYPE_LIST_PAGE_SIZE = 50;
+function typeListPage(items, page) {
+  const pageCount = Math.max(1, Math.ceil(items.length / TYPE_LIST_PAGE_SIZE));
+  if (!Number.isInteger(page) || page < 1 || page > pageCount) {
+    throw new CliError(`\u7C7B\u578B\u9875\u7801\u8D85\u51FA\u8303\u56F4\uFF0C\u5F53\u524D\u5171 ${pageCount} \u9875`, "TYPE_LIST_PAGE");
+  }
+  return {
+    page,
+    pageCount,
+    total: items.length,
+    hasPrevious: page > 1,
+    hasNext: page < pageCount,
+    items: items.slice((page - 1) * TYPE_LIST_PAGE_SIZE, page * TYPE_LIST_PAGE_SIZE)
+  };
+}
 function formatTypeList(items) {
   return items.map((item) => `${item.code}	${item.nameChain ?? item.name}`).join("\n");
 }
-function formatTypeInfo(item) {
+function formatTypeListPage(page) {
+  const header = `\u7B2C ${page.page}/${page.pageCount} \u9875\uFF0C\u5171 ${page.total} \u4E2A\u53EF\u7528\u6700\u7EC8\u53F6\u5B50\u7C7B\u578B`;
+  const rows = formatTypeList(page.items);
+  return rows ? `${header}
+${rows}` : `${header}
+\u6CA1\u6709\u5339\u914D\u7684\u542F\u7528\u6700\u7EC8\u53F6\u5B50\u7C7B\u578B`;
+}
+function formatTypeInfo(item, hierarchy) {
   const optionalConfig = supportsOptionalConfig(item) ? "\u652F\u6301" : "\u4E0D\u652F\u6301";
-  return `${item.code}	${item.nameChain ?? item.name}	\u53EF\u9009\u914D\u7F6E\uFF1A${optionalConfig}`;
+  const label = hierarchy?.join(" / ") || item.nameChain || item.name;
+  return `${item.code}	${label}	\u53EF\u9009\u914D\u7F6E\uFF1A${optionalConfig}`;
 }
 
 // src/domain/version/zip.ts
@@ -25760,7 +25806,7 @@ import { confirm, input } from "@inquirer/prompts";
 import { Command as Command6 } from "commander";
 
 // src/domain/policy/list.ts
-var POLICY_LIST_PAGE_SIZE = 50;
+var POLICY_TEMPLATE_PAGE_SIZE = 20;
 function infoApi(apis) {
   return apis?.info ?? ((params) => service_API_default.Resource.info(params));
 }
@@ -25879,13 +25925,6 @@ async function applyPolicyTemplate(input2) {
   const policyText = compiledContract(await request2({ _id: template.id, fillArgs: template.fillArgs }));
   await applyPolicy({ ...input2, policyText });
 }
-function positiveInteger(value, fallback, name, max) {
-  const actual = value ?? fallback;
-  if (!Number.isInteger(actual) || actual < 1 || actual > max) {
-    throw new CliError(`${name} \u5FC5\u987B\u662F 1\u2013${max} \u7684\u6574\u6570`, "POLICY_TEMPLATE_PAGE");
-  }
-  return actual;
-}
 async function getPolicyList(input2) {
   const context = await loadPolicyContext(input2);
   const typeHierarchy = await getTypeHierarchy(context.typeCode, input2.apis);
@@ -25894,46 +25933,40 @@ async function getPolicyList(input2) {
     policies: [...context.policies].sort((a, b) => b.status - a.status || a.policyName.localeCompare(b.policyName))
   };
 }
-function policyListPage(list2, page) {
-  const pageCount = Math.max(1, Math.ceil(list2.policies.length / POLICY_LIST_PAGE_SIZE));
+function formatPolicyList(list2) {
+  const header = [
+    `\u8D44\u6E90\u7C7B\u578B\uFF1A${list2.typeHierarchy.join(" / ")}`,
+    `\u5171 ${list2.policies.length} \u6761\u6388\u6743\u7B56\u7565`
+  ];
+  if (list2.policies.length === 0) return [...header, "\u8FD8\u6CA1\u6709\u6388\u6743\u7B56\u7565"].join("\n");
+  return [
+    ...header,
+    ...list2.policies.map((item) => `${item.policyId}	${item.policyName}	${item.status === 1 ? "on" : "off"}`)
+  ].join("\n");
+}
+function policyTemplatePage(templates, page) {
+  const pageCount = Math.max(1, Math.ceil(templates.length / POLICY_TEMPLATE_PAGE_SIZE));
   if (!Number.isInteger(page) || page < 1 || page > pageCount) {
-    throw new CliError(`\u7B56\u7565\u9875\u7801\u8D85\u51FA\u8303\u56F4\uFF0C\u5F53\u524D\u5171 ${pageCount} \u9875`, "POLICY_LIST_PAGE");
+    throw new CliError(`\u7B56\u7565\u6A21\u677F\u9875\u7801\u8D85\u51FA\u8303\u56F4\uFF0C\u5F53\u524D\u5171 ${pageCount} \u9875`, "POLICY_TEMPLATE_PAGE");
   }
   return {
-    ...list2,
     page,
     pageCount,
-    total: list2.policies.length,
+    total: templates.length,
     hasPrevious: page > 1,
     hasNext: page < pageCount,
-    items: list2.policies.slice((page - 1) * POLICY_LIST_PAGE_SIZE, page * POLICY_LIST_PAGE_SIZE)
+    items: templates.slice((page - 1) * POLICY_TEMPLATE_PAGE_SIZE, page * POLICY_TEMPLATE_PAGE_SIZE)
   };
 }
-function formatPolicyListPage(page) {
-  const header = [
-    `\u8D44\u6E90\u7C7B\u578B\uFF1A${page.typeHierarchy.join(" / ")}`,
-    `\u7B2C ${page.page}/${page.pageCount} \u9875\uFF0C\u5171 ${page.total} \u6761`
-  ];
-  if (page.items.length === 0) return [...header, "\u8FD8\u6CA1\u6709\u6388\u6743\u7B56\u7565"].join("\n");
+function formatPolicyTemplatePage(page) {
+  const header = `\u7B2C ${page.page}/${page.pageCount} \u9875\uFF0C\u5171 ${page.total} \u4E2A\u6388\u6743\u7B56\u7565\u6A21\u677F`;
+  if (page.items.length === 0) return `${header}
+\u6CA1\u6709\u53EF\u7528\u6388\u6743\u7B56\u7565\u6A21\u677F`;
   return [
-    ...header,
-    ...page.items.map((item) => `${item.policyId}	${item.policyName}	${item.status === 1 ? "on" : "off"}`)
+    header,
+    ...page.items.map((item) => [item.id, item.name, item.summary].filter(Boolean).join("	"))
   ].join("\n");
 }
-async function listPolicyTemplates(input2) {
-  const page = positiveInteger(input2.page, 1, "--page", Number.MAX_SAFE_INTEGER);
-  const pageSize2 = positiveInteger(input2.pageSize, 20, "--page-size", 100);
-  const templates = await getPolicyTemplates(input2);
-  const pageCount = Math.max(1, Math.ceil(templates.length / pageSize2));
-  if (page > pageCount) {
-    throw new CliError(`--page \u8D85\u51FA\u8303\u56F4\uFF0C\u5F53\u524D\u5171 ${pageCount} \u9875`, "POLICY_TEMPLATE_PAGE");
-  }
-  const rows = templates.slice((page - 1) * pageSize2, page * pageSize2).map((item) => [item.id, item.name, item.summary].filter(Boolean).join("	"));
-  const next = page < pageCount ? `
-\u4E0B\u4E00\u9875\uFF1A--page ${page + 1}` : "";
-  return `\u7B2C ${page}/${pageCount} \u9875\uFF0C\u5171 ${templates.length} \u6761${rows.length ? `
-${rows.join("\n")}` : ""}${next}`;
-}
 function assertPolicyInput(context, policyName, policyText) {
   const name = policyName.trim();
   const text = policyText.trim();
@@ -26013,39 +26046,18 @@ function createPolicyApplyCommand() {
 
 // src/commands/policy/list.ts
 import { Command as Command7 } from "commander";
-async function showPolicyPages(pageFor) {
-  let page = 1;
-  while (true) {
-    const current = pageFor(page);
-    console.log(formatPolicyListPage(current));
-    if (!current.hasPrevious && !current.hasNext) return;
-    if (!isInteractive()) {
-      if (current.hasNext) {
-        console.log(`\u8FD8\u6709 ${current.total - current.page * POLICY_LIST_PAGE_SIZE} \u6761\u7B56\u7565\uFF1B\u8BF7\u5728\u4EA4\u4E92\u7EC8\u7AEF\u8FD0\u884C policy list \u67E5\u770B\u540E\u7EED\u9875`);
-      }
-      return;
-    }
-    const action = await selectQuestion("\u6388\u6743\u7B56\u7565\u5217\u8868", [
-      ...current.hasPrevious ? [{ name: "\u4E0A\u4E00\u9875", value: "__previous__" }] : [],
-      ...current.hasNext ? [{ name: "\u4E0B\u4E00\u9875", value: "__next__" }] : [],
-      { name: "\u9000\u51FA", value: "__exit__" }
-    ]);
-    if (action === "__exit__") return;
-    page += action === "__next__" ? 1 : -1;
-  }
-}
 function createPolicyListCommand() {
   const command = addSharedOptions(new Command7("list"));
   command.description(
     // i18n: cli.command.policy.list.description
-    "\u770B\u5DF2\u6709\u7B56\u7565\u53CA\u8D44\u6E90\u7C7B\u578B\u5C42\u7EA7"
+    "\u67E5\u770B\u5F53\u524D\u8D44\u6E90\u7684\u5168\u90E8\u6388\u6743\u7B56\u7565\u53CA\u8D44\u6E90\u7C7B\u578B\u5C42\u7EA7"
   ).action(async function() {
     const shared = readSharedOptions(this);
     const list2 = await getPolicyList({
       cwd: resolveCwd(shared.cwd),
       file: shared.file
     });
-    await showPolicyPages((page) => policyListPage(list2, page));
+    console.log(formatPolicyList(list2));
   });
   return command;
 }
@@ -26067,22 +26079,39 @@ function createPolicySetCommand() {
 }
 
 // src/commands/policy/template.ts
-import { confirm as confirm3, select } from "@inquirer/prompts";
+import { confirm as confirm3 } from "@inquirer/prompts";
 import { Command as Command9 } from "commander";
+async function showTemplatePages(templates) {
+  let page = 1;
+  while (true) {
+    const current = policyTemplatePage(templates, page);
+    console.log(formatPolicyTemplatePage(current));
+    if (!current.hasPrevious && !current.hasNext) return;
+    if (!isInteractive()) {
+      if (current.hasNext) {
+        console.log(`\u8FD8\u6709 ${current.total - current.page * POLICY_TEMPLATE_PAGE_SIZE} \u4E2A\u6388\u6743\u7B56\u7565\u6A21\u677F\uFF1B\u8BF7\u5728\u4EA4\u4E92\u7EC8\u7AEF\u8FD0\u884C policy template list \u67E5\u770B\u540E\u7EED\u9875`);
+      }
+      return;
+    }
+    const action = await selectQuestion("\u6388\u6743\u7B56\u7565\u6A21\u677F\u5217\u8868", [
+      ...current.hasPrevious ? [{ name: "\u4E0A\u4E00\u9875", value: "__previous__" }] : [],
+      ...current.hasNext ? [{ name: "\u4E0B\u4E00\u9875", value: "__next__" }] : [],
+      { name: "\u9000\u51FA", value: "__exit__" }
+    ]);
+    if (action === "__exit__") return;
+    page += action === "__next__" ? 1 : -1;
+  }
+}
 async function chooseTemplate(templates) {
-  let page = 0;
-  const pageSize2 = 20;
+  let page = 1;
   while (true) {
-    const slice = templates.slice(page * pageSize2, (page + 1) * pageSize2);
-    const value = await select({
-      message: `\u8BF7\u9009\u62E9\u6388\u6743\u7B56\u7565\u6A21\u677F\uFF08\u7B2C ${page + 1}/${Math.ceil(templates.length / pageSize2)} \u9875\uFF09`,
-      choices: [
-        ...slice.map((item) => ({ name: `${item.name} (${item.id})${item.summary ? ` \u2014 ${item.summary}` : ""}`, value: item.id })),
-        ...page > 0 ? [{ name: "\u4E0A\u4E00\u9875", value: "__previous__" }] : [],
-        ...page < Math.ceil(templates.length / pageSize2) - 1 ? [{ name: "\u4E0B\u4E00\u9875", value: "__next__" }] : [],
-        { name: "\u53D6\u6D88", value: "__cancel__" }
-      ]
-    });
+    const current = policyTemplatePage(templates, page);
+    const value = await selectQuestion(`\u8BF7\u9009\u62E9\u6388\u6743\u7B56\u7565\u6A21\u677F\uFF08\u7B2C ${current.page}/${current.pageCount} \u9875\uFF09`, [
+      ...current.items.map((item) => ({ name: `${item.name} (${item.id})${item.summary ? ` \u2014 ${item.summary}` : ""}`, value: item.id })),
+      ...current.hasPrevious ? [{ name: "\u4E0A\u4E00\u9875", value: "__previous__" }] : [],
+      ...current.hasNext ? [{ name: "\u4E0B\u4E00\u9875", value: "__next__" }] : [],
+      { name: "\u53D6\u6D88", value: "__cancel__" }
+    ]);
     if (value === "__previous__") {
       page -= 1;
       continue;
@@ -26097,9 +26126,9 @@ async function chooseTemplate(templates) {
 }
 function createPolicyTemplateCommand() {
   const template = addSharedOptions(new Command9("template")).description("\u6388\u6743\u7B56\u7565\u6A21\u677F");
-  addSharedOptions(template.command("list")).description("\u5217\u5F53\u524D\u6A21\u677F\u5217\u8868").option("--page <n>", "\u9875\u7801\uFF0C\u4ECE 1 \u5F00\u59CB", Number).option("--page-size <n>", "\u6BCF\u9875 1\u2013100 \u6761\uFF0C\u9ED8\u8BA4 20", Number).action(async function(options) {
+  addSharedOptions(template.command("list")).description("\u5217\u5F53\u524D\u6A21\u677F\u5217\u8868\uFF08\u6BCF\u9875 20 \u6761\uFF09").action(async function() {
     const shared = readSharedOptions(this);
-    console.log(await listPolicyTemplates({ cwd: resolveCwd(shared.cwd), file: shared.file, page: options.page, pageSize: options.pageSize }));
+    await showTemplatePages(await getPolicyTemplates({ cwd: resolveCwd(shared.cwd), file: shared.file }));
   });
   addSharedOptions(template.command("apply")).description("\u5E94\u7528\u5F53\u524D\u7C7B\u578B\u7684\u4E00\u6761\u6A21\u677F\u5E76\u542F\u7528").argument("[templateId]", "\u6A21\u677F\u7F16\u53F7").option("--name <name>", "\u7B56\u7565\u540D").action(async function(templateId, options) {
     const shared = readSharedOptions(this);
@@ -26634,22 +26663,40 @@ function requireTypeAuth(command) {
   const shared = readSharedOptions(command);
   requireAuth({ cwd: resolveCwd(shared.cwd) });
 }
+async function showTypePages(items, commandText) {
+  let page = 1;
+  while (true) {
+    const current = typeListPage(items, page);
+    console.log(formatTypeListPage(current));
+    if (!current.hasPrevious && !current.hasNext) return;
+    if (!isInteractive()) {
+      if (current.hasNext) {
+        console.log(`\u8FD8\u6709 ${current.total - current.page * TYPE_LIST_PAGE_SIZE} \u4E2A\u8D44\u6E90\u7C7B\u578B\uFF1B\u8BF7\u5728\u4EA4\u4E92\u7EC8\u7AEF\u8FD0\u884C ${commandText} \u67E5\u770B\u540E\u7EED\u9875`);
+      }
+      return;
+    }
+    const action = await selectQuestion("\u8D44\u6E90\u7C7B\u578B\u5217\u8868", [
+      ...current.hasPrevious ? [{ name: "\u4E0A\u4E00\u9875", value: "__previous__" }] : [],
+      ...current.hasNext ? [{ name: "\u4E0B\u4E00\u9875", value: "__next__" }] : [],
+      { name: "\u9000\u51FA", value: "__exit__" }
+    ]);
+    if (action === "__exit__") return;
+    page += action === "__next__" ? 1 : -1;
+  }
+}
 function createTypeCommand() {
   const type = addSharedOptions(new Command14("type"));
   type.description(
     // i18n: cli.command.type.description
-    "\u67E5\u8BE2\u53F6\u5B50\u7C7B\u578B"
+    "\u67E5\u8BE2\u53EF\u9009\u6700\u7EC8\u53F6\u5B50\u7C7B\u578B"
   );
   addSharedOptions(type.command("list")).description(
     // i18n: cli.command.type.list.description
-    "\u5217\u51FA\u53F6\u5B50\u7C7B\u578B"
+    "\u5217\u51FA\u6700\u7EC8\u53F6\u5B50\u7C7B\u578B\u7684\u5B8C\u6574\u5C42\u7EA7\u8DEF\u5F84"
   ).action(async function() {
     requireTypeAuth(this);
     const items = await listLeafTypes();
-    const text = formatTypeList(items);
-    if (text) {
-      console.log(text);
-    }
+    await showTypePages(items, "type list");
   });
   addSharedOptions(type.command("search")).description(
     // i18n: cli.command.type.search.description
@@ -26661,10 +26708,7 @@ function createTypeCommand() {
   ).action(async function(keyword) {
     requireTypeAuth(this);
     const items = await searchLeafTypes(keyword ?? "");
-    const text = formatTypeList(items);
-    if (text) {
-      console.log(text);
-    }
+    await showTypePages(items, `type search ${keyword ?? ""}`.trim());
   });
   addSharedOptions(type.command("pick")).description(
     // i18n: cli.command.type.pick.description
@@ -26677,14 +26721,11 @@ function createTypeCommand() {
     requireTypeAuth(this);
     if (!options.type) {
       const items = await listLeafTypes();
-      const text = formatTypeList(items);
-      if (text) {
-        console.log(text);
-      }
+      await showTypePages(items, "type pick");
       return;
     }
     const info2 = await getTypeInfo(options.type);
-    console.log(formatTypeInfo(info2));
+    console.log(formatTypeInfo(info2, await getTypeHierarchy(info2.code)));
   });
   addSharedOptions(type.command("info")).description(
     // i18n: cli.command.type.info.description
@@ -26699,7 +26740,7 @@ function createTypeCommand() {
       throw new CliError("\u8BF7\u63D0\u4F9B\u7C7B\u578B\u7F16\u53F7", "TYPE_CODE_REQUIRED");
     }
     const info2 = await getTypeInfo(code);
-    console.log(formatTypeInfo(info2));
+    console.log(formatTypeInfo(info2, await getTypeHierarchy(info2.code)));
   });
   return type;
 }