@dimina/compiler 1.0.9 → 1.0.10

package/dist/bin/index.cjs

@@ -5,7 +5,7 @@ const process = require("node:process");
 const chokidar = require("chokidar");
 const commander = require("commander");
 const index = require("../index.cjs");
-const version = "1.0.7";
+const version = "1.0.10";
 const pack = {
   version
 };

package/dist/bin/index.js

@@ -4,7 +4,7 @@ import process from "node:process";
 import chokidar from "chokidar";
 import { program } from "commander";
 import build from "../index.js";
-const version = "1.0.7";
+const version = "1.0.10";
 const pack = {
   version
 };

package/dist/core/view-compiler.cjs

@@ -34,8 +34,6 @@ const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
 const wxsModuleRegistry = /* @__PURE__ */ new Set();
 const wxsFilePathMap = /* @__PURE__ */ new Map();
-const moduleCompileStatus = /* @__PURE__ */ new Map();
-const moduleCompileResults = /* @__PURE__ */ new Map();
 if (!node_worker_threads.isMainThread) {
   node_worker_threads.parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -60,16 +58,8 @@ if (!node_worker_threads.isMainThread) {
     }
   });
 }
-function clearCompileState() {
-  moduleCompileStatus.clear();
-  moduleCompileResults.clear();
-  compileResCache.clear();
-  wxsModuleRegistry.clear();
-  wxsFilePathMap.clear();
-}
 async function compileML(pages, root, progress) {
   const workPath = env.getWorkPath();
-  clearCompileState();
   initWxsFilePathMap(workPath);
   for (const page of pages) {
     const scriptRes = /* @__PURE__ */ new Map();
@@ -135,71 +125,49 @@ function isRegisteredWxsModule(modulePath) {
 }
 function buildCompileView(module2, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module2.path;
-  if (moduleCompileStatus.has(currentPath)) {
-    const status = moduleCompileStatus.get(currentPath);
-    if (status === "pending") {
-      console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-      return { scriptModule: [] };
-    } else if (status === "completed") {
-      return moduleCompileResults.get(currentPath) || { scriptModule: [] };
-    } else if (status === "failed") {
-      console.warn("[view]", `模块编译失败，跳过: ${currentPath}`);
-      return { scriptModule: [] };
-    }
-  }
   if (depthChain.includes(currentPath)) {
     console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return { scriptModule: [] };
+    return;
   }
-  if (depthChain.length > 5) {
-    console.warn("[view]", `检测到深度依赖，中断编译: ${[...depthChain, currentPath].join(" -> ")}`);
-    return { scriptModule: [] };
+  if (depthChain.length > 20) {
+    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  moduleCompileStatus.set(currentPath, "pending");
   depthChain = [...depthChain, currentPath];
-  try {
-    const allScriptModules = [];
-    const currentInstruction = compileModule(module2, isComponent, scriptRes);
-    if (currentInstruction && currentInstruction.scriptModule) {
-      allScriptModules.push(...currentInstruction.scriptModule);
-    }
-    if (module2.usingComponents) {
-      for (const componentInfo of Object.values(module2.usingComponents)) {
-        const componentModule = env.getComponent(componentInfo);
-        if (!componentModule) {
-          continue;
-        }
-        if (componentModule.path === module2.path) {
-          console.warn("[view]", `检测到自依赖，跳过处理: ${module2.path}`);
-          continue;
-        }
-        const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain);
-        if (componentInstruction && componentInstruction.scriptModule) {
-          for (const sm of componentInstruction.scriptModule) {
-            if (!allScriptModules.find((existing) => existing.path === sm.path)) {
-              allScriptModules.push(sm);
-            }
+  const allScriptModules = [];
+  const currentInstruction = compileModule(module2, isComponent, scriptRes);
+  if (currentInstruction && currentInstruction.scriptModule) {
+    allScriptModules.push(...currentInstruction.scriptModule);
+  }
+  if (module2.usingComponents) {
+    for (const componentInfo of Object.values(module2.usingComponents)) {
+      const componentModule = env.getComponent(componentInfo);
+      if (!componentModule) {
+        continue;
+      }
+      if (componentModule.path === module2.path) {
+        console.warn("[view]", `检测到循环依赖，跳过处理: ${module2.path}`);
+        continue;
+      }
+      const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain);
+      if (componentInstruction && componentInstruction.scriptModule) {
+        for (const sm of componentInstruction.scriptModule) {
+          if (!allScriptModules.find((existing) => existing.path === sm.path)) {
+            allScriptModules.push(sm);
           }
         }
       }
     }
-    if (!isComponent && allScriptModules.length > 0) {
-      for (const sm of allScriptModules) {
-        if (!scriptRes.has(sm.path)) {
-          scriptRes.set(sm.path, sm.code);
-        }
+  }
+  if (!isComponent && allScriptModules.length > 0) {
+    for (const sm of allScriptModules) {
+      if (!scriptRes.has(sm.path)) {
+        scriptRes.set(sm.path, sm.code);
       }
-      compileModuleWithAllWxs(module2, scriptRes, allScriptModules);
     }
-    const result = { scriptModule: allScriptModules };
-    moduleCompileStatus.set(currentPath, "completed");
-    moduleCompileResults.set(currentPath, result);
-    return result;
-  } catch (error) {
-    moduleCompileStatus.set(currentPath, "failed");
-    console.error("[view]", `模块编译失败: ${currentPath}`, error.message);
-    return { scriptModule: [] };
+    compileModuleWithAllWxs(module2, scriptRes, allScriptModules);
   }
+  return { scriptModule: allScriptModules };
 }
 function compileModule(module2, isComponent, scriptRes) {
   const { tpl, instruction } = toCompileTemplate(isComponent, module2.path, module2.usingComponents, module2.componentPlaceholder);
@@ -277,20 +245,22 @@ function compileModule(module2, isComponent, scriptRes) {
     const ast = babel.parseSync(code2);
     insertWxsToRenderAst(ast, instruction.scriptModule, scriptRes);
     code2 = babel.transformFromAstSync(ast, "", {
-      comments: false
+      comments: false,
+      sourceType: "script"
     }).code;
-    tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
+    tplComponents += `'${tm.path}':${code2.replace(/;$/, "")},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
   insertWxsToRenderAst(tplAst, instruction.scriptModule, scriptRes);
   const { code: transCode } = babel.transformFromAstSync(tplAst, "", {
-    comments: false
+    comments: false,
+    sourceType: "script"
   });
   const code = `Module({
 		path: '${module2.path}',
 		id: '${module2.id}',
-		render: ${transCode.replace(/;$/, "").replace(/^"use strict";\s*/, "")},
+		render: ${transCode.replace(/;$/, "")},
 		usingComponents: ${JSON.stringify(module2.usingComponents)},
 		tplComponents: ${tplComponents},
 		});`;
@@ -417,7 +387,8 @@ function processWxsContent(wxsContent, wxsFilePath, scriptModule, workPath, file
     }
   });
   return babel.transformFromAstSync(wxsAst, "", {
-    comments: false
+    comments: false,
+    sourceType: "script"
   }).code;
 }
 function isWxsModuleByContent(moduleCode, modulePath = "") {
@@ -491,7 +462,8 @@ function compileModuleWithAllWxs(module2, scriptRes, allScriptModules) {
     const ast = babel.parseSync(code2);
     insertWxsToRenderAst(ast, allScriptModules, scriptRes);
     code2 = babel.transformFromAstSync(ast, "", {
-      comments: false
+      comments: false,
+      sourceType: "script"
     }).code;
     tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
   }
@@ -499,7 +471,8 @@ function compileModuleWithAllWxs(module2, scriptRes, allScriptModules) {
   const tplAst = babel.parseSync(tplCode.code);
   insertWxsToRenderAst(tplAst, allScriptModules, scriptRes);
   const { code: transCode } = babel.transformFromAstSync(tplAst, "", {
-    comments: false
+    comments: false,
+    sourceType: "script"
   });
   const code = `Module({
 		path: '${module2.path}',
@@ -515,10 +488,41 @@ function compileModuleWithAllWxs(module2, scriptRes, allScriptModules) {
   compileResCache.set(module2.path, cacheData);
   scriptRes.set(module2.path, code);
 }
-function processIncludedFileWxsDependencies(content, includePath, scriptModule, components) {
-  console.warn("[view]", `跳过被引入文件的组件 wxs 依赖处理: ${includePath}`);
+function processIncludedFileWxsDependencies(content, includePath, scriptModule, components, processedPaths = /* @__PURE__ */ new Set()) {
+  if (processedPaths.has(includePath)) {
+    return;
+  }
+  processedPaths.add(includePath);
+  const $ = cheerio__namespace.load(content, {
+    xmlMode: true,
+    decodeEntities: false
+  });
+  const componentTags = /* @__PURE__ */ new Set();
+  $("*").each((_, elem) => {
+    const tagName = elem.tagName;
+    if (components && components[tagName]) {
+      componentTags.add(tagName);
+    }
+  });
+  for (const tagName of componentTags) {
+    const componentPath = components[tagName];
+    const componentModule = env.getComponent(componentPath);
+    if (componentModule) {
+      if (processedPaths.has(componentModule.path)) {
+        continue;
+      }
+      const componentTemplate = toCompileTemplate(true, componentModule.path, componentModule.usingComponents, componentModule.componentPlaceholder, processedPaths);
+      if (componentTemplate && componentTemplate.instruction && componentTemplate.instruction.scriptModule) {
+        for (const sm of componentTemplate.instruction.scriptModule) {
+          if (!scriptModule.find((existing) => existing.path === sm.path)) {
+            scriptModule.push(sm);
+          }
+        }
+      }
+    }
+  }
 }
-function toCompileTemplate(isComponent, path2, components, componentPlaceholder) {
+function toCompileTemplate(isComponent, path2, components, componentPlaceholder, processedPaths = /* @__PURE__ */ new Set()) {
   const workPath = env.getWorkPath();
   const fullPath = getViewPath(workPath, path2);
   if (!fullPath) {
@@ -573,7 +577,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder)
           scriptModule,
           includePath
         );
-        processIncludedFileWxsDependencies(includeContent, includePath);
+        processIncludedFileWxsDependencies(includeContent, includePath, scriptModule, components, processedPaths);
         $includeContent("template").remove();
         $includeContent("wxs").remove();
         $includeContent("dds").remove();
@@ -613,7 +617,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder)
           scriptModule,
           importPath
         );
-        processIncludedFileWxsDependencies(importContent, importPath);
+        processIncludedFileWxsDependencies(importContent, importPath, scriptModule, components, processedPaths);
       }
     }
   });
@@ -697,6 +701,7 @@ function transTag(opts) {
   const propsAry = isStart ? getProps(attrs, tag) : [];
   const multipleSlots = attrs?.slot;
   if (attrs?.slot) {
+    const isDynamicSlot = isWrappedByBraces(multipleSlots);
     if (isStart) {
       const withVIf = [];
       const withoutVIf = [];
@@ -704,13 +709,24 @@ function transTag(opts) {
         const prop = propsAry[i];
         if (prop.includes("v-if") || prop.includes("v-else-if") || prop.includes("v-else")) {
           withVIf.push(prop);
-        } else {
+        } else if (!prop.includes("slot")) {
           withoutVIf.push(prop);
         }
       }
-      tagRes = `<template ${`${withVIf.join(" ")}`} #${multipleSlots}><${res}${` ${withoutVIf.join(" ")}`}>`;
+      const vIfProps = withVIf.length > 0 ? `${withVIf.join(" ")} ` : "";
+      const vOtherProps = withoutVIf.length > 0 ? ` ${withoutVIf.join(" ")}` : "";
+      const templateContent = `<template ${vIfProps}${generateSlotDirective(multipleSlots)}><${res}${vOtherProps}>`;
+      if (isDynamicSlot) {
+        tagRes = `<dd-block>${templateContent}`;
+      } else {
+        tagRes = templateContent;
+      }
     } else {
-      tagRes = `</${res}></template>`;
+      if (isDynamicSlot) {
+        tagRes = `</${res}></template></dd-block>`;
+      } else {
+        tagRes = `</${res}></template>`;
+      }
     }
   } else {
     if (isStart) {
@@ -722,6 +738,14 @@ function transTag(opts) {
   }
   return tagRes;
 }
+function generateSlotDirective(slotValue) {
+  if (isWrappedByBraces(slotValue)) {
+    const slotExpression = parseBraceExp(slotValue);
+    return `#[${slotExpression}]`;
+  } else {
+    return `#${slotValue}`;
+  }
+}
 function getProps(attrs, tag) {
   const attrsList = [];
   Object.entries(attrs).forEach(([name, value]) => {
@@ -1060,11 +1084,7 @@ function transTagWxs($, scriptModule, filePath) {
   });
   wxsNodes.remove();
 }
-function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Set(), scriptModule = [], maxDepth = 5) {
-  if (maxDepth <= 0) {
-    console.warn("[view]", "collectAllWxsModules 达到最大递归深度，停止处理");
-    return [];
-  }
+function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Set(), scriptModule = []) {
   const allWxsModules = [];
   const workPath = env.getWorkPath();
   for (const [modulePath, moduleCode] of scriptRes.entries()) {
@@ -1081,12 +1101,7 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
       for (const depPath of dependencies) {
         if (!collectedPaths.has(depPath)) {
           if (scriptRes.has(depPath)) {
-            const depModules = collectAllWxsModules(
-              /* @__PURE__ */ new Map([[depPath, scriptRes.get(depPath)]]),
-              collectedPaths,
-              scriptModule,
-              maxDepth - 1
-            );
+            const depModules = collectAllWxsModules(/* @__PURE__ */ new Map([[depPath, scriptRes.get(depPath)]]), collectedPaths, scriptModule);
             allWxsModules.push(...depModules);
           } else {
             const loaded = loadWxsModule(depPath, workPath, scriptModule);
@@ -1094,12 +1109,7 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
               scriptRes.set(depPath, loaded.code);
               allWxsModules.push(loaded);
               collectedPaths.add(depPath);
-              const depModules = collectAllWxsModules(
-                /* @__PURE__ */ new Map([[depPath, loaded.code]]),
-                collectedPaths,
-                scriptModule,
-                maxDepth - 1
-              );
+              const depModules = collectAllWxsModules(/* @__PURE__ */ new Map([[depPath, loaded.code]]), collectedPaths, scriptModule);
               allWxsModules.push(...depModules);
             }
           }
@@ -1177,6 +1187,7 @@ function insertWxsToRenderAst(ast, scriptModule, scriptRes) {
   }
 }
 exports.compileML = compileML;
+exports.generateSlotDirective = generateSlotDirective;
 exports.generateVModelTemplate = generateVModelTemplate;
 exports.parseBraceExp = parseBraceExp;
 exports.parseClassRules = parseClassRules;

package/dist/core/view-compiler.js

@@ -14,8 +14,6 @@ const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
 const wxsModuleRegistry = /* @__PURE__ */ new Set();
 const wxsFilePathMap = /* @__PURE__ */ new Map();
-const moduleCompileStatus = /* @__PURE__ */ new Map();
-const moduleCompileResults = /* @__PURE__ */ new Map();
 if (!isMainThread) {
   parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -40,16 +38,8 @@ if (!isMainThread) {
     }
   });
 }
-function clearCompileState() {
-  moduleCompileStatus.clear();
-  moduleCompileResults.clear();
-  compileResCache.clear();
-  wxsModuleRegistry.clear();
-  wxsFilePathMap.clear();
-}
 async function compileML(pages, root, progress) {
   const workPath = getWorkPath();
-  clearCompileState();
   initWxsFilePathMap(workPath);
   for (const page of pages) {
     const scriptRes = /* @__PURE__ */ new Map();
@@ -115,71 +105,49 @@ function isRegisteredWxsModule(modulePath) {
 }
 function buildCompileView(module, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module.path;
-  if (moduleCompileStatus.has(currentPath)) {
-    const status = moduleCompileStatus.get(currentPath);
-    if (status === "pending") {
-      console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-      return { scriptModule: [] };
-    } else if (status === "completed") {
-      return moduleCompileResults.get(currentPath) || { scriptModule: [] };
-    } else if (status === "failed") {
-      console.warn("[view]", `模块编译失败，跳过: ${currentPath}`);
-      return { scriptModule: [] };
-    }
-  }
   if (depthChain.includes(currentPath)) {
     console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-    return { scriptModule: [] };
+    return;
   }
-  if (depthChain.length > 5) {
-    console.warn("[view]", `检测到深度依赖，中断编译: ${[...depthChain, currentPath].join(" -> ")}`);
-    return { scriptModule: [] };
+  if (depthChain.length > 20) {
+    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  moduleCompileStatus.set(currentPath, "pending");
   depthChain = [...depthChain, currentPath];
-  try {
-    const allScriptModules = [];
-    const currentInstruction = compileModule(module, isComponent, scriptRes);
-    if (currentInstruction && currentInstruction.scriptModule) {
-      allScriptModules.push(...currentInstruction.scriptModule);
-    }
-    if (module.usingComponents) {
-      for (const componentInfo of Object.values(module.usingComponents)) {
-        const componentModule = getComponent(componentInfo);
-        if (!componentModule) {
-          continue;
-        }
-        if (componentModule.path === module.path) {
-          console.warn("[view]", `检测到自依赖，跳过处理: ${module.path}`);
-          continue;
-        }
-        const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain);
-        if (componentInstruction && componentInstruction.scriptModule) {
-          for (const sm of componentInstruction.scriptModule) {
-            if (!allScriptModules.find((existing) => existing.path === sm.path)) {
-              allScriptModules.push(sm);
-            }
+  const allScriptModules = [];
+  const currentInstruction = compileModule(module, isComponent, scriptRes);
+  if (currentInstruction && currentInstruction.scriptModule) {
+    allScriptModules.push(...currentInstruction.scriptModule);
+  }
+  if (module.usingComponents) {
+    for (const componentInfo of Object.values(module.usingComponents)) {
+      const componentModule = getComponent(componentInfo);
+      if (!componentModule) {
+        continue;
+      }
+      if (componentModule.path === module.path) {
+        console.warn("[view]", `检测到循环依赖，跳过处理: ${module.path}`);
+        continue;
+      }
+      const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain);
+      if (componentInstruction && componentInstruction.scriptModule) {
+        for (const sm of componentInstruction.scriptModule) {
+          if (!allScriptModules.find((existing) => existing.path === sm.path)) {
+            allScriptModules.push(sm);
           }
         }
       }
     }
-    if (!isComponent && allScriptModules.length > 0) {
-      for (const sm of allScriptModules) {
-        if (!scriptRes.has(sm.path)) {
-          scriptRes.set(sm.path, sm.code);
-        }
+  }
+  if (!isComponent && allScriptModules.length > 0) {
+    for (const sm of allScriptModules) {
+      if (!scriptRes.has(sm.path)) {
+        scriptRes.set(sm.path, sm.code);
       }
-      compileModuleWithAllWxs(module, scriptRes, allScriptModules);
     }
-    const result = { scriptModule: allScriptModules };
-    moduleCompileStatus.set(currentPath, "completed");
-    moduleCompileResults.set(currentPath, result);
-    return result;
-  } catch (error) {
-    moduleCompileStatus.set(currentPath, "failed");
-    console.error("[view]", `模块编译失败: ${currentPath}`, error.message);
-    return { scriptModule: [] };
+    compileModuleWithAllWxs(module, scriptRes, allScriptModules);
   }
+  return { scriptModule: allScriptModules };
 }
 function compileModule(module, isComponent, scriptRes) {
   const { tpl, instruction } = toCompileTemplate(isComponent, module.path, module.usingComponents, module.componentPlaceholder);
@@ -257,20 +225,22 @@ function compileModule(module, isComponent, scriptRes) {
     const ast = babel.parseSync(code2);
     insertWxsToRenderAst(ast, instruction.scriptModule, scriptRes);
     code2 = babel.transformFromAstSync(ast, "", {
-      comments: false
+      comments: false,
+      sourceType: "script"
     }).code;
-    tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
+    tplComponents += `'${tm.path}':${code2.replace(/;$/, "")},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
   insertWxsToRenderAst(tplAst, instruction.scriptModule, scriptRes);
   const { code: transCode } = babel.transformFromAstSync(tplAst, "", {
-    comments: false
+    comments: false,
+    sourceType: "script"
   });
   const code = `Module({
 		path: '${module.path}',
 		id: '${module.id}',
-		render: ${transCode.replace(/;$/, "").replace(/^"use strict";\s*/, "")},
+		render: ${transCode.replace(/;$/, "")},
 		usingComponents: ${JSON.stringify(module.usingComponents)},
 		tplComponents: ${tplComponents},
 		});`;
@@ -397,7 +367,8 @@ function processWxsContent(wxsContent, wxsFilePath, scriptModule, workPath, file
     }
   });
   return babel.transformFromAstSync(wxsAst, "", {
-    comments: false
+    comments: false,
+    sourceType: "script"
   }).code;
 }
 function isWxsModuleByContent(moduleCode, modulePath = "") {
@@ -471,7 +442,8 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
     const ast = babel.parseSync(code2);
     insertWxsToRenderAst(ast, allScriptModules, scriptRes);
     code2 = babel.transformFromAstSync(ast, "", {
-      comments: false
+      comments: false,
+      sourceType: "script"
     }).code;
     tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
   }
@@ -479,7 +451,8 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
   const tplAst = babel.parseSync(tplCode.code);
   insertWxsToRenderAst(tplAst, allScriptModules, scriptRes);
   const { code: transCode } = babel.transformFromAstSync(tplAst, "", {
-    comments: false
+    comments: false,
+    sourceType: "script"
   });
   const code = `Module({
 		path: '${module.path}',
@@ -495,10 +468,41 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
   compileResCache.set(module.path, cacheData);
   scriptRes.set(module.path, code);
 }
-function processIncludedFileWxsDependencies(content, includePath, scriptModule, components) {
-  console.warn("[view]", `跳过被引入文件的组件 wxs 依赖处理: ${includePath}`);
+function processIncludedFileWxsDependencies(content, includePath, scriptModule, components, processedPaths = /* @__PURE__ */ new Set()) {
+  if (processedPaths.has(includePath)) {
+    return;
+  }
+  processedPaths.add(includePath);
+  const $ = cheerio.load(content, {
+    xmlMode: true,
+    decodeEntities: false
+  });
+  const componentTags = /* @__PURE__ */ new Set();
+  $("*").each((_, elem) => {
+    const tagName = elem.tagName;
+    if (components && components[tagName]) {
+      componentTags.add(tagName);
+    }
+  });
+  for (const tagName of componentTags) {
+    const componentPath = components[tagName];
+    const componentModule = getComponent(componentPath);
+    if (componentModule) {
+      if (processedPaths.has(componentModule.path)) {
+        continue;
+      }
+      const componentTemplate = toCompileTemplate(true, componentModule.path, componentModule.usingComponents, componentModule.componentPlaceholder, processedPaths);
+      if (componentTemplate && componentTemplate.instruction && componentTemplate.instruction.scriptModule) {
+        for (const sm of componentTemplate.instruction.scriptModule) {
+          if (!scriptModule.find((existing) => existing.path === sm.path)) {
+            scriptModule.push(sm);
+          }
+        }
+      }
+    }
+  }
 }
-function toCompileTemplate(isComponent, path2, components, componentPlaceholder) {
+function toCompileTemplate(isComponent, path2, components, componentPlaceholder, processedPaths = /* @__PURE__ */ new Set()) {
   const workPath = getWorkPath();
   const fullPath = getViewPath(workPath, path2);
   if (!fullPath) {
@@ -553,7 +557,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder)
           scriptModule,
           includePath
         );
-        processIncludedFileWxsDependencies(includeContent, includePath);
+        processIncludedFileWxsDependencies(includeContent, includePath, scriptModule, components, processedPaths);
         $includeContent("template").remove();
         $includeContent("wxs").remove();
         $includeContent("dds").remove();
@@ -593,7 +597,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder)
           scriptModule,
           importPath
         );
-        processIncludedFileWxsDependencies(importContent, importPath);
+        processIncludedFileWxsDependencies(importContent, importPath, scriptModule, components, processedPaths);
       }
     }
   });
@@ -677,6 +681,7 @@ function transTag(opts) {
   const propsAry = isStart ? getProps(attrs, tag) : [];
   const multipleSlots = attrs?.slot;
   if (attrs?.slot) {
+    const isDynamicSlot = isWrappedByBraces(multipleSlots);
     if (isStart) {
       const withVIf = [];
       const withoutVIf = [];
@@ -684,13 +689,24 @@ function transTag(opts) {
         const prop = propsAry[i];
         if (prop.includes("v-if") || prop.includes("v-else-if") || prop.includes("v-else")) {
           withVIf.push(prop);
-        } else {
+        } else if (!prop.includes("slot")) {
           withoutVIf.push(prop);
         }
       }
-      tagRes = `<template ${`${withVIf.join(" ")}`} #${multipleSlots}><${res}${` ${withoutVIf.join(" ")}`}>`;
+      const vIfProps = withVIf.length > 0 ? `${withVIf.join(" ")} ` : "";
+      const vOtherProps = withoutVIf.length > 0 ? ` ${withoutVIf.join(" ")}` : "";
+      const templateContent = `<template ${vIfProps}${generateSlotDirective(multipleSlots)}><${res}${vOtherProps}>`;
+      if (isDynamicSlot) {
+        tagRes = `<dd-block>${templateContent}`;
+      } else {
+        tagRes = templateContent;
+      }
     } else {
-      tagRes = `</${res}></template>`;
+      if (isDynamicSlot) {
+        tagRes = `</${res}></template></dd-block>`;
+      } else {
+        tagRes = `</${res}></template>`;
+      }
     }
   } else {
     if (isStart) {
@@ -702,6 +718,14 @@ function transTag(opts) {
   }
   return tagRes;
 }
+function generateSlotDirective(slotValue) {
+  if (isWrappedByBraces(slotValue)) {
+    const slotExpression = parseBraceExp(slotValue);
+    return `#[${slotExpression}]`;
+  } else {
+    return `#${slotValue}`;
+  }
+}
 function getProps(attrs, tag) {
   const attrsList = [];
   Object.entries(attrs).forEach(([name, value]) => {
@@ -1040,11 +1064,7 @@ function transTagWxs($, scriptModule, filePath) {
   });
   wxsNodes.remove();
 }
-function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Set(), scriptModule = [], maxDepth = 5) {
-  if (maxDepth <= 0) {
-    console.warn("[view]", "collectAllWxsModules 达到最大递归深度，停止处理");
-    return [];
-  }
+function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Set(), scriptModule = []) {
   const allWxsModules = [];
   const workPath = getWorkPath();
   for (const [modulePath, moduleCode] of scriptRes.entries()) {
@@ -1061,12 +1081,7 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
       for (const depPath of dependencies) {
         if (!collectedPaths.has(depPath)) {
           if (scriptRes.has(depPath)) {
-            const depModules = collectAllWxsModules(
-              /* @__PURE__ */ new Map([[depPath, scriptRes.get(depPath)]]),
-              collectedPaths,
-              scriptModule,
-              maxDepth - 1
-            );
+            const depModules = collectAllWxsModules(/* @__PURE__ */ new Map([[depPath, scriptRes.get(depPath)]]), collectedPaths, scriptModule);
             allWxsModules.push(...depModules);
           } else {
             const loaded = loadWxsModule(depPath, workPath, scriptModule);
@@ -1074,12 +1089,7 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
               scriptRes.set(depPath, loaded.code);
               allWxsModules.push(loaded);
               collectedPaths.add(depPath);
-              const depModules = collectAllWxsModules(
-                /* @__PURE__ */ new Map([[depPath, loaded.code]]),
-                collectedPaths,
-                scriptModule,
-                maxDepth - 1
-              );
+              const depModules = collectAllWxsModules(/* @__PURE__ */ new Map([[depPath, loaded.code]]), collectedPaths, scriptModule);
               allWxsModules.push(...depModules);
             }
           }
@@ -1158,6 +1168,7 @@ function insertWxsToRenderAst(ast, scriptModule, scriptRes) {
 }
 export {
   compileML,
+  generateSlotDirective,
   generateVModelTemplate,
   parseBraceExp,
   parseClassRules,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -45,23 +45,23 @@
 		"星河"
 	],
 	"dependencies": {
-		"@babel/core": "^7.28.3",
+		"@babel/core": "^7.28.4",
 		"@babel/plugin-transform-modules-commonjs": "^7.27.1",
-		"@babel/traverse": "^7.28.3",
-		"@babel/types": "^7.28.2",
-		"@vue/compiler-sfc": "^3.5.19",
+		"@babel/traverse": "^7.28.4",
+		"@babel/types": "^7.28.4",
+		"@vue/compiler-sfc": "^3.5.21",
 		"autoprefixer": "^10.4.21",
 		"cheerio": "^1.1.2",
 		"chokidar": "^4.0.3",
 		"commander": "^14.0.0",
-		"cssnano": "^7.1.0",
+		"cssnano": "^7.1.1",
 		"esbuild": "^0.25.9",
 		"htmlparser2": "^10.0.0",
 		"less": "^4.4.1",
-		"listr2": "^9.0.2",
+		"listr2": "^9.0.3",
 		"postcss": "^8.5.6",
 		"postcss-selector-parser": "^7.1.0",
-		"sass": "^1.90.0",
+		"sass": "^1.92.1",
 		"typescript": "^5.9.2"
 	},
 	"publishConfig": {