@playcraft/devkit 1.0.26 → 1.0.27

package/core/utils/fontRegistry.js

@@ -1,4 +1,6 @@
-"use strict";/**
+'use strict';
+
+/**
  * 平台预置字体字典。
  *
  * 所有字体文件内置于 playable-scripts/core/resources/fonts/ 目录下。
@@ -9,21 +11,87 @@
  *   - builtin=false: 需要从本地字体文件读取并 base64 内联到产物中
  *
  * key 命名规范：与 theme.schema.json5 中 fontFamily 的 enum 值一一对应。
- */const path=require("path");/** 字体资源目录（随 npm 包发布） */const FONTS_DIR=path.join(__dirname,"..","resources","fonts");const FONT_REGISTRY={// ===== 系统自带字体（无需注入） =====
-system:{builtin:true,fallback:"system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", sans-serif"},Arial:{builtin:true,fallback:"Arial, Helvetica, sans-serif"},monaco:{builtin:true,fallback:"Monaco, \"Courier New\", monospace"},// ===== 平台内置字体（base64 内联注入） =====
-// key 必须与 theme.schema.json5 fontFamily.enum 值完全一致
-// Google Fonts 字体：单文件 woff2
-Poppins:{builtin:false,fontFileName:"poppins-regular.woff2",cssFamily:"Poppins, sans-serif"},"Noto Sans SC":{builtin:false,fontFileName:"noto-sans-sc-regular.woff2",cssFamily:"\"Noto Sans SC\", sans-serif"},// 本地 ttf 种子字体（单文件 woff2，由 download-fonts.js 用 pyftsubset 生成）
-"Pangmen Zhengdao":{builtin:false,fontFileName:"pangmen-regular.woff2",// 由 pangmen-biaoti.ttf subset 生成
-cssFamily:"\"Pangmen Zhengdao\", sans-serif"},// ZeoSeven 字体：unicode-range 子集（build 时按需筛选）
-"Maoken Zhuyuan Ti":{builtin:false,subsetsDir:"maoken",fontFileName:"maoken-regular.woff2",cssFamily:"\"Maoken Zhuyuan Ti\", sans-serif"}};/**
+ */
+
+const path = require('path');
+
+/** 字体资源目录（随 npm 包发布） */
+const FONTS_DIR = path.join(__dirname, '..', 'resources', 'fonts');
+
+const FONT_REGISTRY = {
+  // ===== 系统自带字体（无需注入） =====
+  system: {
+    builtin: true,
+    fallback: 'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif',
+  },
+  Arial: {
+    builtin: true,
+    fallback: 'Arial, Helvetica, sans-serif',
+  },
+  monaco: {
+    builtin: true,
+    fallback: 'Monaco, "Courier New", monospace',
+  },
+
+  // ===== 平台内置字体（base64 内联注入） =====
+  // key 必须与 theme.schema.json5 fontFamily.enum 值完全一致
+
+  // Google Fonts 字体：单文件 woff2
+  Poppins: {
+    builtin: false,
+    fontFileName: 'poppins-regular.woff2',
+    cssFamily: 'Poppins, sans-serif',
+  },
+  'Noto Sans SC': {
+    builtin: false,
+    fontFileName: 'noto-sans-sc-regular.woff2',
+    cssFamily: '"Noto Sans SC", sans-serif',
+  },
+
+  // 本地 ttf 种子字体（单文件 woff2，由 download-fonts.js 用 pyftsubset 生成）
+  'Pangmen Zhengdao': {
+    builtin: false,
+    fontFileName: 'pangmen-regular.woff2', // 由 pangmen-biaoti.ttf subset 生成
+    cssFamily: '"Pangmen Zhengdao", sans-serif',
+  },
+
+  // ZeoSeven 字体：unicode-range 子集（build 时按需筛选）
+  'Maoken Zhuyuan Ti': {
+    builtin: false,
+    subsetsDir: 'maoken',
+    fontFileName: 'maoken-regular.woff2',
+    cssFamily: '"Maoken Zhuyuan Ti", sans-serif',
+  },
+};
+
+/**
  * @returns {string[]} 所有已注册的字体 key 列表
- */function getRegisteredFontKeys(){return Object.keys(FONT_REGISTRY)}/**
+ */
+function getRegisteredFontKeys() {
+  return Object.keys(FONT_REGISTRY);
+}
+
+/**
  * @param {string} key - 字体 key
  * @returns {boolean} 是否为系统自带字体
- */function isBuiltin(key){return!!(FONT_REGISTRY[key]&&FONT_REGISTRY[key].builtin)}/**
+ */
+function isBuiltin(key) {
+  return !!(FONT_REGISTRY[key] && FONT_REGISTRY[key].builtin);
+}
+
+/**
  * @param {string} key - 字体 key
  * @returns {object|null} 字体配置对象，未注册返回 null
- */function getFontEntry(key){return FONT_REGISTRY[key]||null}/**
+ */
+function getFontEntry(key) {
+  return FONT_REGISTRY[key] || null;
+}
+
+/**
  * @returns {string} 字体资源目录绝对路径
- */function getFontsDir(){return FONTS_DIR}module.exports={FONT_REGISTRY,getRegisteredFontKeys,isBuiltin,getFontEntry,getFontsDir};
+ */
+function getFontsDir() {
+  return FONTS_DIR;
+}
+
+module.exports = { FONT_REGISTRY, getRegisteredFontKeys, isBuiltin, getFontEntry, getFontsDir };

