@lark-apaas/fullstack-cli 1.1.67-alpha.20260916155507 → 1.1.67-alpha.20260917070101

package/dist/index.js

@@ -2587,14 +2587,29 @@ function buildDefaultRules(opts) {
     { onlyNestjs: true, type: "eslint-ignore", to: "eslint.config.js", pattern: "server/mcp/ui/**" },
     { onlyNestjs: true, type: "eslint-ignore", to: "eslint.config.mjs", pattern: "server/mcp/ui/**" },
     { onlyNestjs: true, type: "eslint-ignore", to: "eslint.config.cjs", pattern: "server/mcp/ui/**" },
-    { onlyNestjs: true, type: "add-script", name: "type:check:mcp-ui", command: "node ./scripts/lint.js --typecheck-mcp-ui", overwrite: false },
-    { onlyNestjs: true, type: "add-script", name: "eslint:mcp-ui", command: "node ./scripts/lint.js --eslint-mcp-ui", overwrite: false },
+    { onlyNestjs: true, type: "add-script", name: "type:check:mcp-ui", command: "node ./scripts/check.cjs --typecheck-mcp-ui", overwrite: false },
+    { onlyNestjs: true, type: "add-script", name: "eslint:mcp-ui", command: "node ./scripts/check.cjs --eslint-mcp-ui", overwrite: false },
+    {
+      onlyNestjs: true,
+      type: "patch-script",
+      name: "type:check:mcp-ui",
+      to: "node ./scripts/check.cjs --typecheck-mcp-ui",
+      ifEquals: ["node ./scripts/lint.js --typecheck-mcp-ui"]
+    },
+    {
+      onlyNestjs: true,
+      type: "patch-script",
+      name: "eslint:mcp-ui",
+      to: "node ./scripts/check.cjs --eslint-mcp-ui",
+      ifEquals: ["node ./scripts/lint.js --eslint-mcp-ui"]
+    },
     {
       onlyNestjs: true,
       type: "patch-script",
       name: "type:check",
-      to: "node ./scripts/lint.js --typecheck",
+      to: "node ./scripts/check.cjs --typecheck",
       ifEquals: [
+        "node ./scripts/lint.js --typecheck",
         'concurrently -n "server,client" -c "blue,green" "npm run type:check:server" "npm run type:check:client"',
         'concurrently "npm run type:check:server" "npm run type:check:client"',
         'concurrently "npm run type:check:client" "npm run type:check:server"'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.67-alpha.20260916155507",
+  "version": "1.1.67-alpha.20260917070101",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/scripts/check.cjs

@@ -0,0 +1,123 @@
+#!/usr/bin/env node
+
+// 叶子检查入口：不得调用 lint 或聚合 type:check npm script。
+const path = require('node:path');
+const { spawn } = require('node:child_process');
+const fs = require('node:fs');
+const cwd = process.cwd();
+
+function getBinName(name) {
+  return process.platform === 'win32' ? `${name}.cmd` : name;
+}
+
+function runCommand(command, args) {
+  return new Promise((resolve) => {
+    const child = spawn(command, args, {
+      cwd,
+      stdio: 'inherit',
+      shell: false,
+    });
+
+    child.on('close', (code) => resolve(code ?? 1));
+    child.on('error', () => resolve(1));
+  });
+}
+
+// 串行依次执行每个任务，全部跑完后再聚合退出码：
+// 降低并发资源占用、让各任务输出按顺序清晰可读，同时保留“一次暴露所有 lint 问题”的行为。
+async function runTasksSerially(taskSpecs) {
+  let exitCode = 0;
+  for (const [command, args] of taskSpecs) {
+    const code = await runCommand(command, args);
+    if (code !== 0) {
+      exitCode = 1;
+    }
+  }
+  return exitCode;
+}
+
+function isEslintTarget(filePath) { return /\.(c|m)?(j|t)sx?$/.test(filePath); }
+
+const UI_DIR = 'server/mcp/ui';
+
+function uiSourceFiles() {
+  const files = [];
+  function visit(relative) {
+    const absolute = path.join(cwd, relative);
+    if (!fs.existsSync(absolute)) return;
+    if (fs.lstatSync(absolute).isSymbolicLink()) {
+      throw new Error(`MCP UI 检查不支持符号链接: ${relative}`);
+    }
+    for (const entry of fs.readdirSync(absolute, { withFileTypes: true })) {
+      if (['node_modules', 'dist', '.git'].includes(entry.name)) continue;
+      const file = `${relative}/${entry.name}`;
+      if (entry.isSymbolicLink()) throw new Error(`MCP UI 检查不支持符号链接: ${file}`);
+      if (entry.isDirectory()) visit(file);
+      else if (isEslintTarget(file) && !/\.d\.(?:ts|mts|cts)$/.test(file)) files.push(file);
+    }
+  }
+  visit(UI_DIR);
+  return files.sort();
+}
+
+function uiTasks({ types = true, eslint = true } = {}) {
+  const sources = uiSourceFiles();
+  if (!sources.length) return [];
+  const tasks = [];
+  if (types) {
+    const config = `${UI_DIR}/tsconfig.json`;
+    if (!fs.existsSync(path.join(cwd, config))) {
+      throw new Error(`MCP UI 缺少 ${config}，请按 mcp-guide 补齐独立浏览器 TypeScript 配置。`);
+    }
+    const ts = require('typescript');
+    const parsed = ts.getParsedCommandLineOfConfigFile(path.join(cwd, config), {}, {
+      ...ts.sys,
+      onUnRecoverableConfigFileDiagnostic: d => { throw new Error(ts.flattenDiagnosticMessageText(d.messageText, '\n')); },
+    });
+    if (!parsed || parsed.errors.length) throw new Error(`MCP UI TypeScript 配置无效: ${config}`);
+    const included = new Set(parsed.fileNames.map(file => path.resolve(file)));
+    const missing = sources.filter(file => !included.has(path.resolve(cwd, file)));
+    if (missing.length) throw new Error(`MCP UI TypeScript 配置未覆盖源码: ${missing.join(', ')}；请检查 include/exclude，JS 源码需开启 allowJs。`);
+    tasks.push([getBinName('npx'), ['--no-install', 'tsc', '--noEmit', '-p', config]]);
+  }
+  if (eslint) {
+    const config = ['eslint.mcp-ui.config.js', 'eslint.mcp-ui.config.cjs', 'eslint.mcp-ui.config.mjs']
+      .find(file => fs.existsSync(path.join(cwd, file)));
+    if (!config) throw new Error('MCP UI 缺少独立 ESLint 配置，请按 mcp-guide 创建 eslint.mcp-ui.config.cjs。');
+    tasks.push([getBinName('npx'), ['--no-install', 'eslint', '--config', config, '--quiet', '--max-warnings', '0', ...sources]]);
+  }
+  return tasks;
+}
+
+function packageScripts() {
+  return JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8')).scripts || {};
+}
+
+async function runTypeCheck() {
+  const scripts = packageScripts();
+  const tasks = ['type:check:server', 'type:check:client'].map(name => {
+    if (!scripts[name]) throw new Error(`缺少 scripts.${name}，请保留应用原有类型检查命令。`);
+    return [getBinName('npm'), ['run', name]];
+  });
+  tasks.push(...uiTasks({ eslint: false }));
+  process.exit(await runTasksSerially(tasks));
+}
+
+async function main(args = process.argv.slice(2)) {
+  const modes = ['--typecheck', '--typecheck-mcp-ui', '--eslint-mcp-ui'];
+  if (args.length !== 1 || !modes.includes(args[0])) {
+    throw new Error('用法: check.cjs --typecheck | --typecheck-mcp-ui | --eslint-mcp-ui');
+  }
+  // 自定义 leaf script 意外回到聚合入口时立即失败，避免生成递归进程树。
+  if (process.env.MIAODA_TYPECHECK_ACTIVE === '1') {
+    throw new Error('检测到检查命令递归，请检查 type:check:server/client，不能回调 lint 或 type:check。');
+  }
+  process.env.MIAODA_TYPECHECK_ACTIVE = '1';
+  if (args[0] === '--typecheck') return runTypeCheck();
+  process.exit(await runTasksSerially(uiTasks(args[0] === '--typecheck-mcp-ui' ? { eslint: false } : { types: false })));
+}
+
+module.exports = { getBinName, runTasksSerially, uiTasks, packageScripts, main };
+if (require.main === module) {
+  main().catch(error => { console.error(`[check] ${error.message}`); process.exit(1); });
+}

package/templates/scripts/lint.js

@@ -1,41 +1,10 @@
 #!/usr/bin/env node
 
 const path = require('node:path');
-const { spawn } = require('node:child_process');
 const fs = require('node:fs');
 
 const cwd = process.cwd();
 
-function getBinName(name) {
-  return process.platform === 'win32' ? `${name}.cmd` : name;
-}
-
-function runCommand(command, args) {
-  return new Promise((resolve) => {
-    const child = spawn(command, args, {
-      cwd,
-      stdio: 'inherit',
-      shell: false,
-    });
-
-    child.on('close', (code) => resolve(code ?? 1));
-    child.on('error', () => resolve(1));
-  });
-}
-
-// 串行依次执行每个任务，全部跑完后再聚合退出码：
-// 降低并发资源占用、让各任务输出按顺序清晰可读，同时保留“一次暴露所有 lint 问题”的行为。
-async function runTasksSerially(taskSpecs) {
-  let exitCode = 0;
-  for (const [command, args] of taskSpecs) {
-    const code = await runCommand(command, args);
-    if (code !== 0) {
-      exitCode = 1;
-    }
-  }
-  return exitCode;
-}
-
 function normalizeProjectFile(filePath) {
   const absolutePath = path.isAbsolute(filePath)
     ? filePath
@@ -106,75 +75,9 @@ function canRunStylelint() {
   return STYLELINT_CONFIG_FILES.some(file => fs.existsSync(path.join(cwd, file)));
 }
 
-const UI_DIR = 'server/mcp/ui';
-const UI_TYPECHECK = 'node ./scripts/lint.js --typecheck';
-
-function isUiFile(file) {
-  return file.startsWith(`${UI_DIR}/`);
-}
-
-function uiSourceFiles() {
-  const files = [];
-  function visit(relative) {
-    const absolute = path.join(cwd, relative);
-    if (!fs.existsSync(absolute)) return;
-    if (fs.lstatSync(absolute).isSymbolicLink()) {
-      throw new Error(`MCP UI 检查不支持符号链接: ${relative}`);
-    }
-    for (const entry of fs.readdirSync(absolute, { withFileTypes: true })) {
-      if (['node_modules', 'dist', '.git'].includes(entry.name)) continue;
-      const file = `${relative}/${entry.name}`;
-      if (entry.isSymbolicLink()) throw new Error(`MCP UI 检查不支持符号链接: ${file}`);
-      if (entry.isDirectory()) visit(file);
-      else if (isEslintTarget(file) && !/\.d\.(?:ts|mts|cts)$/.test(file)) files.push(file);
-    }
-  }
-  visit(UI_DIR);
-  return files.sort();
-}
-
-function uiTasks({ types = true, eslint = true } = {}) {
-  const sources = uiSourceFiles();
-  if (!sources.length) return [];
-  const tasks = [];
-  if (types) {
-    const config = `${UI_DIR}/tsconfig.json`;
-    if (!fs.existsSync(path.join(cwd, config))) {
-      throw new Error(`MCP UI 缺少 ${config}，请按 mcp-guide 补齐独立浏览器 TypeScript 配置。`);
-    }
-    const ts = require('typescript');
-    const parsed = ts.getParsedCommandLineOfConfigFile(path.join(cwd, config), {}, {
-      ...ts.sys,
-      onUnRecoverableConfigFileDiagnostic: d => { throw new Error(ts.flattenDiagnosticMessageText(d.messageText, '\n')); },
-    });
-    if (!parsed || parsed.errors.length) throw new Error(`MCP UI TypeScript 配置无效: ${config}`);
-    const included = new Set(parsed.fileNames.map(file => path.resolve(file)));
-    const missing = sources.filter(file => !included.has(path.resolve(cwd, file)));
-    if (missing.length) throw new Error(`MCP UI TypeScript 配置未覆盖源码: ${missing.join(', ')}；请检查 include/exclude，JS 源码需开启 allowJs。`);
-    tasks.push([getBinName('npx'), ['--no-install', 'tsc', '--noEmit', '-p', config]]);
-  }
-  if (eslint) {
-    const config = ['eslint.mcp-ui.config.js', 'eslint.mcp-ui.config.cjs', 'eslint.mcp-ui.config.mjs']
-      .find(file => fs.existsSync(path.join(cwd, file)));
-    if (!config) throw new Error('MCP UI 缺少独立 ESLint 配置，请按 mcp-guide 创建 eslint.mcp-ui.config.cjs。');
-    tasks.push([getBinName('npx'), ['--no-install', 'eslint', '--config', config, '--quiet', '--max-warnings', '0', ...sources]]);
-  }
-  return tasks;
-}
-
-function packageScripts() {
-  return JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8')).scripts || {};
-}
-
-async function runTypeCheck() {
-  const scripts = packageScripts();
-  const tasks = ['type:check:server', 'type:check:client'].map(name => {
-    if (!scripts[name]) throw new Error(`缺少 scripts.${name}，请保留应用原有类型检查命令。`);
-    return [getBinName('npm'), ['run', name]];
-  });
-  tasks.push(...uiTasks({ eslint: false }));
-  process.exit(await runTasksSerially(tasks));
-}
+const { getBinName, runTasksSerially, uiTasks, packageScripts, main: runChecks } = require('./check.cjs');
+const UI_TYPECHECKS = ['node ./scripts/check.cjs --typecheck', 'node ./scripts/lint.js --typecheck'];
+function isUiFile(file) { return file.startsWith('server/mcp/ui/'); }
 
 async function runDefaultLint() {
   const taskSpecs = [
@@ -183,7 +86,7 @@ async function runDefaultLint() {
   ];
 
   // Customized type:check remains untouched; ensure full lint still checks UI.
-  taskSpecs.push(...uiTasks({ types: packageScripts()['type:check'] !== UI_TYPECHECK }));
+  taskSpecs.push(...uiTasks({ types: !UI_TYPECHECKS.includes(packageScripts()['type:check']) }));
 
   if (canRunStylelint()) {
     taskSpecs.push([getBinName('npm'), ['run', 'stylelint']]);
@@ -264,9 +167,8 @@ async function main() {
     throw new Error('用法: lint.js [--files <paths...> | --typecheck | --typecheck-mcp-ui | --eslint-mcp-ui]');
   }
   if (args[0] === '--files' && args.slice(1).some(arg => arg.startsWith('--'))) throw new Error('--files 不可与其他检查模式混用');
-  if (args.includes('--typecheck')) return runTypeCheck();
-  if (args.includes('--typecheck-mcp-ui')) return process.exit(await runTasksSerially(uiTasks({ eslint: false })));
-  if (args.includes('--eslint-mcp-ui')) return process.exit(await runTasksSerially(uiTasks({ types: false })));
+  // 兼容旧入口，只向独立检查器转发；新的 npm scripts 不再指向 lint.js。
+  if (modes.includes(args[0])) return runChecks(args);
   const files = parseFilesArg(process.argv.slice(2));
   if (files === null) {
     await runDefaultLint();