create-dwy 0.18.1 → 0.18.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # create-dwy
 
+## 0.18.3
+
+### Patch Changes
+
+- 技术栈/场景包下的子条目随父包显示为已勾选，不再画成删除线空框。逐条取消仍在下一步预勾清单里。
+
+---
+
+## 0.18.2
+
+### Patch Changes
+
+- 技术栈包与场景包都会在包名下列出子条目；选包后统一进入预勾清单，可逐条取消。
+
+---
+
 ## 0.18.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dwy",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "项目脚手架与多平台 AI 配置同步工具",
   "type": "module",
   "bin": {

package/src/searchable-select.js

@@ -121,14 +121,13 @@ function wrapHard(text, width) {
  * @param {number} contentWidth 可写字符宽
  * @returns {string[]}
  */
-function buildDescPanel(description, barPrefix, contentWidth) {
+function buildDescPanel(description, barPrefix, contentWidth, lineCount = DESC_PANEL_LINES) {
   const raw = (description && description.trim()) ? description.trim() : '（无说明）'
   const wrapped = wrapHard(raw, contentWidth)
-  // 固定 DESC_PANEL_LINES 行：超出截断末行加省略，不足补空
   const lines = []
-  for (let i = 0; i < DESC_PANEL_LINES; i++) {
+  for (let i = 0; i < lineCount; i++) {
     let part = wrapped[i] ?? ''
-    if (i === DESC_PANEL_LINES - 1 && wrapped.length > DESC_PANEL_LINES) {
+    if (i === lineCount - 1 && wrapped.length > lineCount) {
       const ellipsis = '…'
       part = (wrapped[i] ?? '').slice(0, Math.max(contentWidth - ellipsis.length, 0)) + ellipsis
     }
@@ -162,6 +161,7 @@ function resolveDescription(options, focusedValue) {
  * @param {unknown[]} [opts.initialValues]
  * @param {boolean} [opts.required]
  * @param {number} [opts.maxItems]
+ * @param {number} [opts.descLines] 底部说明区行数，包内子条目列表可加高
  * @param {string} [opts.placeholder]
  * @param {(search: string, opt: object) => boolean} [opts.filter]
  * @returns {Promise<unknown[] | symbol>}
@@ -233,6 +233,7 @@ export function searchableMultiselect(opts) {
         resolveDescription(this.filteredOptions, this.focusedValue),
         bar,
         contentWidth,
+        opts.descLines ?? DESC_PANEL_LINES,
       )
       const instructions = [
         `${styleText('dim', '↑/↓')} to navigate`,
@@ -262,7 +263,15 @@ export function searchableMultiselect(opts) {
               ? styleText('green', S_CHECKBOX_SELECTED)
               : styleText('dim', S_CHECKBOX_INACTIVE)
             if (opt.disabled) {
-              return `${styleText('gray', S_CHECKBOX_INACTIVE)} ${styleText(['strikethrough', 'gray'], label)}`
+              // 包内子条目：随父包勾选显示已勾，禁止点选，不要删除线
+              const packOn = opt.packId && this.selectedValues.includes(opt.packId)
+              if (packOn) {
+                const previewBox = styleText('green', S_CHECKBOX_SELECTED)
+                return active
+                  ? `${previewBox} ${label}`
+                  : `${previewBox} ${styleText('dim', label)}`
+              }
+              return `${styleText('dim', S_CHECKBOX_INACTIVE)} ${styleText('dim', label)}`
             }
             // 聚焦也不拼 hint，描述只在底部公共区
             if (active) {

package/src/sync-packs.js

@@ -131,7 +131,7 @@ export function normalizePacks(raw) {
  * @param {object} pack
  * @param {'skills' | 'rules' | 'hooks'} type
  */
-function itemInPack(item, pack, type) {
+export function itemInPack(item, pack, type) {
   if (type === 'skills') {
     if ((pack.skillNames || []).includes(item.name)) return true
     return (pack.skillCategories || []).includes(item.category)
@@ -163,6 +163,37 @@ function uniqueByName(items) {
  * @param {{ skills: object[], rules: object[], commands?: object[], hooks: object[] }} scans
  * @param {{ stacks?: string[], scenes?: string[], skillsOnly?: boolean }} selection
  */
+/**
+ * 列出某包在当前扫描结果里的子条目，带 type，供界面展示「包下面有哪些」。
+ *
+ * @param {object} pack
+ * @param {{ skills?: object[], rules?: object[], hooks?: object[] }} scans
+ * @param {{ skillsOnly?: boolean }} [opts]
+ */
+export function listPackItems(pack, scans, { skillsOnly = false } = {}) {
+  const types = skillsOnly ? ['skills'] : ['skills', 'rules', 'hooks']
+  const items = []
+  for (const type of types) {
+    for (const item of scans[type] || []) {
+      if (itemInPack(item, pack, type)) items.push({ ...item, type })
+    }
+  }
+  return items
+}
+
+/**
+ * 条目属于已选包时，用包的中文名做分组前缀。
+ *
+ * @param {{ name: string, category?: string }} item
+ * @param {'skills' | 'rules' | 'hooks'} type
+ * @param {string[]} packIds
+ */
+export function packLabelForItem(item, type, packIds) {
+  const packs = [...STACK_PACKS, ...SCENE_PACKS]
+  const hit = packs.find(pack => packIds.includes(pack.id) && itemInPack(item, pack, type))
+  return hit?.label || item.category || '其他'
+}
+
 export function expandPackSelection(scans, { stacks = [], scenes = [], skillsOnly = false } = {}) {
   const packById = new Map([...STACK_PACKS, ...SCENE_PACKS].map(pack => [pack.id, pack]))
   const selectedPacks = [...stacks, ...scenes]

package/src/sync-scene.js

@@ -1,30 +1,48 @@
 /**
- * 按包勾选交互：技术栈包 → 场景包 → 展示已预勾的子条目（可取消）。
+ * 按包勾选交互：技术栈包 → 场景包（包下挂子条目）→ 预勾子条目可取消。
  * 由 dwy / dwy sync 在「按场景和技术栈」模式下调用。
  */
 
 import { isCancel } from '@clack/prompts'
 import { SEARCH_PLACEHOLDER, searchableMultiselect, searchableSelect } from './searchable-select.js'
-import { SCENE_PACKS, STACK_PACKS, expandPackSelection, normalizePacks } from './sync-packs.js'
+import {
+  SCENE_PACKS,
+  STACK_PACKS,
+  expandPackSelection,
+  listPackItems,
+  normalizePacks,
+  packLabelForItem,
+} from './sync-packs.js'
 import { chalk } from './utils.js'
 
-const TYPE_LABELS = {
-  skills: 'Skills',
-  rules: 'Rules',
-  hooks: 'Hooks',
-}
-
 /**
- * 把包目录转成可搜索选项。
+ * 包名 + 其下子条目。子条目 disabled，只展示不参与勾选；勾的是整包。
  *
- * @param {Array<{ id: string, label: string, description: string }>} packs
+ * @param {object[]} packs
+ * @param {object} scans
+ * @param {{ skillsOnly?: boolean }} [opts]
  */
-function packOptions(packs) {
-  return packs.map(pack => ({
-    value: pack.id,
-    label: pack.label,
-    description: pack.description,
-  }))
+export function packOptionsWithChildren(packs, scans, { skillsOnly = false } = {}) {
+  const rows = []
+  for (const pack of packs) {
+    const items = listPackItems(pack, scans, { skillsOnly })
+    const names = items.map(item => item.name)
+    rows.push({
+      value: pack.id,
+      label: `${pack.label}（${items.length}）`,
+      description: names.length > 0 ? names.join('、') : pack.description,
+    })
+    for (const item of items) {
+      rows.push({
+        value: `hint:${pack.id}:${item.type}:${item.name}`,
+        label: `  ${item.name}`,
+        description: item.description || pack.label,
+        disabled: true,
+        packId: pack.id,
+      })
+    }
+  }
+  return rows
 }
 
 /**
@@ -38,21 +56,24 @@ export function packItemKey(type, name) {
 }
 
 /**
- * 把包展开结果打成一条可搜索列表。label 含类型 + 分类 + 名字。
+ * 把包展开结果打成一条可搜索列表，按包名分组，便于对照取消。
  *
  * @param {{ skills: object[], rules: object[], hooks: object[] }} selected
+ * @param {string[]} packIds
  */
-export function buildPackItemOptions(selected) {
+export function buildPackItemOptions(selected, packIds = []) {
   const rows = []
   for (const type of ['skills', 'rules', 'hooks']) {
     for (const item of selected[type] || []) {
+      const packLabel = packLabelForItem(item, type, packIds)
       rows.push({
         value: packItemKey(type, item.name),
-        label: `${TYPE_LABELS[type]} / ${item.category || '其他'} / ${item.name}`,
+        label: `${packLabel} / ${item.name}`,
         description: item.description,
       })
     }
   }
+  rows.sort((a, b) => a.label.localeCompare(b.label, 'zh'))
   return rows
 }
 
@@ -89,7 +110,7 @@ function printPackSummary(stacks, scenes, selected) {
 }
 
 /**
- * 按包选择条目。栈/场景选完后展示聚合子条目，默认全勾，用户可取消。
+ * 按包选择条目。选包时列出包下子条目；确认后默认全勾，用户可取消。
  * 返回 { skills, rules, commands, hooks, packs } 或 null（取消）。
  *
  * @param {object} scans
@@ -101,19 +122,21 @@ export async function interactiveSelectByPacks(scans, syncState, { skillsOnly =
   let stacks = previous.stacks.length > 0 ? previous.stacks : ['common']
   let scenes = previous.scenes
   let step = 'stacks'
+  const packOpts = { skillsOnly }
 
   while (true) {
     if (step === 'stacks') {
       const result = await searchableMultiselect({
-        message: '选择技术栈（通用默认勾选）',
-        options: packOptions(STACK_PACKS),
+        message: '选择技术栈（通用默认勾选；包下列出子条目，下一步可逐条取消）',
+        options: packOptionsWithChildren(STACK_PACKS, scans, packOpts),
         initialValues: stacks,
         required: true,
-        maxItems: 12,
+        maxItems: 15,
         placeholder: SEARCH_PLACEHOLDER,
+        descLines: 8,
       })
       if (isCancel(result)) return null
-      stacks = result
+      stacks = result.filter(id => !String(id).startsWith('hint:'))
 
       const nav = await searchableSelect({
         message: `已选 ${stacks.length} 个技术栈。下一步：`,
@@ -132,28 +155,30 @@ export async function interactiveSelectByPacks(scans, syncState, { skillsOnly =
 
     if (step === 'scenes') {
       const result = await searchableMultiselect({
-        message: '选择场景包（可全不选）',
-        options: packOptions(SCENE_PACKS),
+        message: '选择场景包（可全不选；包下列出子条目，下一步可逐条取消）',
+        options: packOptionsWithChildren(SCENE_PACKS, scans, packOpts),
         initialValues: scenes,
         required: false,
-        maxItems: 10,
+        maxItems: 15,
         placeholder: SEARCH_PLACEHOLDER,
+        descLines: 8,
       })
       if (isCancel(result)) return null
-      scenes = result
+      scenes = result.filter(id => !String(id).startsWith('hint:'))
       step = 'items'
       continue
     }
 
     const expanded = expandPackSelection(scans, { stacks, scenes, skillsOnly })
     printPackSummary(stacks, scenes, expanded)
-    const options = buildPackItemOptions(expanded)
+    const packIds = [...stacks, ...scenes]
+    const options = buildPackItemOptions(expanded, packIds)
     if (options.length === 0) {
       return { skills: [], rules: [], commands: [], hooks: [], packs: { stacks, scenes } }
     }
 
     const keys = await searchableMultiselect({
-      message: '包已预勾子条目，取消不需要的即可',
+      message: '已按包预勾子条目，取消不需要的即可',
       options,
       initialValues: options.map(option => option.value),
       required: false,