@fulgurjs/federation 6.11.1 → 6.11.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 当前发布说明
 
+## 6.11.3
+
+- 修复公开入口在应用工厂中动态导入时，SDK 与业务工厂自动合并导致的生产 TLA 等待环；SDK 保持独立分组，保留用户合法的 manualChunks。
+- Vue 声明生成按工具链能力使用官方程序的闭包检查/输出或 dev 增量缓存，避免对运行时动态装配的全部业务页面反复进行无关检查；保持真实 props、推导结果及错误定位。
+- 日志、截图、Markdown 等非类型输入不再触发声明重生成；服务关闭时中止编译、等待退出后清理独占缓存，取消不再误触发系统强杀重试。
+- 修复只有 Vue SFC 的工程被配置解析误报“没有输入”的问题，临时声明配置保留原工程的继承配置。
+
+## 6.11.2
+
+- 声明生成单次超时上限从固定 10 分钟改为：默认堆 10 分钟、提堆重试 30 分钟；`FG_DTS_TIMEOUT_MS`（毫秒）可覆盖。大型真实闭包在 8GB 堆下可运行 10 分钟以上，旧上限会在提堆重试阶段被超时强杀并误报为编译错误。
+- 超时强杀（execFile timeout 终止）与「闭包内编译错误」「系统级终止」三类诊断彻底分离：首次超时自动以提堆 + 更长上限重试，仍超时给出 `FG_DTS_TIMEOUT_MS` 修法。
+- 新增超时桩回归（FG_DTS_TIMEOUT_MS 缩短至 400ms 验证强杀路径）。
+
+
 ## 6.11.1
 
 - 声明生成子进程被系统级终止（OS 内存压力下的 SIGKILL 等：无 V8 堆横幅、无 TS 诊断）时，诊断与「闭包内编译错误」区分：识别终止信号、自动重试一次，仍失败时给出内存压力/外部 kill 的环境修法，不再误报为代码错误。

package/dist/cli.js

@@ -3139,7 +3139,7 @@ var RUNTIME_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    RUNTIME_VERSION = "6.11.1";
+    RUNTIME_VERSION = "6.11.3";
   }
 });
 
@@ -3634,6 +3634,67 @@ var init_dts_diagnostics = __esm({
   }
 });
 
