@dsh-workbench/module-tools 1.1.7 → 1.1.9

package/README.md

@@ -30,8 +30,11 @@ pnpm design check # 设计底稿有没有空格、README 有没有落后
 没带 note 又没记录时 `release` 在跑任何门禁之前就拦下。
 日志写在确认之后，发失败不回滚：这一版已经记下了，下一次发布直接用。
 `package.json` 缺 `files` 里的 `CHANGELOG.md` 一样拦下；`author` 没写时从本机 `git config` 补进 manifest，索引与产物都带上。
-模块的 `package.json` 可用 `dsh.workbench.market` 声明 `category` 与 `labels`（字符串数组）；
-不写就不带分类和标签，索引里只留 `metadata.workbench: true` 这条身份标记。
+标签只住在市集条目上（`metadata.labels`），**不写进 `package.json`**：清单的键是协议定死的
+（`apiVersion` / `unit` / `title` / `card` / `tools` / `host` / `needs`），往里塞私货 check 会判红。
+发布时带 `--label <短词>`（可重复，最多两个）：它并进索引条目的 `metadata.labels`；
+不传就沿用老清单里已经写过的（`dsh.workbench.market.labels`，只在读那一侧认）。
+标题 / 署名 / 说明仍保持索引里现有的那份不动。
 要换署名时带 `--author "姓名 <邮箱>"`（或只给姓名）：它写回 `package.json`，索引、产物与提交都用它，
 `--refresh` 时也一样。**发布本身不改市集里的标题 / 署名 / 说明**：这些元数据只由 `--refresh`（或显式 `--author`）写，
 避免一台还没更新的机器发新版时把别人刚改的元数据盖回去。一个包名归第一次发布的人（条目文件里的 `owner`）：换署名发同名会被拒，

package/bin/dsh-wb-module.mjs

