@dimina/compiler 1.0.10 → 1.0.11

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.10";
+const version = "1.0.11";
 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.10";
+const version = "1.0.11";
 const pack = {
   version
 };

package/dist/core/logic-compiler.cjs

@@ -49,10 +49,7 @@ ${error.stack}`);
         error: {
           message: error.message,
           stack: error.stack,
-          name: error.name,
-          file: error.file || null,
-          line: error.line || null,
-          code: error.code || null
+          name: error.name
         }
       });
     }

package/dist/core/logic-compiler.js

@@ -47,10 +47,7 @@ ${error.stack}`);
         error: {
           message: error.message,
           stack: error.stack,
-          name: error.name,
-          file: error.file || null,
-          line: error.line || null,
-          code: error.code || null
+          name: error.name
         }
       });
     }

package/dist/core/style-compiler.cjs

@@ -50,7 +50,14 @@ if (!node_worker_threads.isMainThread) {
       }
       node_worker_threads.parentPort.postMessage({ success: true });
     } catch (error) {
-      node_worker_threads.parentPort.postMessage({ success: false, error: error.message });
+      node_worker_threads.parentPort.postMessage({
+        success: false,
+        error: {
+          message: error.message,
+          stack: error.stack,
+          name: error.name
+        }
+      });
     }
   });
 }

package/dist/core/style-compiler.js

@@ -31,7 +31,14 @@ if (!isMainThread) {
       }
       parentPort.postMessage({ success: true });
     } catch (error) {
-      parentPort.postMessage({ success: false, error: error.message });
+      parentPort.postMessage({
+        success: false,
+        error: {
+          message: error.message,
+          stack: error.stack,
+          name: error.name
+        }
+      });
     }
   });
 }

package/dist/core/view-compiler.cjs

@@ -29,6 +29,112 @@ function _interopNamespaceDefault(e) {
 }
 const cheerio__namespace = /* @__PURE__ */ _interopNamespaceDefault(cheerio);
 const htmlparser2__namespace = /* @__PURE__ */ _interopNamespaceDefault(htmlparser2);
+const traverse$1 = _traverse.default ? _traverse.default : _traverse;
+const KEYWORDS = /* @__PURE__ */ new Set([
+  "true",
+  "false",
+  "null",
+  "undefined",
+  "NaN",
+  "Infinity",
+  "this",
+  "arguments",
+  "Array",
+  "Object",
+  "String",
+  "Number",
+  "Boolean",
+  "Math",
+  "Date",
+  "RegExp",
+  "Error",
+  "JSON",
+  "console",
+  "window",
+  "document",
+  "parseInt",
+  "parseFloat",
+  "isNaN",
+  "isFinite",
+  "encodeURI",
+  "encodeURIComponent",
+  "decodeURI",
+  "decodeURIComponent"
+]);
+function extractDependencies(expression) {
+  if (!expression || typeof expression !== "string") {
+    return [];
+  }
+  const dependencies = /* @__PURE__ */ new Set();
+  try {
+    const code = `(${expression})`;
+    const ast = babel.parseSync(code, {
+      sourceType: "module",
+      plugins: []
+    });
+    traverse$1(ast, {
+      Identifier(path2) {
+        const name = path2.node.name;
+        if (KEYWORDS.has(name)) {
+          return;
+        }
+        const parent = path2.parent;
+        if (parent.type === "MemberExpression" && parent.property === path2.node && !parent.computed) {
+          return;
+        }
+        if (parent.type === "CallExpression" && parent.callee === path2.node) {
+          dependencies.add(name);
+          return;
+        }
+        if (parent.type === "ObjectProperty" && parent.key === path2.node && !parent.computed) {
+          return;
+        }
+        dependencies.add(name);
+      },
+      // 处理成员表达式，确保只提取根对象
+      MemberExpression(path2) {
+        let root = path2.node.object;
+        while (root.type === "MemberExpression") {
+          root = root.object;
+        }
+        if (root.type === "Identifier" && !KEYWORDS.has(root.name)) {
+          dependencies.add(root.name);
+        }
+        path2.skip();
+      }
+    });
+  } catch (error) {
+    console.warn("[expression-parser] AST 解析失败，表达式:", expression, "错误:", error.message);
+    return [];
+  }
+  return Array.from(dependencies);
+}
+function parseExpression(expression) {
+  if (!expression || typeof expression !== "string") {
+    return {
+      expression: "",
+      dependencies: [],
+      isSimple: true
+    };
+  }
+  const dependencies = extractDependencies(expression);
+  const isSimple = dependencies.length === 1 && expression.trim() === dependencies[0];
+  return {
+    expression: expression.trim(),
+    dependencies,
+    isSimple
+  };
+}
+function parseBindings(bindings) {
+  if (!bindings || typeof bindings !== "object") {
+    return {};
+  }
+  const parsed = {};
+  for (const [propName, expression] of Object.entries(bindings)) {
+    parsed[propName] = parseExpression(expression);
+  }
+  return parsed;
+}
 const traverse = _traverse.default ? _traverse.default : _traverse;
 const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
