@playcraft/build 0.0.17 → 0.0.21

package/dist/vite/plugin-source-builder.js

@@ -444,18 +444,16 @@ function validateAndCleanSceneScripts(sceneData, registeredScripts, _sceneName /
         // 处理 ESM 格式：scripts 是对象 { scriptName: {...}, ... }
         if (scriptComp.scripts && typeof scriptComp.scripts === 'object' && !Array.isArray(scriptComp.scripts)) {
             const validScripts = {};
-            const validOrder = [];
             for (const [scriptName, scriptData] of Object.entries(scriptComp.scripts)) {
                 if (registeredScripts.has(scriptName)) {
                     validScripts[scriptName] = scriptData;
-                    if (scriptComp.order?.includes(scriptName)) {
-                        validOrder.push(scriptName);
-                    }
                 }
                 else {
                     removedScripts.push(`${entity.name || entityId}/${scriptName}`);
                 }
             }
+            // BUG: Preserve original order: filter based on the original order array, not scripts object key order
+            const validOrder = (scriptComp.order || []).filter((name) => name in validScripts);
             scriptComp.scripts = validScripts;
             scriptComp.order = validOrder;
             // 如果所有脚本都被移除，删除整个 script 组件
@@ -571,6 +569,52 @@ outputDir, selectedScenes) {
         }
     }
 }