package/core/utils/fontResolver.js

@@ -1,4 +1,6 @@
-"use strict";/**
+'use strict';
+
+/**
  * 字体解析工具。
  *
  * 负责：
@@ -9,9 +11,17 @@
  *   5. 读取字体内置文件，生成 base64 @font-face CSS
  *
  * dev / build 共用此模块。
- */const fs=require("fs");const path=require("path");const JSON5=require("json5");const{FONT_REGISTRY,isBuiltin,getFontsDir}=require("./fontRegistry");// ── 内存缓存（dev 模式多次 transformIndexHtml 时复用） ──
-let _cacheKey=null;// 'themeName::schemaMtime::dataMtime'
-let _cachedCSS=null;// 生成的 CSS 字符串 '' 表示无字体需要注入
+ */
+
+const fs = require('fs');
+const path = require('path');
+const JSON5 = require('json5');
+const { FONT_REGISTRY, isBuiltin, getFontsDir } = require('./fontRegistry');
+
+// ── 内存缓存（dev 模式多次 transformIndexHtml 时复用） ──
+let _cacheKey = null;       // 'themeName::schemaMtime::dataMtime'
+let _cachedCSS = null;      // 生成的 CSS 字符串 '' 表示无字体需要注入
+
 /**
  * 递归扫描 JSON Schema，收集所有名为 `fontFamily` 且有 `enum` 的字段节点。
  *
@@ -19,12 +29,64 @@ let _cachedCSS=null;// 生成的 CSS 字符串 '' 表示无字体需要注入
  * @param {Array<{trail: string[], enum: string[], default: string}>} nodes - 收集结果
  * @param {string[]} trail - 当前属性路径
  * @returns {Array}
- */function collectFontFamilySchemaNodes(schema,nodes=[],trail=[]){if(!schema||typeof schema!=="object")return nodes;if(schema.type==="object"&&schema.properties){for(const[key,sub]of Object.entries(schema.properties)){if(key==="fontFamily"&&sub&&Array.isArray(sub.enum)){nodes.push({trail:[...trail,key],enum:sub.enum,default:sub.default})}else{collectFontFamilySchemaNodes(sub,nodes,[...trail,key])}}}return nodes}/**
+ */
+function collectFontFamilySchemaNodes(schema, nodes = [], trail = []) {
+  if (!schema || typeof schema !== 'object') return nodes;
+  if (schema.type === 'object' && schema.properties) {
+    for (const [key, sub] of Object.entries(schema.properties)) {
+      if (key === 'fontFamily' && sub && Array.isArray(sub.enum)) {
+        nodes.push({
+          trail: [...trail, key],
+          enum: sub.enum,
+          default: sub.default,
+        });
+      } else {
+        collectFontFamilySchemaNodes(sub, nodes, [...trail, key]);
+      }
+    }
+  }
+  return nodes;
+}
+
+/**
  * 深度合并两个对象（同 validateThemeData.js 的 deepMerge 语义）。
  * override 中的值优先，数组整体替换不拼接。
- */function deepMerge(base,override){const result={...base};for(const key of Object.keys(override)){const bv=base[key];const ov=override[key];if(ov!==null&&typeof ov==="object"&&!Array.isArray(ov)&&bv!==null&&typeof bv==="object"&&!Array.isArray(bv)){result[key]=deepMerge(bv,ov)}else if(ov!==undefined){result[key]=ov}}return result}/**
+ */
+function deepMerge(base, override) {
+  const result = { ...base };
+  for (const key of Object.keys(override)) {
+    const bv = base[key];
+    const ov = override[key];
+    if (
+      ov !== null && typeof ov === 'object' && !Array.isArray(ov) &&
+      bv !== null && typeof bv === 'object' && !Array.isArray(bv)
+    ) {
+      result[key] = deepMerge(bv, ov);
+    } else if (ov !== undefined) {
+      result[key] = ov;
+    }
+  }
+  return result;
+}
+
+/**
  * 从 JSON Schema 递归提取 default 值树（同 validateThemeData.js）。
- */function extractDefaults(node){if(!node||typeof node!=="object")return undefined;if(node.type==="object"&&node.properties){const r={};for(const[k,v]of Object.entries(node.properties)){const val=extractDefaults(v);if(val!==undefined)r[k]=val}return Object.keys(r).length?r:undefined}if("default"in node)return node.default;return undefined}/**
+ */
+function extractDefaults(node) {
+  if (!node || typeof node !== 'object') return undefined;
+  if (node.type === 'object' && node.properties) {
+    const r = {};
+    for (const [k, v] of Object.entries(node.properties)) {
+      const val = extractDefaults(v);
+      if (val !== undefined) r[k] = val;
+    }
+    return Object.keys(r).length ? r : undefined;
+  }
+  if ('default' in node) return node.default;
+  return undefined;
+}
+
+/**
  * 合并 schema 的 default 值与 theme.data.json5。
  * 如果 schemaContent 已经是纯数据（非 Schema 格式），直接作为数据使用。
  *
@@ -32,21 +94,64 @@ let _cachedCSS=null;// 生成的 CSS 字符串 '' 表示无字体需要注入
  * @param {object} themeData     - 已解析的 theme.data.json5 内容
  * @param {string} themeName     - 当前主题名（仅用于日志）
  * @returns {object}
- */function mergeThemeData(schemaContent,themeData,themeName){// schema 已经是纯数据（如批量构建子进程中 schema 已被覆写）
-if(!isJsonSchema(schemaContent)){// 直接使用 schema 作为 mergedData
-return schemaContent}// schema 是 JSON Schema 格式 → 提取 default + 合并 theme.data
-return deepMerge(extractDefaults(schemaContent)||{},themeData||{})}/**
+ */
+function mergeThemeData(schemaContent, themeData, themeName) {
+  // schema 已经是纯数据（如批量构建子进程中 schema 已被覆写）
+  if (!isJsonSchema(schemaContent)) {
+    // 直接使用 schema 作为 mergedData
+    return schemaContent;
+  }
+  // schema 是 JSON Schema 格式 → 提取 default + 合并 theme.data
+  return deepMerge(extractDefaults(schemaContent) || {}, themeData || {});
+}
+
+/**
  * 判断对象是否为 JSON Schema 格式（有 type='object' 和 properties）。
- */function isJsonSchema(obj){return obj&&typeof obj==="object"&&obj.type==="object"&&typeof obj.properties==="object"}/**
+ */
+function isJsonSchema(obj) {
+  return obj && typeof obj === 'object' && obj.type === 'object' && typeof obj.properties === 'object';
+}
+
+/**
  * 递归遍历 mergedData，提取所有 key 为 `fontFamily` 的字符串值。
  *
  * @param {object} mergedData
  * @param {string[]} values
  * @returns {string[]}
- */function collectUsedFontFamilies(mergedData,values=[]){if(!mergedData||typeof mergedData!=="object")return values;for(const[k,v]of Object.entries(mergedData)){if(k==="fontFamily"&&typeof v==="string"&&v){values.push(v)}else if(v&&typeof v==="object"&&!Array.isArray(v)){collectUsedFontFamilies(v,values)}}return values}/**
+ */
+function collectUsedFontFamilies(mergedData, values = []) {
+  if (!mergedData || typeof mergedData !== 'object') return values;
+  for (const [k, v] of Object.entries(mergedData)) {
+    if (k === 'fontFamily' && typeof v === 'string' && v) {
+      values.push(v);
+    } else if (v && typeof v === 'object' && !Array.isArray(v)) {
+      collectUsedFontFamilies(v, values);
+    }
+  }
+  return values;
+}
+
+/**
  * 读取字体文件并返回 base64 编码内容。
  * 支持缓存，同进程内同一文件只读一次。
- */const _fontDataCache=new Map;function readFontBase64(fileName){if(_fontDataCache.has(fileName))return _fontDataCache.get(fileName);const fontPath=path.join(getFontsDir(),fileName);if(!fs.existsSync(fontPath)){console.warn(`[font] Font file not found: ${fontPath}, skipping`);_fontDataCache.set(fileName,null);return null}const data=fs.readFileSync(fontPath);const base64=data.toString("base64");_fontDataCache.set(fileName,base64);return base64}/**
+ */
+const _fontDataCache = new Map();
+
+function readFontBase64(fileName) {
+  if (_fontDataCache.has(fileName)) return _fontDataCache.get(fileName);
+  const fontPath = path.join(getFontsDir(), fileName);
+  if (!fs.existsSync(fontPath)) {
+    console.warn(`[font] Font file not found: ${fontPath}, skipping`);
+    _fontDataCache.set(fileName, null);
+    return null;
+  }
+  const data = fs.readFileSync(fontPath);
+  const base64 = data.toString('base64');
+  _fontDataCache.set(fileName, base64);
+  return base64;
+}
+
+/**
  * 主入口：根据项目根目录 + 主题名称，计算字体注入计划。
  *
  * @param {object} opts
@@ -60,41 +165,234 @@ return deepMerge(extractDefaults(schemaContent)||{},themeData||{})}/**
  *   injectFonts: Array<{key: string, entry: object}>,
  *   warnings: string[]
  * }}
- */function resolveFontPlans(opts){const{projectRoot,themeName,themeConfig,mergedData:preMerged}=opts;const sourceDir=themeConfig&&themeConfig.sourceDir||"src/theme";const themeBaseDir=path.join(projectRoot,sourceDir);const schemaPath=path.join(themeBaseDir,"theme.schema.json5");const dataPath=path.join(themeBaseDir,themeName,"theme.data.json5");if(!fs.existsSync(schemaPath)){return{usedFonts:[],builtinFonts:[],injectFonts:[],mergedData:{},warnings:[]}}const schemaContent=JSON5.parse(fs.readFileSync(schemaPath,"utf8"));// 收集 schema 中所有 fontFamily 字段的 enum 合集作为白名单
-const nodes=collectFontFamilySchemaNodes(schemaContent);const schemaEnumSet=new Set;nodes.forEach(n=>n.enum.forEach(e=>schemaEnumSet.add(e)));// 合并数据：优先使用传入的预合并数据，其次 IO 自算
-let mergedData;if(preMerged){mergedData=preMerged}else{const themeData=fs.existsSync(dataPath)?JSON5.parse(fs.readFileSync(dataPath,"utf8")):{};mergedData=mergeThemeData(schemaContent,themeData,themeName)}// 收集使用过的 fontFamily（去重）
-const rawUsed=collectUsedFontFamilies(mergedData);const usedFonts=Array.from(new Set(rawUsed));// 分类 + 校验
-const builtinFonts=[];const injectFonts=[];const warnings=[];for(const key of usedFonts){if(!FONT_REGISTRY[key]){warnings.push(`[font] "${key}" not found in FONT_REGISTRY, will use as raw CSS font-family`);continue}if(schemaEnumSet.size>0&&!schemaEnumSet.has(key)){warnings.push(`[font] "${key}" used but not declared in any schema fontFamily.enum`)}if(isBuiltin(key)){builtinFonts.push(key)}else{injectFonts.push({key,entry:FONT_REGISTRY[key]})}}return{usedFonts,builtinFonts,injectFonts,mergedData,warnings}}/**
+ */
+function resolveFontPlans(opts) {
+  const { projectRoot, themeName, themeConfig, mergedData: preMerged } = opts;
+  const sourceDir = (themeConfig && themeConfig.sourceDir) || 'src/theme';
+  const themeBaseDir = path.join(projectRoot, sourceDir);
+  const schemaPath = path.join(themeBaseDir, 'theme.schema.json5');
+  const dataPath = path.join(themeBaseDir, themeName, 'theme.data.json5');
+
+  if (!fs.existsSync(schemaPath)) {
+    return { usedFonts: [], builtinFonts: [], injectFonts: [], mergedData: {}, warnings: [] };
+  }
+
+  const schemaContent = JSON5.parse(fs.readFileSync(schemaPath, 'utf8'));
+
+  // 收集 schema 中所有 fontFamily 字段的 enum 合集作为白名单
+  const nodes = collectFontFamilySchemaNodes(schemaContent);
+  const schemaEnumSet = new Set();
+  nodes.forEach(n => n.enum.forEach(e => schemaEnumSet.add(e)));
+
+  // 合并数据：优先使用传入的预合并数据，其次 IO 自算
+  let mergedData;
+  if (preMerged) {
+    mergedData = preMerged;
+  } else {
+    const themeData = fs.existsSync(dataPath) ? JSON5.parse(fs.readFileSync(dataPath, 'utf8')) : {};
+    mergedData = mergeThemeData(schemaContent, themeData, themeName);
+  }
+
+  // 收集使用过的 fontFamily（去重）
+  const rawUsed = collectUsedFontFamilies(mergedData);
+  const usedFonts = Array.from(new Set(rawUsed));
+
+  // 分类 + 校验
+  const builtinFonts = [];
+  const injectFonts = [];
+  const warnings = [];
+
+  for (const key of usedFonts) {
+    if (!FONT_REGISTRY[key]) {
+      warnings.push(`[font] "${key}" not found in FONT_REGISTRY, will use as raw CSS font-family`);
+      continue;
+    }
+    if (schemaEnumSet.size > 0 && !schemaEnumSet.has(key)) {
+      warnings.push(`[font] "${key}" used but not declared in any schema fontFamily.enum`);
+    }
+    if (isBuiltin(key)) {
+      builtinFonts.push(key);
+    } else {
+      injectFonts.push({ key, entry: FONT_REGISTRY[key] });
+    }
+  }
+
+  return { usedFonts, builtinFonts, injectFonts, mergedData, warnings };
+}
+
+/**
  * 递归遍历配置对象，收集所有字符串值（用于提取文案字符集）。
- */function collectAllStrings(obj,strs=[]){if(!obj||typeof obj!=="object")return strs;for(const[k,v]of Object.entries(obj)){if(typeof v==="string"&&v){strs.push(v)}else if(v&&typeof v==="object"&&!Array.isArray(v)){collectAllStrings(v,strs)}}return strs}/**
+ */
+function collectAllStrings(obj, strs = []) {
+  if (!obj || typeof obj !== 'object') return strs;
+  for (const [k, v] of Object.entries(obj)) {
+    if (typeof v === 'string' && v) {
+      strs.push(v);
+    } else if (v && typeof v === 'object' && !Array.isArray(v)) {
+      collectAllStrings(v, strs);
+    }
+  }
+  return strs;
+}
+
+/**
  * 解析单个 unicode-range 值（如 "U+4E00-9FFF, U+3400-4DBF"），判断是否覆盖 codePoint。
- */function rangeCoversCodePoint(rangeStr,cp){const parts=rangeStr.split(/\s*,\s*/);for(const part of parts){const m=part.match(/^U\+([0-9A-Fa-f]+)(?:-U\+([0-9A-Fa-f]+))?/);if(!m)continue;const lo=parseInt(m[1],16);const hi=m[2]?parseInt(m[2],16):lo;if(cp>=lo&&cp<=hi)return true}return false}/**
+ */
+function rangeCoversCodePoint(rangeStr, cp) {
+  const parts = rangeStr.split(/\s*,\s*/);
+  for (const part of parts) {
+    const m = part.match(/^U\+([0-9A-Fa-f]+)(?:-U\+([0-9A-Fa-f]+))?/);
+    if (!m) continue;
+    const lo = parseInt(m[1], 16);
+    const hi = m[2] ? parseInt(m[2], 16) : lo;
+    if (cp >= lo && cp <= hi) return true;
+  }
+  return false;
+}
+
+/**
  * 从 ZeoSeven 子集目录中，筛选出 covering 目标字符集的子集 woff2 文件。
  * @returns {{ css: string, usedFiles: string[] }} 或 null
- */function buildSubsetCSS(key,entry,targetChars){const subsDir=path.join(getFontsDir(),entry.subsetsDir);const indexPath=path.join(subsDir,"index.json");if(!fs.existsSync(indexPath))return null;const index=JSON.parse(fs.readFileSync(indexPath,"utf8"));// { "hash.woff2": "U+..." }
-// 找出覆盖目标字符的子集文件名（去重）
-const neededFiles=new Set;const matchedRanges={};// debug
-for(const ch of targetChars){const cp=ch.codePointAt(0);for(const[file,rangeStr]of Object.entries(index)){if(rangeCoversCodePoint(rangeStr,cp)){neededFiles.add(file);matchedRanges[ch]=rangeStr;// debug
-break}}}if(targetChars.length<=20){console.log(`[font] ${key} subset matching:`,matchedRanges)}console.log(`[font] ${key}: ${neededFiles.size} subsets for ${targetChars.length} unique chars`);if(neededFiles.size===0)return null;// 读取每个需要的子集文件并生成 @font-face 声明
-// 使用 cssFamily 中的主字体名（如 Poppins），而非内部 key（如 poppins）
-const familyName=entry.cssFamily?entry.cssFamily.split(",")[0].trim().replace(/^["']|["']$/g,""):key;const blocks=[];for(const file of neededFiles){const data=readFontBase64(path.join(entry.subsetsDir,file));if(!data)continue;const range=index[file];blocks.push(`@font-face{font-family:'${familyName}';src:url(data:font/woff2;base64,${data}) format('woff2');unicode-range:${range};font-display:swap}`)}return blocks.length>0?{css:blocks.join("\n"),usedFiles:[...neededFiles]}:null}/**
+ */
+function buildSubsetCSS(key, entry, targetChars) {
+  const subsDir = path.join(getFontsDir(), entry.subsetsDir);
+  const indexPath = path.join(subsDir, 'index.json');
+
+  if (!fs.existsSync(indexPath)) return null;
+
+  const index = JSON.parse(fs.readFileSync(indexPath, 'utf8')); // { "hash.woff2": "U+..." }
+
+  // 找出覆盖目标字符的子集文件名（去重）
+  const neededFiles = new Set();
+  const matchedRanges = {}; // debug
+  for (const ch of targetChars) {
+    const cp = ch.codePointAt(0);
+    for (const [file, rangeStr] of Object.entries(index)) {
+      if (rangeCoversCodePoint(rangeStr, cp)) {
+        neededFiles.add(file);
+        matchedRanges[ch] = rangeStr; // debug
+        break;
+      }
+    }
+  }
+
+  if (targetChars.length <= 20) {
+    console.log(`[font] ${key} subset matching:`, matchedRanges);
+  }
+  console.log(`[font] ${key}: ${neededFiles.size} subsets for ${targetChars.length} unique chars`);
+
+  if (neededFiles.size === 0) return null;
+
+  // 读取每个需要的子集文件并生成 @font-face 声明
+  // 使用 cssFamily 中的主字体名（如 Poppins），而非内部 key（如 poppins）
+  const familyName = entry.cssFamily ? entry.cssFamily.split(',')[0].trim().replace(/^["']|["']$/g, '') : key;
+  const blocks = [];
+  for (const file of neededFiles) {
+    const data = readFontBase64(path.join(entry.subsetsDir, file));
+    if (!data) continue;
+    const range = index[file];
+    blocks.push(
+      `@font-face{font-family:'${familyName}';src:url(data:font/woff2;base64,${data}) format('woff2');unicode-range:${range};font-display:swap}`
+    );
+  }
+
+  return blocks.length > 0 ? { css: blocks.join('\n'), usedFiles: [...neededFiles] } : null;
+}
+
+/**
  * 生成要注入到 <head> 的 <style> 片段（base64 @font-face）。
  *
  * @param {Array<{key: string, entry: object}>} injectFonts
  * @param {object} mergedData - 合并后的主题数据，用于提取字符集
  * @returns {string}
- */function generateFontFaceStyle(injectFonts,mergedData){if(!injectFonts||injectFonts.length===0)return"";// 从配置中提取所有文案字符（用于动态 subset）
-const allStrings=collectAllStrings(mergedData||{});const targetChars=[...new Set(allStrings.join("").split(""))].join("");const blocks=[];for(const{key,entry}of injectFonts){// ZeoSeven 字体：按需筛选 unicode-range 子集
-if(entry.subsetsDir){const subset=buildSubsetCSS(key,entry,targetChars);if(subset){blocks.push(subset.css);console.log(`[font] ${key}: ${subset.usedFiles.length} subsets for ${targetChars.length} unique chars`);continue}// subsetsDir 存在但筛选失败 → 回退到单文件
-}// Google Fonts / 单文件回退
-const base64=readFontBase64(entry.fontFileName);if(!base64)continue;// 使用 cssFamily 的主字体名，与游戏代码中 fontFamily 值一致
-const familyName=entry.cssFamily?entry.cssFamily.split(",")[0].trim().replace(/^["']|["']$/g,""):key;blocks.push(`@font-face{font-family:'${familyName}';src:url(data:font/woff2;base64,${base64}) format('woff2');font-display:swap}`)}if(blocks.length===0)return"";return`<style data-playable-fonts>\n${blocks.join("\n")}\n</style>`}/**
+ */
+function generateFontFaceStyle(injectFonts, mergedData) {
+  if (!injectFonts || injectFonts.length === 0) return '';
+
+  // 从配置中提取所有文案字符（用于动态 subset）
+  const allStrings = collectAllStrings(mergedData || {});
+  const targetChars = [...new Set(allStrings.join('').split(''))].join('');
+
+  const blocks = [];
+
+  for (const { key, entry } of injectFonts) {
+    // ZeoSeven 字体：按需筛选 unicode-range 子集
+    if (entry.subsetsDir) {
+      const subset = buildSubsetCSS(key, entry, targetChars);
+      if (subset) {
+        blocks.push(subset.css);
+        console.log(`[font] ${key}: ${subset.usedFiles.length} subsets for ${targetChars.length} unique chars`);
+        continue;
+      }
+      // subsetsDir 存在但筛选失败 → 回退到单文件
+    }
+    // Google Fonts / 单文件回退
+    const base64 = readFontBase64(entry.fontFileName);
+    if (!base64) continue;
+    // 使用 cssFamily 的主字体名，与游戏代码中 fontFamily 值一致
+    const familyName = entry.cssFamily ? entry.cssFamily.split(',')[0].trim().replace(/^["']|["']$/g, '') : key;
+    blocks.push(
+      `@font-face{font-family:'${familyName}';src:url(data:font/woff2;base64,${base64}) format('woff2');font-display:swap}`
+    );
+  }
+
+  if (blocks.length === 0) return '';
+
+  return `<style data-playable-fonts>\n${blocks.join('\n')}\n</style>`;
+}
+
+/**
  * dev/build 统一入口：获取字体 CSS。
  * 内建基于 schema/theme.data 修改时间的缓存，dev 模式下避免重复 IO。
  *
  * @param {object} opts - 同 resolveFontPlans
  * @param {boolean} [opts.force] - 强制跳过缓存
  * @returns {string}
- */function getOrGenerateFontCSS(opts){const{projectRoot,themeName,themeConfig,force}=opts;const sourceDir=themeConfig&&themeConfig.sourceDir||"src/theme";const themeBaseDir=path.join(projectRoot,sourceDir);const schemaPath=path.join(themeBaseDir,"theme.schema.json5");const dataPath=path.join(themeBaseDir,themeName,"theme.data.json5");if(!fs.existsSync(schemaPath))return"";// 构建缓存 key：主题名 + 两个文件的修改时间
-const schemaMtime=fs.statSync(schemaPath).mtimeMs;const dataMtime=fs.existsSync(dataPath)?fs.statSync(dataPath).mtimeMs:0;const cacheKey=`${themeName}::${schemaMtime}::${dataMtime}`;if(!force&&_cacheKey===cacheKey&&_cachedCSS!==null){return _cachedCSS}const plan=resolveFontPlans({projectRoot,themeName,themeConfig,mergedData:opts.mergedData});// 打印 warn
-plan.warnings.forEach(w=>console.warn(w));const css=generateFontFaceStyle(plan.injectFonts,plan.mergedData);if(plan.injectFonts.length>0){const names=plan.injectFonts.map(f=>f.key).join(", ");console.log(`[font] Injecting fonts: ${names}`)}if(plan.builtinFonts.length>0){console.log(`[font] Using system fonts: ${plan.builtinFonts.join(", ")}`)}_cacheKey=cacheKey;_cachedCSS=css;return css}module.exports={collectFontFamilySchemaNodes,mergeThemeData,collectUsedFontFamilies,resolveFontPlans,generateFontFaceStyle,getOrGenerateFontCSS,isJsonSchema};
+ */
+function getOrGenerateFontCSS(opts) {
+  const { projectRoot, themeName, themeConfig, force } = opts;
+  const sourceDir = (themeConfig && themeConfig.sourceDir) || 'src/theme';
+  const themeBaseDir = path.join(projectRoot, sourceDir);
+  const schemaPath = path.join(themeBaseDir, 'theme.schema.json5');
+  const dataPath = path.join(themeBaseDir, themeName, 'theme.data.json5');
+
+  if (!fs.existsSync(schemaPath)) return '';
+
+  // 构建缓存 key：主题名 + 两个文件的修改时间
+  const schemaMtime = fs.statSync(schemaPath).mtimeMs;
+  const dataMtime = fs.existsSync(dataPath) ? fs.statSync(dataPath).mtimeMs : 0;
+  const cacheKey = `${themeName}::${schemaMtime}::${dataMtime}`;
+
+  if (!force && _cacheKey === cacheKey && _cachedCSS !== null) {
+    return _cachedCSS;
+  }
+
+  const plan = resolveFontPlans({ projectRoot, themeName, themeConfig, mergedData: opts.mergedData });
+
+  // 打印 warn
+  plan.warnings.forEach(w => console.warn(w));
+
+  const css = generateFontFaceStyle(plan.injectFonts, plan.mergedData);
+
+  if (plan.injectFonts.length > 0) {
+    const names = plan.injectFonts.map(f => f.key).join(', ');
+    console.log(`[font] Injecting fonts: ${names}`);
+  }
+  if (plan.builtinFonts.length > 0) {
+    console.log(`[font] Using system fonts: ${plan.builtinFonts.join(', ')}`);
+  }
+
+  _cacheKey = cacheKey;
+  _cachedCSS = css;
+  return css;
+}
+
+module.exports = {
+  collectFontFamilySchemaNodes,
+  mergeThemeData,
+  collectUsedFontFamilies,
+  resolveFontPlans,
+  generateFontFaceStyle,
+  getOrGenerateFontCSS,
+  isJsonSchema,
+};

package/core/utils/generateAdikteevHtmlWebpackPluginConfig.js

@@ -1,4 +1,7 @@
-"use strict";const fs=require("fs");const path=require("path");/**
+const fs = require('fs');
+const path = require('path');
+
+/**
  * Adikteev 平台要求的占位符变量
  * 这些变量会在生产环境中被 Adikteev 平台替换为实际值
  * 
@@ -9,13 +12,16 @@
  * 2. CSS 必须单独提取为 style.css，通过 <link rel="stylesheet"> 引用
  * 3. JS 必须单独为 creative.js，通过 <script src> 引用
  * 4. JS 和 CSS 文件会被上传到 Adikteev CDN
- */const AdikteevPlaceholders=`<meta charset="UTF-8">
+ */
+const AdikteevPlaceholders = `<meta charset="UTF-8">
 <link rel="stylesheet" href="style.css">
 <script type="application/javascript">
   var AK_CLICK_DESTINATION_URL = "PLACEHOLDER_CLICK_REDIRECT";
   var AK_CLICK_PIXEL_URL = "PLACEHOLDER_CLICK_PIXEL";
 </script>
-<script type="application/javascript" src="creative.js"></script>`;/**
+<script type="application/javascript" src="creative.js"></script>`;
+
+/**
  * 生成 Adikteev 平台所需的 HTML 配置
  * 
  * Adikteev 特殊要求:
@@ -30,7 +36,36 @@
  * - style.css → 上传到 Adikteev CDN
  * - creative.js → 上传到 Adikteev CDN
  * - index.html → HTML 片段（引用上述文件）
- */exports.generateAdikteevHtmlWebpackPluginConfig=function generateAdikteevHtmlWebpackPluginConfig(originalHtmlContentPath){originalHtmlContentPath=originalHtmlContentPath||"src/index.html";let originalBody="";try{const content=fs.readFileSync(path.resolve(originalHtmlContentPath),"utf8");const match=content.match(/<body>([\s\S]*?)<\/body>/);if(match){originalBody=match[1].trim();// 移除缩进以获得更清晰的输出
-originalBody=originalBody.replaceAll("    ","").replaceAll("\t","")}}catch(e){console.warn("[Adikteev] Could not read original HTML body:",e.message)}return{filename:"index.html",inject:false,minify:false,templateContent:({htmlWebpackPlugin})=>{// 生成 HTML 代码片段（非完整文档）
-// 结构: CSS 引用 → 占位符变量 → JS 引用 → body 内容
-return[AdikteevPlaceholders,originalBody].join("\n")}}};
+ */
+exports.generateAdikteevHtmlWebpackPluginConfig = function generateAdikteevHtmlWebpackPluginConfig(originalHtmlContentPath) {
+  originalHtmlContentPath = originalHtmlContentPath || 'src/index.html';
+  let originalBody = '';
+
+  try {
+    const content = fs.readFileSync(path.resolve(originalHtmlContentPath), 'utf8');
+    const match = content.match(/<body>([\s\S]*?)<\/body>/);
+
+    if (match) {
+      originalBody = match[1].trim();
+      // 移除缩进以获得更清晰的输出
+      originalBody = originalBody.replaceAll('    ', '').replaceAll('\t', '');
+    }
+  } catch (e) {
+    console.warn('[Adikteev] Could not read original HTML body:', e.message);
+  }
+
+  return {
+    filename: 'index.html',
+    inject: false,
+    minify: false,
+    templateContent: ({ htmlWebpackPlugin }) => {
+      // 生成 HTML 代码片段（非完整文档）
+      // 结构: CSS 引用 → 占位符变量 → JS 引用 → body 内容
+      return [
+        AdikteevPlaceholders,
+        originalBody
+      ].join('\n');
+    }
+  };
+};
+

package/core/utils/generateBigabidHtmlWebpackPluginConfig.js

@@ -1,4 +1,7 @@
-"use strict";const fs=require("fs");const path=require("path");const BigabidPlaceholders=`<meta charset="UTF-8">
+const fs = require('fs');
+const path = require('path');
+
+const BigabidPlaceholders = `<meta charset="UTF-8">
 <script src="mraid.js"></script>
 <script>window.BIGABID_BIDTIMEMACROS = {  
   mraid_viewable: unescape("#IMP_TRACE_MRAID_VIEWABLE_ESC#"),  
@@ -9,5 +12,29 @@
   final_url: unescape("#FINAL_LANDING_URL_ESC#")  
 }</script>  
 <script src="#BIGABID_PLAYABLE_CDN_URL#"></script>  
-%{IMP_BEACON}`;exports.generateBigabidHtmlWebpackPluginConfig=function generateBigabidHtmlWebpackPluginConfig(originalHtmlContentPath){originalHtmlContentPath=originalHtmlContentPath||"src/index.html";let originalBody="";try{const content=fs.readFileSync(path.resolve(originalHtmlContentPath),"utf8");const match=content.match(/<body>([\s\S]*?)<\/body>/);if(match){originalBody=match[1].trim();// Remove tabs for a better look
-originalBody=originalBody.replaceAll("    ","").replaceAll("\t","")}}catch(e){}return{filename:"index.html",inject:false,minify:false,templateContent:({htmlWebpackPlugin})=>{return[BigabidPlaceholders,htmlWebpackPlugin.tags.headTags,originalBody].join("\n")}}};
+%{IMP_BEACON}`;
+
+exports.generateBigabidHtmlWebpackPluginConfig = function generateBigabidHtmlWebpackPluginConfig(originalHtmlContentPath) {
+  originalHtmlContentPath = originalHtmlContentPath || 'src/index.html';
+  let originalBody = '';
+
+  try {
+    const content = fs.readFileSync(path.resolve(originalHtmlContentPath), 'utf8');
+    const match = content.match(/<body>([\s\S]*?)<\/body>/);
+
+    if (match) {
+      originalBody = match[1].trim();
+      // Remove tabs for a better look
+      originalBody = originalBody.replaceAll('    ', '').replaceAll('\t', '');
+    }
+  } catch (e) {}
+
+  return {
+    filename: 'index.html',
+    inject: false,
+    minify: false,
+    templateContent: ({ htmlWebpackPlugin }) => {
+      return [BigabidPlaceholders, htmlWebpackPlugin.tags.headTags, originalBody].join('\n');
+    }
+  };
+};