@@ -54,7 +160,14 @@ if (!node_worker_threads.isMainThread) {
       }
       node_worker_threads.parentPort.postMessage({ success: true });
     } catch (error) {
-      node_worker_threads.parentPort.postMessage({ success: false, error: error.message });
+      node_worker_threads.parentPort.postMessage({
+        success: false,
+        error: {
+          message: error.message,
+          stack: error.stack,
+          name: error.name
+        }
+      });
     }
   });
 }
@@ -488,6 +601,31 @@ function compileModuleWithAllWxs(module2, scriptRes, allScriptModules) {
   compileResCache.set(module2.path, cacheData);
   scriptRes.set(module2.path, code);
 }
+function processIncludeConditionalAttrs($, elem, includeContent) {
+  const allAttrs = $(elem).attr();
+  const conditionAttrs = {};
+  let hasCondition = false;
+  for (const attrName in allAttrs) {
+    if (attrName.endsWith(":if") || attrName.endsWith(":elif") || attrName.endsWith(":else")) {
+      conditionAttrs[attrName] = allAttrs[attrName];
+      hasCondition = true;
+    }
+  }
+  if (hasCondition) {
+    let blockAttrs = "";
+    for (const attrName in conditionAttrs) {
+      const attrValue = conditionAttrs[attrName];
+      if (attrValue !== void 0 && attrValue !== "") {
+        blockAttrs += ` ${attrName}="${attrValue}"`;
+      } else {
+        blockAttrs += ` ${attrName}`;
+      }
+    }
+    return `<block${blockAttrs}>${includeContent}</block>`;
+  } else {
+    return includeContent;
+  }
+}
 function processIncludedFileWxsDependencies(content, includePath, scriptModule, components, processedPaths = /* @__PURE__ */ new Set()) {
   if (processedPaths.has(includePath)) {
     return;
@@ -581,7 +719,8 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder,
         $includeContent("template").remove();
         $includeContent("wxs").remove();
         $includeContent("dds").remove();
-        $(elem).replaceWith($includeContent.html());
+        const processedContent = processIncludeConditionalAttrs($, elem, $includeContent.html());
+        $(elem).replaceWith(processedContent);
       } else {
         $(elem).remove();
       }
@@ -698,7 +837,7 @@ function transTag(opts) {
     res = `dd-${tag}`;
   }
   let tagRes;
-  const propsAry = isStart ? getProps(attrs, tag) : [];
+  const propsAry = isStart ? getProps(attrs, tag, components) : [];
   const multipleSlots = attrs?.slot;
   if (attrs?.slot) {
     const isDynamicSlot = isWrappedByBraces(multipleSlots);
@@ -746,8 +885,9 @@ function generateSlotDirective(slotValue) {
     return `#${slotValue}`;
   }
 }
-function getProps(attrs, tag) {
+function getProps(attrs, tag, components) {
   const attrsList = [];
+  const propBindings = {};
   Object.entries(attrs).forEach(([name, value]) => {
     if (name.endsWith(":if")) {
       attrsList.push({
@@ -846,6 +986,11 @@ function getProps(attrs, tag) {
       if (tag === "template" && name === "data") {
         pVal = `{${pVal}}`;
       }
+      if (components && components[tag]) {
+        if (pVal && typeof pVal === "string") {
+          propBindings[name] = pVal;
+        }
+      }
       attrsList.push({
         name: `:${name}`,
         value: pVal
@@ -868,6 +1013,24 @@ function getProps(attrs, tag) {
       propsRes.push(`${name}="${escapeQuotes(value)}"`);
     }
   });
+  if (components && components[tag] && Object.keys(propBindings).length > 0) {
+    try {
+      const validBindings = {};
+      for (const [key, value] of Object.entries(propBindings)) {
+        if (value !== void 0 && value !== null && typeof value === "string") {
+          validBindings[key] = value;
+        }
+      }
+      if (Object.keys(validBindings).length > 0) {
+        const parsedBindings = parseBindings(validBindings);
+        const bindingsJson = JSON.stringify(parsedBindings);
+        const escapedJson = bindingsJson.replace(/"/g, "&quot;");
+        propsRes.push(`v-c-prop-bindings="${escapedJson}"`);
+      }
+    } catch (error) {
+      console.warn("[compiler] 序列化 propBindings 失败:", error.message, "标签:", tag, "绑定数据:", propBindings);
+    }
+  }
   return propsRes;
 }
 function generateVModelTemplate(expression) {
@@ -1192,5 +1355,6 @@ exports.generateVModelTemplate = generateVModelTemplate;
 exports.parseBraceExp = parseBraceExp;
 exports.parseClassRules = parseClassRules;
 exports.parseKeyExpression = parseKeyExpression;
+exports.processIncludeConditionalAttrs = processIncludeConditionalAttrs;
 exports.processWxsContent = processWxsContent;
 exports.splitWithBraces = splitWithBraces;

package/dist/core/view-compiler.js

@@ -9,6 +9,112 @@ import * as cheerio from "cheerio";
 import { transform } from "esbuild";
 import * as htmlparser2 from "htmlparser2";
 import { r as resetStoreInfo, g as getTargetPath, a as getComponent, b as getContentByPath, c as getAbsolutePath, d as getWorkPath, e as collectAssets, f as getAppId, t as transformRpx, h as tagWhiteList } from "../env-Csj3AHY4.js";
+const traverse$1 = _traverse.default ? _traverse.default : _traverse;
+const KEYWORDS = /* @__PURE__ */ new Set([
+  "true",
+  "false",
+  "null",
+  "undefined",
+  "NaN",
+  "Infinity",
+  "this",
+  "arguments",
+  "Array",
+  "Object",
+  "String",
+  "Number",
+  "Boolean",
+  "Math",
+  "Date",
+  "RegExp",
+  "Error",
+  "JSON",
+  "console",
+  "window",
+  "document",
+  "parseInt",
+  "parseFloat",
+  "isNaN",
+  "isFinite",
+  "encodeURI",
+  "encodeURIComponent",
+  "decodeURI",
+  "decodeURIComponent"
+]);
+function extractDependencies(expression) {
+  if (!expression || typeof expression !== "string") {
+    return [];
+  }
+  const dependencies = /* @__PURE__ */ new Set();
+  try {
+    const code = `(${expression})`;
+    const ast = babel.parseSync(code, {
+      sourceType: "module",
+      plugins: []
+    });
+    traverse$1(ast, {
+      Identifier(path2) {
+        const name = path2.node.name;
+        if (KEYWORDS.has(name)) {
+          return;
+        }
+        const parent = path2.parent;
+        if (parent.type === "MemberExpression" && parent.property === path2.node && !parent.computed) {
+          return;
+        }
+        if (parent.type === "CallExpression" && parent.callee === path2.node) {
+          dependencies.add(name);
+          return;
+        }
+        if (parent.type === "ObjectProperty" && parent.key === path2.node && !parent.computed) {
+          return;
+        }
+        dependencies.add(name);
+      },
+      // 处理成员表达式，确保只提取根对象
+      MemberExpression(path2) {
+        let root = path2.node.object;
+        while (root.type === "MemberExpression") {
+          root = root.object;
+        }
+        if (root.type === "Identifier" && !KEYWORDS.has(root.name)) {
+          dependencies.add(root.name);
+        }
+        path2.skip();
+      }
+    });
+  } catch (error) {
+    console.warn("[expression-parser] AST 解析失败，表达式:", expression, "错误:", error.message);
+    return [];
+  }
+  return Array.from(dependencies);
+}
+function parseExpression(expression) {
+  if (!expression || typeof expression !== "string") {
+    return {
+      expression: "",
+      dependencies: [],
+      isSimple: true
+    };
+  }
+  const dependencies = extractDependencies(expression);
+  const isSimple = dependencies.length === 1 && expression.trim() === dependencies[0];
+  return {
+    expression: expression.trim(),
+    dependencies,
+    isSimple
+  };
+}
+function parseBindings(bindings) {
+  if (!bindings || typeof bindings !== "object") {
+    return {};
+  }
+  const parsed = {};
+  for (const [propName, expression] of Object.entries(bindings)) {
+    parsed[propName] = parseExpression(expression);
+  }
+  return parsed;
+}
 const traverse = _traverse.default ? _traverse.default : _traverse;
 const fileType = [".wxml", ".ddml"];
 const compileResCache = /* @__PURE__ */ new Map();
@@ -34,7 +140,14 @@ if (!isMainThread) {
       }
       parentPort.postMessage({ success: true });
     } catch (error) {
-      parentPort.postMessage({ success: false, error: error.message });
+      parentPort.postMessage({
+        success: false,
+        error: {
+          message: error.message,
+          stack: error.stack,
+          name: error.name
+        }
+      });
     }
   });
 }
@@ -468,6 +581,31 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
   compileResCache.set(module.path, cacheData);
   scriptRes.set(module.path, code);
 }
+function processIncludeConditionalAttrs($, elem, includeContent) {
+  const allAttrs = $(elem).attr();
+  const conditionAttrs = {};
+  let hasCondition = false;
+  for (const attrName in allAttrs) {
+    if (attrName.endsWith(":if") || attrName.endsWith(":elif") || attrName.endsWith(":else")) {
+      conditionAttrs[attrName] = allAttrs[attrName];
+      hasCondition = true;
+    }
+  }
+  if (hasCondition) {
+    let blockAttrs = "";
+    for (const attrName in conditionAttrs) {
+      const attrValue = conditionAttrs[attrName];
+      if (attrValue !== void 0 && attrValue !== "") {
+        blockAttrs += ` ${attrName}="${attrValue}"`;
+      } else {
+        blockAttrs += ` ${attrName}`;
+      }
+    }
+    return `<block${blockAttrs}>${includeContent}</block>`;
+  } else {
+    return includeContent;
+  }
+}
 function processIncludedFileWxsDependencies(content, includePath, scriptModule, components, processedPaths = /* @__PURE__ */ new Set()) {
   if (processedPaths.has(includePath)) {
     return;
@@ -561,7 +699,8 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder,
         $includeContent("template").remove();
         $includeContent("wxs").remove();
         $includeContent("dds").remove();
-        $(elem).replaceWith($includeContent.html());
+        const processedContent = processIncludeConditionalAttrs($, elem, $includeContent.html());
+        $(elem).replaceWith(processedContent);
       } else {
         $(elem).remove();
       }
@@ -678,7 +817,7 @@ function transTag(opts) {
     res = `dd-${tag}`;
   }
   let tagRes;
-  const propsAry = isStart ? getProps(attrs, tag) : [];
+  const propsAry = isStart ? getProps(attrs, tag, components) : [];
   const multipleSlots = attrs?.slot;
   if (attrs?.slot) {
     const isDynamicSlot = isWrappedByBraces(multipleSlots);
@@ -726,8 +865,9 @@ function generateSlotDirective(slotValue) {
     return `#${slotValue}`;
   }
 }
-function getProps(attrs, tag) {
+function getProps(attrs, tag, components) {
   const attrsList = [];
+  const propBindings = {};
   Object.entries(attrs).forEach(([name, value]) => {
     if (name.endsWith(":if")) {
       attrsList.push({
@@ -826,6 +966,11 @@ function getProps(attrs, tag) {
       if (tag === "template" && name === "data") {
         pVal = `{${pVal}}`;
       }
+      if (components && components[tag]) {
+        if (pVal && typeof pVal === "string") {
+          propBindings[name] = pVal;
+        }
+      }
       attrsList.push({
         name: `:${name}`,
         value: pVal
@@ -848,6 +993,24 @@ function getProps(attrs, tag) {
       propsRes.push(`${name}="${escapeQuotes(value)}"`);
     }
   });
+  if (components && components[tag] && Object.keys(propBindings).length > 0) {
+    try {
+      const validBindings = {};
+      for (const [key, value] of Object.entries(propBindings)) {
+        if (value !== void 0 && value !== null && typeof value === "string") {
+          validBindings[key] = value;
+        }
+      }
+      if (Object.keys(validBindings).length > 0) {
+        const parsedBindings = parseBindings(validBindings);
+        const bindingsJson = JSON.stringify(parsedBindings);
+        const escapedJson = bindingsJson.replace(/"/g, "&quot;");
+        propsRes.push(`v-c-prop-bindings="${escapedJson}"`);
+      }
+    } catch (error) {
+      console.warn("[compiler] 序列化 propBindings 失败:", error.message, "标签:", tag, "绑定数据:", propBindings);
+    }
+  }
   return propsRes;
 }
 function generateVModelTemplate(expression) {
@@ -1173,6 +1336,7 @@ export {
   parseBraceExp,
   parseClassRules,
   parseKeyExpression,
+  processIncludeConditionalAttrs,
   processWxsContent,
   splitWithBraces
 };

package/dist/index.cjs

@@ -8,7 +8,7 @@ const fs = require("node:fs");
 const env = require("./env-Cmen1qwy.cjs");
 const os = require("node:os");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
-const artCode = `
+const artCode$1 = `
 ██████╗ ██╗███╗   ███╗██╗███╗   ██╗ █████╗
 ██╔══██╗██║████╗ ████║██║████╗  ██║██╔══██╗
 ██║  ██║██║██╔████╔██║██║██╔██╗ ██║███████║
@@ -16,8 +16,8 @@ const artCode = `
 ██████╔╝██║██║ ╚═╝ ██║██║██║ ╚████║██║  ██║
 ╚═════╝ ╚═╝╚═╝     ╚═╝╚═╝╚═╝  ╚═══╝╚═╝  ╚═╝
 `;
-function artCode$1() {
-  console.log(artCode);
+function artCode() {
+  console.log(artCode$1);
 }
 function createDist() {
   const distPath = env.getTargetPath();
@@ -317,7 +317,7 @@ function compileConfig() {
 let isPrinted = false;
 async function build(targetPath, workPath, useAppIdDir = true) {
   if (!isPrinted) {
-    artCode$1();
+    artCode();
     isPrinted = true;
   }
   const tasks = new listr2.Listr(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -45,24 +45,24 @@
 		"星河"
 	],
 	"dependencies": {
-		"@babel/core": "^7.28.4",
+		"@babel/core": "^7.28.5",
 		"@babel/plugin-transform-modules-commonjs": "^7.27.1",
-		"@babel/traverse": "^7.28.4",
-		"@babel/types": "^7.28.4",
-		"@vue/compiler-sfc": "^3.5.21",
-		"autoprefixer": "^10.4.21",
+		"@babel/traverse": "^7.28.5",
+		"@babel/types": "^7.28.5",
+		"@vue/compiler-sfc": "^3.5.25",
+		"autoprefixer": "^10.4.22",
 		"cheerio": "^1.1.2",
 		"chokidar": "^4.0.3",
-		"commander": "^14.0.0",
-		"cssnano": "^7.1.1",
-		"esbuild": "^0.25.9",
+		"commander": "^14.0.2",
+		"cssnano": "^7.1.2",
+		"esbuild": "^0.25.12",
 		"htmlparser2": "^10.0.0",
-		"less": "^4.4.1",
-		"listr2": "^9.0.3",
+		"less": "^4.4.2",
+		"listr2": "^9.0.5",
 		"postcss": "^8.5.6",
-		"postcss-selector-parser": "^7.1.0",
-		"sass": "^1.92.1",
-		"typescript": "^5.9.2"
+		"postcss-selector-parser": "^7.1.1",
+		"sass": "^1.95.1",
+		"typescript": "^5.9.3"
 	},
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"