@dimina/compiler 1.0.2 → 1.0.4

package/README.md

@@ -69,6 +69,7 @@ Usage: dmcc build [选项]
   -c, --work-path <path>     编译文件所在目录（默认为当前目录）
   -s, --target-path <path>   编译产物存放路径（默认为当前目录）
   -w, --watch                启用改动监听（实时编译）
+  --no-app-id-dir            产物根目录不包含appId，默认为 false
   -h, --help                 显示帮助信息
 ```
 
@@ -86,6 +87,9 @@ dmcc build -w
 
 # 完整示例：编译指定目录，输出到指定目录，并启用监听
 dmcc build -c ./src -s ./dist -w
+
+# 产物根目录不包含appId
+dmcc build --no-app-id-dir
 ```
 
 ### 编译流程说明
@@ -101,14 +105,25 @@ app.json, index.json  ->  config.json  (配置文件)
 
 ### 编译产物目录结构
 
-编译后，会在目标目录生成以小程序 id 命名的文件夹，项目结构如下：
+编译后，默认会在目标目录生成以小程序 id 命名的文件夹，项目结构如下：
+
+```txt
+dist/
+  ├─ {appId}/      # 小程序 ID 目录（使用 --no-app-id-dir 参数可以去除此目录层级）
+    ├─ logic.js      # 小程序逻辑代码
+    ├─ view.js       # 小程序视图代码
+    ├─ style.css     # 小程序样式
+    └─ config.json   # 小程序配置
+```
+
+如果使用 `--no-app-id-dir` 参数，产物将直接输出到目标目录，而不会创建以 appId 命名的子目录：
 
 ```txt
 dist/
-  ├── logic.js      # 小程序逻辑代码
-  ├── view.js       # 小程序视图代码
-  ├── style.css     # 小程序样式
-  └── config.json   # 小程序配置
+  ├─ logic.js      # 小程序逻辑代码
+  ├─ view.js       # 小程序视图代码
+  ├─ style.css     # 小程序样式
+  └─ config.json   # 小程序配置
 ```
 
 ### 常见问题

package/dist/bin/index.cjs

@@ -5,14 +5,15 @@ const path = require("node:path");
 const commander = require("commander");
 const chokidar = require("chokidar");
 const index = require("../index.cjs");
-const version = "1.0.2";
+const version = "1.0.4";
 const pack = {
   version
 };
