fe-stack 0.0.15 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fe-stack",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "共享的配置文件集合，用于 Vite、Tailwind、Biome、Prettier 和 TypeScript",
   "type": "module",
   "exports": {

package/vite-plugin-rollup-dts.d.ts

@@ -20,6 +20,13 @@ export interface RollupDtsPluginOptions {
   entries?: Entry[];
   /** tsconfig.json 文件路径，默认为 './tsconfig.json' */
   tsconfigPath?: string;
+  /**
+   * 共享类型输出路径（多入口时使用）
+   * 插件会自动分析各入口输出，找出在所有入口中都存在的类型声明
+   * 将这些共享类型提取到指定文件，并更新各入口文件的 import
+   * @example './dist/shared.d.ts'
+   */
+  sharedTypesOutput?: string | null;
 }
 
 /**

package/vite-plugin-rollup-dts.js

@@ -94,8 +94,280 @@ function getEntriesFromConfig(config) {
   }));
 }
 
+/**
+ * 使用 API Extractor 处理单个入口
+ */
+function rollupEntry(entry, projectFolder, tsconfigPath) {
+  const mainEntryPointFilePath = path.resolve(
+    projectFolder,
+    entry.mainEntryPoint,
+  );
+
+  if (!fs.existsSync(mainEntryPointFilePath)) {
+    console.warn(
+      `[rollup-dts] ⚠️  Skipping ${entry.name}: ${entry.mainEntryPoint} not found`,
+    );
+    return { success: false, skipped: true };
+  }
+
+  console.log(`[rollup-dts] 📦 Rolling up types for: ${entry.name}`);
+
+  const config = {
+    ...baseConfig,
+    compiler: {
+      tsconfigFilePath: `<projectFolder>/${tsconfigPath}`,
+    },
+    mainEntryPointFilePath: `<projectFolder>/${entry.mainEntryPoint}`,
+    dtsRollup: {
+      enabled: true,
+      untrimmedFilePath: `<projectFolder>/${entry.output}`,
+    },
+  };
+
+  const safeName = entry.name.replace(/\//g, '-');
+  const tempConfigPath = path.resolve(
+    projectFolder,
+    `api-extractor.${safeName}.tmp.json`,
+  );
+  fs.writeFileSync(tempConfigPath, JSON.stringify(config, null, 2));
+
+  let success = false;
+  try {
+    const extractorConfig = ExtractorConfig.loadFileAndPrepare(tempConfigPath);
+    const extractorResult = Extractor.invoke(extractorConfig, {
+      localBuild: true,
+      showVerboseMessages: false,
+    });
+
+    if (extractorResult.succeeded) {
+      console.log(
+        `[rollup-dts] ✅ ${entry.name}: types rolled up successfully`,
+      );
+      success = true;
+    } else {
+      console.warn(
+        `[rollup-dts] ⚠️  ${entry.name}: API Extractor completed with warnings/errors`,
+      );
+      if (fs.existsSync(path.resolve(projectFolder, entry.output))) {
+        success = true;
+      }
+    }
+  } catch (error) {
+    console.warn(
+      `[rollup-dts] ⚠️  ${entry.name}: Error during rollup, keeping original .d.ts files`,
+    );
+    console.warn(`   ${error instanceof Error ? error.message : error}`);
+  } finally {
+    if (fs.existsSync(tempConfigPath)) {
+      fs.unlinkSync(tempConfigPath);
+    }
+  }
+
+  return { success, skipped: false };
+}
+
+/**
+ * 从 .d.ts 内容中解析类型声明
+ * 返回 Map<typeName, { declaration: string, kind: string }>
+ */
+function parseTypeDeclarations(content) {
+  const declarations = new Map();
+  const lines = content.split('\n');
+
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+
+    // 匹配类型声明开始
+    const match = line.match(
+      /^export\s+declare\s+(interface|type|enum|class|namespace)\s+(\w+)/,
+    );
+
+    if (match) {
+      const kind = match[1];
+      const name = match[2];
+      const declLines = [line];
+
+      // type alias 可能是单行
+      if (kind === 'type' && line.includes('=') && line.includes(';')) {
+        declarations.set(name, { declaration: line, kind });
+        i++;
+        continue;
+      }
+
+      // 多行声明，收集直到闭合
+      let braceCount =
+        (line.match(/{/g) || []).length - (line.match(/}/g) || []).length;
+      i++;
+
+      while (i < lines.length && braceCount > 0) {
+        declLines.push(lines[i]);
+        braceCount +=
+          (lines[i].match(/{/g) || []).length -
+          (lines[i].match(/}/g) || []).length;
+        i++;
+      }
+
+      declarations.set(name, { declaration: declLines.join('\n'), kind });
+    } else {
+      i++;
+    }
+  }
+
+  return declarations;
+}
+
+/**
+ * 从多个输出文件中找出共享的类型声明
+ */
+function findSharedTypeDeclarations(outputs) {
+  if (outputs.length < 2) return new Map();
+
+  // 解析所有文件的类型声明
+  const allDeclarations = outputs.map((output) => ({
+    name: output.name,
+    declarations: parseTypeDeclarations(output.content),
+  }));
+
+  // 找出在所有文件中都出现的类型名称
+  const firstDecls = allDeclarations[0].declarations;
+  const sharedTypes = new Map();
+
+  for (const [typeName, typeInfo] of firstDecls) {
+    // 检查是否在所有其他文件中都存在
+    const existsInAll = allDeclarations
+      .slice(1)
+      .every((file) => file.declarations.has(typeName));
+
+    if (existsInAll) {
+      sharedTypes.set(typeName, typeInfo);
+    }
+  }
+
+  return sharedTypes;
+}
+
+/**
+ * 从文件内容中移除指定的类型声明
+ */
+function removeTypeDeclarations(content, typeNames) {
+  const lines = content.split('\n');
+  const newLines = [];
+
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+
+    // 检查是否是要移除的类型声明
+    const match = line.match(
+      /^export\s+declare\s+(interface|type|enum|class|namespace)\s+(\w+)/,
+    );
+
+    if (match && typeNames.includes(match[2])) {
+      const kind = match[1];
+
+      // type alias 单行
+      if (kind === 'type' && line.includes('=') && line.includes(';')) {
+        i++;
+        continue;
+      }
+
+      // 多行声明，跳过直到闭合
+      let braceCount =
+        (line.match(/{/g) || []).length - (line.match(/}/g) || []).length;
+      i++;
+
+      while (i < lines.length && braceCount > 0) {
+        braceCount +=
+          (lines[i].match(/{/g) || []).length -
+          (lines[i].match(/}/g) || []).length;
+        i++;
+      }
+    } else {
+      newLines.push(line);
+      i++;
+    }
+  }
+
+  return newLines.join('\n').replace(/\n{3,}/g, '\n\n').trim();
+}
+
+/**
+ * 提取共享类型到单独文件，并更新各入口文件
+ */
+function extractSharedTypes(outputs, projectFolder, sharedTypesOutput) {
+  // 找出共享的类型声明
+  const sharedTypes = findSharedTypeDeclarations(outputs);
+
+  if (sharedTypes.size === 0) {
+    console.log('[rollup-dts] ℹ️  No shared types found across entries');
+    return { sharedTypeNames: [], sharedFilePath: null };
+  }
+
+  const sharedTypeNames = Array.from(sharedTypes.keys());
+  console.log(
+    `[rollup-dts] 📝 Found ${sharedTypes.size} shared types: ${sharedTypeNames.join(', ')}`,
+  );
+
+  // 生成共享类型文件内容
+  const sharedContent = Array.from(sharedTypes.values())
+    .map((t) => t.declaration)
+    .join('\n\n');
+
+  const sharedFilePath = path.resolve(projectFolder, sharedTypesOutput);
+
+  // 确保目录存在
+  const sharedDir = path.dirname(sharedFilePath);
+  if (!fs.existsSync(sharedDir)) {
+    fs.mkdirSync(sharedDir, { recursive: true });
+  }
+
+  // 写入共享类型文件
+  fs.writeFileSync(sharedFilePath, sharedContent + '\n\nexport { }\n', 'utf-8');
+  console.log(`[rollup-dts] ✅ Shared types written to: ${sharedTypesOutput}`);
+
+  // 更新各入口文件
+  for (const output of outputs) {
+    // 移除共享类型声明
+    let newContent = removeTypeDeclarations(output.content, sharedTypeNames);
+
+    // 找出这个文件中实际使用的共享类型
+    const usedTypes = sharedTypeNames.filter((name) => {
+      const regex = new RegExp(`\\b${name}\\b`);
+      return regex.test(newContent);
+    });
+
+    if (usedTypes.length > 0) {
+      // 计算相对路径
+      const outputDir = path.dirname(output.path);
+      let relativePath = path
+        .relative(outputDir, sharedFilePath)
+        .replace(/\\/g, '/');
+
+      if (!relativePath.startsWith('.')) {
+        relativePath = './' + relativePath;
+      }
+
+      // 添加 import 和 re-export
+      const importExport = `import type { ${usedTypes.join(', ')} } from '${relativePath}';\nexport type { ${usedTypes.join(', ')} } from '${relativePath}';\n\n`;
+      newContent = importExport + newContent;
+
+      console.log(
+        `[rollup-dts] 🔗 Updated ${output.name}: imports ${usedTypes.join(', ')}`,
+      );
+    }
+
+    fs.writeFileSync(output.path, newContent, 'utf-8');
+  }
+
+  return { sharedTypeNames, sharedFilePath };
+}
+
 export function rollupDtsPlugin(options = {}) {
-  const { tsconfigPath = './tsconfig.json' } = options;
+  const {
+    tsconfigPath = './tsconfig.json',
+    sharedTypesOutput = null, // 例如: './dist/shared.d.ts'
+  } = options;
   let resolvedConfig;
   let entries = [];
 
@@ -118,83 +390,52 @@ export function rollupDtsPlugin(options = {}) {
 
       const projectFolder = process.cwd();
       const results = [];
+      const keepFiles = [];
 
       console.log('\n[rollup-dts] Starting to bundle declaration files...');
 
+      // 第一步：处理所有入口
       for (const entry of entries) {
-        const mainEntryPointFilePath = path.resolve(
-          projectFolder,
-          entry.mainEntryPoint,
-        );
+        const result = rollupEntry(entry, projectFolder, tsconfigPath);
+        results.push({ entry, ...result });
 
-        if (!fs.existsSync(mainEntryPointFilePath)) {
-          console.warn(
-            `[rollup-dts] ⚠️  Skipping ${entry.name}: ${entry.mainEntryPoint} not found`,
-          );
-          continue;
+        if (result.success) {
+          keepFiles.push(path.resolve(projectFolder, entry.output));
         }
+      }
+
+      // 第二步：如果有多个入口且指定了共享类型输出，提取共享类型
+      let sharedTypeNames = [];
+      if (sharedTypesOutput && results.filter((r) => r.success).length > 1) {
+        console.log('[rollup-dts] 🔍 Analyzing shared types across entries...');
+
+        // 读取所有成功的入口输出
+        const outputs = results
+          .filter((r) => r.success)
+          .map((r) => ({
+            name: r.entry.name,
+            path: path.resolve(projectFolder, r.entry.output),
+            content: fs.readFileSync(
+              path.resolve(projectFolder, r.entry.output),
+              'utf-8',
+            ),
+          }));
 
-        console.log(`[rollup-dts] 📦 Rolling up types for: ${entry.name}`);
-
-        const config = {
-          ...baseConfig,
-          compiler: {
-            tsconfigFilePath: `<projectFolder>/${tsconfigPath}`,
-          },
-          mainEntryPointFilePath: `<projectFolder>/${entry.mainEntryPoint}`,
-          dtsRollup: {
-            enabled: true,
-            untrimmedFilePath: `<projectFolder>/${entry.output}`,
-          },
-        };
-
-        // 用安全的文件名（将 / 替换为 -）
-        const safeName = entry.name.replace(/\//g, '-');
-        const tempConfigPath = path.resolve(
+        const { sharedTypeNames: names, sharedFilePath } = extractSharedTypes(
+          outputs,
           projectFolder,
-          `api-extractor.${safeName}.tmp.json`,
+          sharedTypesOutput,
         );
-        fs.writeFileSync(tempConfigPath, JSON.stringify(config, null, 2));
-
-        let success = false;
-        try {
-          const extractorConfig =
-            ExtractorConfig.loadFileAndPrepare(tempConfigPath);
-          const extractorResult = Extractor.invoke(extractorConfig, {
-            localBuild: true,
-            showVerboseMessages: false,
-          });
 
-          if (extractorResult.succeeded) {
-            console.log(
-              `[rollup-dts] ✅ ${entry.name}: types rolled up successfully`,
-            );
-            success = true;
-          } else {
-            console.warn(
-              `[rollup-dts] ⚠️  ${entry.name}: API Extractor completed with warnings/errors`,
-            );
-            if (fs.existsSync(path.resolve(projectFolder, entry.output))) {
-              success = true;
-            }
-          }
-        } catch (error) {
-          console.warn(
-            `[rollup-dts] ⚠️  ${entry.name}: Error during rollup, keeping original .d.ts files`,
-          );
-          console.warn(`   ${error instanceof Error ? error.message : error}`);
-        } finally {
-          if (fs.existsSync(tempConfigPath)) {
-            fs.unlinkSync(tempConfigPath);
-          }
-        }
+        sharedTypeNames = names;
 
-        results.push({ entry, success });
+        if (sharedFilePath) {
+          keepFiles.push(sharedFilePath);
+        }
       }
 
-      // Determine which directories to keep
+      // 第三步：清理中间文件
       const dirsToKeep = new Set();
-
       for (const { entry, success } of results) {
         if (!success) {
           const entryDir = path.dirname(
@@ -207,15 +448,11 @@ export function rollupDtsPlugin(options = {}) {
         }
       }
 
-      // Clean up only if all entries succeeded
       if (dirsToKeep.size === 0) {
         console.log('[rollup-dts] 🧹 Cleaning up intermediate files...');
         const outDir = resolvedConfig?.build?.outDir || 'dist';
         const distDir = path.resolve(projectFolder, outDir);
-        cleanupIntermediateFiles(
-          distDir,
-          entries.map((e) => path.resolve(projectFolder, e.output)),
-        );
+        cleanupIntermediateFiles(distDir, keepFiles);
       } else {
         console.log(
           '[rollup-dts] ⚠️  Some entries failed, keeping intermediate files',
@@ -223,8 +460,15 @@ export function rollupDtsPlugin(options = {}) {
       }
 
       console.log('[rollup-dts] 📊 Summary:');
-      for (const { entry, success } of results) {
-        console.log(`   ${success ? '✅' : '❌'} ${entry.name}`);
+      for (const { entry, success, skipped } of results) {
+        if (skipped) {
+          console.log(`   ⏭️  ${entry.name} (skipped)`);
+        } else {
+          console.log(`   ${success ? '✅' : '❌'} ${entry.name}`);
+        }
+      }
+      if (sharedTypeNames.length > 0) {
+        console.log(`   📦 shared: ${sharedTypeNames.length} types extracted`);
       }
     },
   };

package/vite.config.base.js

@@ -11,9 +11,12 @@ import { rollupDtsPlugin } from './vite-plugin-rollup-dts.js';
 /**
  * @typedef {import('vite').UserConfig} UserConfig
  * @typedef {import('vite-plugin-dts').PluginOptions} DtsPluginOptions
+ * @typedef {Object} RollupDtsOptions
+ * @property {string} [tsconfigPath] - tsconfig.json 路径
+ * @property {string} [sharedTypesOutput] - 共享类型输出路径（多入口时）
  * @typedef {Object} CreateBaseConfigOptions
  * @property {'app' | 'lib'} [mode] - 构建模式：'app' 为 Vue 应用，'lib' 为库打包
- * @property {Partial<DtsPluginOptions>} [dtsConfig] - vite-plugin-dts 配置（仅 lib 模式），会与默认配置合并
+ * @property {Partial<DtsPluginOptions> & RollupDtsOptions} [dtsConfig] - vite-plugin-dts 配置（仅 lib 模式），会与默认配置合并
  * @property {UserConfig} [viteConfig] - 额外的 Vite 配置，会与基础配置合并
  */
 
@@ -67,6 +70,9 @@ export function createBaseConfig(dirname, options = {}) {
 
   // Lib mode: 提供默认配置
   if (mode === 'lib') {
+    // 提取 rollupDts 专用配置
+    const { sharedTypesOutput, tsconfigPath, ...dtsOnlyConfig } = dtsConfig;
+
     baseConfig.build = {
       copyPublicDir: false,
       lib: {
@@ -81,12 +87,17 @@ export function createBaseConfig(dirname, options = {}) {
       dts({
         include: ['src/**/*.ts'],
         root: dirname,
-        ...dtsConfig,
+        ...dtsOnlyConfig,
         rollupTypes: false,
       }),
     );
     if (dtsConfig.rollupTypes) {
-      baseConfig.plugins.push(rollupDtsPlugin());
+      baseConfig.plugins.push(
+        rollupDtsPlugin({
+          tsconfigPath,
+          sharedTypesOutput,
+        }),
+      );
     }
   }