@@ -61,6 +61,7 @@ const RELEASE_HELP = `
   --registry <url> --access restricted|public --npmrc <文件>
   --license <id> --out <目录> --git <remote>
   --author <署名>                                       换署名（姓名，或 姓名 <邮箱>）；写回 package.json
+  --label <短词>                                        给市集条目打标签（1–2 个，可重复）；写回 package.json
   --changelog-note <文字> --changelog-type added|changed|fixed|removed|security|deprecated
                                                         这一版还没有更新日志时写进 CHANGELOG.md（文件不在先建）
   --index auto|none|<目录|git 地址>                     发布后要更新的索引源

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/module-tools",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "模块包的构建与门禁工具：build（单文件 ESM 宿主侧 + 套 loader 壳的浏览器侧）、check（契约/产物边界/源码边界/卡片渲染）。模块包不再各带一份构建脚本。",
   "license": "MIT",
   "type": "module",
@@ -33,7 +33,7 @@
     "semver": "^7.8.5",
     "typescript": "5.9.3",
     "typescript-eslint": "^8.71.0",
-    "@dsh-workbench/shared": "1.1.7"
+    "@dsh-workbench/shared": "1.1.9"
   },
   "repository": {
     "type": "git",

package/src/market-index.mjs

@@ -1,5 +1,4 @@
-import { randomBytes } from 'node:crypto';
-import { cpSync, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
+import { cpSync, copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { isDeepStrictEqual } from 'node:util';
 
@@ -11,15 +10,12 @@ import {
   collectMarketEntryFiles,
   gitUrlOk,
   marketArtifactPath,
-  marketArtifactPathFor,
   marketArtifactRoot,
+  marketEntryFileOf,
   marketEntryFilesOfLegacy,
-  marketEntryPath,
-  marketMetaDocOf,
-  marketMetaPath,
   marketSourceKey,
-  marketVersionDocOf,
   parseMarketIndexJson,
+  sortMarketVersions,
 } from '@dsh-workbench/shared/host';
 
 const MARKET_DIR = 'market';
@@ -182,48 +178,12 @@ function ensureVersionFree(workdir, dir, input) {
   }
 }
 
-function writeEntryFile(workdir, dir, entry, version) {
-  const doc = marketVersionDocOf(entry, version);
-  const rel = marketEntryPath(dir, entry.name, version.version);
-  const file = join(workdir, ...rel.split('/'));
-  if (existsSync(file)) {
-    const current = JSON.parse(readFileSync(file, 'utf8'));
-    if (isDeepStrictEqual(current, doc)) return rel;
-    throw new MarketIndexError(
-      `索引里已经有 ${entry.name}@${version.version}（${rel}）—— 换个版本号再发`,
-      'market-owner',
-    );
-  }
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, `${JSON.stringify(doc, null, 2)}\n`);
-  return rel;
-}
-
-function metaEpochOf(workdir, dir, name) {
-  const root = join(workdir, dir, name);
-  if (!existsSync(root)) return 0;
-  let epoch = 0;
-  for (const item of readdirSync(root)) {
-    if (!item.startsWith('meta-') || !item.endsWith('.json')) continue;
-    try {
-      const doc = JSON.parse(readFileSync(join(root, item), 'utf8'));
-      if (typeof doc.epoch === 'number' && doc.epoch > epoch) epoch = doc.epoch;
-    } catch {
-      continue;
-    }
-  }
-  return epoch;
-}
-
-function writeMetaFile(workdir, dir, entry, at) {
-  const epoch = metaEpochOf(workdir, dir, entry.name) + 1;
-  const suffix = randomBytes(3).toString('hex');
-  const doc = marketMetaDocOf(entry, epoch, Math.floor(at / 1000));
-  const rel = marketMetaPath(dir, entry.name, epoch, suffix);
-  const file = join(workdir, ...rel.split('/'));
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, `${JSON.stringify(doc, null, 2)}\n`);
-  return rel;
+function writeEntryFile(workdir, dir, entry) {
+  const file = marketEntryFileOf(entry, dir);
+  const target = join(workdir, ...file.path.split('/'));
+  mkdirSync(dirname(target), { recursive: true });
+  writeFileSync(target, file.text);
+  return file.path;
 }
 
 function migrateLegacyIndex(workdir, dir) {
@@ -344,14 +304,30 @@ function textListOf(value) {
     : [];
 }
 
+function recordOf(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value) ? value : {};
+}
+
+export function labelsOfManifest(manifest) {
+  const dsh = recordOf(recordOf(manifest).dsh);
+  const workbench = recordOf(dsh.workbench);
+  return textListOf(recordOf(workbench.market).labels);
+}
+
+export function mergeEntryLabels(entry, labels) {
+  if (!Array.isArray(labels) || labels.length === 0) return entry;
+  const wanted = [...labels];
+  if (isDeepStrictEqual(entry.metadata?.labels ?? [], wanted)) return entry;
+  return { ...entry, metadata: { ...(entry.metadata ?? {}), labels: wanted } };
+}
+
 export function entryMetaOf(manifest) {
   const author = authorOf(manifest);
   const homepage = typeof manifest.homepage === 'string' ? manifest.homepage.trim() : '';
   const keywords = textListOf(manifest.keywords);
-  const market = manifest.dsh?.workbench?.market;
-  const marketRecord = market !== null && typeof market === 'object' && !Array.isArray(market) ? market : {};
+  const marketRecord = recordOf(manifest.dsh?.workbench?.market);
   const category = typeof marketRecord.category === 'string' ? marketRecord.category.trim() : '';
-  const labels = textListOf(marketRecord.labels);
+  const labels = labelsOfManifest(manifest);
   const order = manifest.dsh?.workbench?.card?.order;
   const unit = unitOf(manifest);
   const title = titleOf(manifest);
@@ -373,21 +349,22 @@ export function entryMetaOf(manifest) {
 }
 
 export function indexEntryOf(input) {
-  const manifest = input.manifest;
-  const dsh = manifest.engines?.dsh;
-  const owner = authorTextOf(manifest);
+  const owner = authorTextOf(input.manifest);
   return {
-    name: manifest.name,
+    name: input.manifest.name,
     ...(owner === '' ? {} : { owner }),
-    ...entryMetaOf(manifest),
-    versions: [
-      {
-        version: input.version,
-        publishTimestamp: Math.floor(input.at / 1000),
-        source: input.source,
-        ...(typeof dsh === 'string' && dsh.trim() !== '' ? { engines: { dsh: dsh.trim() } } : {}),
-      },
-    ],
+    ...entryMetaOf(input.manifest),
+    versions: [versionRecordOf(input)],
+  };
+}
+
+export function versionRecordOf(input) {
+  const dsh = input.manifest.engines?.dsh;
+  return {
+    version: input.version,
+    publishTimestamp: Math.floor(input.at / 1000),
+    source: input.source,
+    ...(typeof dsh === 'string' && dsh.trim() !== '' ? { engines: { dsh: dsh.trim() } } : {}),
   };
 }
 
@@ -590,11 +567,11 @@ function remoteHeadOf(exec, workdir, branch) {
   return line.split(/\s+/)[0] ?? '';
 }
 
-function copyArtifacts(root, workdir, name, version, manifest) {
+function copyArtifacts(root, workdir, name, manifest) {
   if (!SAFE_PACKAGE_NAME.test(name)) {
     throw new MarketIndexError(`包名不是合法 npm 名，没法当产物目录：${JSON.stringify(name)}`, 'index-write');
   }
-  const path = marketArtifactPathFor(name, version);
+  const path = marketArtifactRoot(name);
   const dest = join(workdir, path);
   rmSync(dest, { recursive: true, force: true });
   mkdirSync(dest, { recursive: true });
@@ -637,22 +614,6 @@ export function marketClaim({ plan, exec, home, name, unit, publisher }) {
   });
 }
 
-const META_KEYS = ['title', 'description', 'author', 'owner', 'homepage', 'icon', 'metadata'];
-
-function withCurrentMeta(entry, current, update) {
-  if (current === undefined) return entry;
-  const next = { ...entry };
-  if (!update) {
-    for (const key of META_KEYS) {
-      if (key === 'owner') continue;
-      if (current[key] === undefined) delete next[key];
-      else next[key] = current[key];
-    }
-  }
-  if (current.owner !== undefined) next.owner = current.owner;
-  return next;
-}
-
 export function updateMarketIndex(options) {
   const { plan, exec, home, root, manifest, version, publish, now, resume, onStep } = options;
   const unit = options.unit ?? unitOf(manifest);
@@ -677,11 +638,19 @@ export function updateMarketIndex(options) {
       if (plan.source.localPath === undefined) {
         const fetched = runGit(exec, workdir, ['fetch', 'origin', branch], { allowFailure: true });
         if (fetched.status === 0) runGit(exec, workdir, ['reset', '--hard', `origin/${branch}`], { allowFailure: true });
-        runGit(exec, workdir, ['clean', '-fd', '--', marketArtifactPathFor(manifest.name, version), dir], {
+        runGit(exec, workdir, ['clean', '-fd', '--', marketArtifactRoot(manifest.name), dir], {
           allowFailure: true,
         });
       }
-      rmSync(join(workdir, dir, manifest.name, `${version}.json`), { force: true });
+      const file = join(workdir, dir, `${manifest.name}.json`);
+      if (existsSync(file)) {
+        const kept = JSON.parse(readFileSync(file, 'utf8'));
+        const versions = (Array.isArray(kept.versions) ? kept.versions : []).filter(
+          (one) => one?.version !== version,
+        );
+        if (versions.length === 0) rmSync(file, { force: true });
+        else writeFileSync(file, `${JSON.stringify({ ...kept, versions }, null, 2)}\n`);
+      }
     } else {
       assertClean(exec, workdir);
     }
@@ -719,7 +688,7 @@ export function updateMarketIndex(options) {
       const done = replicatePush(exec, workdir, branch, baseSha, () => {
         ensureClaimFree(workdir, dir, claimInput);
         migrateLegacyIndex(workdir, dir);
-        artifactPath = copyArtifacts(root, workdir, manifest.name, version, manifest);
+        artifactPath = copyArtifacts(root, workdir, manifest.name, manifest);
         report({ phase: 'artifacts-copied' });
         artifactSha = commitOf(exec, workdir, `chore(release): ${entryName}`, identityOf(manifest));
         report({ phase: 'artifacts-committed', artifactCommit: artifactSha });
@@ -740,15 +709,32 @@ export function updateMarketIndex(options) {
       if (source === undefined) throw new MarketIndexError('这个出口没有可写进索引的 source（tarball 不进索引）', 'index-write');
       if (source.type === 'npm' && source.registry === 'https://registry.npmjs.org/') delete source.registry;
     }
-    const entry = indexEntryOf({ manifest, version, source, at: now() });
+    const versionRecord = versionRecordOf({ manifest, version, source, at: now() });
     report({ phase: 'index' });
     const indexed = replicatePush(exec, workdir, branch, baseSha, () => {
       if (plan.policy !== 'artifacts-in-repo') migrateLegacyIndex(workdir, dir);
       ensureClaimFree(workdir, dir, claimInput);
+      ensureVersionFree(workdir, dir, claimInput);
       const current = readWorktreeIndex(workdir, dir).plugins.find((one) => one.name === manifest.name);
-      const written = withCurrentMeta(entry, current, options.metadata === true);
-      if (current === undefined || options.metadata === true) writeMetaFile(workdir, dir, written, now());
-      writeEntryFile(workdir, dir, written, written.versions[0]);
+      const owner = authorTextOf(manifest);
+      let next;
+      if (current === undefined) {
+        next = {
+          name: manifest.name,
+          ...(owner === '' ? {} : { owner }),
+          ...entryMetaOf(manifest),
+          versions: [versionRecord],
+        };
+      } else {
+        next = { ...current, versions: sortMarketVersions([versionRecord, ...current.versions]) };
+        if (options.metadata === true) {
+          const merged = { ...next, ...entryMetaOf(manifest) };
+          if (current.owner !== undefined) merged.owner = current.owner;
+          next = merged;
+        }
+      }
+      next = mergeEntryLabels(next, options.labels);
+      writeEntryFile(workdir, dir, next);
       indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`, identityOf(manifest));
       report({ phase: 'index-committed', indexCommit: indexSha });
       return indexSha;