+/**
+ * 构建文件夹 ID -> 完整目录路径的映射
+ * PlayCraft Git 项目的 assets.json 中，资产的 path 字段是文件夹 ID 数组（如 [30097022, 30097024]），
+ * 需要通过递归遍历构建每个 folder ID 对应的完整路径（如 "LiteCreator/System"）
+ */
+function buildFolderFullPathMap(assets) {
+    const folderMap = new Map();
+    const buildPath = (folderId, visited = new Set()) => {
+        if (visited.has(folderId))
+            return '';
+        if (folderMap.has(folderId))
+            return folderMap.get(folderId);
+        visited.add(folderId);
+        const folder = assets[folderId];
+        if (!folder || folder.type !== 'folder')
+            return '';
+        const pathIds = folder.path || [];
+        if (pathIds.length === 0) {
+            folderMap.set(folderId, folder.name);
+            return folder.name;
+        }
+        // 最后一个 ID 是直接父文件夹
+        const parentId = String(pathIds[pathIds.length - 1]);
+        const parentPath = buildPath(parentId, visited);
+        const fullPath = parentPath ? `${parentPath}/${folder.name}` : folder.name;
+        folderMap.set(folderId, fullPath);
+        return fullPath;
+    };
+    for (const [id, asset] of Object.entries(assets)) {
+        if (asset.type === 'folder') {
+            buildPath(id);
+        }
+    }
+    return folderMap;
+}
+/**
+ * 从资产的 path 数组（文件夹 ID 列表）重建 treePath
+ * path 数组中最后一个 ID 是直接父文件夹
+ */
+function resolveTreePathFromPathArray(pathIds, folderFullPathMap) {
+    if (!pathIds || !Array.isArray(pathIds) || pathIds.length === 0) {
+        return '';
+    }
+    const parentFolderId = String(pathIds[pathIds.length - 1]);
+    return folderFullPathMap.get(parentFolderId) || '';
+}
 /**
  * 规范化资源 URL（补齐 file.url）
  * 源码导出中的资源只有 file.filename，没有 file.url
@@ -580,6 +624,8 @@ async function normalizeAssetUrls(projectConfig, projectDir) {
     const assets = projectConfig.format === 'playcanvas'
         ? projectConfig.assets
         : projectConfig.assets;
+    // 构建文件夹 ID -> 完整路径的映射（用于从 path 数组重建 treePath）
+    const folderFullPathMap = buildFolderFullPathMap(assets);
     let normalizedCount = 0;
     let notFoundCount = 0;
     for (const [assetId, asset] of Object.entries(assets)) {
@@ -620,13 +666,21 @@ async function normalizeAssetUrls(projectConfig, projectDir) {
             path.join('files', 'assets', String(assetId), filename),
             path.join('files', filename),
         ];
-        // PlayCraft 结构：使用 treePath 或 path 字段推断文件位置
+        // PlayCraft 结构：使用 treePath 推断文件位置
         if (assetData.treePath) {
+            candidates.push(path.join('assets', assetData.treePath, filename));
             candidates.push(path.join(assetData.treePath, filename));
         }
-        if (assetData.path && typeof assetData.path === 'string') {
-            candidates.push(assetData.path);
+        // PlayCraft Git 仓库结构：从 path 数组（文件夹 ID 列表）重建 treePath
+        if (assetData.path && Array.isArray(assetData.path) && assetData.path.length > 0) {
+            const computedTreePath = resolveTreePathFromPathArray(assetData.path, folderFullPathMap);
+            if (computedTreePath) {
+                candidates.push(path.join('assets', computedTreePath, filename));
+                candidates.push(path.join(computedTreePath, filename));
+            }
         }
+        // 最后尝试直接在 assets/ 根目录下查找（顶层文件）
+        candidates.push(path.join('assets', filename));
         let found = false;
         for (const rel of candidates) {
             const abs = path.join(projectDir, rel);
@@ -687,6 +741,156 @@ async function patchScriptAssets(config, outputDir) {
         }
     }
 }
+/**
+ * Analyze script file import dependencies and add missing dependency scripts to config.assets.
+ * This handles cases like: BoardRandomFiller.mjs imports ./BoardShapeGenerator.mjs,
+ * which is not directly referenced in the scene or templates.
+ */
+async function collectScriptImportDependencies(projectConfig, projectDir, importMap, configAssets) {
+    const assets = projectConfig.format === 'playcanvas'
+        ? projectConfig.assets
+        : projectConfig.assets;
+    // Build folder ID -> name mapping
+    const folderMap = new Map();
+    for (const [assetId, asset] of Object.entries(assets)) {
+        if (asset.type === 'folder') {
+            folderMap.set(assetId, asset.name);
+        }
+    }
+    // Build reverse mapping: targetPath -> assetId (for ALL script assets, not just configAssets)
+    const targetPathToAssetId = new Map();
+    for (const [assetId, asset] of Object.entries(assets)) {
+        const assetData = asset;
+        if (assetData.type !== 'script')
+            continue;
+        const filename = assetData.file?.filename || assetData.name + '.mjs';
+        const pathIds = assetData.path || [];
+        const folderPath = buildScriptFolderPath(pathIds, folderMap);
+        const targetPath = resolveTargetPathFromImportMap(folderPath, filename, importMap);
+        if (targetPath) {
+            targetPathToAssetId.set(targetPath.replace(/\\/g, '/'), assetId);
+        }
+    }
+    // Regex to extract import specifiers from script content
+    const importRegex = /(from\s+['"])([^'"]+)(['"])|(\bimport\s*\(\s*['"])([^'"]+)(['"]\s*\))/g;
+    const importsMap = importMap.content.imports || {};
+    // Iteratively discover new script dependencies
+    const processedScripts = new Set();
+    let newDepsFound = true;
+    while (newDepsFound) {
+        newDepsFound = false;
+        const currentScriptIds = Object.keys(configAssets).filter(id => configAssets[id].type === 'script' && !processedScripts.has(id));
+        for (const scriptId of currentScriptIds) {
+            processedScripts.add(scriptId);
+            const assetData = assets[scriptId];
+            if (!assetData)
+                continue;
+            // Resolve source file path
+            const sourcePath = await resolveScriptSourcePath(assetData, scriptId, projectDir);
+            if (!sourcePath)
+                continue;
+            let content;
+            try {
+                content = await fs.readFile(sourcePath, 'utf-8');
+            }
+            catch {
+                continue;
+            }
+            // Get current script's target path for relative path resolution
+            const filename = assetData.file?.filename || assetData.name + '.mjs';
+            const pathIds = assetData.path || [];
+            const folderPath = buildScriptFolderPath(pathIds, folderMap);
+            const scriptTargetPath = resolveTargetPathFromImportMap(folderPath, filename, importMap);
+            if (!scriptTargetPath)
+                continue;
+            const scriptDir = path.dirname(scriptTargetPath).replace(/\\/g, '/');
+            // Parse all import statements
+            let match;
+            importRegex.lastIndex = 0;
+            while ((match = importRegex.exec(content)) !== null) {
+                const modulePath = match[2] || match[5];
+                if (!modulePath)
+                    continue;
+                let resolvedTargetPath = null;
+                if (modulePath.startsWith('./') || modulePath.startsWith('../')) {
+                    // Relative import: resolve against script's directory
+                    const joined = path.posix.join(scriptDir, modulePath);
+                    resolvedTargetPath = path.posix.normalize(joined);
+                }
+                else if (!modulePath.startsWith('/') && !modulePath.startsWith('http')) {
+                    // Import Map alias: resolve via import map
+                    resolvedTargetPath = resolveModulePathViaImportMap(modulePath, importsMap);
+                }
+                if (!resolvedTargetPath)
+                    continue;
+                resolvedTargetPath = resolvedTargetPath.replace(/\\/g, '/');
+                // Look up the asset by target path
+                const depAssetId = targetPathToAssetId.get(resolvedTargetPath);
+                if (depAssetId === undefined) {
+                    console.warn(`Warning: resolvedTargetPath '${resolvedTargetPath}' not found in targetPathToAssetId`);
+                }
+                else if (!configAssets[depAssetId]) {
+                    // Found a missing dependency — add it to configAssets
+                    configAssets[depAssetId] = assets[depAssetId];
+                    newDepsFound = true;
+                    console.log(`📜 [ScriptDeps] ${assetData.name} imports ${assets[depAssetId].name} (${depAssetId}) — added to configAssets`);
+                }
+            }
+        }
+    }
+}
+/**
+ * Resolve the source file path for a script asset.
+ * @param assets - 可选，所有资产的 map，用于从 path 数组重建 treePath（PlayCraft Git 仓库场景）
+ */
+async function resolveScriptSourcePath(assetData, scriptId, projectDir, assets) {
+    if (assetData.file?.url) {
+        const fullPath = path.join(projectDir, assetData.file.url);
+        try {
+            await fs.access(fullPath);
+            return fullPath;
+        }
+        catch {
+            // file.url 指向的文件不存在，继续搜索
+        }
+    }
+    if (assetData.file?.filename) {
+        const filename = assetData.file.filename;
+        const revision = assetData.revision ?? 1;
+        const candidates = [
+            // PlayCanvas 标准结构
+            path.join(projectDir, 'files', 'assets', String(scriptId), String(revision), filename),
+            path.join(projectDir, 'files', 'assets', String(scriptId), '1', filename),
+            path.join(projectDir, 'files', 'assets', String(scriptId), filename),
+        ];
+        // PlayCraft 结构：使用 treePath
+        if (assetData.treePath) {
+            candidates.push(path.join(projectDir, 'assets', assetData.treePath, filename));
+            candidates.push(path.join(projectDir, assetData.treePath, filename));
+        }
+        // PlayCraft Git 仓库：从 path 数组重建 treePath
+        if (assets && assetData.path && Array.isArray(assetData.path) && assetData.path.length > 0) {
+            const folderFullPathMap = buildFolderFullPathMap(assets);
+            const computedTreePath = resolveTreePathFromPathArray(assetData.path, folderFullPathMap);
+            if (computedTreePath) {
+                candidates.push(path.join(projectDir, 'assets', computedTreePath, filename));
+                candidates.push(path.join(projectDir, computedTreePath, filename));
+            }
+        }
+        // 最后尝试直接在 assets/ 根目录下查找
+        candidates.push(path.join(projectDir, 'assets', filename));
+        for (const candidate of candidates) {
+            try {
+                await fs.access(candidate);
+                return candidate;
+            }
+            catch {
+                // try next
+            }
+        }
+    }
+    return null;
+}
 /**
  * 生成 ESM 模板文件
  */
