@dimina/compiler 1.0.6 → 1.0.7

package/dist/core/view-compiler.cjs

@@ -1,14 +1,15 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const fs = require("node:fs");
 const node_worker_threads = require("node:worker_threads");
 const babel = require("@babel/core");
-const types = require("@babel/types");
 const _traverse = require("@babel/traverse");
+const types = require("@babel/types");
 const compilerSfc = require("@vue/compiler-sfc");
 const cheerio = require("cheerio");
-const htmlparser2 = require("htmlparser2");
 const esbuild = require("esbuild");
-const env = require("../env-Chow6VXH.cjs");
+const htmlparser2 = require("htmlparser2");
+const env = require("../env-CGYKCSjT.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -30,7 +31,6 @@ const htmlparser2__namespace = /* @__PURE__ */ _interopNamespaceDefault(htmlpars
 const traverse = _traverse.default ? _traverse.default : _traverse;
 const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
-const processedModules = /* @__PURE__ */ new Set();
 if (!node_worker_threads.isMainThread) {
   node_worker_threads.parentPort.on("message", async ({ pages, storeInfo }) => {
     try {
@@ -75,13 +75,13 @@ async function compileML(pages, root, progress) {
     if (root) {
       const subDir = `${env.getTargetPath()}/${root}`;
       if (!fs.existsSync(subDir)) {
-        fs.mkdirSync(subDir);
+        fs.mkdirSync(subDir, { recursive: true });
       }
       fs.writeFileSync(`${subDir}/${filename}.js`, mergeRender);
     } else {
       const mainDir = `${env.getTargetPath()}/main`;
       if (!fs.existsSync(mainDir)) {
-        fs.mkdirSync(mainDir);
+        fs.mkdirSync(mainDir, { recursive: true });
       }
       fs.writeFileSync(`${mainDir}/${filename}.js`, mergeRender);
     }
@@ -91,10 +91,12 @@ async function compileML(pages, root, progress) {
 function buildCompileView(module2, isComponent = false, scriptRes, depthChain = []) {
   const currentPath = module2.path;
   if (depthChain.includes(currentPath)) {
-    console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
-  if (depthChain.length > 100) {
-    console.warn(`检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+  if (depthChain.length > 20) {
+    console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
+    return;
   }
   depthChain = [...depthChain, currentPath];
   compileModule(module2, isComponent, scriptRes);
@@ -104,10 +106,13 @@ function buildCompileView(module2, isComponent = false, scriptRes, depthChain =
       if (!componentModule) {
         continue;
       }
+      if (componentModule.path === module2.path) {
+        console.warn("[view]", `检测到自依赖，跳过处理: ${module2.path}`);
+        continue;
+      }
       buildCompileView(componentModule, true, scriptRes, depthChain);
     }
   }
-  processedModules.add(currentPath);
 }
 function compileModule(module2, isComponent, scriptRes) {
   const { tpl, instruction } = toCompileTemplate(isComponent, module2.path, module2.usingComponents, module2.componentPlaceholder);
@@ -143,7 +148,7 @@ function compileModule(module2, isComponent, scriptRes) {
   });
   let tplComponents = "{";
   for (const tm of instruction.templateModule) {
-    tplComponents += `'${tm.path}':${compilerSfc.compileTemplate({
+    let { code: code2 } = compilerSfc.compileTemplate({
       source: tm.tpl,
       filename: tm.path,
       id: `data-v-${module2.id}`,
@@ -156,36 +161,17 @@ function compileModule(module2, isComponent, scriptRes) {
         mode: "function",
         inline: true
       }
-    }).code},`;
+    });
+    const ast = babel.parseSync(code2);
+    insertWxsToRenderAst(ast, instruction.scriptModule, scriptRes);
+    code2 = babel.transformFromAstSync(ast, "", {
+      comments: false
+    }).code;
+    tplComponents += `'${tm.path}':${code2.replace(/;$/, "").replace(/^"use strict";\s*/, "")},`;
   }
   tplComponents += "}";
   const tplAst = babel.parseSync(tplCode.code);
-  for (const sm of instruction.scriptModule) {
-    if (!scriptRes.has(sm.path)) {
-      scriptRes.set(sm.path, sm.code);
-    }
-    const assignmentExpression = types.assignmentExpression(
-      "=",
-      // 创建赋值表达式
-      types.memberExpression(
-        types.identifier("_ctx"),
-        // 对象标识符
-        types.identifier(sm.path),
-        // 属性标识符
-        false
-        // 是否是计算属性
-      ),
-      // 创建require调用表达式
-      types.callExpression(
-        types.identifier("require"),
-        // 函数标识符
-        [types.stringLiteral(sm.path)]
-        // 参数列表，这里传入字符串字面量'foo'
-      )
-    );
-    const expressionStatement = types.expressionStatement(assignmentExpression);
-    tplAst.program.body[0].expression.body.body.splice(0, 0, expressionStatement);
-  }
+  insertWxsToRenderAst(tplAst, instruction.scriptModule, scriptRes);
   const { code: transCode } = babel.transformFromAstSync(tplAst, "", {
     comments: false
   });
@@ -211,9 +197,19 @@ function toCompileTemplate(isComponent, path, components, componentPlaceholder)
   } else {
     if (isComponent) {
       content = `<wrapper>${content}</wrapper>`;
+    } else {
+      const tempRoot = cheerio__namespace.load(content, {
+        xmlMode: true,
+        decodeEntities: false
+      });
+      const rootNodes = tempRoot.root().children().toArray().filter((node) => node.type !== "comment");
+      if (rootNodes.length > 1) {
+        content = `<view>${content}</view>`;
+      }
     }
   }
   const templateModule = [];
+  const scriptModule = [];
   const $ = cheerio__namespace.load(content, {
     xmlMode: true,
     decodeEntities: false
@@ -236,70 +232,34 @@ function toCompileTemplate(isComponent, path, components, componentPlaceholder)
     }
   });
   transTagTemplate($, templateModule, path, components);
+  transTagWxs($, scriptModule, path);
   const importNodes = $("import");
   importNodes.each((_, elem) => {
     const src = $(elem).attr("src");
     if (src) {
-      const importContent = env.getContentByPath(env.getAbsolutePath(workPath, path, src)).trim();
+      const importFullPath = env.getAbsolutePath(workPath, path, src);
+      const importPath = importFullPath.replace(workPath, "").split("/").slice(0, -1).join("/");
+      const importContent = env.getContentByPath(importFullPath).trim();
       if (importContent) {
+        const $$ = cheerio__namespace.load(importContent, {
+          xmlMode: true,
+          decodeEntities: false
+        });
         transTagTemplate(
-          cheerio__namespace.load(importContent, {
-            xmlMode: true,
-            decodeEntities: false
-          }),
+          $$,
           templateModule,
           path,
           components
         );
+        transTagWxs(
+          $$,
+          scriptModule,
+          importPath
+        );
       }
     }
   });
   importNodes.remove();
-  const scriptModule = [];
-  let wxsNodes = $("wxs");
-  if (wxsNodes.length === 0) {
-    wxsNodes = $("dds");
-  }
-  wxsNodes.each((_, elem) => {
-    const smName = $(elem).attr("module");
-    if (smName) {
-      let wxsContent;
-      if (compileResCache.has(smName)) {
-        wxsContent = compileResCache.get(smName);
-      } else {
-        const src = $(elem).attr("src");
-        if (src) {
-          wxsContent = env.getContentByPath(env.getAbsolutePath(workPath, path, src)).trim();
-        } else {
-          wxsContent = $(elem).html();
-        }
-        const wxsAst = babel.parseSync(wxsContent);
-        traverse(wxsAst, {
-          CallExpression(path2) {
-            if (path2.node.callee.name === "getRegExp" || path2.node.callee.name === "getDate") {
-              const args = [];
-              for (let i = 0; i < path2.node.arguments.length; i++) {
-                args.push(path2.node.arguments[i]);
-              }
-              const newExpr = types.newExpression(types.identifier(path2.node.callee.name.substring(3)), args);
-              path2.replaceWith(newExpr);
-            }
-          }
-        });
-        wxsContent = babel.transformFromAstSync(wxsAst, "", {
-          comments: false
-        }).code;
-        compileResCache.set(smName, wxsContent);
-      }
-      if (wxsContent) {
-        scriptModule.push({
-          path: smName,
-          code: wxsContent
-        });
-      }
-    }
-  });
-  wxsNodes.remove();
   transAsses($, $("image"), path);
   const res = [];
   transHtmlTag($.html(), res, components);
@@ -316,7 +276,6 @@ function transTagTemplate($, templateModule, path, components, componentPlacehol
   templateNodes.each((_, elem) => {
     const name = $(elem).attr("name");
     const templateContent = $(elem);
-    templateContent.find("template").remove();
     templateContent.find("import").remove();
     templateContent.find("include").remove();
     templateContent.find("wxs").remove();
@@ -377,20 +336,20 @@ function transTag(opts) {
     res = `dd-${tag}`;
   }
   let tagRes;
-  const propsAry = getProps(attrs, tag);
+  const propsAry = isStart ? getProps(attrs, tag) : [];
   const multipleSlots = attrs?.slot;
   if (attrs?.slot) {
-    const withVIf = [];
-    const withoutVIf = [];
-    for (let i = 0; i < propsAry.length; i++) {
-      const prop = propsAry[i];
-      if (prop.includes("v-if") || prop.includes("v-else-if") || prop.includes("v-else")) {
-        withVIf.push(prop);
-      } else {
-        withoutVIf.push(prop);
-      }
-    }
     if (isStart) {
+      const withVIf = [];
+      const withoutVIf = [];
+      for (let i = 0; i < propsAry.length; i++) {
+        const prop = propsAry[i];
+        if (prop.includes("v-if") || prop.includes("v-else-if") || prop.includes("v-else")) {
+          withVIf.push(prop);
+        } else {
+          withoutVIf.push(prop);
+        }
+      }
       tagRes = `<template ${`${withVIf.join(" ")}`} #${multipleSlots}><${res}${` ${withoutVIf.join(" ")}`}>`;
     } else {
       tagRes = `</${res}></template>`;
@@ -430,14 +389,7 @@ function getProps(attrs, tag) {
       });
     } else if (name.endsWith(":for-item") || name.endsWith(":for-index")) ;
     else if (name.endsWith(":key")) {
-      let tranValue;
-      if (/\*this/.test(value)) {
-        tranValue = JSON.stringify("item");
-      } else if (/item/.test(value)) {
-        tranValue = getForItemName(attrs);
-      } else {
-        tranValue = parseKeyExpression(value, getForItemName(attrs));
-      }
+      const tranValue = parseKeyExpression(value, getForItemName(attrs));
       attrsList.push({
         name: ":key",
         value: tranValue
@@ -556,12 +508,22 @@ function generateVModelTemplate(expression) {
 }
 function parseKeyExpression(exp, itemName = "item") {
   exp = exp.trim();
+  if (/\*this/.test(exp) || /\*item/.test(exp)) {
+    return `${itemName}.toString()`;
+  }
   if (!exp.includes("{{")) {
-    return exp.startsWith(itemName) ? `'${exp}'` : `'${itemName}.${exp}'`;
+    if (/^-?\d+(\.\d+)?$/.test(exp)) {
+      return exp;
+    }
+    return exp.startsWith(itemName) ? `${exp}` : `${itemName}.${exp}`;
   }
   if (exp.startsWith("{{") && exp.endsWith("}}")) {
     const content = exp.slice(2, -2).trim();
-    return content.startsWith(itemName) ? `'${content}'` : `'${itemName}.${content}'`;
+    if (content === "this") {
+      return `${itemName}.toString()`;
+    } else {
+      return content.startsWith(itemName) ? `${content}` : `${itemName}.${content}`;
+    }
   }
   const parts = exp.split(/(\{\{.*?\}\})/);
   const result = parts.map((part) => {
@@ -672,12 +634,83 @@ function parseBraceExp(exp) {
   }
   return group.join("").replace(/^\+|\+$/g, "");
 }
-const viewCompiler = {
-  splitWithBraces,
-  parseClassRules,
-  parseBraceExp,
-  parseKeyExpression,
-  compileML,
-  generateVModelTemplate
-};
-module.exports = viewCompiler;
+function transTagWxs($, scriptModule, path) {
+  let wxsNodes = $("wxs");
+  if (wxsNodes.length === 0) {
+    wxsNodes = $("dds");
+  }
+  wxsNodes.each((_, elem) => {
+    const smName = $(elem).attr("module");
+    if (smName) {
+      let wxsContent;
+      if (compileResCache.has(smName)) {
+        wxsContent = compileResCache.get(smName);
+      } else {
+        const src = $(elem).attr("src");
+        if (src) {
+          wxsContent = env.getContentByPath(env.getAbsolutePath(env.getWorkPath(), path, src)).trim();
+        } else {
+          wxsContent = $(elem).html();
+        }
+        const wxsAst = babel.parseSync(wxsContent);
+        traverse(wxsAst, {
+          CallExpression(path2) {
+            if (path2.node.callee.name === "getRegExp" || path2.node.callee.name === "getDate") {
+              const args = [];
+              for (let i = 0; i < path2.node.arguments.length; i++) {
+                args.push(path2.node.arguments[i]);
+              }
+              const newExpr = types.newExpression(types.identifier(path2.node.callee.name.substring(3)), args);
+              path2.replaceWith(newExpr);
+            }
+          }
+        });
+        wxsContent = babel.transformFromAstSync(wxsAst, "", {
+          comments: false
+        }).code;
+        compileResCache.set(smName, wxsContent);
+      }
+      if (wxsContent) {
+        scriptModule.push({
+          path: smName,
+          code: wxsContent
+        });
+      }
+    }
+  });
+  wxsNodes.remove();
+}
+function insertWxsToRenderAst(ast, scriptModule, scriptRes) {
+  for (const sm of scriptModule) {
+    if (!scriptRes.has(sm.path)) {
+      scriptRes.set(sm.path, sm.code);
+    }
+    const assignmentExpression = types.assignmentExpression(
+      "=",
+      // 创建赋值表达式
+      types.memberExpression(
+        types.identifier("_ctx"),
+        // 对象标识符
+        types.identifier(sm.path),
+        // 属性标识符
+        false
+        // 是否是计算属性
+      ),
+      // 创建require调用表达式
+      types.callExpression(
+        types.identifier("require"),
+        // 函数标识符
+        [types.stringLiteral(sm.path)]
+        // 参数列表，这里传入字符串字面量'foo'
+      )
+    );
+    const expressionStatement = types.expressionStatement(assignmentExpression);
+    ast.program.body[0].expression.body.body.unshift(expressionStatement);
+  }
+}
+exports.compileML = compileML;
+exports.generateVModelTemplate = generateVModelTemplate;
+exports.parseBraceExp = parseBraceExp;
+exports.parseClassRules = parseClassRules;
+exports.parseKeyExpression = parseKeyExpression;
+exports.splitWithBraces = splitWithBraces;