@lark-apaas/fullstack-cli 1.1.61-alpha.20260819082510 → 1.1.61-alpha.20260819103003

package/dist/index.js

@@ -2608,31 +2608,6 @@ function defaultProfile(opts) {
     activateGitHooks: true
   };
 }
-function nestFullstackProfile(opts) {
-  const base = defaultProfile(opts);
-  return {
-    ...base,
-    sync: [
-      ...base.sync,
-      // dev 专用 tsconfig：只打开 noEmitOnError，其余继承 tsconfig.node.json
-      {
-        from: "templates/tsconfig.dev.json",
-        to: "tsconfig.dev.json",
-        type: "file",
-        overwrite: true
-      },
-      // 让 dev:server 用上它。ifStartsWith 精确限定为平台模板生成的形态，
-      // 用户真正改写过的 dev:server 保持原样（改写后仅退化为 message 文案不够精确，
-      // ready/failed 判定不受影响）。
-      {
-        type: "patch-script",
-        name: "dev:server",
-        to: "NODE_ENV=development nest start --watch -p tsconfig.dev.json",
-        ifStartsWith: "NODE_ENV=development nest start --watch"
-      }
-    ]
-  };
-}
 function emptyProfile() {
   return {
     sync: [],
@@ -2649,7 +2624,7 @@ function viteReactProfile() {
 }
 var SYNC_PROFILES = {
   "design-stack": defaultProfile,
-  "nestjs-react-fullstack": nestFullstackProfile,
+  "nestjs-react-fullstack": defaultProfile,
   "vite-react": viteReactProfile,
   html: emptyProfile,
   // design-html 与 html 同语义：空 sync + 不激活 git hooks（彻底 no-op）

package/package.json

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

package/templates/scripts/dev.js

@@ -252,44 +252,23 @@ process.on('SIGTERM', cleanup);
 process.on('SIGINT', cleanup);
 process.on('SIGHUP', cleanup);
 
-// Stale dist makes nest --watch skip missing files; watcher won't self-heal.
-function cleanStaleDist() {
-  const distPath = path.join(PROJECT_ROOT, 'dist');
-  if (fs.existsSync(distPath)) {
-    fs.rmSync(distPath, { recursive: true, force: true });
-    logEvent('INFO', 'main', 'Cleaned dist/ to force full rebuild');
-  }
-}
-
-// ── Dev session state (consumed by /dev/health) ───────────────────────────────
-// 记录本次 dev 会话首次拉起 server 的时刻。/dev/health 只用它做「超时兜底」：
-// 超过上限仍未探测到存活的 Nest 进程，才允许判定为终态失败。
-// 写失败一律静默——health 是旁路能力，绝不能反向拖垮 dev 主流程。
-const devStatusPath = path.join(LOG_DIR, 'dev-status.json');
-
-function writeDevStatus() {
-  const tmp = `${devStatusPath}.${process.pid}.tmp`;
-  try {
-    fs.writeFileSync(
-      tmp,
-      JSON.stringify({
-        schema: 1,
-        firstStartedAt: Date.now(),
-        supervisorPid: process.pid,
-      })
-    );
-    fs.renameSync(tmp, devStatusPath); // 原子替换，避免读到半个文件
-  } catch {
-    try { fs.unlinkSync(tmp); } catch {}
-  }
-}
+// 定向保留 dist/ 里能复用的部分, 替代之前无脑 rm -rf dist/。
+// 收益: 保留 dist/server 让 nest --watch 从增量编译起点起 (省 8-13s 冷启动),
+// routes JSON 也保留 (build 会覆盖, 无 stale 风险)。dist/client/index.html 按
+// preset 打的 <meta name="miaoda-html-mode"> marker 判定:
+//   marker=dev  → 保留 dist/client/ 整个 (dev cache hit)
+//   marker=prod → agent 跑过 build:client 污染, 定向清 index.html + assets/
+// 具体逻辑抽到 lib/preserve-dev-cache.cjs 便于单测。
+// 降级 escape hatch: FORCE_CLEAN_DIST=true 走原全清路径 (marker 逻辑出 bug 时用)。
+const { preserveDevCache } = require('./lib/preserve-dev-cache.cjs');
 
 // ── Main ──────────────────────────────────────────────────────────────────────
 async function main() {
   logEvent('INFO', 'main', '========== Dev session started ==========');
 
-  cleanStaleDist();
-  writeDevStatus();
+  preserveDevCache(PROJECT_ROOT, {
+    log: (level, msg) => logEvent(level, 'main', msg),
+  });
 
   // Initialize action plugins
   writeOutput('\n🔌 Initializing action plugins...\n');

package/templates/scripts/lib/__test__/preserve-dev-cache.test.ts

@@ -0,0 +1,168 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const { preserveDevCache, detectHtmlMode } = require('../preserve-dev-cache.cjs');
+
+interface LogEntry {
+  level: string;
+  msg: string;
+}
+
+function makeLogger(entries: LogEntry[]) {
+  return (level: string, msg: string) => {
+    entries.push({ level, msg });
+  };
+}
+
+const DEV_HTML =
+  '<html><head><meta name="miaoda-html-mode" content="dev"><title>x</title></head><body></body></html>';
+const PROD_HTML =
+  '<html><head><meta name="miaoda-html-mode" content="prod"><title>x</title></head><body></body></html>';
+const UNMARKED_HTML = '<html><head><title>x</title></head><body></body></html>';
+
+describe('detectHtmlMode', () => {
+  it('reads dev marker', () => {
+    expect(detectHtmlMode(DEV_HTML)).toBe('dev');
+  });
+
+  it('reads prod marker', () => {
+    expect(detectHtmlMode(PROD_HTML)).toBe('prod');
+  });
+
+  it('returns unknown when no marker', () => {
+    expect(detectHtmlMode(UNMARKED_HTML)).toBe('unknown');
+  });
+});
+
+describe('preserveDevCache', () => {
+  let tmpRoot: string;
+  let logs: LogEntry[];
+
+  function setupDist(
+    files: Record<string, string | null> = {}
+  ): { distPath: string; clientDir: string; serverDir: string } {
+    const distPath = path.join(tmpRoot, 'dist');
+    const clientDir = path.join(distPath, 'client');
+    const serverDir = path.join(distPath, 'server');
+    fs.mkdirSync(clientDir, { recursive: true });
+    fs.mkdirSync(serverDir, { recursive: true });
+    // 默认放个 nest 编译产物 + routes JSON, 用来验证保留策略
+    fs.writeFileSync(path.join(serverDir, 'main.js'), '/* nest bundle */');
+    fs.writeFileSync(
+      path.join(distPath, 'api-routes.json'),
+      JSON.stringify([])
+    );
+    for (const [rel, content] of Object.entries(files)) {
+      if (content === null) continue;
+      const abs = path.join(distPath, rel);
+      fs.mkdirSync(path.dirname(abs), { recursive: true });
+      fs.writeFileSync(abs, content);
+    }
+    return { distPath, clientDir, serverDir };
+  }
+
+  beforeEach(() => {
+    tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'preserve-dev-cache-'));
+    logs = [];
+    delete process.env.FORCE_CLEAN_DIST;
+  });
+
+  afterEach(() => {
+    fs.rmSync(tmpRoot, { recursive: true, force: true });
+    delete process.env.FORCE_CLEAN_DIST;
+  });
+
+  it('no-op when dist/ does not exist', () => {
+    const result = preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    expect(result.action).toBe('no_dist');
+    expect(fs.existsSync(path.join(tmpRoot, 'dist'))).toBe(false);
+    expect(logs[0].msg).toMatch(/no dist/);
+  });
+
+  it('preserves entire dist/client when index.html has dev marker', () => {
+    const { clientDir, serverDir } = setupDist({
+      'client/index.html': DEV_HTML,
+      'client/assets/foo.js': '/* dev asset */',
+    });
+    const result = preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    expect(result.action).toBe('preserved');
+    expect(result.mode).toBe('dev');
+    expect(fs.existsSync(path.join(clientDir, 'index.html'))).toBe(true);
+    expect(fs.existsSync(path.join(clientDir, 'assets', 'foo.js'))).toBe(true);
+    expect(fs.existsSync(path.join(serverDir, 'main.js'))).toBe(true);
+  });
+
+  it('cleans index.html + assets/ but preserves server/ when marker=prod', () => {
+    const { distPath, clientDir, serverDir } = setupDist({
+      'client/index.html': PROD_HTML,
+      'client/assets/index-abc.js': '/* build product */',
+      'client/assets/index-def.css': '/* build product */',
+    });
+    const result = preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    expect(result.action).toBe('cleaned_polluted');
+    expect(result.mode).toBe('prod');
+    expect(fs.existsSync(path.join(clientDir, 'index.html'))).toBe(false);
+    expect(fs.existsSync(path.join(clientDir, 'assets'))).toBe(false);
+    // dist/server + routes JSON 保留
+    expect(fs.existsSync(path.join(serverDir, 'main.js'))).toBe(true);
+    expect(fs.existsSync(path.join(distPath, 'api-routes.json'))).toBe(true);
+  });
+
+  it('cleans same way when marker is missing (treats as pollution)', () => {
+    const { clientDir, serverDir } = setupDist({
+      'client/index.html': UNMARKED_HTML,
+      'client/assets/foo.js': '/* whatever */',
+    });
+    const result = preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    expect(result.action).toBe('cleaned_polluted');
+    expect(result.mode).toBe('unknown');
+    expect(fs.existsSync(path.join(clientDir, 'index.html'))).toBe(false);
+    expect(fs.existsSync(path.join(clientDir, 'assets'))).toBe(false);
+    expect(fs.existsSync(path.join(serverDir, 'main.js'))).toBe(true);
+  });
+
+  it('no-op when dist/client/index.html is missing (nest --watch has partial dist)', () => {
+    const { distPath, serverDir } = setupDist();
+    const result = preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    expect(result.action).toBe('no_index');
+    expect(fs.existsSync(distPath)).toBe(true);
+    expect(fs.existsSync(path.join(serverDir, 'main.js'))).toBe(true);
+  });
+
+  it('FORCE_CLEAN_DIST=true wipes entire dist regardless of marker', () => {
+    const { distPath } = setupDist({
+      'client/index.html': DEV_HTML,
+      'client/assets/foo.js': 'x',
+    });
+    const result = preserveDevCache(tmpRoot, {
+      log: makeLogger(logs),
+      forceClean: true,
+    });
+    expect(result.action).toBe('force_cleaned');
+    expect(fs.existsSync(distPath)).toBe(false);
+  });
+
+  it('FORCE_CLEAN_DIST env var enables force clean path', () => {
+    process.env.FORCE_CLEAN_DIST = 'true';
+    const { distPath } = setupDist({
+      'client/index.html': DEV_HTML,
+    });
+    const result = preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    expect(result.action).toBe('force_cleaned');
+    expect(fs.existsSync(distPath)).toBe(false);
+  });
+
+  it('emits INFO log with mode and action', () => {
+    setupDist({
+      'client/index.html': PROD_HTML,
+      'client/assets/foo.js': 'x',
+    });
+    preserveDevCache(tmpRoot, { log: makeLogger(logs) });
+    const msgs = logs.map((l) => l.msg).join('\n');
+    expect(msgs).toContain('prod');
+    expect(msgs).toContain('cleaned');
+  });
+});

package/templates/scripts/lib/preserve-dev-cache.cjs

@@ -0,0 +1,123 @@
+'use strict';
+
+// dev.js 启动时替代无脑 rm -rf dist/ 的 lib: 保留 dist/server (nest --watch 增量编译起点)
+// + 按 HTML mode marker 决定 dist/client 是保留还是清污染。
+// 跟 preset 侧 html-output plugin 的 injectHtmlModeMarker / detectHtmlMode 配套:
+// preset 写盘时打 marker (dev 版 vs prod 污染版), 这里读 marker 定去留。
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * 从 HTML 里回读 <meta name="miaoda-html-mode" content="dev|prod"> marker。
+ * 与 packages/tools/fullstack-vite-preset/src/vite-plugins/html-output-plugin.ts
+ * 的 detectHtmlMode 同源, 为了让 dev.js 模板脚本零依赖跑起来这里重复一份。
+ */
+function detectHtmlMode(htmlContent) {
+  const match = htmlContent.match(
+    /<meta\s+name=["']miaoda-html-mode["']\s+content=["'](dev|prod)["'][^>]*>/i
+  );
+  return (match && match[1]) || 'unknown';
+}
+
+/**
+ * 定向清理 dist/ 的可复用副本, 替代 dev.js 之前无脑 `rm -rf dist/` 的 cleanStaleDist。
+ *
+ * 决策规则:
+ *  - FORCE_CLEAN_DIST=true → 走 escape hatch 全清 (preserveDevCache 逻辑 / 保留的
+ *    dist/server 出 stale 时兜底)
+ *  - dist/ 不存在 → 无动作
+ *  - dist/client/index.html 存在且 marker=dev → 整个 dist/client/ 保留 (dev cache hit)
+ *  - 存在但 marker=prod 或缺失 → 只清 dist/client/index.html + dist/client/assets/
+ *    (build 污染部分), dist/server/ 与 routes JSON 保留
+ *  - 不存在 → 无动作, htmlOutputPlugin 稍后会写入
+ *
+ * @param {string} projectRoot 项目根目录
+ * @param {object} [options]
+ * @param {(level: string, msg: string) => void} [options.log] 日志回调, 默认 console.log
+ * @param {boolean} [options.forceClean] 覆盖 FORCE_CLEAN_DIST env var 判断 (给测试用)
+ * @returns {{ action: 'no_dist' | 'force_cleaned' | 'no_index' | 'preserved' | 'cleaned_polluted' | 'read_failed_cleaned' | 'cleanup_failed', mode: string }}
+ */
+function preserveDevCache(projectRoot, options) {
+  const log = (options && options.log) || defaultLogger;
+  const forceClean =
+    options && typeof options.forceClean === 'boolean'
+      ? options.forceClean
+      : process.env.FORCE_CLEAN_DIST === 'true';
+
+  const distPath = path.join(projectRoot, 'dist');
+  if (!fs.existsSync(distPath)) {
+    log('INFO', 'preserveDevCache: no dist/, will be created by vite/nest');
+    return { action: 'no_dist', mode: 'unknown' };
+  }
+
+  if (forceClean) {
+    fs.rmSync(distPath, { recursive: true, force: true });
+    log(
+      'INFO',
+      'preserveDevCache: FORCE_CLEAN_DIST=true, cleaned entire dist/'
+    );
+    return { action: 'force_cleaned', mode: 'unknown' };
+  }
+
+  const clientDir = path.join(distPath, 'client');
+  const indexHtml = path.join(clientDir, 'index.html');
+
+  if (!fs.existsSync(indexHtml)) {
+    log(
+      'INFO',
+      'preserveDevCache: no dist/client/index.html, other artifacts preserved'
+    );
+    return { action: 'no_index', mode: 'unknown' };
+  }
+
+  let mode = 'unknown';
+  let readFailed = false;
+  try {
+    const content = fs.readFileSync(indexHtml, 'utf-8');
+    mode = detectHtmlMode(content);
+  } catch (e) {
+    log(
+      'WARN',
+      `preserveDevCache: read dist/client/index.html failed: ${e.message}, treating as polluted`
+    );
+    readFailed = true;
+    mode = 'unknown';
+  }
+
+  if (mode === 'dev') {
+    log('INFO', 'preserveDevCache: dist/client preserved (dev cache hit)');
+    return { action: 'preserved', mode: 'dev' };
+  }
+
+  // marker=prod 或 unknown → build:client 污染 (或人为放的产物), 定向清 index.html + assets/
+  // dist/server/, dist/*.json 保留
+  try {
+    fs.rmSync(indexHtml, { force: true });
+    const assetsDir = path.join(clientDir, 'assets');
+    if (fs.existsSync(assetsDir)) {
+      fs.rmSync(assetsDir, { recursive: true, force: true });
+    }
+    log(
+      'INFO',
+      `preserveDevCache: dist/client/index.html was ${mode}, cleaned index.html + assets/ (dist/server preserved)`
+    );
+    return {
+      action: readFailed ? 'read_failed_cleaned' : 'cleaned_polluted',
+      mode,
+    };
+  } catch (e) {
+    log(
+      'WARN',
+      `preserveDevCache: cleanup failed: ${e.message}, continuing anyway (index.html / assets may still be polluted)`
+    );
+    return { action: 'cleanup_failed', mode };
+  }
+}
+
+function defaultLogger(level, msg) {
+  // eslint-disable-next-line no-console
+  console.log(`[${level}] [main] ${msg}`);
+}
+
+module.exports = { detectHtmlMode, preserveDevCache };

package/templates/tsconfig.dev.json

@@ -1,7 +0,0 @@
-{
-  "//": "由 @lark-apaas/fullstack-cli 派生，请勿手工修改；自定义请改 tsconfig.node.json",
-  "extends": "./tsconfig.node.json",
-  "compilerOptions": {
-    "noEmitOnError": true
-  }
-}