@dsh-workbench/module-tools 1.0.0-beta.0 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/module-tools",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0",
   "description": "模块包的构建与门禁工具：build（单文件 ESM 宿主侧 + 套 loader 壳的浏览器侧）、check（契约/产物边界/源码边界/卡片渲染）。模块包不再各带一份构建脚本。",
   "license": "MIT",
   "type": "module",
@@ -30,9 +30,10 @@
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.1.1",
     "execa": "^10.2.0",
+    "semver": "^7.8.5",
     "typescript": "5.9.3",
     "typescript-eslint": "^8.71.0",
-    "@dsh-workbench/shared": "1.0.0-beta.0"
+    "@dsh-workbench/shared": "1.0.0"
   },
   "repository": {
     "type": "git",
@@ -43,6 +44,9 @@
   "bugs": {
     "url": "https://github.com/novaeth/dsh-workbench/issues"
   },
+  "devDependencies": {
+    "@types/semver": "^7.8.0"
+  },
   "scripts": {
     "lint": "eslint src bin scripts",
     "arch": "arch-guard",

package/src/changelog.mjs

@@ -9,10 +9,9 @@ import {
   changelogHasEntry,
   changelogSkeleton,
   changelogVersion,
+  isValidVersion,
 } from '@dsh-workbench/shared/host';
 
-const SEMVER = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/;
-
 const USAGE = `用法：
   changelog init                              建一份 ${CHANGELOG_FILE}（已有就不动）
   changelog add <版本> [--type ${CHANGELOG_KINDS.join('|')}] [--note <文字>] [--date <日期>]
@@ -89,7 +88,7 @@ export function addChangelog(root, { version, kind = 'changed', note, date }) {
     throw new ChangelogError(`--type 只认 ${CHANGELOG_KINDS.join(' / ')}（收到「${kind}」）`);
   }
   const wanted = changelogVersion(version === undefined || version === '' ? manifestVersionOf(root) : version);
-  if (!SEMVER.test(wanted)) {
+  if (!isValidVersion(wanted)) {
     throw new ChangelogError(`版本要写成 x.y.z（收到「${String(version)}」）—— 也可以省略，用 package.json 里的`);
   }
   const file = changelogFileOf(root);
@@ -134,7 +133,7 @@ function runAdd(root, args) {
 
 function runCheck(root, args) {
   const version = changelogVersion(positional(args, 1) ?? manifestVersionOf(root));
-  if (!SEMVER.test(version)) {
+  if (!isValidVersion(version)) {
     console.error('changelog check 要知道查哪一版：给一个 x.y.z，或先让 package.json 有 version');
     process.exit(2);
   }

package/src/checks/contracts.mjs

@@ -253,6 +253,17 @@ function mountOf(face, created, manifest, tools) {
       },
       manifests: () => [],
       opencliCommand: 'opencli',
+      env: {},
+      git: {
+        origin: async () => ({ kind: 'no-origin' }),
+        branch: async () => ({ kind: 'no-branch' }),
+        head: async () => ({ kind: 'no-head' }),
+      },
+      libs: {
+        load: async () => {
+          throw new Error('gate: libs 未装');
+        },
+      },
       store: fakeStore(),
       longTasks: fakeLongTasks(created),
     });
@@ -603,9 +614,16 @@ export async function run() {
         }
       }
 
-      if (needs.some((need) => need?.kind === 'lib') && !products.includes('libInstallCommand')) {
+      const usesLibPort = sourceFilesOf(pkg.dir).some((file) =>
+        /(?:\blibs\.load\b|\bworkflowFromLibs\b|\bLibReader\b)/.test(readFileSync(file, 'utf8')),
+      );
+      if (
+        needs.some((need) => need?.kind === 'lib') &&
+        !products.includes('libInstallCommand') &&
+        !usesLibPort
+      ) {
         problems.push(
-          `${name}: 声明了 lib 类 need 却没用 libInstallCommand（@dsh-workbench/shared/host 里现成的）—— ` +
+          `${name}: 声明了 lib 类 need 却既没用 libInstallCommand，也没走 core 的 LibReader（libs.load）—— ` +
             `lib 没装好时用户只看到"没装"，没有能照做的那条安装命令`,
         );
       }

package/src/checks/style.mjs

@@ -125,6 +125,30 @@ const ANCHOR_EXEMPT = new Map([
     '@dsh-workbench/module-demo-anchor-exempt:src/components/IssueRow.tsx',
     '自检探针：整行链形态的裸 `<a>`（只在这个临时探针包里出现）',
   ],
+  [
+    '@pagoda-dsh-workbench/module-argocd:src/components/views/EnvRows.tsx',
+    '图标钮 / 按钮皮 / 整行链：外观与交互沿用既有视图，文字链已走 kit 的 Link',
+  ],
+  [
+    '@pagoda-dsh-workbench/module-argocd:src/components/views/IdentityFields.tsx',
+    '图标钮 / 按钮皮：登录入口沿用既有视图，文字链已走 kit 的 Link',
+  ],
+  [
+    '@pagoda-dsh-workbench/module-coding-analysis:src/components/views/AnalysisBody.tsx',
+    '图标钮：卡片角上的外链按钮，不是正文文字链',
+  ],
+  [
+    '@pagoda-dsh-workbench/module-coding-analysis:src/components/views/AnalysisStates.tsx',
+    '按钮皮的链：空态行动区，沿用既有视图',
+  ],
+  [
+    '@pagoda-dsh-workbench/module-coding-analysis:src/components/views/EnvSettings.tsx',
+    '按钮皮的链：设置区行动入口，沿用既有视图',
+  ],
+  [
+    '@pagoda-dsh-workbench/module-coding-issues:src/components/IssueRow.tsx',
+    '整行链：缺陷行整行可点，不是正文文字链',
+  ],
 ]);
 
 function bareControlsIn(text) {

package/src/market-index.mjs

@@ -1,5 +1,6 @@
 import { cpSync, copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
+import { isDeepStrictEqual } from 'node:util';
 
 import {
   MARKET_INDEX_README_LINES,
@@ -69,6 +70,22 @@ export function sanitizeManifest(manifest) {
   return next;
 }
 
+function authorParts(manifest) {
+  const author = manifest?.author;
+  const raw =
+    typeof author === 'string'
+      ? author.trim()
+      : author !== null && typeof author === 'object' && typeof author.name === 'string'
+        ? author.name.trim()
+        : '';
+  const declaredEmail =
+    author !== null && typeof author === 'object' && typeof author.email === 'string' ? author.email.trim() : '';
+  const match = /^(.*?)\s*<([^>]*)>/.exec(raw);
+  const name = (match === null ? raw : match[1]).trim();
+  const email = match === null ? declaredEmail : match[2].trim() || declaredEmail;
+  return { name, email };
+}
+
 function authorOf(manifest) {
   const author = manifest.author;
   if (typeof author === 'string') return author.trim();
@@ -76,23 +93,41 @@ function authorOf(manifest) {
   return '';
 }
 
+export function identityOf(manifest) {
+  const { name, email } = authorParts(manifest);
+  if (name === '') return undefined;
+  return email === '' ? { name } : { name, email };
+}
+
 function descriptionOf(manifest) {
   const description = typeof manifest.description === 'string' ? manifest.description.trim() : '';
   return description === '' ? undefined : { zh: description };
 }
 
-export function indexEntryOf(input) {
-  const manifest = input.manifest;
+function titleOf(manifest) {
+  const title = manifest.title;
+  if (typeof title === 'string') {
+    const text = title.trim();
+    return text === '' ? undefined : { zh: text };
+  }
+  if (title === null || typeof title !== 'object' || Array.isArray(title)) return undefined;
+  const zh = typeof title.zh === 'string' ? title.zh.trim() : '';
+  const en = typeof title.en === 'string' ? title.en.trim() : '';
+  if (zh === '' && en === '') return undefined;
+  return { ...(zh === '' ? {} : { zh }), ...(en === '' ? {} : { en }) };
+}
+
+export function entryMetaOf(manifest) {
   const author = authorOf(manifest);
   const homepage = typeof manifest.homepage === 'string' ? manifest.homepage.trim() : '';
   const keywords = Array.isArray(manifest.keywords)
     ? manifest.keywords.flatMap((one) => (typeof one === 'string' && one.trim() !== '' ? [one.trim()] : []))
     : [];
   const order = manifest.dsh?.workbench?.card?.order;
-  const dsh = manifest.engines?.dsh;
+  const title = titleOf(manifest);
   const description = descriptionOf(manifest);
   return {
-    name: manifest.name,
+    ...(title === undefined ? {} : { title }),
     ...(description === undefined ? {} : { description }),
     ...(author === '' ? {} : { author }),
     ...(homepage === '' ? {} : { homepage }),
@@ -102,6 +137,15 @@ export function indexEntryOf(input) {
       ...(keywords.length === 0 ? {} : { keywords }),
       ...(typeof order === 'number' ? { sortKeys: { order } } : {}),
     },
+  };
+}
+
+export function indexEntryOf(input) {
+  const manifest = input.manifest;
+  const dsh = manifest.engines?.dsh;
+  return {
+    name: manifest.name,
+    ...entryMetaOf(manifest),
     versions: [
       {
         version: input.version,
@@ -253,10 +297,15 @@ function assertClean(exec, workdir) {
   }
 }
 
-function commitOf(exec, workdir, message) {
+function commitOf(exec, workdir, message, identity) {
   const added = runGit(exec, workdir, ['add', '-A'], { allowFailure: true });
   if (added.status !== 0) throw new MarketIndexError(`git add 没过：${tailOf(`${added.stdout}\n${added.stderr}`)}`);
-  const committed = runGit(exec, workdir, ['commit', '-m', message], { allowFailure: true });
+  const who = [];
+  if (identity !== undefined) {
+    who.push('-c', `user.name=${identity.name}`);
+    if (identity.email !== undefined) who.push('-c', `user.email=${identity.email}`);
+  }
+  const committed = runGit(exec, workdir, [...who, 'commit', '-m', message], { allowFailure: true });
   const text = `${committed.stdout}\n${committed.stderr}`;
   if (committed.status !== 0 && !/nothing to commit|no changes added|无文件要提交/i.test(text)) {
     throw new MarketIndexError(`git commit 没过：${tailOf(text)}`);
@@ -379,7 +428,7 @@ export function updateMarketIndex(options) {
       report({ phase: 'artifacts' });
       artifactPath = copyArtifacts(root, workdir, unit, manifest);
       report({ phase: 'artifacts-copied' });
-      const sha = commitOf(exec, workdir, `chore(release): ${entryName}`);
+      const sha = commitOf(exec, workdir, `chore(release): ${entryName}`, identityOf(manifest));
       report({ phase: 'artifacts-committed', artifactCommit: sha });
       const pushed = pushOf(exec, workdir, branch);
       if (pushed.status !== 0) {
@@ -400,7 +449,7 @@ export function updateMarketIndex(options) {
     const entry = indexEntryOf({ manifest, version, source, at: now() });
     report({ phase: 'index' });
     writeEntry(workdir, indexPath, entry);
-    let indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`);
+    let indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`, identityOf(manifest));
     report({ phase: 'index-committed', indexCommit: indexSha });
     const pushed = pushOf(exec, workdir, branch);
     if (pushed.status !== 0) {
@@ -412,7 +461,7 @@ export function updateMarketIndex(options) {
         );
       }
       writeEntry(workdir, indexPath, entry);
-      indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`);
+      indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`, identityOf(manifest));
       report({ phase: 'index-committed', indexCommit: indexSha });
       const retried = pushOf(exec, workdir, branch);
       if (retried.status !== 0) {
@@ -451,6 +500,76 @@ export function updateMarketIndex(options) {
   }
 }
 
+export function refreshMarketEntry(options) {
+  const { plan, exec, home, manifest } = options;
+  let base = { kind: 'git', url: plan.source.url, entry: manifest.name };
+  let phase = 'start';
+  try {
+    const workdir = worktreeOf(plan, exec, home);
+    const indexPath = plan.source.path ?? MARKET_FILE;
+    assertClean(exec, workdir);
+    const branch = plan.source.ref ?? currentBranch(exec, workdir);
+    base = { ...base, branch };
+    const file = join(workdir, indexPath);
+    if (!existsSync(file)) throw new MarketIndexError(`索引里还没有 ${indexPath} —— 先正常发一版`, 'index-write');
+    const parsed = parseMarketIndexJson(readFileSync(file, 'utf8'));
+    if (!parsed.ok) {
+      throw new MarketIndexError(
+        `${indexPath} 不是 format 1：${parsed.problems.map((one) => one.detail).join('；')}`,
+        'index-write',
+      );
+    }
+    const existing = parsed.index.plugins.find((one) => one.name === manifest.name);
+    if (existing === undefined) {
+      throw new MarketIndexError(`${manifest.name} 还不在索引里 —— 先正常发一版`, 'index-write');
+    }
+    const latest = existing.versions[0]?.version ?? '';
+    const meta = entryMetaOf(manifest);
+    const next = { ...existing };
+    for (const key of ['title', 'description', 'author', 'homepage', 'metadata']) {
+      if (Object.hasOwn(meta, key)) next[key] = meta[key];
+      else delete next[key];
+    }
+    if (isDeepStrictEqual(next, existing)) {
+      return { ...base, updated: false, unchanged: true, version: latest, phase: 'done' };
+    }
+    writeEntry(workdir, indexPath, next);
+    let indexSha = commitOf(exec, workdir, `chore(market): refresh ${manifest.name}`, identityOf(manifest));
+    const pushed = pushOf(exec, workdir, branch);
+    if (pushed.status !== 0) {
+      const replayed = resetToRemote(exec, workdir, branch);
+      if (!replayed) {
+        throw new MarketIndexError(`元数据没推上去（本地 commit ${indexSha}）：${tailOf(pushed.stderr)}`, 'index-write');
+      }
+      writeEntry(workdir, indexPath, next);
+      indexSha = commitOf(exec, workdir, `chore(market): refresh ${manifest.name}`, identityOf(manifest));
+      const retried = pushOf(exec, workdir, branch);
+      if (retried.status !== 0) {
+        throw new MarketIndexError(`元数据没推上去：${tailOf(retried.stderr)}`, 'index-write');
+      }
+    }
+    const head = runGit(exec, workdir, ['rev-parse', 'HEAD']);
+    const headSha = head.status === 0 ? head.stdout.trim() : '';
+    const remoteHead = remoteHeadOf(exec, workdir, branch);
+    if (headSha === '' || remoteHead !== headSha) {
+      phase = 'remote-check';
+      throw new MarketIndexError(
+        `索引没推上去：远端 ${branch} 是 ${shortOf(remoteHead)}，本地是 ${shortOf(headSha)}`,
+        'git-market-pushed',
+      );
+    }
+    return { ...base, updated: true, version: latest, commit: indexSha, phase: 'done' };
+  } catch (error) {
+    return {
+      ...base,
+      updated: false,
+      phase,
+      code: error instanceof MarketIndexError ? error.step : undefined,
+      reason: messageOf(error),
+    };
+  }
+}
+
 function hasHead(exec, workdir) {
   return runGit(exec, workdir, ['rev-parse', '--verify', 'HEAD'], { allowFailure: true }).status === 0;
 }

package/src/publish.mjs

@@ -5,6 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { execaSync } from 'execa';
 
 import { DESIGN_FILE } from './design.mjs';
+import { publishTagOf } from './release-util.mjs';
 
 const CLI = fileURLToPath(new URL('../bin/dsh-wb-module.mjs', import.meta.url));
 
@@ -111,6 +112,9 @@ export async function publish({ root }) {
     return;
   }
   console.log('✔ 清单干净。真要发就自己跑（凭据在你手上）：');
-  console.log(`  npm publish${manifest.publishConfig?.registry === undefined ? '' : ` --registry ${manifest.publishConfig.registry}`}`);
+  const tag = publishTagOf(manifest.version);
+  console.log(
+    `  npm publish${manifest.publishConfig?.registry === undefined ? '' : ` --registry ${manifest.publishConfig.registry}`}${tag === undefined ? '' : ` --tag ${tag}`}`,
+  );
   console.log(`  包目录：${relative(process.cwd(), root) === '' ? '.' : relative(process.cwd(), root)}`);
 }

package/src/release-publish.mjs

@@ -0,0 +1,169 @@
+import { existsSync, mkdirSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { NeedsUser, ReleaseError, publishTagOf, tailOf } from './release-util.mjs';
+import { npmrcArgs } from './release-target.mjs';
+
+const REQUIRED_FILES = ['dist/host.js', 'client.js', 'cordis.patch.yml', 'package.json', 'CHANGELOG.md'];
+
+function parseJson(text) {
+  const raw = String(text ?? '');
+  const start = raw.search(/[[{]/);
+  if (start === -1) return undefined;
+  try {
+    return JSON.parse(raw.slice(start));
+  } catch {
+    return undefined;
+  }
+}
+
+function quote(value) {
+  const text = String(value);
+  return /[\s"'$`\\]/.test(text) ? `'${text.replace(/'/g, `'\\''`)}'` : text;
+}
+
+export function localFiles(exec, root) {
+  const result = exec(
+    'npm',
+    ['pack', '--dry-run', '--json', '--ignore-scripts', '--cache', join(tmpdir(), 'dsh-wb-npm-cache')],
+    { cwd: root, capture: true, allowFailure: true },
+  );
+  if (result.status !== 0) throw new ReleaseError(`核不了本地包内容：${tailOf(`${result.stdout}\n${result.stderr}`)}`);
+  const parsed = parseJson(result.stdout);
+  const first = Array.isArray(parsed) ? parsed[0] : parsed;
+  const files = Array.isArray(first?.files) ? first.files.map((one) => String(one.path ?? one)) : [];
+  if (files.length === 0) throw new ReleaseError('npm pack 没列出包内容');
+  return files;
+}
+
+export function checkPublished(files) {
+  const missing = REQUIRED_FILES.filter((one) => !files.includes(one));
+  if (missing.length > 0) throw new ReleaseError(`包里少了 ${missing.join(' / ')} —— 装上会起不来`);
+  const leaked = files.filter(
+    (one) => one.startsWith('src/') || one.endsWith('.npmrc') || one.startsWith('template') || one.includes('.env'),
+  );
+  if (leaked.length > 0) throw new ReleaseError(`包里混进了不该发的：${leaked.slice(0, 3).join('、')}`);
+}
+
+export function checkGitFiles(files) {
+  const missing = REQUIRED_FILES.filter((one) => !files.includes(one));
+  if (missing.length > 0) throw new ReleaseError(`tag 里少了 ${missing.join(' / ')} —— 装上会起不来`);
+  const leaked = files.filter((one) => one.endsWith('.npmrc') || one.includes('.env'));
+  if (leaked.length > 0) throw new ReleaseError(`tag 里混进了凭据文件：${leaked.slice(0, 3).join('、')}`);
+}
+
+export function registryExists(exec, info, name, version) {
+  const argv = ['view', `${name}@${version}`, 'version', '--json', '--registry', info.registry, ...npmrcArgs(info.npmrc)];
+  const result = exec('npm', argv, { capture: true, allowFailure: true });
+  if (result.status === 0) return true;
+  const text = `${result.stdout}\n${result.stderr}`;
+  if (/E404|404|No matching version|not found|不存在/i.test(text)) return false;
+  throw new ReleaseError(`查团队源失败（${info.registry}）：${tailOf(text)}`);
+}
+
+function publishArgsOf(info, version) {
+  const tag = publishTagOf(version);
+  return [
+    'publish',
+    '--registry',
+    info.registry,
+    '--access',
+    info.access,
+    '--ignore-scripts',
+    ...(tag === undefined ? [] : ['--tag', tag]),
+    ...npmrcArgs(info.npmrc),
+  ];
+}
+
+function otpCommandOf(root, info, version) {
+  const tag = publishTagOf(version);
+  return [
+    `cd ${quote(root)}`,
+    '&&',
+    'npm',
+    'publish',
+    '--registry',
+    info.registry,
+    '--access',
+    info.access,
+    '--ignore-scripts',
+    ...(tag === undefined ? [] : ['--tag', tag]),
+    ...npmrcArgs(info.npmrc),
+  ].join(' ');
+}
+
+export function publishRegistry(exec, root, info, manifest, version) {
+  const result = exec('npm', publishArgsOf(info, version), { cwd: root, capture: true, allowFailure: true });
+  if (result.status === 0) return;
+  const text = `${result.stdout}\n${result.stderr}`;
+  if (/EOTP|one-time password|OTP/i.test(text)) {
+    throw new NeedsUser(
+      'otp',
+      '源要求一次性验证码。构建和门禁都过了，请在终端跑下面这条，按提示输入验证码；完了跟我说「好了」，我来核对。',
+      otpCommandOf(root, info, version),
+      { target: info.target, name: manifest.name, version, registry: info.registry },
+    );
+  }
+  if (info.target === 'public' && /E403|403|taken|already exists|Forbidden|cannot publish over/i.test(text)) {
+    throw new NeedsUser('name', '这个名字在 npm 上已经被占了。换一个：`@<user>/<name>` 或加一个后缀？', undefined, {
+      target: info.target,
+      name: manifest.name,
+      version,
+    });
+  }
+  if (/E403|403|already exists|Forbidden/i.test(text)) {
+    throw new NeedsUser('scope', '团队源不让发这个包名（可能被占了，或没有权限）。让管理员确认 scope / 权限后跟我说。', undefined, {
+      target: info.target,
+      name: manifest.name,
+      version,
+    });
+  }
+  if (/E402|402|E404|404|scope|payment|not found/i.test(text)) {
+    throw new NeedsUser('scope', '团队源要求包名带 scope。用 `@<scope>/<name>` 吗？', undefined, {
+      target: info.target,
+      name: manifest.name,
+      version,
+    });
+  }
+  throw new ReleaseError(`npm publish 没过：${tailOf(text)}`);
+}
+
+export function verifyRegistry(exec, info, name, version) {
+  const view = exec(
+    'npm',
+    ['view', `${name}@${version}`, 'version', 'dist.tarball', '--json', '--registry', info.registry, ...npmrcArgs(info.npmrc)],
+    { capture: true, allowFailure: true },
+  );
+  if (view.status !== 0) {
+    throw new ReleaseError(`发完了，但在源上查不到 ${name}@${version} —— 去 registry 确认一下`);
+  }
+  const packed = exec(
+    'npm',
+    ['pack', `${name}@${version}`, '--dry-run', '--json', '--ignore-scripts', '--registry', info.registry, ...npmrcArgs(info.npmrc)],
+    { capture: true, allowFailure: true },
+  );
+  if (packed.status !== 0) throw new ReleaseError(`发完了，但核不了包：${tailOf(`${packed.stdout}\n${packed.stderr}`)}`);
+  const parsed = parseJson(packed.stdout);
+  const first = Array.isArray(parsed) ? parsed[0] : parsed;
+  const files = Array.isArray(first?.files) ? first.files.map((one) => String(one.path ?? one)) : [];
+  if (files.length === 0) throw new ReleaseError('发完了，但 npm pack 没列出包内容');
+  checkPublished(files);
+  return files;
+}
+
+export function packTarball(exec, info, version) {
+  mkdirSync(info.out, { recursive: true });
+  const result = exec(
+    'npm',
+    ['pack', '--json', '--ignore-scripts', '--pack-destination', info.out],
+    { capture: true, allowFailure: true },
+  );
+  if (result.status !== 0) throw new ReleaseError(`npm pack 没过：${tailOf(`${result.stdout}\n${result.stderr}`)}`);
+  const parsed = parseJson(result.stdout);
+  const first = Array.isArray(parsed) ? parsed[0] : parsed;
+  const filename = typeof first?.filename === 'string' ? first.filename : info.fileNameOf(version);
+  const file = join(info.out, filename);
+  if (!existsSync(file)) throw new ReleaseError(`npm pack 说生成了 ${filename}，但文件不在 ${info.out}`);
+  return file;
+}