@dimina/compiler 1.0.16 → 1.1.0

package/dist/index.js

@@ -1,11 +1,65 @@
-import { c as getPages, l as getTargetPath, m as collectAssets, n as getAppId, p as storeInfo, r as getAppName, s as getPageConfigInfo, t as getAppConfigInfo, u as getWorkPath, y as art_default } from "./env-p9Az8lv5.js";
+import { c as getPageConfigInfo, d as getTargetPath, f as getTemplateExts, h as getWorkPath, i as getAppStyleScopeId, l as getPages, n as getAppId, p as getViewScriptExts, r as getAppName, t as getAppConfigInfo, u as getStyleExts, v as storeInfo, y as collectAssets } from "./env-OH3--qg8.js";
 import path from "node:path";
+import process from "node:process";
 import { fileURLToPath } from "node:url";
 import { Worker } from "node:worker_threads";
-import { Listr } from "listr2";
-import process from "node:process";
+import { Listr, PRESET_TIMER, isUnicodeSupported } from "listr2";
 import fs from "node:fs";
 import os from "node:os";
+//#region src/common/compile-progress.js
+var DEFAULT_TERMINAL_COLUMNS = 80;
+var MIN_PROGRESS_WIDTH = 8;
+var MAX_PROGRESS_WIDTH = 28;
+var RENDERER_CHROME_WIDTH = 14;
+var PROGRESS_BRACKETS_WIDTH = 2;
+/**
+* Format worker progress without assuming a fixed terminal width.
+* The completed count remains the source of truth. Whole cells avoid the
+* visible gap that partial block glyphs leave before the unfilled section.
+*/
+function formatCompileProgress(completed, total, options = {}) {
+	const unicode = options.unicode ?? isUnicodeSupported();
+	const columns = normalizePositiveInteger(options.columns) || process.stdout.columns || DEFAULT_TERMINAL_COLUMNS;
+	const safeTotal = normalizePositiveInteger(total);
+	const safeCompleted = Math.min(normalizePositiveInteger(completed), safeTotal);
+	const ratio = safeTotal === 0 ? 0 : safeCompleted / safeTotal;
+	const percentage = Math.round(ratio * 100);
+	const separator = unicode ? "·" : "|";
+	const metadata = `${String(safeCompleted).padStart(String(safeTotal).length)}/${safeTotal} ${separator} ${String(percentage).padStart(3)}%`;
+	const availableWidth = columns - metadata.length - RENDERER_CHROME_WIDTH - PROGRESS_BRACKETS_WIDTH;
+	if (availableWidth < MIN_PROGRESS_WIDTH) return metadata;
+	const width = Math.min(availableWidth, MAX_PROGRESS_WIDTH);
+	return `[${unicode ? createUnicodeBar(ratio, width) : createAsciiBar(ratio, width)}]  ${metadata}`;
+}
+function createUnicodeBar(ratio, width) {
+	const completeWidth = Math.round(ratio * width);
+	const emptyWidth = width - completeWidth;
+	return `${"█".repeat(completeWidth)}${"░".repeat(emptyWidth)}`;
+}
+function createAsciiBar(ratio, width) {
+	const completeWidth = Math.floor(ratio * width);
+	const showHead = ratio > 0 && ratio < 1;
+	const bodyWidth = Math.max(0, completeWidth - (showHead ? 1 : 0));
+	const emptyWidth = width - bodyWidth - (showHead ? 1 : 0);
+	return `${"=".repeat(bodyWidth)}${showHead ? ">" : ""}${"-".repeat(emptyWidth)}`;
+}
+function normalizePositiveInteger(value) {
+	return Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : 0;
+}
+//#endregion
+//#region src/common/art.js
+var artCode = `
+██████╗ ██╗███╗   ███╗██╗███╗   ██╗ █████╗
+██╔══██╗██║████╗ ████║██║████╗  ██║██╔══██╗
+██║  ██║██║██╔████╔██║██║██╔██╗ ██║███████║
+██║  ██║██║██║╚██╔╝██║██║██║╚██╗██║██╔══██║
+██████╔╝██║██║ ╚═╝ ██║██║██║ ╚████║██║  ██║
+╚═════╝ ╚═╝╚═╝     ╚═╝╚═╝╚═╝  ╚═══╝╚═╝  ╚═╝
+`;
+function art_default() {
+	console.log(artCode);
+}
+//#endregion
 //#region src/common/publish.js
 function createDist() {
 	const distPath = getTargetPath();
@@ -187,13 +241,10 @@ var NpmBuilder = class {
 		const miniprogramExts = [
 			".js",
 			".json",
-			".wxml",
-			".wxss",
-			".wxs",
 			".ts",
-			".less",
-			".scss",
-			".styl"
+			...getTemplateExts(),
+			...getStyleExts(),
+			...getViewScriptExts()
 		];
 		const ext = path.extname(filename).toLowerCase();
 		return miniprogramExts.includes(ext) || filename === "package.json" || filename === "README.md" || filename.startsWith(".");
@@ -308,26 +359,32 @@ function compileConfig() {
 //#endregion
 //#region src/index.js
 var isPrinted = false;
+var previousCompatibilityWarnings = /* @__PURE__ */ new Map();
 /**
 * 构建命令入口
 * @param {string} targetPath 编译产物目标路径
 * @param {string} workPath 编译工作目录
-* @param {boolean} useAppIdDir 产物根目录是否包含appId
+* @param {boolean} useAppIdDir 产物根目录是否包含 appId
+* @param {object} [options] 构建选项
+* @param {boolean} [options.sourcemap] 是否生成 sourcemap
+* @param {{ template?: string[], style?: string[], viewScript?: string[] }} [options.fileTypes]
+*   自定义文件类型，在内置 wx/dd 类型基础上追加；template 为模板扩展名，style 为样式扩展名，
+*   viewScript 为视图脚本扩展名和内联标签名
 */
 async function build(targetPath, workPath, useAppIdDir = true, options = {}) {
-	const { sourcemap = false } = options;
+	const { sourcemap = false, fileTypes } = options;
 	if (!isPrinted) {
 		art_default();
 		isPrinted = true;
 	}
 	const tasks = new Listr([
 		{
-			title: "准备项目编译环境",
+			title: "初始化项目",
 			task: (_, task) => task.newListr([
 				{
 					title: "收集配置信息",
 					task: (ctx) => {
-						ctx.storeInfo = storeInfo(workPath);
+						ctx.storeInfo = storeInfo(workPath, { fileTypes });
 					}
 				},
 				{
@@ -351,29 +408,42 @@ async function build(targetPath, workPath, useAppIdDir = true, options = {}) {
 			], { concurrent: false })
 		},
 		{
-			title: `开始编译:${workPath.split("/").pop()}`,
+			title: `编译项目 · ${path.basename(path.resolve(workPath))}`,
 			task: (ctx, task) => {
 				const pages = getPages();
 				ctx.pages = pages;
+				ctx.compatibilityWarnings = /* @__PURE__ */ new Set();
 				return task.newListr([
 					{
-						title: "编译页面文件",
+						title: "编译视图",
+						rendererOptions: {
+							outputBar: true,
+							persistentOutput: false
+						},
 						task: async (ctx, task) => {
 							return runCompileInWorker("view", ctx, task, { sourcemap });
 						}
 					},
 					{
-						title: "编译页面逻辑",
+						title: "编译逻辑",
+						rendererOptions: {
+							outputBar: true,
+							persistentOutput: false
+						},
 						task: async (ctx, task) => {
 							return runCompileInWorker("logic", ctx, task, { sourcemap });
 						}
 					},
 					{
-						title: "编译样式文件",
+						title: "编译样式",
+						rendererOptions: {
+							outputBar: true,
+							persistentOutput: false
+						},
 						task: async (ctx, task) => {
 							pages.mainPages.unshift({
 								path: "app",
-								id: ""
+								id: getAppStyleScopeId()
 							});
 							return runCompileInWorker("style", ctx, task, { sourcemap });
 						}
@@ -382,14 +452,23 @@ async function build(targetPath, workPath, useAppIdDir = true, options = {}) {
 			}
 		},
 		{
-			title: "输出编译产物",
+			title: "写入编译产物",
 			task: () => {
 				publishToDist(targetPath, useAppIdDir);
 			}
 		}
-	], { concurrent: false });
+	], {
+		concurrent: false,
+		rendererOptions: {
+			collapseSubtasks: true,
+			formatOutput: "truncate",
+			timer: PRESET_TIMER
+		},
+		fallbackRendererOptions: { timer: PRESET_TIMER }
+	});
 	try {
 		const context = await tasks.run();
+		printCompatibilityWarnings(workPath, context.compatibilityWarnings);
 		return {
 			appId: getAppId(),
 			name: getAppName(),
@@ -418,16 +497,12 @@ function runCompileInWorker(script, ctx, task, options = {}) {
 		});
 		worker.on("message", (message) => {
 			try {
-				if (message.completedTasks) {
-					const progress = message.completedTasks / totalTasks;
-					const percentage = progress * 100;
-					const barLength = 30;
-					const filledLength = Math.ceil(barLength * progress);
-					task.output = `[${"█".repeat(filledLength) + "░".repeat(barLength - filledLength)}] ${percentage.toFixed(2)}%`;
-				}
+				for (const warning of message.compatibilityWarnings || []) ctx.compatibilityWarnings.add(warning);
+				if (process.stdout.isTTY && message.completedTasks !== void 0) task.output = formatCompileProgress(message.completedTasks, totalTasks);
 				if (message.success) {
 					if (isResolved) return;
 					isResolved = true;
+					if (process.stdout.isTTY && totalTasks > 0) task.output = formatCompileProgress(totalTasks, totalTasks);
 					worker.terminate();
 					resolve();
 				} else if (message.error) {
@@ -446,9 +521,25 @@ function runCompileInWorker(script, ctx, task, options = {}) {
 			handleError(err);
 		});
 		worker.on("exit", (code) => {
-			if (code !== 0 && !isResolved) handleError(workerError || /* @__PURE__ */ new Error(code === 1 ? "Worker terminated due to reaching memory limit: JS heap out of memory" : `Worker stopped with exit code ${code}`));
+			if (code !== 0 && !isResolved) {
+				const error = workerError || /* @__PURE__ */ new Error(code === 1 ? "Worker terminated due to reaching memory limit: JS heap out of memory" : `Worker stopped with exit code ${code}`);
+				handleError(error);
+			}
 		});
 	}));
 }
+function printCompatibilityWarnings(workPath, warnings = /* @__PURE__ */ new Set()) {
+	const projectPath = path.resolve(workPath);
+	const hasPreviousResult = previousCompatibilityWarnings.has(projectPath);
+	const previousWarnings = previousCompatibilityWarnings.get(projectPath) || /* @__PURE__ */ new Set();
+	const currentWarnings = new Set(warnings);
+	const newWarnings = [...currentWarnings].filter((warning) => !previousWarnings.has(warning));
+	previousCompatibilityWarnings.set(projectPath, currentWarnings);
+	if (newWarnings.length === 0) return;
+	const qualifier = hasPreviousResult ? " new" : "";
+	const suffix = newWarnings.length === 1 ? "" : "s";
+	console.warn(`\n[compat] ${newWarnings.length}${qualifier} compatibility warning${suffix}`);
+	for (const warning of newWarnings) console.warn(`  - ${warning.replace(/^\[compat\]\s*/, "")}`);
+}
 //#endregion
 export { build as default };

package/dist/rolldown-runtime-D6vf50IK.cjs

@@ -0,0 +1,28 @@
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+//#endregion
+Object.defineProperty(exports, "__toESM", {
+	enumerable: true,
+	get: function() {
+		return __toESM;
+	}
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dimina/compiler",
-	"version": "1.0.16",
+	"version": "1.1.0",
 	"description": "星河编译工具",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -43,6 +43,9 @@
 	},
 	"author": "doslin",
 	"license": "Apache-2.0",
+	"engines": {
+		"node": ">=20"
+	},
 	"keywords": [
 		"dimina",
 		"compiler",
@@ -51,22 +54,23 @@
 		"星河"
 	],
 	"dependencies": {
-		"@vue/compiler-sfc": "^3.5.34",
-		"autoprefixer": "^10.5.0",
+		"@vue/compiler-sfc": "^3.5.39",
+		"@vue/shared": "^3.5.39",
+		"autoprefixer": "^10.5.3",
 		"cheerio": "^1.2.0",
 		"chokidar": "^4.0.3",
 		"commander": "^14.0.3",
-		"cssnano": "^8.0.1",
-		"esbuild": "^0.28.0",
+		"cssnano": "^8.0.2",
+		"esbuild": "^0.28.1",
 		"htmlparser2": "^12.0.0",
-		"less": "^4.6.4",
+		"less": "^4.6.7",
 		"listr2": "^9.0.5",
 		"magic-string": "^0.30.21",
-		"oxc-parser": "^0.129.0",
-		"oxc-walker": "^0.7.0",
-		"postcss": "^8.5.14",
-		"postcss-selector-parser": "^7.1.1",
-		"sass": "^1.99.0",
+		"oxc-parser": "^0.139.0",
+		"oxc-walker": "^1.0.0",
+		"postcss": "^8.5.19",
+		"postcss-selector-parser": "^7.1.4",
+		"sass": "^1.101.0",
 		"source-map-js": "^1.2.1"
 	},
 	"publishConfig": {