@lark-apaas/fullstack-cli 1.1.68-alpha.20260920222630 → 1.1.68-alpha.20260930060426

package/package.json

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

package/templates/scripts/hooks/run-precommit.js

@@ -6,78 +6,47 @@ const { spawnSync } = require('node:child_process');
 
 const SEP = '  ' + '─'.repeat(36);
 
-function failAndExit(step, body) {
+function failAndExit(step, body, code) {
   process.stderr.write('\n✗ pre-commit failed: ' + step + '\n');
+  process.stderr.write('  command: npm run lint\n');
   process.stderr.write(SEP + '\n');
   if (body && body.length > 0) {
-    process.stderr.write(body.replace(/\s+$/, '') + '\n');
+    process.stderr.write(body);
+    if (!body.endsWith('\n')) process.stderr.write('\n');
   }
   process.stderr.write(SEP + '\n');
-  process.stderr.write('  bypass: git commit --no-verify\n');
-  process.exit(1);
-}
-
-function getStagedFiles() {
-  const res = spawnSync(
-    'git',
-    ['diff', '--cached', '--name-status', '--find-renames', '-z'],
-    {
-      cwd: process.cwd(),
-      stdio: ['ignore', 'pipe', 'pipe'],
-      encoding: 'utf8',
-    },
+  process.stderr.write(
+    '  修复可编辑代码并重跑 npm run lint（原项目完整检查）。\n'
   );
-  if (res.error) {
-    failAndExit('staged files', String(res.error.message || res.error));
-  }
-  if (res.status !== 0) {
-    failAndExit('staged files', `${res.stdout || ''}\n${res.stderr || ''}`);
-  }
-
-  const fields = (res.stdout || '').split('\0');
-  const files = [];
-  for (let index = 0; index < fields.length;) {
-    const status = fields[index++];
-    if (!status) break;
-    const sourcePath = fields[index++];
-    if (!sourcePath) failAndExit('staged files', `Malformed git diff output for status ${status}`);
-
-    if (status.startsWith('R') || status.startsWith('C')) {
-      const destinationPath = fields[index++];
-      if (!destinationPath) failAndExit('staged files', `Malformed git diff output for status ${status}`);
-      // Renames can cross client/server/shared boundaries. Keep both paths so
-      // lint.js can select every affected typecheck, while ignoring a missing
-      // source path for file-level linters. Copies do not remove the source.
-      if (status.startsWith('R')) files.push(sourcePath);
-      files.push(destinationPath);
-      continue;
-    }
-
-    files.push(sourcePath);
-  }
-  return files;
+  process.stderr.write(
+    '  命中平台受保护路径时停止反复编辑该文件或检查配置；记录路径、规则和检查原始输出，交有权限的平台维护者修复并复查。\n'
+  );
+  process.stderr.write('  检查仍未通过；不得声称检查或提交成功。\n');
+  process.exit(code);
 }
 
 function runLint() {
   const cwd = process.cwd();
-  const stagedFiles = getStagedFiles();
-  if (stagedFiles.length === 0) {
-    process.stdout.write('[pre-commit] No staged files to lint\n');
-    return;
-  }
-
-  const res = spawnSync('npm', ['run', 'lint', '--', '--files', ...stagedFiles], {
+  const res = spawnSync('npm', ['run', 'lint'], {
     cwd,
     stdio: ['ignore', 'pipe', 'pipe'],
     env: process.env,
   });
   if (res.error) {
-    failAndExit('lint', String(res.error.message || res.error));
+    failAndExit('lint', String(res.error.message || res.error), 1);
   }
   if (res.status !== 0) {
     const stdout = res.stdout ? res.stdout.toString() : '';
     const stderr = res.stderr ? res.stderr.toString() : '';
-    failAndExit('lint', stdout + '\n' + stderr);
+    const body =
+      stdout +
+      (stdout && stderr && !stdout.endsWith('\n') ? '\n' : '') +
+      stderr;
+    failAndExit(
+      'lint',
+      body + (res.signal ? '\nTerminated by signal: ' + res.signal : ''),
+      res.status ?? 1
+    );
   }
 }
 

package/templates/scripts/lint.js

@@ -40,6 +40,12 @@ function normalizeProjectFile(filePath) {
   const absolutePath = path.isAbsolute(filePath)
     ? filePath
     : path.resolve(cwd, filePath);
+
+  if (!fs.existsSync(absolutePath)) {
+    console.warn(`[lint] Skip missing file: ${filePath}`);
+    return null;
+  }
+
   const relativePath = path.relative(cwd, absolutePath);
   if (relativePath.startsWith('..')) {
     console.warn(`[lint] Skip file outside project: ${filePath}`);
@@ -58,15 +64,6 @@ function parseFilesArg(argv) {
   return argv.slice(filesIndex + 1).filter(Boolean);
 }
 
-function parseMode(argv) {
-  if (argv.length === 0) return { type: 'default' };
-  if (argv.length === 1 && argv[0] === '--typecheck') return { type: 'typecheck' };
-  if (argv[0] === '--files' && argv.length > 1 && argv.slice(1).every(arg => !arg.startsWith('--'))) {
-    return { type: 'files', files: argv.slice(1) };
-  }
-  throw new Error('Usage: lint.js [--typecheck | --files <paths...>]');
-}
-
 function isEslintTarget(filePath) {
   return /\.(c|m)?(j|t)sx?$/.test(filePath);
 }
@@ -110,14 +107,6 @@ function canRunStylelint() {
   return STYLELINT_CONFIG_FILES.some(file => fs.existsSync(path.join(cwd, file)));
 }
 
-function packageScripts() {
-  try {
-    return JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8')).scripts || {};
-  } catch {
-    return {};
-  }
-}
-
 async function runDefaultLint() {
   const taskSpecs = [
     [getBinName('npm'), ['run', 'eslint']],
@@ -133,19 +122,6 @@ async function runDefaultLint() {
   process.exit(await runTasksSerially(taskSpecs));
 }
 
-async function runTypeCheck() {
-  const scripts = packageScripts();
-  const names = ['type:check:server', 'type:check:client'];
-  const missing = names.filter(name => !scripts[name]);
-  if (missing.length > 0) {
-    throw new Error(`Missing required npm scripts: ${missing.join(', ')}`);
-  }
-
-  process.exit(await runTasksSerially(
-    names.map(name => [getBinName('npm'), ['run', name]]),
-  ));
-}
-
 async function runSelectiveLint(inputFiles) {
   const normalizedFiles = Array.from(
     new Set(inputFiles.map(normalizeProjectFile).filter(Boolean)),
@@ -156,15 +132,8 @@ async function runSelectiveLint(inputFiles) {
     process.exit(0);
   }
 
-  // Deleted files and the source side of renames must still select the
-  // affected project typecheck, but must not be passed to file-level linters.
-  const existingFiles = normalizedFiles.filter(filePath => {
-    const exists = fs.existsSync(path.join(cwd, filePath));
-    if (!exists) console.warn(`[lint] Skip missing file-level target: ${filePath}`);
-    return exists;
-  });
-  const eslintFiles = existingFiles.filter(isEslintTarget);
-  const stylelintFiles = existingFiles.filter(isStylelintTarget);
+  const eslintFiles = normalizedFiles.filter(isEslintTarget);
+  const stylelintFiles = normalizedFiles.filter(isStylelintTarget);
   const typeCheckFiles = normalizedFiles.filter(isTypeCheckTarget);
 
   const clientTypeFiles = [];
@@ -210,19 +179,18 @@ async function runSelectiveLint(inputFiles) {
 }
 
 async function main() {
-  const args = process.argv.slice(2);
-  const mode = parseMode(args);
-  if (mode.type === 'typecheck') {
-    await runTypeCheck();
+  const files = parseFilesArg(process.argv.slice(2));
+  if (files === null) {
+    await runDefaultLint();
     return;
   }
 
-  if (mode.type === 'default') {
-    await runDefaultLint();
-    return;
+  if (files.length === 0) {
+    console.error('[lint] --files requires at least one file path');
+    process.exit(1);
   }
 
-  await runSelectiveLint(mode.files);
+  await runSelectiveLint(files);
 }
 
 main().catch((error) => {