@dazhicheng/common 1.0.7 → 1.0.8

package/.env.development

@@ -9,11 +9,11 @@ VITE_MOCK_ENABLED = true
 
 # 代理目标地址（开发环境通过 Vite 代理转发请求到此地址，解决跨域问题）
 VITE_API_PROXY_URL = https://m1.apifoxmock.com/m1/6400575-6097373-default
+
 VITE_API_PROXY_URL_dev = http://192.168.128.215:11000
 VITE_API_MOCK = http://192.168.129.158:9998/mock/
 VITE_API_PROXY_URL_test = http://192.168.127.72:11000/
 
-
 VITE_API_PROXY_URL_dev_yun = http://116.6.49.180:11000/
 VITE_API_PROXY_URL_test_yun = http://116.6.49.180:11001/
 

package/.gitlab-ci.yml

@@ -1,74 +1,74 @@
-stages:
-  - MR_TEST
-  - develop
-  - test
-  - sit
-
-variables:
-  DOCKER_BUILDKIT: 1
-
-MR 构建测试:
-  stage: MR_TEST
-  image: docker:20.10.20
-  tags:
-    - MR_TEST
-  script:
-    # 构建镜像（不部署）
-    - docker build --build-arg NODE_ENV=dev --no-cache -t a-fulfillment-mr-test:mr-$CI_MERGE_REQUEST_IID .
-    # 验证镜像构建成功
-    - docker images | grep a-fulfillment-mr-test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
-
-开发环境发版:
-  stage: develop
-  image: docker:20.10.20
-  tags:
-    - develop
-  resource_group: deploy-develop # 重点
-  script:
-    <<<script_开发环境发版>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - develop
-
-开发环境发版_107:
-  stage: develop
-  image: docker:20.10.20
-  tags:
-    - develop_107
-  resource_group: deploy-develop_107 # 重点
-  script:
-    <<<script_开发环境发版_107>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - develop
-
-# 测试环境 -----------------------------------------------------------------------------------------------
-测试环境发版:
-  stage: test
-  image: docker:20.10.20
-  tags:
-    - test
-  resource_group: deploy-test # 重点
-  script:
-    <<<script_测试环境发版>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - test
-
-测试环境发版_107:
-  stage: test
-  image: docker:20.10.20
-  tags:
-    - test_107
-  resource_group: deploy-test_107 # 重点
-  script:
-    <<<script_测试环境发版_107>>>
-    # 清理悬空镜像
-    - docker image prune -f || true
-  only:
-    - test
+stages:
+  - MR_TEST
+  - develop
+  - test
+  - sit
+
+variables:
+  DOCKER_BUILDKIT: 1
+
+MR 构建测试:
+  stage: MR_TEST
+  image: docker:20.10.20
+  tags:
+    - MR_TEST
+  script:
+    # 构建镜像（不部署）
+    - docker build --build-arg NODE_ENV=dev --no-cache -t a-fulfillment-mr-test:mr-$CI_MERGE_REQUEST_IID .
+    # 验证镜像构建成功
+    - docker images | grep a-fulfillment-mr-test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+
+开发环境发版:
+  stage: develop
+  image: docker:20.10.20
+  tags:
+    - develop
+  resource_group: deploy-develop # 重点
+  script:
+    <<<script_开发环境发版>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - develop
+
+开发环境发版_107:
+  stage: develop
+  image: docker:20.10.20
+  tags:
+    - develop_107
+  resource_group: deploy-develop_107 # 重点
+  script:
+    <<<script_开发环境发版_107>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - develop
+
+# 测试环境 -----------------------------------------------------------------------------------------------
+测试环境发版:
+  stage: test
+  image: docker:20.10.20
+  tags:
+    - test
+  resource_group: deploy-test # 重点
+  script:
+    <<<script_测试环境发版>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - test
+
+测试环境发版_107:
+  stage: test
+  image: docker:20.10.20
+  tags:
+    - test_107
+  resource_group: deploy-test_107 # 重点
+  script:
+    <<<script_测试环境发版_107>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - test

package/nginx_dev.conf

@@ -11,14 +11,14 @@ server {
     try_files $uri $uri/ /index.html;
     <<<CORS配置>>>
   }
