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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/module-tools",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.1",
   "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-beta.1"
   },
   "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/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-util.mjs

@@ -2,6 +2,7 @@ import { mkdirSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { execaSync } from 'execa';
+import semver from 'semver';
 
 export class ReleaseError extends Error {
   constructor(message, code = 1) {
@@ -52,6 +53,12 @@ export function tailOf(text) {
     .join(' | ');
 }
 
+export function publishTagOf(version) {
+  const prerelease = semver.prerelease(String(version ?? '').trim());
+  if (prerelease === null) return undefined;
+  return typeof prerelease[0] === 'string' ? prerelease[0] : 'next';
+}
+
 export function defaultExec(command, argv, { cwd, capture = false, allowFailure = false } = {}) {
   const cache = join(tmpdir(), 'dsh-wb-npm-cache');
   const logs = join(tmpdir(), 'dsh-wb-npm-logs');

package/src/release.mjs

@@ -3,6 +3,7 @@ import { homedir, tmpdir } from 'node:os';
 import { dirname, join, relative, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { isDeepStrictEqual } from 'node:util';
+import semver from 'semver';
 
 import { DESIGN_FILE, acceptanceOf } from './design.mjs';
 import {
@@ -18,7 +19,7 @@ import {
 } from './release-journal.mjs';
 import { emit, installOf, marketInstallOf, stateOf } from './release-report.mjs';
 import { authorChangeOf, changelogGateOf } from './release-changelog.mjs';
-import { NeedsUser, ReleaseError, ResumableError, defaultExec, tailOf } from './release-util.mjs';
+import { NeedsUser, ReleaseError, ResumableError, defaultExec, publishTagOf, tailOf } from './release-util.mjs';
 import {
   MarketIndexError,
   marketVersionExists,
@@ -33,7 +34,6 @@ const CLI = fileURLToPath(new URL('../bin/dsh-wb-module.mjs', import.meta.url));
 const SCRIPTS = ['typecheck', 'test', 'selfcheck'];
 const TARGETS = ['team', 'public', 'tarball', 'git', 'market', 'local'];
 const PUBLIC_REGISTRIES = ['https://registry.npmjs.org/', 'https://registry.npmmirror.com/'];
-const SEMVER = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/;
 const REQUIRED_FILES = ['dist/host.js', 'client.js', 'cordis.patch.yml', 'package.json', 'CHANGELOG.md'];
 
 function argValue(args, flag) {
@@ -190,20 +190,15 @@ function repositoryOf(root, exec) {
 }
 
 function bumpVersion(version, kind) {
-  const match = /^(\d+)\.(\d+)\.(\d+)/.exec(String(version));
-  if (match === null) throw new ReleaseError(`当前版本号读不出来：${String(version)}`);
-  const major = Number(match[1]);
-  const minor = Number(match[2]);
-  const patch = Number(match[3]);
-  if (kind === 'major') return `${major + 1}.0.0`;
-  if (kind === 'minor') return `${major}.${minor + 1}.0`;
-  return `${major}.${minor}.${patch + 1}`;
+  const next = semver.inc(String(version), kind);
+  if (next === null) throw new ReleaseError(`当前版本号读不出来：${String(version)}`);
+  return next;
 }
 
 function nextVersion(current, asked, exists) {
   if (asked !== undefined) {
     const version = /^(major|minor|patch)$/.test(asked) ? bumpVersion(current, asked) : asked;
-    if (!SEMVER.test(version)) {
+    if (semver.valid(version) === null) {
       throw new ReleaseError(`--version 只认 patch / minor / major / x.y.z（收到「${asked}」）`);
     }
     if (exists(version)) throw new ReleaseError(`${version} 已经被占了 —— 换一个版本`);
@@ -436,7 +431,8 @@ function registryExists(exec, info, name, version) {
   throw new ReleaseError(`查团队源失败（${info.registry}）：${tailOf(text)}`);
 }
 
-function publishArgsOf(info) {
+function publishArgsOf(info, version) {
+  const tag = publishTagOf(version);
   return [
     'publish',
     '--registry',
@@ -444,11 +440,13 @@ function publishArgsOf(info) {
     '--access',
     info.access,
     '--ignore-scripts',
+    ...(tag === undefined ? [] : ['--tag', tag]),
     ...npmrcArgs(info.npmrc),
   ];
 }
 
-function otpCommandOf(root, info) {
+function otpCommandOf(root, info, version) {
+  const tag = publishTagOf(version);
   return [
     `cd ${quote(root)}`,
     '&&',
@@ -459,19 +457,20 @@ function otpCommandOf(root, info) {
     '--access',
     info.access,
     '--ignore-scripts',
+    ...(tag === undefined ? [] : ['--tag', tag]),
     ...npmrcArgs(info.npmrc),
   ].join(' ');
 }
 
 function publishRegistry(exec, root, info, manifest, version) {
-  const result = exec('npm', publishArgsOf(info), { cwd: root, capture: true, allowFailure: true });
+  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),
+      otpCommandOf(root, info, version),
       { target: info.target, name: manifest.name, version, registry: info.registry },
     );
   }