+// src/dts-vue-program.ts
+function genVueDeclarationProgram() {
+  return String.raw`
+const fs = require('node:fs');
+const path = require('node:path');
+const { createRequire } = require('node:module');
+const req = createRequire(path.join(process.cwd(), 'package.json'));
+const ts = req('typescript');
+const vue = req('vue-tsc');
+const configFile = process.argv[1];
+const closure = new Set(JSON.parse(process.argv[2]).map(file => path.resolve(file)));
+const raw = ts.readConfigFile(configFile, ts.sys.readFile);
+const parsed = ts.parseJsonConfigFileContent(raw.config, ts.sys, path.dirname(configFile), undefined, configFile, undefined, [
+  { extension: '.vue', isMixedContent: true, scriptKind: ts.ScriptKind.Deferred },
+]);
+// 不把 Vue 的映射后诊断序列化到 TS buildinfo；有损的位置不能用于闭包门禁。
+parsed.options.incremental = false;
+delete parsed.options.tsBuildInfoFile;
+const formatHost = {
+  getCurrentDirectory: () => process.cwd(),
+  getCanonicalFileName: file => file,
+  getNewLine: () => '\n',
+};
+const diagnostics = [...(raw.error ? [raw.error] : []), ...parsed.errors];
+if (!diagnostics.length) {
+  const program = vue.createProgram({
+    rootNames: parsed.fileNames,
+    options: parsed.options,
+    host: ts.createCompilerHost(parsed.options),
+  });
+  diagnostics.push(...program.getOptionsDiagnostics(), ...program.getGlobalDiagnostics());
+  const sources = program.getSourceFiles().filter(file => {
+    const original = file.fileName.replace(/(\.vue)\.[cm]?[jt]sx?$/, '$1');
+    return closure.has(path.resolve(original));
+  });
+  for (const file of sources) {
+    diagnostics.push(...program.getSyntacticDiagnostics(file), ...program.getSemanticDiagnostics(file));
+    if (!file.isDeclarationFile) {
+      // 官方 emit 保留真实 props、重载和推导结果，绝不以手写接口或 any 代替。
+      const emitted = program.emit(file, undefined, undefined, true);
+      diagnostics.push(...emitted.diagnostics);
+      if (emitted.emitSkipped) diagnostics.push({
+        category: ts.DiagnosticCategory.Error, code: 90001,
+        messageText: '暴露模块声明 emit 被编译器跳过：' + file.fileName,
+      });
+    }
+  }
+}
+const errors = diagnostics.filter(diagnostic => diagnostic.category === ts.DiagnosticCategory.Error);
+if (errors.length) {
+  process.stdout.write(ts.formatDiagnostics(errors, formatHost));
+  process.exitCode = 1;
+}
+`;
+}
+var init_dts_vue_program = __esm({
+  "src/dts-vue-program.ts"() {
+    "use strict";
+  }
+});
+
 // src/dts-shared.ts
 function isSafeBundlePath(v) {
   if (typeof v !== "string" || v.length === 0) return false;
@@ -3928,7 +3989,9 @@ function loadTsContext(root, ts, diagnostics) {
     diagnostics.push(`tsconfig \u89E3\u6790\u5931\u8D25\uFF08${tsconfigFile}\uFF09\uFF1A${ts.flattenDiagnosticMessageText(raw.error.messageText, " ")}`);
     return null;
   }
-  const parsed = ts.parseJsonConfigFileContent(raw.config, ts.sys, path6.dirname(tsconfigFile));
+  const parsed = ts.parseJsonConfigFileContent(raw.config, ts.sys, path6.dirname(tsconfigFile), void 0, void 0, void 0, [
+    { extension: ".vue", isMixedContent: true, scriptKind: ts.ScriptKind.Deferred }
+  ]);
   const co = { ...parsed.options };
   if (typeof co.baseUrl === "string" && !path6.isAbsolute(co.baseUrl)) {
     co.baseUrl = path6.resolve(path6.dirname(tsconfigFile), co.baseUrl);
@@ -4016,11 +4079,17 @@ async function generateTypesBundle(input) {
     const vueTscPkg = JSON.parse(fs6.readFileSync(path6.join(vueTscDir, "package.json"), "utf8"));
     const binRel = vueTscPkg.bin?.["vue-tsc"] ?? vueTscPkg.bin?.["vue-tsc.js"] ?? "bin/vue-tsc.js";
     const binPath = path6.resolve(vueTscDir, binRel);
+    const scopedVueProgram = /^1\./.test(vueTscPkg.version);
     if (!fs6.existsSync(binPath)) {
       return { ok: false, diagnostics: [`vue-tsc \u5165\u53E3\u4E0D\u5B58\u5728\uFF08${binPath}\uFF09\u3002\u8BF7\u91CD\u65B0\u5B89\u88C5 vue-tsc\u3002`] };
     }
-    const tmpCfg = path6.join(root, `.fulgurjs-types-tsconfig-${process.pid}-${crypto.randomUUID()}.json`);
-    const outDir = fs6.mkdtempSync(path6.join(root, "node_modules", ".fulgurjs-types-emit-"));
+    const cacheDir = input.incrementalDir;
+    if (cacheDir) fs6.mkdirSync(cacheDir, { recursive: true });
+    const tmpCfg = path6.join(root, `.fulgurjs-types-tsconfig-${cacheDir ? path6.basename(cacheDir) : `${process.pid}-${crypto.randomUUID()}`}.json`);
+    const outDir = cacheDir ? path6.join(cacheDir, "emit") : fs6.mkdtempSync(path6.join(root, "node_modules", ".fulgurjs-types-emit-"));
+    const clearOutput = () => {
+      if (!cacheDir) fs6.rmSync(outDir, { recursive: true, force: true });
+    };
     const baseCo = { ...rawOptionsWithInherited(ctx) };
     delete baseCo.noEmit;
     delete baseCo.incremental;
@@ -4031,6 +4100,7 @@ async function generateTypesBundle(input) {
     delete baseCo.extends;
     const resolvedTypeFiles = resolveTypesEntries(root, baseCo, diagnostics);
     fs6.writeFileSync(tmpCfg, JSON.stringify({
+      ...ctx.tsconfigFile ? { extends: ctx.tsconfigFile } : {},
       compilerOptions: {
         ...baseCo,
         noEmit: false,
@@ -4042,7 +4112,8 @@ async function generateTypesBundle(input) {
         declarationMap: false,
         sourceMap: false,
         outDir,
-        rootDir
+        rootDir,
+        ...cacheDir && !scopedVueProgram ? { incremental: true, tsBuildInfoFile: path6.join(cacheDir, "state.tsbuildinfo") } : {}
       },
       include: [
         ...entryFiles.map((f) => path6.relative(root, f)),
@@ -4053,23 +4124,50 @@ async function generateTypesBundle(input) {
     if (process.env.FG_DUMP_TSCFG) fs6.writeFileSync(process.env.FG_DUMP_TSCFG, fs6.readFileSync(tmpCfg, "utf8"));
     const isOom = (text) => /(^|\n)\s*FATAL ERROR:.*(heap out of memory|Ineffective mark-compacts|Allocation failed)/i.test(text);
     const isSystemKilled = (e, out, errText) => !!e && (e.signal != null || /(^|\n)\s*(Killed|-9)\s*(:9)?\s*$/i.test(errText)) && !isOom(errText) && !/error TS\d+/i.test(out + "\n" + errText);
+    const isTimeoutKill = (e) => !!e && e.killed === true && !/error TS\d+/i.test(String(e.message ?? ""));
+    const timeoutFor = (raisedHeap) => {
+      const env = Number(process.env.FG_DTS_TIMEOUT_MS);
+      if (Number.isFinite(env) && env > 0) return env;
+      return raisedHeap ? 30 * 60 * 1e3 : 10 * 60 * 1e3;
+    };
     try {
       const attempt = (extraNodeArgs) => new Promise((resolve2) => {
+        if (signal?.aborted) {
+          resolve2({ err: Object.assign(new Error("\u58F0\u660E\u751F\u6210\u5DF2\u53D6\u6D88"), { code: "ABORT_ERR" }), stdout: "", stderr: "" });
+          return;
+        }
         const child = execFile(
           process.execPath,
-          [...extraNodeArgs, binPath, "-p", tmpCfg, "--noErrorTruncation", "--pretty", "false"],
-          { cwd: root, encoding: "utf8", maxBuffer: 64 * 1024 * 1024, timeout: 10 * 60 * 1e3 },
-          (err2, stdout2, stderr2) => resolve2({ err: err2 ?? null, stdout: String(stdout2 ?? ""), stderr: String(stderr2 ?? "") })
+          [...extraNodeArgs, ...scopedVueProgram ? ["--eval", genVueDeclarationProgram(), tmpCfg, JSON.stringify([...closure])] : [binPath, "-p", tmpCfg, "--noErrorTruncation", "--pretty", "false"]],
+          { cwd: root, encoding: "utf8", maxBuffer: 64 * 1024 * 1024, timeout: timeoutFor(extraNodeArgs.length > 0) },
+          (err2, stdout2, stderr2) => {
+            signal?.removeEventListener("abort", abort);
+            resolve2({ err: err2 ?? null, stdout: String(stdout2 ?? ""), stderr: String(stderr2 ?? "") });
+          }
         );
-        signal?.addEventListener("abort", () => child.kill("SIGKILL"), { once: true });
+        const abort = () => {
+          child.kill("SIGKILL");
+        };
+        signal?.addEventListener("abort", abort, { once: true });
+        if (signal?.aborted) abort();
       });
-      let { err, stdout, stderr } = await attempt([]);
+      const heapMarker = cacheDir ? path6.join(cacheDir, "raised-heap") : void 0;
+      const raisedArgs = [`--max-old-space-size=${process.env.FG_DTS_MAX_OLD_SPACE ?? "8192"}`];
+      const initialArgs = heapMarker && fs6.existsSync(heapMarker) ? raisedArgs : [];
+      let { err, stdout, stderr } = await attempt(initialArgs);
+      if (signal?.aborted) {
+        clearOutput();
+        return { ok: false, diagnostics: ["vue-tsc \u58F0\u660E\u751F\u6210\u88AB\u4E2D\u6B62\uFF08dev server \u5173\u95ED\uFF09\u3002"] };
+      }
       if (err && isOom(stderr)) {
         const raised = process.env.FG_DTS_MAX_OLD_SPACE ?? "8192";
-        diagnostics.push(`vue-tsc \u58F0\u660E\u751F\u6210\u5728\u9ED8\u8BA4\u5806\u4E0B\u5185\u5B58\u4E0D\u8DB3\uFF08V8 OOM\uFF09\uFF0C\u4EE5 --max-old-space-size=${raised}MB \u91CD\u8BD5\u3002`);
-        ({ err, stdout, stderr } = await attempt([`--max-old-space-size=${raised}`]));
+        if (initialArgs.length === 0) {
+          diagnostics.push(`vue-tsc \u58F0\u660E\u751F\u6210\u5728\u9ED8\u8BA4\u5806\u4E0B\u5185\u5B58\u4E0D\u8DB3\uFF08V8 OOM\uFF09\uFF0C\u4EE5 --max-old-space-size=${raised}MB \u91CD\u8BD5\u3002`);
+          if (heapMarker) fs6.writeFileSync(heapMarker, "");
+          ({ err, stdout, stderr } = await attempt([`--max-old-space-size=${raised}`]));
+        }
         if (err && isOom(stderr)) {
-          fs6.rmSync(outDir, { recursive: true, force: true });
+          clearOutput();
           diagnostics.push(
             "vue-tsc \u58F0\u660E\u751F\u6210\u5185\u5B58\u4E0D\u8DB3\uFF08\u63D0\u9AD8\u5806\u540E\u4ECD OOM\uFF09\u2014\u2014\u7C7B\u578B\u8D44\u6E90\u672A\u4EA7\u51FA\u3002",
             "\u4FEE\u6CD5\uFF1A\u7528\u73AF\u5883\u53D8\u91CF FG_DTS_MAX_OLD_SPACE \u63D0\u9AD8\u751F\u6210\u5668\u5806\uFF08\u5982 16384\uFF09\uFF0C\u6216\u7F29\u5C0F\u66B4\u9732\u6A21\u5757\u7684\u9759\u6001\u4F9D\u8D56\u9762\u540E\u91CD\u8BD5\u3002"
@@ -4077,11 +4175,24 @@ async function generateTypesBundle(input) {
           return { ok: false, diagnostics };
         }
       }
-      if (err && isSystemKilled(err, stdout, stderr)) {
+      if (err && isTimeoutKill(err) && !isOom(stderr)) {
+        const raised = process.env.FG_DTS_MAX_OLD_SPACE ?? "8192";
+        diagnostics.push(`vue-tsc \u58F0\u660E\u751F\u6210\u8D85\u8FC7\u5355\u6B21\u4E0A\u9650\uFF08${Math.round(timeoutFor(false) / 6e4)} \u5206\u949F\uFF09\u88AB\u5F3A\u6740\uFF0C\u4EE5\u63D0\u5806 + \u66F4\u957F\u4E0A\u9650\u91CD\u8BD5\u3002`);
+        ({ err, stdout, stderr } = await attempt([`--max-old-space-size=${raised}`]));
+        if (err && isTimeoutKill(err) && !isOom(stderr) && !/error TS\d+/i.test(stdout + "\n" + stderr)) {
+          clearOutput();
+          diagnostics.push(
+            `vue-tsc \u58F0\u660E\u751F\u6210\u518D\u6B21\u8D85\u65F6\uFF08\u5355\u6B21\u4E0A\u9650 ${Math.round(timeoutFor(true) / 6e4)} \u5206\u949F\uFF09\u2014\u2014\u7C7B\u578B\u8D44\u6E90\u672A\u4EA7\u51FA\u3002`,
+            "\u4FEE\u6CD5\uFF1A\u7528\u73AF\u5883\u53D8\u91CF FG_DTS_TIMEOUT_MS \u63D0\u9AD8\u4E0A\u9650\uFF08\u6BEB\u79D2\uFF0C\u5982 3600000\uFF09\uFF0C\u6216\u7F29\u5C0F\u66B4\u9732\u6A21\u5757\u7684\u9759\u6001\u4F9D\u8D56\u9762\u3002"
+          );
+          return { ok: false, diagnostics };
+        }
+      }
+      if (err && isSystemKilled(err, stdout, stderr) && !isTimeoutKill(err)) {
         diagnostics.push(`vue-tsc \u58F0\u660E\u751F\u6210\u8FDB\u7A0B\u88AB\u7CFB\u7EDF\u7EC8\u6B62\uFF08signal=${err.signal ?? "Killed"}\uFF0C\u65E0 TypeScript \u8BCA\u65AD\u8F93\u51FA\uFF09\uFF0C\u91CD\u8BD5\u4E00\u6B21\u3002`);
         ({ err, stdout, stderr } = await attempt([]));
-        if (err && isSystemKilled(err, stdout, stderr)) {
-          fs6.rmSync(outDir, { recursive: true, force: true });
+        if (err && isSystemKilled(err, stdout, stderr) && !isTimeoutKill(err)) {
+          clearOutput();
           diagnostics.push(
             "vue-tsc \u58F0\u660E\u751F\u6210\u8FDB\u7A0B\u518D\u6B21\u88AB\u7CFB\u7EDF\u7EC8\u6B62\u2014\u2014\u7C7B\u578B\u8D44\u6E90\u672A\u4EA7\u51FA\u3002",
             "\u5E38\u89C1\u539F\u56E0\uFF1A\u673A\u5668\u5185\u5B58\u538B\u529B\u4E0B\u88AB OS \u7EC8\u6B62\uFF08\u5982\u540C\u65F6\u8FD0\u884C\u591A\u4E2A\u5927\u578B\u58F0\u660E\u751F\u6210/\u6784\u5EFA\uFF09\uFF0C\u6216\u8FDB\u7A0B\u88AB\u5916\u90E8 kill\u3002",
@@ -4093,7 +4204,7 @@ async function generateTypesBundle(input) {
       if (err) {
         if (signal?.aborted) {
           diagnostics.push("vue-tsc \u58F0\u660E\u751F\u6210\u88AB\u4E2D\u6B62\uFF08dev server \u5173\u95ED\uFF09\u3002");
-          fs6.rmSync(outDir, { recursive: true, force: true });
+          clearOutput();
           return { ok: false, diagnostics };
         }
         const errFiles = parseErrorFiles(stdout, root);
@@ -4103,19 +4214,19 @@ async function generateTypesBundle(input) {
           const tail = formatDeclarationDiagnostics(stdout, stderr, err.message, root, closure);
           diagnostics.push(`vue-tsc \u58F0\u660E\u751F\u6210\u5931\u8D25\uFF08\u66B4\u9732\u95ED\u5305\u5185\u5B58\u5728\u7F16\u8BD1\u9519\u8BEF\uFF09\u2014\u2014\u7C7B\u578B\u8D44\u6E90\u672A\u4EA7\u51FA\uFF1A
 ${tail}`);
-          fs6.rmSync(outDir, { recursive: true, force: true });
+          clearOutput();
           return { ok: false, diagnostics };
         }
       }
     } catch {
-      fs6.rmSync(outDir, { recursive: true, force: true });
+      clearOutput();
       fs6.rmSync(tmpCfg, { force: true });
       return { ok: false, diagnostics };
     } finally {
       fs6.rmSync(tmpCfg, { force: true });
     }
     collectEmitted(ts, outDir, rootDir, emitted, closure);
-    fs6.rmSync(outDir, { recursive: true, force: true });
+    clearOutput();
   } else {
     const outDir = fs6.mkdtempSync(path6.join(root, "node_modules", ".fulgurjs-types-emit-"));
     const program = ts.createProgram([...entryFiles, ...ctx.ambientInputs, ...resolveTypesEntries(root, ctx.rawOptions, [])], {
@@ -4340,6 +4451,7 @@ var init_dts_generate = __esm({
   "src/dts-generate.ts"() {
     "use strict";
     init_dts_diagnostics();
+    init_dts_vue_program();
     init_dts_shared();
     INHERITABLE_KEYS = [
       "paths",