-  
+
   location /dev-api/ {
     proxy_set_header Host $host;
     proxy_set_header X-Real-Ip $remote_addr;
     proxy_set_header X-Forwarded-For $remote_addr;
     proxy_pass http://116.6.49.180:11000/;
   }
-  
+
   error_page   500 502 503 504  /50x.html;
   location = /50x.html {
     root   html;

package/nginx_test.conf

@@ -11,14 +11,14 @@ server {
     try_files $uri $uri/ /index.html;
     <<<CORS配置>>>
   }
-  
+
   location /test-api/ {
     proxy_set_header Host $host;
     proxy_set_header X-Real-Ip $remote_addr;
     proxy_set_header X-Forwarded-For $remote_addr;
     proxy_pass http://116.6.49.180:11001/;
   }
-  
+
   error_page   500 502 503 504  /50x.html;
   location = /50x.html {
     root   html;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",

package/sync-common.mjs

@@ -1,305 +1,337 @@
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-import prettier from "prettier";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const commonDir = __dirname;
-
-const localMarkerPattern = /^\s*<<<([^>]+)>>>\s*$/gm;
-const commonMarkerPattern = /<<<([^>]+)>>>/g;
-const defaultManagedFiles = [
-  ".gitignore",
-  ".stylelintignore",
-  ".gitattributes",
-  ".prettierignore",
-  { name: ".prettierrc.txt" },
-  ".env",
-  ".env.dev",
-  ".env.development",
-  ".env.production",
-  ".env.sit",
-  ".env.test",
-  { name: ".stylelintrc.cjs.txt" },
-  { name: "commitlint.config.cjs.txt" },
-  ".gitlab-ci.yml",
-  "pnpm-workspace.yaml",
-  "Dockerfile",
-  { name: "eslint.config.mjs.txt" },
-  "tsconfig.json",
-  { name: "nginx_dev.conf" },
-  { name: "nginx_test.conf" },
-  { name: "commit-msg", dir: ".husky" },
-  { name: "pre-commit", dir: ".husky" },
-];
-
-const getFileRelativePath = file => (file.dir ? path.join(file.dir, file.name) : file.name);
-const getTargetFileName = file => {
-  if (file.targetName) {
-    return file.targetName;
-  }
-
-  return file.name.endsWith(".txt") ? file.name.slice(0, -4) : file.name;
-};
-const getTargetRelativePath = file =>
-  file.dir ? path.join(file.dir, getTargetFileName(file)) : getTargetFileName(file);
-const getFileKey = file => `${file.dir ?? ""}::${file.name}`;
-
-const ensureCommonFile = file => {
-  const filePath = path.join(commonDir, getFileRelativePath(file));
-  if (!fs.existsSync(filePath)) {
-    console.error(`\n[sync:common] {${getFileKey(file)}} missing common file: ${filePath}`);
-    return "";
-  }
-  return filePath;
-};
-
-const normalizeLineEndings = content => content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-
-const parseLocalSections = filePaths => {
-  const candidates = [filePaths].flat().filter(Boolean);
-  const existingPath = candidates.find(filePath => fs.existsSync(filePath));
-
-  if (!existingPath) {
-    return { before: "", after: "", blocks: {}, hasMarkers: false, sourcePath: "" };
-  }
-
-  const rawContent = normalizeLineEndings(fs.readFileSync(existingPath, "utf8"));
-  if (!rawContent.trim()) {
-    return { before: "", after: "", blocks: {}, hasMarkers: false, sourcePath: existingPath };
-  }
-
-  const markers = [...rawContent.matchAll(localMarkerPattern)];
-  if (markers.length === 0) {
-    return { before: "", after: rawContent, blocks: {}, hasMarkers: false, sourcePath: existingPath };
-  }
-
-  const blocks = {};
-
-  for (let index = 0; index < markers.length; index += 1) {
-    const current = markers[index];
-    const next = markers[index + 1];
-    const blockName = current[1].trim();
-    const start = current.index + current[0].length;
-    const end = next ? next.index : rawContent.length;
-    const blockContent = rawContent.slice(start, end).replace(/^\n/, "");
-    blocks[blockName] = blockContent;
-  }
-
-  return {
-    before: blocks.before ?? "",
-    after: blocks.after ?? "",
-    blocks,
-    hasMarkers: true,
-    sourcePath: existingPath,
-  };
-};
-
-const replaceNamedBlocks = (content, blocks = {}) =>
-  content.replace(commonMarkerPattern, (match, blockName, offset, source) => {
-    const replacement = blocks[blockName.trim()];
-    if (!replacement) {
-      return "";
-    }
-
-    const lineStart = source.lastIndexOf("\n", offset - 1) + 1;
-    const linePrefix = source.slice(lineStart, offset);
-    const indentation = (linePrefix.match(/^\s*/) ?? [""])[0];
-
-    return replacement.split("\n").map(line => `${indentation}${line}`).join("\n");
-  });
-
-const getDefaultHeader = () => "";
-
-const getDefaultLocalFiles = file => {
-  const sourceRelativePath = getFileRelativePath(file);
-  const targetRelativePath = getTargetRelativePath(file);
-
-  return {
-    merged: path.join("local", sourceRelativePath),
-    targetMerged: targetRelativePath !== sourceRelativePath ? path.join("local", targetRelativePath) : "",
-  };
-};
-
-const getDefaultBlockHeaders = () => ({
-  before: "",
-  common: "",
-  after: "",
-});
-
-const getDefaultFileConfig = file => ({
-  name: file.name,
-  dir: file.dir,
-  targetName: file.targetName,
-  header: getDefaultHeader(),
-  localFiles: getDefaultLocalFiles(file),
-  blockHeaders: getDefaultBlockHeaders(),
-});
-
-const mergeFileConfig = (defaultFile, projectFile = {}) => ({
-  ...defaultFile,
-  ...projectFile,
-  localFiles: {
-    ...(defaultFile.localFiles ?? {}),
-    ...(projectFile.localFiles ?? {}),
-  },
-  blockHeaders: {
-    ...(defaultFile.blockHeaders ?? {}),
-    ...(projectFile.blockHeaders ?? {}),
-  },
-});
-
-const normalizeFileEntry = file => {
-  if (typeof file === "string") {
-    return { name: file };
-  }
-
-  return file;
-};
-
-const normalizeFiles = (config = {}) => {
-  if (Array.isArray(config)) {
-    return config.map(normalizeFileEntry);
-  }
-
-  if (Array.isArray(config.files)) {
-    return config.files.map(normalizeFileEntry);
-  }
-
-  return [
-    ...(config.textFiles ?? []).map(file => ({ type: "textFiles", ...normalizeFileEntry(file) })),
-    ...(config.directFiles ?? []).map(file => ({
-      type: "directFiles",
-      ...normalizeFileEntry(file),
-    })),
-  ];
-};
-
-const mergeManagedFiles = (projectConfig = {}, runtimeConfig = {}) => {
-  const defaultFiles = normalizeFiles(defaultManagedFiles).map(file =>
-    mergeFileConfig(getDefaultFileConfig(file), file),
-  );
-  const projectFiles = normalizeFiles(projectConfig);
-  const runtimeFiles = normalizeFiles(runtimeConfig);
-  const mergedMap = new Map(defaultFiles.map(file => [getFileKey(file), { ...file }]));
-
-  for (const projectFile of projectFiles) {
-    const key = getFileKey(projectFile);
-    const current = mergedMap.get(key) ?? getDefaultFileConfig(projectFile);
-    mergedMap.set(key, mergeFileConfig(current, projectFile));
-  }
-
-  for (const runtimeFile of runtimeFiles) {
-    const key = getFileKey(runtimeFile);
-    const current = mergedMap.get(key) ?? getDefaultFileConfig(runtimeFile);
-    mergedMap.set(key, mergeFileConfig(current, runtimeFile));
-  }
-
-  return [...mergedMap.values()].filter(file => file.enabled !== false);
-};
-
-const logGenerated = ({ rootDir, targetPath, commonPath, localPaths, usedLocalPaths }) => {
-  const targetName = path.relative(rootDir, targetPath).replaceAll("\\", "/");
-  const commonName = `@dazhicheng/common/${path.relative(commonDir, commonPath).replaceAll("\\", "/")}`;
-  const sourceText = [commonName, ...usedLocalPaths].join(" + ");
-
-  console.log(`\n[sync:common] generated ${targetName} <- ${sourceText}`);
-  if (localPaths.length > 0) {
-    console.log(`[sync:common] 如需项目增量，请修改 ${localPaths.join(" / ")}`);
-    console.log("[sync:common] local 文件支持 <<<name>>> 任意命名块，占位将替换 common 中同名标记");
-  }
-};
-
-const renderFile = ({ file, commonContent, localSections, usedLocalPaths }) => {
-  let output = file.header ?? "";
-  const renderedCommonContent = replaceNamedBlocks(commonContent, localSections.blocks);
-
-  if (localSections.before) {
-    if (localSections.sourcePath) {
-      usedLocalPaths.push(path.relative(process.cwd(), localSections.sourcePath).replaceAll("\\", "/"));
-    }
-    output += `${file.blockHeaders.before ?? ""}${localSections.before}\n\n`;
-  }
-
-  output += `${file.blockHeaders.common ?? ""}${renderedCommonContent}`;
-
-  if (localSections.after) {
-    if (localSections.sourcePath) {
-      const localPath = path.relative(process.cwd(), localSections.sourcePath).replaceAll("\\", "/");
-      if (!usedLocalPaths.includes(localPath)) {
-        usedLocalPaths.push(localPath);
-      }
-    }
-    output += `${file.blockHeaders.after ?? ""}${localSections.after}`;
-  }
-
-  return output.endsWith("\n") ? output : `${output}\n`;
-};
-
-const formatWithPrettier = async ({ targetPath, output }) => {
-  try {
-    const fileInfo = await prettier.getFileInfo(targetPath);
-    if (fileInfo.ignored || !fileInfo.inferredParser) {
-      console.log(`[sync:common] skipped prettier for ${targetPath}: parser unavailable`);
-      return output;
-    }
-
-    const config = (await prettier.resolveConfig(targetPath)) ?? {};
-    return normalizeLineEndings(await prettier.format(output, {
-      ...config,
-      filepath: targetPath,
-    }));
-  } catch (error) {
-    console.log(`[sync:common] skipped prettier for ${targetPath}: ${error.message}`);
-    return output;
-  }
-};
-
-const syncFiles = async ({ files, rootDir }) => {
-  for (const file of files) {
-    const commonPath = ensureCommonFile(file);
-    if (!commonPath) {
-      continue;
-    }
-    const targetPath = path.join(rootDir, getTargetRelativePath(file));
-    const targetDir = path.dirname(targetPath);
-    if (!fs.existsSync(targetDir)) {
-      fs.mkdirSync(targetDir, { recursive: true });
-    }
-    const localPaths = Object.values(file.localFiles ?? {}).filter(Boolean);
-    const resolvedLocalPaths = localPaths.map(localPath => path.join(rootDir, localPath));
-    const localSections = parseLocalSections(resolvedLocalPaths);
-    const commonContent = normalizeLineEndings(fs.readFileSync(commonPath, "utf8")).trimEnd();
-    const usedLocalPaths = [];
-    const output = renderFile({ file, commonContent, localSections, usedLocalPaths });
-
-    const formattedOutput = await formatWithPrettier({ targetPath, output });
-
-    fs.writeFileSync(targetPath, formattedOutput);
-    logGenerated({
-      rootDir,
-      targetPath,
-      commonPath,
-      localPaths: Object.values(file.localFiles ?? {}).filter(Boolean),
-      usedLocalPaths,
-    });
-  }
-};
-
-export const runSyncCommon = async ({ rootDir, files = [], config = {} }) => {
-  const runtimeConfig = {
-    ...(config ?? {}),
-    files: [...normalizeFiles(config ?? {}), ...normalizeFiles(files)],
-  };
-  const managedFiles = mergeManagedFiles({}, runtimeConfig);
-
-  await syncFiles({ files: managedFiles, rootDir });
-};
-
-const isDirectRun = process.argv[1] && path.resolve(process.argv[1]) === __filename;
-
-if (isDirectRun) {
-  const cwd = process.cwd();
-  await runSyncCommon({ rootDir: cwd });
-}
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import prettier from "prettier";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const commonDir = __dirname;
+
+const localMarkerPattern = /^\s*<<<([^>]+)>>>\s*$/gm;
+const commonMarkerPattern = /<<<([^>]+)>>>/g;
+const defaultManagedFiles = [
+  ".gitignore",
+  ".stylelintignore",
+  ".gitattributes",
+  ".prettierignore",
+  { name: ".prettierrc.txt" },
+  ".env",
+  ".env.dev",
+  ".env.development",
+  ".env.production",
+  ".env.sit",
+  ".env.test",
+  { name: ".stylelintrc.cjs.txt" },
+  { name: "commitlint.config.cjs.txt" },
+  ".gitlab-ci.yml.txt",
+  "pnpm-workspace.yaml",
+  "Dockerfile",
+  { name: "eslint.config.mjs.txt" },
+  "tsconfig.json",
+  { name: "nginx_dev.conf" },
+  { name: "nginx_test.conf" },
+  { name: "commit-msg", dir: ".husky" },
+  { name: "pre-commit", dir: ".husky" },
+];
+
+const getFileRelativePath = file => (file.dir ? path.join(file.dir, file.name) : file.name);
+const getTargetFileName = file => {
+  if (file.targetName) {
+    return file.targetName;
+  }
+
+  return file.name.endsWith(".txt") ? file.name.slice(0, -4) : file.name;
+};
+const getTargetRelativePath = file =>
+  file.dir ? path.join(file.dir, getTargetFileName(file)) : getTargetFileName(file);
+const getFileKey = file => `${file.dir ?? ""}::${file.name}`;
+
+const ensureCommonFile = file => {
+  const relativePath = getFileRelativePath(file);
+  const candidates = [relativePath];
+
+  if (relativePath.endsWith(".txt")) {
+    candidates.push(relativePath.slice(0, -4));
+  }
+
+  const filePath = candidates.map(candidate => path.join(commonDir, candidate)).find(fs.existsSync);
+  if (!filePath) {
+    console.error(
+      `\n[sync:common] {${getFileKey(file)}} missing common file: ${candidates
+        .map(candidate => path.join(commonDir, candidate))
+        .join(" / ")}`,
+    );
+    return "";
+  }
+  return filePath;
+};
+
+const normalizeLineEndings = content => content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+
+const parseLocalSections = filePaths => {
+  const candidates = [filePaths].flat().filter(Boolean);
+  const existingPath = candidates.find(filePath => fs.existsSync(filePath));
+
+  if (!existingPath) {
+    return { before: "", after: "", blocks: {}, hasMarkers: false, sourcePath: "" };
+  }
+
+  const rawContent = normalizeLineEndings(fs.readFileSync(existingPath, "utf8"));
+  if (!rawContent.trim()) {
+    return { before: "", after: "", blocks: {}, hasMarkers: false, sourcePath: existingPath };
+  }
+
+  const markers = [...rawContent.matchAll(localMarkerPattern)];
+  if (markers.length === 0) {
+    return { before: "", after: rawContent, blocks: {}, hasMarkers: false, sourcePath: existingPath };
+  }
+
+  const blocks = {};
+
+  for (let index = 0; index < markers.length; index += 1) {
+    const current = markers[index];
+    const next = markers[index + 1];
+    const blockName = current[1].trim();
+    const start = current.index + current[0].length;
+    const end = next ? next.index : rawContent.length;
+    const blockContent = rawContent.slice(start, end).replace(/^\n/, "");
+    blocks[blockName] = blockContent;
+  }
+
+  return {
+    before: blocks.before ?? "",
+    after: blocks.after ?? "",
+    blocks,
+    hasMarkers: true,
+    sourcePath: existingPath,
+  };
+};
+
+const replaceNamedBlocks = (content, blocks = {}) =>
+  content.replace(commonMarkerPattern, (match, blockName, offset, source) => {
+    const replacement = blocks[blockName.trim()];
+    if (replacement === undefined) {
+      return "";
+    }
+
+    const lineStart = source.lastIndexOf("\n", offset - 1) + 1;
+    const linePrefix = source.slice(lineStart, offset);
+    const indentation = (linePrefix.match(/^\s*/) ?? [""])[0];
+
+    if (replacement === "") {
+      return "";
+    }
+
+    return replacement
+      .split("\n")
+      .map((line, index) => (index === 0 ? line.trimStart() : `${indentation}${line}`))
+      .join("\n");
+  });
+
+const getDefaultHeader = () => "";
+
+const getDefaultLocalFiles = file => {
+  const sourceRelativePath = getFileRelativePath(file);
+  const targetRelativePath = getTargetRelativePath(file);
+
+  return {
+    merged: path.join("local", sourceRelativePath),
+    targetMerged: targetRelativePath !== sourceRelativePath ? path.join("local", targetRelativePath) : "",
+  };
+};
+
+const getDefaultBlockHeaders = () => ({
+  before: "",
+  common: "",
+  after: "",
+});
+
+const getDefaultFileConfig = file => ({
+  name: file.name,
+  dir: file.dir,
+  targetName: file.targetName,
+  header: getDefaultHeader(),
+  localFiles: getDefaultLocalFiles(file),
+  blockHeaders: getDefaultBlockHeaders(),
+});
+
+const mergeFileConfig = (defaultFile, projectFile = {}) => ({
+  ...defaultFile,
+  ...projectFile,
+  localFiles: {
+    ...(defaultFile.localFiles ?? {}),
+    ...(projectFile.localFiles ?? {}),
+  },
+  blockHeaders: {
+    ...(defaultFile.blockHeaders ?? {}),
+    ...(projectFile.blockHeaders ?? {}),
+  },
+});
+
+const normalizeFileEntry = file => {
+  if (typeof file === "string") {
+    return { name: file };
+  }
+
+  return file;
+};
+
+const normalizeFiles = (config = {}) => {
+  if (Array.isArray(config)) {
+    return config.map(normalizeFileEntry);
+  }
+
+  if (Array.isArray(config.files)) {
+    return config.files.map(normalizeFileEntry);
+  }
+
+  return [
+    ...(config.textFiles ?? []).map(file => ({ type: "textFiles", ...normalizeFileEntry(file) })),
+    ...(config.directFiles ?? []).map(file => ({
+      type: "directFiles",
+      ...normalizeFileEntry(file),
+    })),
+  ];
+};
+
+const mergeManagedFiles = (projectConfig = {}, runtimeConfig = {}) => {
+  const defaultFiles = normalizeFiles(defaultManagedFiles).map(file =>
+    mergeFileConfig(getDefaultFileConfig(file), file),
+  );
+  const projectFiles = normalizeFiles(projectConfig);
+  const runtimeFiles = normalizeFiles(runtimeConfig);
+  const mergedMap = new Map(defaultFiles.map(file => [getFileKey(file), { ...file }]));
+
+  for (const projectFile of projectFiles) {
+    const key = getFileKey(projectFile);
+    const current = mergedMap.get(key) ?? getDefaultFileConfig(projectFile);
+    mergedMap.set(key, mergeFileConfig(current, projectFile));
+  }
+
+  for (const runtimeFile of runtimeFiles) {
+    const key = getFileKey(runtimeFile);
+    const current = mergedMap.get(key) ?? getDefaultFileConfig(runtimeFile);
+    mergedMap.set(key, mergeFileConfig(current, runtimeFile));
+  }
+
+  return [...mergedMap.values()].filter(file => file.enabled !== false);
+};
+
+const logGenerated = ({ rootDir, targetPath, commonPath, localPaths, usedLocalPaths, generatedFile }) => {
+  const targetName = path.relative(rootDir, targetPath).replaceAll("\\", "/");
+  const commonName = `@dazhicheng/common/${path.relative(commonDir, commonPath).replaceAll("\\", "/")}`;
+  const sourceText = [commonName, ...usedLocalPaths].join(" + ");
+
+  generatedFile.push(`[sync:common] generated ${targetName} <- ${sourceText}`);
+  if (localPaths.length > 0) {
+    // console.log(`[sync:common] 如需项目增量，请修改 ${localPaths.join(" / ")}`);
+    // console.log("[sync:common] local 文件支持 <<<name>>> 任意命名块，占位将替换 common 中同名标记");
+  }
+};
+
+const renderFile = ({ file, commonContent, localSections, usedLocalPaths }) => {
+  let output = file.header ?? "";
+  const renderedCommonContent = replaceNamedBlocks(commonContent, localSections.blocks);
+
+  if (localSections.before) {
+    if (localSections.sourcePath) {
+      usedLocalPaths.push(path.relative(process.cwd(), localSections.sourcePath).replaceAll("\\", "/"));
+    }
+    output += `${file.blockHeaders.before ?? ""}${localSections.before}\n`;
+  }
+
+  output += `${file.blockHeaders.common ?? ""}${renderedCommonContent}`;
+
+  if (localSections.after) {
+    if (localSections.sourcePath) {
+      const localPath = path.relative(process.cwd(), localSections.sourcePath).replaceAll("\\", "/");
+      if (!usedLocalPaths.includes(localPath)) {
+        usedLocalPaths.push(localPath);
+      }
+    }
+    output += `${file.blockHeaders.after ?? ""}${localSections.after}`;
+  }
+  output = output.replace(/\n{3,}/g, "\n\n");
+  output = output.replace(/\n\s{1,}\n/g, "\n");
+  return output + "\n";
+};
+
+const formatWithPrettier = async ({ targetPath, output, fmtError }) => {
+  try {
+    const fileInfo = await prettier.getFileInfo(targetPath);
+    if (fileInfo.ignored || !fileInfo.inferredParser) {
+      fmtError.push(`[sync:common] skipped prettier for ${targetPath}: parser unavailable`);
+      return output;
+    }
+
+    const config = (await prettier.resolveConfig(targetPath)) ?? {};
+    return normalizeLineEndings(
+      await prettier.format(output, {
+        ...config,
+        filepath: targetPath,
+      }),
+    );
+  } catch (error) {
+    fmtError.push(`[sync:common] skipped prettier for ${targetPath}: ${error.message}`);
+    return output;
+  }
+};
+
+const syncFiles = async ({ files, rootDir }) => {
+  let fmtError = [];
+  let generatedFile = [];
+  for (const file of files) {
+    const commonPath = ensureCommonFile(file);
+    if (!commonPath) {
+      continue;
+    }
+    const targetPath = path.join(rootDir, getTargetRelativePath(file));
+    const targetDir = path.dirname(targetPath);
+    if (!fs.existsSync(targetDir)) {
+      fs.mkdirSync(targetDir, { recursive: true });
+    }
+    const localPaths = Object.values(file.localFiles ?? {}).filter(Boolean);
+    const resolvedLocalPaths = localPaths.map(localPath => path.join(rootDir, localPath));
+    const localSections = parseLocalSections(resolvedLocalPaths);
+    const commonContent = normalizeLineEndings(fs.readFileSync(commonPath, "utf8")).trimEnd();
+    const usedLocalPaths = [];
+    const output = renderFile({ file, commonContent, localSections, usedLocalPaths });
+
+    const formattedOutput = await formatWithPrettier({ targetPath, output, fmtError });
+
+    fs.writeFileSync(targetPath, formattedOutput);
+    logGenerated({
+      rootDir,
+      targetPath,
+      commonPath,
+      localPaths: Object.values(file.localFiles ?? {}).filter(Boolean),
+      usedLocalPaths,
+      generatedFile,
+    });
+  }
+
+  if (generatedFile.length > 0) {
+    console.log(generatedFile.join("\n"));
+  }
+
+  if (fmtError.length > 0) {
+    console.log("\n" + fmtError.join("\n"));
+  }
+};
+
+export const runSyncCommon = async ({ rootDir, files = [], config = {} }) => {
+  const runtimeConfig = {
+    ...(config ?? {}),
+    files: [...normalizeFiles(config ?? {}), ...normalizeFiles(files)],
+  };
+  const managedFiles = mergeManagedFiles({}, runtimeConfig);
+
+  await syncFiles({ files: managedFiles, rootDir });
+};
+
+const isDirectRun = process.argv[1] && path.resolve(process.argv[1]) === __filename;
+
+if (isDirectRun) {
+  const cwd = process.cwd();
+  await runSyncCommon({ rootDir: cwd });
+}