@@ -830,10 +816,18 @@ export function refreshMarketEntry(options) {
     if (isDeepStrictEqual(next, existing)) {
       return { ...base, updated: false, unchanged: true, version: latest, phase: 'done' };
     }
-    const at = Date.now();
     const baseSha = revOf(exec, workdir, 'HEAD');
     const done = replicatePush(exec, workdir, branch, baseSha, () => {
-      writeMetaFile(workdir, dir, next, at);
+      const fresh = readWorktreeIndex(workdir, dir).plugins.find((one) => one.name === manifest.name);
+      if (fresh === undefined) {
+        throw new MarketIndexError(`${manifest.name} 还不在索引里 —— 先正常发一版`, 'index-write');
+      }
+      const updated = { ...fresh };
+      for (const key of ['title', 'description', 'author', 'homepage', 'metadata']) {
+        if (Object.hasOwn(meta, key)) updated[key] = meta[key];
+        else delete updated[key];
+      }
+      writeEntryFile(workdir, dir, updated);
       return commitOf(exec, workdir, `chore(market): refresh ${manifest.name}`, identityOf(manifest));
     });
     if (!done.ok) throw new MarketIndexError(done.reason, done.code);

package/src/release-util.mjs

@@ -58,6 +58,14 @@ export function argValue(args, flag) {
   return at === -1 ? undefined : args[at + 1];
 }
 
+export function argValues(args, flag) {
+  const values = [];
+  for (let at = 0; at < args.length; at += 1) {
+    if (args[at] === flag) values.push(args[at + 1] ?? '');
+  }
+  return values;
+}
+
 export function hasFlag(args, flag) {
   return args.includes(flag);
 }

package/src/release.mjs

@@ -25,6 +25,7 @@ import {
   ReleaseError,
   ResumableError,
   argValue,
+  argValues,
   defaultExec,
   dshHomeOf,
   hasFlag,
@@ -52,6 +53,7 @@ import {
   authorTextOf,
   claimProblemText,
   identityOf,
+  labelsOfManifest,
   marketClaim,
   marketVersionExists,
   missingPublisherText,
@@ -262,6 +264,11 @@ export async function runRelease({
   if (!CHANGELOG_KINDS.includes(changelogKind)) {
     throw new ReleaseError(`--changelog-type 只认 ${CHANGELOG_KINDS.join(' / ')}（收到「${changelogKind}」）`);
   }
+  const askedLabels = [...new Set(argValues(args, '--label').map((one) => String(one).trim()))];
+  if (askedLabels.some((one) => one === '' || /[\r\n]/u.test(one))) {
+    throw new ReleaseError('--label 只认一行短词：不能是空的');
+  }
+  if (askedLabels.length > 2) throw new ReleaseError('--label 最多两个 —— 一个模块的标签是 1–2 个短词');
   const manifest = readManifest(root);
   const unit = manifest?.dsh?.workbench?.unit;
   if (typeof unit !== 'string' || unit === '') throw new ReleaseError('这不是一个 wb 模块包（没有 dsh.workbench.unit）');
@@ -313,6 +320,9 @@ export async function runRelease({
     emit(out, json, summary);
     return summary;
   }
+  const labels = askedLabels;
+  const labelsForIndex = labels.length > 0 ? labels : labelsOfManifest(manifest);
+  const labelsChange = verify || labels.length === 0 ? undefined : `标签 ← ${labels.join(' · ')}`;
   const explicitApplied = explicitAuthor !== undefined && !verify && !dryRun;
   if (explicitApplied) {
     manifest.author = explicitAuthor;
@@ -343,7 +353,7 @@ export async function runRelease({
   }
   const authored = authorChangeOf(root, manifest, exec);
   if (hasFlag(args, '--refresh')) {
-    if (dryRun) throw new ReleaseError('--refresh 没有预览：它只改索引里的标题 / 作者 / 说明');
+    if (dryRun) throw new ReleaseError('--refresh 没有预览：它只改索引里的标题 / 作者 / 说明 / 标签');
     if (target !== 'market') throw new ReleaseError('--refresh 只对市场索引有意义（--target market）');
     if (indexPlan === undefined) {
       throw new ReleaseError('没有可写的 git 索引源 —— 用 --index <仓库> 指定，或先在「模块市场 → 发现」里初始化索引');
@@ -369,8 +379,13 @@ export async function runRelease({
       },
       changes:
         result.updated === true
-          ? ['市集元数据已刷新', ...(explicitAuthor === undefined ? [] : ['author ← --author'])]
+          ? [
+              '市集元数据已刷新',
+              ...(explicitAuthor === undefined ? [] : ['author ← --author']),
+              ...(labelsChange === undefined ? [] : [labelsChange]),
+            ]
           : [],
+      ...(labels.length === 0 ? {} : { labels }),
       install: '',
       text:
         result.updated === true
@@ -481,6 +496,7 @@ export async function runRelease({
       publish,
       publisher: authorTextOf(manifestNow),
       metadata: authorChange !== undefined,
+      ...(labelsForIndex.length === 0 ? {} : { labels: labelsForIndex }),
       exec,
       home,
       now: () => Date.now(),
@@ -489,6 +505,7 @@ export async function runRelease({
   let changelogChange;
   const changesOf = (version) => [
     ...(authorChange === undefined ? [] : [authorChange]),
+    ...(labelsChange === undefined ? [] : [labelsChange]),
     ...(version === manifest.version ? [] : [`version → ${version}`]),
     ...(changelogChange === undefined ? [] : [changelogChange]),
   ];
@@ -708,6 +725,7 @@ export async function runRelease({
       version,
       files,
       changes: changesOf(version),
+      ...(labels.length === 0 ? {} : { labels }),
       ...(changelogReport === undefined ? {} : { changelog: changelogReport }),
       install: '',
       market: indexPreviewOf(manifest.name, version),
@@ -730,6 +748,7 @@ export async function runRelease({
       publish: {},
       publisher,
       metadata: authorChange !== undefined,
+      ...(labelsForIndex.length === 0 ? {} : { labels: labelsForIndex }),
       exec,
       home,
       now: () => Date.now(),