@@ -728,9 +932,13 @@ async function generateESMTemplate(projectConfig, options, config) {
     catch (error) {
         console.warn('[SourceBuilder] 警告: 无法复制 ESM 包装器:', error);
     }
-    // 3. 收集用户脚本的导入路径
-    const scriptImportPaths = await collectESMScriptImports(projectConfig, options);
-    // 4. 从 Import Map 中提取 gameRule 路径
+    // 3. 分析脚本文件的 import 依赖，将缺失的依赖脚本添加到 config.assets
+    if (options.importMap) {
+        await collectScriptImportDependencies(projectConfig, options.projectDir, options.importMap, config.assets);
+    }
+    // 4. 收集用户脚本的导入路径（传入 config.assets 以包含 template 依赖 + import 依赖的脚本）
+    const scriptImportPaths = await collectESMScriptImports(projectConfig, options, config.assets);
+    // 5. 从 Import Map 中提取 gameRule 路径
     let gameRulePath = '';
     if (options.importMap?.content?.imports) {
         const imports = options.importMap.content.imports;
@@ -743,11 +951,99 @@ async function generateESMTemplate(projectConfig, options, config) {
             console.log(`[SourceBuilder] GameRule 路径: ${gameRulePath}`);
         }
     }
-    // 5. 生成 js/index.mjs（包含脚本导入），使用过滤后的 config.scenes
+    // 5.1 从场景 SystemManager 的 GameConfig.json 中收集 Rule 脚本
+    if (options.importMap && projectConfig.format === 'playcanvas') {
+        const allAssets = projectConfig.assets || {};
+        const pcScenes = projectConfig.scenes;
+        // Iterate over selected scenes (from config.scenes) and find the scene data
+        for (const sceneRef of (config.scenes || [])) {
+            // Extract scene file ID from url (e.g. "4577025.json" -> "4577025")
+            const sceneFileId = (sceneRef.url || '').replace(/\.json$/, '');
+            const sceneData = pcScenes?.[sceneFileId];
+            if (!sceneData?.entities)
+                continue;
+            // Find SystemManager entity
+            for (const [, entity] of Object.entries(sceneData.entities)) {
+                if (entity?.name !== 'SystemManager')
+                    continue;
+                const smScript = entity.components?.script?.scripts?.systemManager;
+                if (!smScript?.attributes?.gameConfigAsset)
+                    continue;
+                const jsonAssetId = String(smScript.attributes.gameConfigAsset);
+                const jsonAsset = allAssets[jsonAssetId];
+                if (!jsonAsset || jsonAsset.type !== 'json')
+                    continue;
+                // Read the GameConfig JSON file
+                const jsonFilePath = await resolveScriptSourcePath(jsonAsset, jsonAssetId, options.projectDir, allAssets);
+                if (!jsonFilePath)
+                    continue;
+                let gameConfig;
+                try {
+                    const content = await fs.readFile(jsonFilePath, 'utf-8');
+                    gameConfig = JSON.parse(content);
+                }
+                catch {
+                    console.warn(`[SourceBuilder] 无法读取 GameConfig.json (${jsonAssetId})`);
+                    continue;
+                }
+                const ruleName = gameConfig?.Gameplay?.Rule;
+                if (!ruleName)
+                    continue;
+                // Resolve Rule script: look for a script asset named "{ruleName}.mjs"
+                const ruleFileName = `${ruleName}.mjs`;
+                let ruleAssetId = null;
+                for (const [assetId, asset] of Object.entries(allAssets)) {
+                    if (asset.type === 'script' && (asset.file?.filename === ruleFileName || asset.name === ruleFileName)) {
+                        ruleAssetId = assetId;
+                        break;
+                    }
+                }
+                if (ruleAssetId && !config.assets[ruleAssetId]) {
+                    config.assets[ruleAssetId] = allAssets[ruleAssetId];
+                    console.log(`📜 [GameConfig] Rule "${ruleName}" → 资源 ${ruleAssetId} — added to configAssets`);
+                    // Also collect its import dependencies
+                    if (options.importMap) {
+                        await collectScriptImportDependencies(projectConfig, options.projectDir, options.importMap, config.assets);
+                    }
+                    // Rebuild script import paths to include the new Rule script
+                    const newPaths = await collectESMScriptImports(projectConfig, options, config.assets);
+                    for (const p of newPaths) {
+                        if (!scriptImportPaths.includes(p)) {
+                            scriptImportPaths.push(p);
+                        }
+                    }
+                }
+                else if (ruleAssetId) {
+                    console.log(`📜 [GameConfig] Rule "${ruleName}" → 资源 ${ruleAssetId} — already in configAssets`);
+                }
+                else {
+                    console.warn(`⚠️ [GameConfig] Rule "${ruleName}" 对应的脚本 ${ruleFileName} 未找到`);
+                }
+                // Use the rule path from 5.1 if Import Map didn't provide a gameRule mapping (step 5)
+                if (ruleAssetId && !gameRulePath) {
+                    const ruleAsset = allAssets[ruleAssetId];
+                    // Build folder map for path resolution
+                    const folderMap = new Map();
+                    for (const [aid, a] of Object.entries(allAssets)) {
+                        if (a.type === 'folder')
+                            folderMap.set(aid, a.name);
+                    }
+                    const ruleFilename = ruleAsset.file?.filename || ruleAsset.name + '.mjs';
+                    const ruleFolderPath = buildScriptFolderPath(ruleAsset.path || [], folderMap);
+                    const targetPath = resolveTargetPathFromImportMap(ruleFolderPath, ruleFilename, options.importMap);
+                    if (targetPath) {
+                        gameRulePath = '../' + targetPath;
+                        console.log(`📜 [GameConfig] 使用 5.1 收集的 Rule 路径: ${gameRulePath}`);
+                    }
+                }
+            }
+        }
+    }
+    // 6. 生成 js/index.mjs（包含脚本导入），使用过滤后的 config.scenes
     await generateESMEntry(projectConfig, outputDir, scriptImportPaths, config.scenes, gameRulePath);
-    // 5. 在 ESM 模式下，复制用户脚本为独立文件，并更新 config.assets 中的 URL
+    // 7. 在 ESM 模式下，复制用户脚本为独立文件，并更新 config.assets 中的 URL
     if (options.importMap) {
-        const scriptUrlMap = await copyUserScriptsForESM(projectConfig, options.projectDir, outputDir, options.importMap);
+        const scriptUrlMap = await copyUserScriptsForESM(projectConfig, options.projectDir, outputDir, options.importMap, config.assets);
         console.log('[SourceBuilder] 用户脚本已复制为独立 ESM 模块');
         // 更新 config.assets 中脚本的 URL
         if (scriptUrlMap.size > 0 && config.assets) {
@@ -760,10 +1056,10 @@ async function generateESMTemplate(projectConfig, options, config) {
             await fs.writeFile(path.join(outputDir, 'config.json'), JSON.stringify(config, null, 2), 'utf-8');
             console.log(`[SourceBuilder] 更新了 ${scriptUrlMap.size} 个脚本的 URL`);
         }
-        // 6. 复制 Import Map 中引用的第三方库文件
+        // 8. 复制 Import Map 中引用的第三方库文件
         await copyImportMapLibraries(projectConfig, options.projectDir, outputDir, options.importMap);
     }
-    // 7. 复制其他必要的模板文件
+    // 9. 复制其他必要的模板文件
     const templateFiles = [
         '__start__.js', // 可能不需要了，但先保留
         '__modules__.js',
@@ -804,20 +1100,43 @@ function fixImportMapPaths(importMap) {
 }
 /**
  * 收集 ESM 脚本的导入路径
+ * @param configAssets - generateConfig 过滤后的 config.assets，包含 template 依赖的脚本
  */
-async function collectESMScriptImports(projectConfig, options) {
-    // 获取脚本 ID 列表和资产（支持 PlayCanvas 和 PlayCraft 两种格式）
-    let scriptIds;
+async function collectESMScriptImports(projectConfig, options, configAssets) {
+    // 获取资产（支持 PlayCanvas 和 PlayCraft 两种格式）
     let assets;
     if (projectConfig.format === 'playcanvas') {
-        const pcProject = projectConfig;
-        scriptIds = pcProject.project.settings?.scripts || [];
-        assets = pcProject.assets;
+        assets = projectConfig.assets;
     }
     else {
-        const pcProject = projectConfig;
-        scriptIds = pcProject.manifest.settings?.scripts || [];
-        assets = pcProject.assets;
+        assets = projectConfig.assets;
+    }
+    // 收集所有需要导入的脚本 ID：
+    // 1. config.assets 中的 script 类型资产（已包含场景依赖 + template 依赖的脚本）
+    // 2. 回退到 settings.scripts（当没有 configAssets 时）
+    const scriptIdsToImport = new Set();
+    if (configAssets) {
+        console.log(`📜 [DEBUG-ESMImports] 使用 configAssets 收集脚本, configAssets 总数: ${Object.keys(configAssets).length}`);
+        for (const [assetId, asset] of Object.entries(configAssets)) {
+            if (asset.type === 'script') {
+                scriptIdsToImport.add(assetId);
+            }
+        }
+        console.log(`[ESMImports] 从 configAssets 收集到 ${scriptIdsToImport.size} 个脚本`);
+    }
+    else {
+        console.log(`[ESMImports] configAssets 未传入, 回退到 settings.scripts`);
+        // Fallback: use settings.scripts
+        let scriptIds;
+        if (projectConfig.format === 'playcanvas') {
+            scriptIds = projectConfig.project.settings?.scripts || [];
+        }
+        else {
+            scriptIds = projectConfig.manifest.settings?.scripts || [];
+        }
+        for (const id of scriptIds) {
+            scriptIdsToImport.add(String(id));
+        }
     }
     const importPaths = [];
     // 构建文件夹 ID 到名称的映射
@@ -829,15 +1148,11 @@ async function collectESMScriptImports(projectConfig, options) {
         }
     }
     // 遍历每个脚本，构建导入路径
-    for (const scriptId of scriptIds) {
+    for (const scriptId of scriptIdsToImport) {
         const asset = assets[String(scriptId)];
         if (!asset || asset.type !== 'script')
             continue;
         const assetData = asset;
-        // 检查 preload 属性
-        const preload = assetData.preload !== false;
-        if (!preload)
-            continue;
         // 获取正确的文件名（带扩展名）
         const filename = assetData.file?.filename || assetData.name + '.mjs';
         // 获取脚本的文件夹路径
@@ -919,7 +1234,7 @@ async function generateESMEntry(projectConfig, outputDir, scriptImportPaths = []
     const preloadModules = [];
     // TODO: 从 assets 中提取 WASM 模块
     // 生成脚本导入路径数组（延迟加载）
-    console.log(`[SourceBuilder] 生成 ${scriptImportPaths.length} 个脚本导入路径`);
+    console.log(`[ESMEntry] 生成 ${scriptImportPaths.length} 个脚本导入路径`);
     // 替换模板占位符
     const entry = esmTemplate
         .replace(/\{\{SCRIPT_IMPORT_PATHS\}\}/g, JSON.stringify(scriptImportPaths))
@@ -939,25 +1254,43 @@ async function generateESMEntry(projectConfig, outputDir, scriptImportPaths = []
 }
 /**
  * 在 ESM 模式下复制用户脚本为独立文件
+ * @param configAssets - generateConfig 过滤后的 config.assets，包含 template 依赖的脚本
  * @returns 脚本ID到新URL的映射
  */
-async function copyUserScriptsForESM(projectConfig, projectDir, outputDir, importMap) {
+async function copyUserScriptsForESM(projectConfig, projectDir, outputDir, importMap, configAssets) {
     const scriptUrlMap = new Map();
-    console.log(`[copyUserScriptsForESM] 项目格式: ${projectConfig.format}`);
-    // 获取脚本 ID 列表和资产（支持 PlayCanvas 和 PlayCraft 两种格式）
-    let scriptIds;
+    // 获取资产（支持 PlayCanvas 和 PlayCraft 两种格式）
     let assets;
     if (projectConfig.format === 'playcanvas') {
-        const pcProject = projectConfig;
-        scriptIds = pcProject.project.settings?.scripts || [];
-        assets = pcProject.assets;
+        assets = projectConfig.assets;
     }
     else {
-        const pcProject = projectConfig;
-        scriptIds = pcProject.manifest.settings?.scripts || [];
-        assets = pcProject.assets;
+        assets = projectConfig.assets;
+    }
+    // 收集所有需要复制的脚本 ID：
+    // 1. config.assets 中的 script 类型资产（已包含场景依赖 + template 依赖的脚本）
+    // 2. 回退到 settings.scripts（当没有 configAssets 时）
+    const scriptIdsToProcess = new Set();
+    if (configAssets) {
+        for (const [assetId, asset] of Object.entries(configAssets)) {
+            if (asset.type === 'script') {
+                scriptIdsToProcess.add(assetId);
+            }
+        }
     }
-    console.log(`[copyUserScriptsForESM] 脚本数量: ${scriptIds.length}`);
+    else {
+        let scriptIds;
+        if (projectConfig.format === 'playcanvas') {
+            scriptIds = projectConfig.project.settings?.scripts || [];
+        }
+        else {
+            scriptIds = projectConfig.manifest.settings?.scripts || [];
+        }
+        for (const id of scriptIds) {
+            scriptIdsToProcess.add(String(id));
+        }
+    }
+    console.log(`[copyUserScriptsForESM] 复制 ${scriptIdsToProcess.size} 个脚本`);
     // 构建文件夹 ID 到名称的映射
     const folderMap = new Map();
     for (const [assetId, asset] of Object.entries(assets)) {
@@ -967,42 +1300,13 @@ async function copyUserScriptsForESM(projectConfig, projectDir, outputDir, impor
         }
     }
     // 遍历每个脚本
-    for (const scriptId of scriptIds) {
+    for (const scriptId of scriptIdsToProcess) {
         const asset = assets[String(scriptId)];
         if (!asset || asset.type !== 'script')
             continue;
         const assetData = asset;
-        // 检查 preload 属性
-        const preload = assetData.preload !== false;
-        if (!preload) {
-            continue; // 跳过 non-preload 脚本
-        }
-        // 获取脚本源文件路径
-        let sourcePath = null;
-        const scriptIdStr = String(scriptId);
-        if (assetData.file?.url) {
-            sourcePath = path.join(projectDir, assetData.file.url);
-        }
-        else if (assetData.file?.filename) {
-            // 如果没有 file.url，根据 filename 和 revision 构建路径
-            const filename = assetData.file.filename;
-            const revision = assetData.revision ?? 1;
-            const candidates = [
-                path.join(projectDir, 'files', 'assets', scriptIdStr, String(revision), filename),
-                path.join(projectDir, 'files', 'assets', scriptIdStr, '1', filename),
-                path.join(projectDir, 'files', 'assets', scriptIdStr, filename),
-            ];
-            for (const candidate of candidates) {
-                try {
-                    await fs.access(candidate);
-                    sourcePath = candidate;
-                    break;
-                }
-                catch {
-                    // 继续尝试下一个
-                }
-            }
-        }
+        // 获取脚本源文件路径（使用统一的解析函数，支持 PlayCraft Git 仓库结构）
+        const sourcePath = await resolveScriptSourcePath(assetData, String(scriptId), projectDir, assets);
         if (!sourcePath) {
             console.warn(`[ESM] 无法找到脚本 ${assetData.name} 的源文件，跳过`);
             continue;
@@ -1312,7 +1616,7 @@ async function copyImportMapLibraries(projectConfig, projectDir, outputDir, impo
             // 文件不存在，需要复制
         }
         // 查找源文件
-        // 1. 首先检查是否是 asset 引用（通过 name 查找）
+        // 1. 首先检查是否是 asset 引用（通过 name 查找），使用统一的解析函数
         let sourceFound = false;
         const filename = path.basename(outputRelPath);
         for (const [assetId, asset] of Object.entries(assets)) {
@@ -1321,29 +1625,8 @@ async function copyImportMapLibraries(projectConfig, projectDir, outputDir, impo
                 continue;
             if (assetData.name !== key && assetData.file?.filename !== filename)
                 continue;
-            // 找到匹配的资源
-            let sourcePath = null;
-            if (assetData.file?.url) {
-                sourcePath = path.join(projectDir, assetData.file.url);
-            }
-            else if (assetData.file?.filename) {
-                const revision = assetData.revision ?? 1;
-                const candidates = [
-                    path.join(projectDir, 'files', 'assets', assetId, String(revision), assetData.file.filename),
-                    path.join(projectDir, 'files', 'assets', assetId, '1', assetData.file.filename),
-                    path.join(projectDir, 'files', 'assets', assetId, assetData.file.filename),
-                ];
-                for (const candidate of candidates) {
-                    try {
-                        await fs.access(candidate);
-                        sourcePath = candidate;
-                        break;
-                    }
-                    catch {
-                        // 继续尝试
-                    }
-                }
-            }
+            // 使用统一的解析函数查找源文件（支持 PlayCraft Git 仓库结构）
+            const sourcePath = await resolveScriptSourcePath(assetData, assetId, projectDir, assets);
             if (sourcePath) {
                 try {
                     await fs.mkdir(path.dirname(outputPath), { recursive: true });
@@ -1365,6 +1648,9 @@ async function copyImportMapLibraries(projectConfig, projectDir, outputDir, impo
                 path.join(projectDir, originalPath),
                 path.join(projectDir, filename),
                 path.join(projectDir, 'Lib', filename),
+                // PlayCraft Git 仓库结构
+                path.join(projectDir, 'assets', filename),
+                path.join(projectDir, 'assets', originalPath),
             ];
             for (const candidate of candidates) {
                 try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playcraft/build",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -8,12 +8,15 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
     "./types": {
       "import": "./dist/types.js",
+      "require": "./dist/types.js",
       "types": "./dist/types.d.ts"
-    }
+    },
+    "./dist/*": "./dist/*"
   },
   "files": [
     "dist",
@@ -42,8 +45,8 @@
     "sharp": "^0.34.5",
     "javascript-obfuscator": "^5.3.0",
     "terser": "^5.46.0",
-    "vite": "^6.4.1",
-    "vite-plugin-singlefile": "^2.3.0"
+    "vite": "^8.0.3",
+    "vite-plugin-singlefile": "^2.3.2"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.4",