-commander.program.command("build").option("-c, --work-path <path>", "编译工作目录").option("-s, --target-path <path>", "编译产物存放路径").option("-w, --watch", "启用监听文件改动").action(async (options) => {
+commander.program.command("build").option("-c, --work-path <path>", "编译工作目录").option("-s, --target-path <path>", "编译产物存放路径").option("-w, --watch", "启用监听文件改动").option("--no-app-id-dir", "产物根目录不包含appId").action(async (options) => {
   const workPath = options.workPath ? path.resolve(options.workPath) : process.cwd();
   const targetPath = options.targetPath ? path.resolve(options.targetPath) : process.cwd();
-  await index(targetPath, workPath);
+  const useAppIdDir = options.appIdDir !== false;
+  await index(targetPath, workPath, useAppIdDir);
   const watch = options.watch;
   if (watch) {
     chokidar.watch(workPath, {
@@ -23,7 +24,7 @@ commander.program.command("build").option("-c, --work-path <path>", "编译工
     }).on("all", async (event, path2) => {
       if (event === "change") {
         console.log(`${path2} 改动，重新编译`);
-        await index(targetPath, workPath);
+        await index(targetPath, workPath, useAppIdDir);
       }
     });
   }

package/dist/bin/index.js

@@ -4,14 +4,15 @@ import path from "node:path";
 import { program } from "commander";
 import chokidar from "chokidar";
 import build from "../index.js";
-const version = "1.0.2";
+const version = "1.0.4";
 const pack = {
   version
 };
-program.command("build").option("-c, --work-path <path>", "编译工作目录").option("-s, --target-path <path>", "编译产物存放路径").option("-w, --watch", "启用监听文件改动").action(async (options) => {
+program.command("build").option("-c, --work-path <path>", "编译工作目录").option("-s, --target-path <path>", "编译产物存放路径").option("-w, --watch", "启用监听文件改动").option("--no-app-id-dir", "产物根目录不包含appId").action(async (options) => {
   const workPath = options.workPath ? path.resolve(options.workPath) : process.cwd();
   const targetPath = options.targetPath ? path.resolve(options.targetPath) : process.cwd();
-  await build(targetPath, workPath);
+  const useAppIdDir = options.appIdDir !== false;
+  await build(targetPath, workPath, useAppIdDir);
   const watch = options.watch;
   if (watch) {
     chokidar.watch(workPath, {
@@ -22,7 +23,7 @@ program.command("build").option("-c, --work-path <path>", "编译工作目录").
     }).on("all", async (event, path2) => {
       if (event === "change") {
         console.log(`${path2} 改动，重新编译`);
-        await build(targetPath, workPath);
+        await build(targetPath, workPath, useAppIdDir);
       }
     });
   }

package/dist/core/view-compiler.cjs

@@ -474,10 +474,23 @@ function getProps(attrs, tag) {
         value: parseBraceExp(value)
       });
     } else if (name === "value" && (tag === "input" || tag === "textarea") || (name === "x" || name === "y") && tag === "movable-view") {
-      attrsList.push({
-        name: `v-model:${name}`,
-        value: parseBraceExp(value)
-      });
+      const parsedValue = parseBraceExp(value);
+      const conditionExp = generateVModelTemplate(parsedValue);
+      if (conditionExp) {
+        attrsList.push({
+          name: `:${name}`,
+          value: parsedValue
+        });
+        attrsList.push({
+          name: `update:${name}`,
+          value: conditionExp
+        });
+      } else {
+        attrsList.push({
+          name: `v-model:${name}`,
+          value: parsedValue
+        });
+      }
     } else if (name.startsWith("data-")) {
       if (isWrappedByBraces(value)) {
         attrsList.push({
@@ -523,6 +536,24 @@ function getProps(attrs, tag) {
   });
   return propsRes;
 }
+function generateVModelTemplate(expression) {
+  let var1, var2, updateExpression;
+  if (expression.includes("&&")) {
+    [var1, var2] = expression.split("&&").map((v) => v.trim());
+    updateExpression = `${var1} ? (${var2} = $event) : (${var1} = $event)`;
+  } else if (expression.includes("||")) {
+    [var1, var2] = expression.split("||").map((v) => v.trim());
+    updateExpression = `${var1} ? (${var1} = $event) : (${var2} = $event)`;
+  } else if (expression.includes("?")) {
+    const parts = expression.split(/[?:]/).map((v) => v.trim());
+    var1 = parts[0];
+    var2 = parts[2];
+    updateExpression = `${var1} ? (${var1} = $event) : (${var2} = $event)`;
+  } else {
+    return false;
+  }
+  return updateExpression;
+}
 function parseKeyExpression(exp, itemName = "item") {
   exp = exp.trim();
   if (!exp.includes("{{")) {
@@ -646,6 +677,7 @@ const viewCompiler = {
   parseClassRules,
   parseBraceExp,
   parseKeyExpression,
-  compileML
+  compileML,
+  generateVModelTemplate
 };
 module.exports = viewCompiler;

package/dist/core/view-compiler.js

@@ -455,10 +455,23 @@ function getProps(attrs, tag) {
         value: parseBraceExp(value)
       });
     } else if (name === "value" && (tag === "input" || tag === "textarea") || (name === "x" || name === "y") && tag === "movable-view") {
-      attrsList.push({
-        name: `v-model:${name}`,
-        value: parseBraceExp(value)
-      });
+      const parsedValue = parseBraceExp(value);
+      const conditionExp = generateVModelTemplate(parsedValue);
+      if (conditionExp) {
+        attrsList.push({
+          name: `:${name}`,
+          value: parsedValue
+        });
+        attrsList.push({
+          name: `update:${name}`,
+          value: conditionExp
+        });
+      } else {
+        attrsList.push({
+          name: `v-model:${name}`,
+          value: parsedValue
+        });
+      }
     } else if (name.startsWith("data-")) {
       if (isWrappedByBraces(value)) {
         attrsList.push({
@@ -504,6 +517,24 @@ function getProps(attrs, tag) {
   });
   return propsRes;
 }
+function generateVModelTemplate(expression) {
+  let var1, var2, updateExpression;
+  if (expression.includes("&&")) {
+    [var1, var2] = expression.split("&&").map((v) => v.trim());
+    updateExpression = `${var1} ? (${var2} = $event) : (${var1} = $event)`;
+  } else if (expression.includes("||")) {
+    [var1, var2] = expression.split("||").map((v) => v.trim());
+    updateExpression = `${var1} ? (${var1} = $event) : (${var2} = $event)`;
+  } else if (expression.includes("?")) {
+    const parts = expression.split(/[?:]/).map((v) => v.trim());
+    var1 = parts[0];
+    var2 = parts[2];
+    updateExpression = `${var1} ? (${var1} = $event) : (${var2} = $event)`;
+  } else {
+    return false;
+  }
+  return updateExpression;
+}
 function parseKeyExpression(exp, itemName = "item") {
   exp = exp.trim();
   if (!exp.includes("{{")) {
@@ -627,7 +658,8 @@ const viewCompiler = {
   parseClassRules,
   parseBraceExp,
   parseKeyExpression,
-  compileML
+  compileML,
+  generateVModelTemplate
 };
 export {
   viewCompiler as default

package/dist/index.cjs

@@ -39,10 +39,10 @@ function createDist() {
   }
   shelljs.mkdir("-p", `${distPath}`);
 }
-function publishToDist(dist) {
+function publishToDist(dist, useAppIdDir = true) {
   const distPath = env.getTargetPath();
   const appId = env.getAppId();
-  const absolutePath = `${path.resolve(process.cwd(), dist)}/${appId}`;
+  const absolutePath = useAppIdDir ? `${path.resolve(process.cwd(), dist)}/${appId}` : `${path.resolve(process.cwd(), dist)}`;
   shelljs.rm("-rf", absolutePath);
   shelljs.mkdir("-p", absolutePath);
   shelljs.cp("-r", `${distPath}/*`, absolutePath);
@@ -113,7 +113,7 @@ class WorkerPool {
 }
 const workerPool = new WorkerPool();
 let isPrinted = false;
-async function build(targetPath, workPath) {
+async function build(targetPath, workPath, useAppIdDir = true) {
   if (!isPrinted) {
     artCode$1();
     isPrinted = true;
@@ -183,7 +183,7 @@ async function build(targetPath, workPath) {
       {
         title: "输出编译产物",
         task: () => {
-          publishToDist(targetPath);
+          publishToDist(targetPath, useAppIdDir);
         }
       }
     ],

package/dist/index.js

@@ -37,10 +37,10 @@ function createDist() {
   }
   shelljs.mkdir("-p", `${distPath}`);
 }
-function publishToDist(dist) {
+function publishToDist(dist, useAppIdDir = true) {
   const distPath = getTargetPath();
   const appId = getAppId();
-  const absolutePath = `${path.resolve(process.cwd(), dist)}/${appId}`;
+  const absolutePath = useAppIdDir ? `${path.resolve(process.cwd(), dist)}/${appId}` : `${path.resolve(process.cwd(), dist)}`;
   shelljs.rm("-rf", absolutePath);
   shelljs.mkdir("-p", absolutePath);
   shelljs.cp("-r", `${distPath}/*`, absolutePath);
@@ -111,7 +111,7 @@ class WorkerPool {
 }
 const workerPool = new WorkerPool();
 let isPrinted = false;
-async function build(targetPath, workPath) {
+async function build(targetPath, workPath, useAppIdDir = true) {
   if (!isPrinted) {
     artCode$1();
     isPrinted = true;
@@ -181,7 +181,7 @@ async function build(targetPath, workPath) {
       {
         title: "输出编译产物",
         task: () => {
-          publishToDist(targetPath);
+          publishToDist(targetPath, useAppIdDir);
         }
       }
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",