@dimina/compiler 1.0.1 → 1.0.3

package/README.md

@@ -1,6 +1,8 @@
 # 星河小程序编译工具
 
-## compiler 编译工具
+[![npm version](https://img.shields.io/npm/v/@dimina/compiler.svg?style=flat)](https://www.npmjs.com/package/@dimina/compiler)
+
+## 编译工具
 
 星河小程序编译工具（dmcc）用于将小程序源码编译为星河小程序运行时所需的文件格式。
 

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.1";
+const version = "1.0.3";
 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.1";
+const version = "1.0.3";
 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/logic-compiler.cjs

@@ -79,7 +79,7 @@ async function compileJS(pages, root, mainCompileRes, progress) {
   });
   return compileRes;
 }
-function buildJSByPath(root, module2, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
+function buildJSByPath(packageName, module2, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
   const currentPath = module2.path;
   if (depthChain.includes(currentPath)) {
     console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
@@ -114,8 +114,8 @@ function buildJSByPath(root, module2, compileRes, mainCompileRes, addExtra, dept
     const allSubPackages = env.getAppConfigInfo().subPackages;
     for (const [name, path2] of Object.entries(module2.usingComponents)) {
       let toMainSubPackage = true;
-      if (root) {
-        const rootPackageName = root.split("_")[1];
+      if (packageName) {
+        const rootPackageName = packageName.startsWith("sub_") ? packageName.slice(4) : packageName;
         const normalizedPath = path2.startsWith("/") ? path2.substring(1) : path2;
         for (const subPackage of allSubPackages) {
           if (normalizedPath.startsWith(`${subPackage.root}/`)) {
@@ -135,7 +135,7 @@ function buildJSByPath(root, module2, compileRes, mainCompileRes, addExtra, dept
       if (!componentModule) {
         continue;
       }
-      buildJSByPath(root, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
+      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
       const props = types.objectProperty(types.identifier(`'${name}'`), types.stringLiteral(path2));
       components.value.properties.push(props);
     }
@@ -158,7 +158,7 @@ function buildJSByPath(root, module2, compileRes, mainCompileRes, addExtra, dept
           const id = requireFullPath.split(`${env.getWorkPath()}/`)[1].split(".js")[0];
           ap.node.arguments[0] = types.stringLiteral(id);
           if (!processedModules.has(id)) {
-            buildJSByPath(root, { path: id }, compileRes, mainCompileRes, false, depthChain);
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
           }
         }
       }

package/dist/core/logic-compiler.js

@@ -78,7 +78,7 @@ async function compileJS(pages, root, mainCompileRes, progress) {
   });
   return compileRes;
 }
-function buildJSByPath(root, module, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
+function buildJSByPath(packageName, module, compileRes, mainCompileRes, addExtra, depthChain = [], putMain = false) {
   const currentPath = module.path;
   if (depthChain.includes(currentPath)) {
     console.warn(`检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
@@ -113,8 +113,8 @@ function buildJSByPath(root, module, compileRes, mainCompileRes, addExtra, depth
     const allSubPackages = getAppConfigInfo().subPackages;
     for (const [name, path] of Object.entries(module.usingComponents)) {
       let toMainSubPackage = true;
-      if (root) {
-        const rootPackageName = root.split("_")[1];
+      if (packageName) {
+        const rootPackageName = packageName.startsWith("sub_") ? packageName.slice(4) : packageName;
         const normalizedPath = path.startsWith("/") ? path.substring(1) : path;
         for (const subPackage of allSubPackages) {
           if (normalizedPath.startsWith(`${subPackage.root}/`)) {
@@ -134,7 +134,7 @@ function buildJSByPath(root, module, compileRes, mainCompileRes, addExtra, depth
       if (!componentModule) {
         continue;
       }
-      buildJSByPath(root, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
+      buildJSByPath(packageName, componentModule, compileRes, mainCompileRes, true, depthChain, toMainSubPackage);
       const props = types.objectProperty(types.identifier(`'${name}'`), types.stringLiteral(path));
       components.value.properties.push(props);
     }
@@ -157,7 +157,7 @@ function buildJSByPath(root, module, compileRes, mainCompileRes, addExtra, depth
           const id = requireFullPath.split(`${getWorkPath()}/`)[1].split(".js")[0];
           ap.node.arguments[0] = types.stringLiteral(id);
           if (!processedModules.has(id)) {
-            buildJSByPath(root, { path: id }, compileRes, mainCompileRes, false, depthChain);
+            buildJSByPath(packageName, { path: id }, compileRes, mainCompileRes, false, depthChain);
           }
         }
       }

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.1",
+	"version": "1.0.3",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",