@wevu/compiler 6.6.12 → 6.6.14

package/dist/index.mjs

@@ -1441,13 +1441,13 @@ function createModuleAnalysis(id, ast) {
 
 //#endregion
 //#region src/plugins/wevu/pageFeatures/optionsObjects.ts
-function unwrapTypeLikeExpression$1(node) {
-	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node)) return unwrapTypeLikeExpression$1(node.expression);
-	if (t.isParenthesizedExpression(node)) return unwrapTypeLikeExpression$1(node.expression);
+function unwrapTypeLikeExpression$2(node) {
+	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node)) return unwrapTypeLikeExpression$2(node.expression);
+	if (t.isParenthesizedExpression(node)) return unwrapTypeLikeExpression$2(node.expression);
 	return node;
 }
 function resolveOptionsObjectFromExpression(node) {
-	const normalized = unwrapTypeLikeExpression$1(node);
+	const normalized = unwrapTypeLikeExpression$2(node);
 	if (t.isObjectExpression(normalized)) return normalized;
 	if (t.isIdentifier(normalized)) return null;
 	if (t.isCallExpression(normalized)) {
@@ -1951,21 +1951,21 @@ function vueSfcTransformPlugin() {
 function isDefineComponentCall(node, aliases) {
 	return t.isIdentifier(node.callee) && aliases.has(node.callee.name);
 }
-function isObjectAssignCall(node) {
+function isObjectAssignCall$1(node) {
 	const callee = node.callee;
 	return t.isMemberExpression(callee) && t.isIdentifier(callee.object, { name: "Object" }) && t.isIdentifier(callee.property, { name: "assign" });
 }
-function unwrapTypeLikeExpression(node) {
-	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node)) return unwrapTypeLikeExpression(node.expression);
-	if (t.isParenthesizedExpression(node)) return unwrapTypeLikeExpression(node.expression);
+function unwrapTypeLikeExpression$1(node) {
+	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node)) return unwrapTypeLikeExpression$1(node.expression);
+	if (t.isParenthesizedExpression(node)) return unwrapTypeLikeExpression$1(node.expression);
 	return node;
 }
 function resolveObjectExpressionFromAssignCall(node) {
-	if (!isObjectAssignCall(node)) return null;
+	if (!isObjectAssignCall$1(node)) return null;
 	for (let index = node.arguments.length - 1; index >= 0; index -= 1) {
 		const arg = node.arguments[index];
 		if (t.isSpreadElement(arg) || !t.isExpression(arg)) continue;
-		const normalized = unwrapTypeLikeExpression(arg);
+		const normalized = unwrapTypeLikeExpression$1(arg);
 		if (t.isObjectExpression(normalized)) return normalized;
 	}
 	return null;
@@ -1990,7 +1990,7 @@ function resolveComponentExpression(declaration, defineComponentDecls, aliases)
 		if (t.isExpression(arg)) return arg;
 		return null;
 	}
-	if (t.isCallExpression(declaration) && isObjectAssignCall(declaration)) return declaration;
+	if (t.isCallExpression(declaration) && isObjectAssignCall$1(declaration)) return declaration;
 	if (t.isIdentifier(declaration)) {
 		const matched = defineComponentDecls.get(declaration.name);
 		return matched ? t.cloneNode(matched, true) : null;
@@ -1999,7 +1999,7 @@ function resolveComponentExpression(declaration, defineComponentDecls, aliases)
 }
 function resolveComponentOptionsObject(componentExpr) {
 	if (!componentExpr) return null;
-	const normalized = unwrapTypeLikeExpression(componentExpr);
+	const normalized = unwrapTypeLikeExpression$1(componentExpr);
 	if (t.isObjectExpression(normalized)) return normalized;
 	if (t.isCallExpression(normalized)) return resolveObjectExpressionFromAssignCall(normalized);
 	return null;
@@ -2712,6 +2712,71 @@ function injectTemplateRefs(optionsObject, bindings, warn) {
 
 //#endregion
 //#region src/plugins/vue/transform/transformScript/rewrite/index.ts
+function hasStaticProperty(target, keyName) {
+	for (const prop of target.properties) {
+		if (prop.type !== "ObjectProperty" && prop.type !== "ObjectMethod" || prop.computed) continue;
+		const key = prop.key;
+		if (key.type === "Identifier" && key.name === keyName) return true;
+		if (key.type === "StringLiteral" && key.value === keyName) return true;
+	}
+	return false;
+}
+function isObjectAssignCall(node) {
+	const callee = node.callee;
+	return t.isMemberExpression(callee) && t.isIdentifier(callee.object, { name: "Object" }) && t.isIdentifier(callee.property, { name: "assign" });
+}
+function unwrapTypeLikeExpression(node) {
+	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node)) return unwrapTypeLikeExpression(node.expression);
+	if (t.isParenthesizedExpression(node)) return unwrapTypeLikeExpression(node.expression);
+	return node;
+}
+function resolveObjectExpressionFromProgram(program, name) {
+	for (let index = program.body.length - 1; index >= 0; index -= 1) {
+		const statement = program.body[index];
+		if (!t.isVariableDeclaration(statement)) continue;
+		for (const declarator of statement.declarations) {
+			if (!t.isIdentifier(declarator.id, { name }) || !declarator.init || !t.isExpression(declarator.init)) continue;
+			const normalized = unwrapTypeLikeExpression(declarator.init);
+			if (t.isObjectExpression(normalized)) return normalized;
+			if (t.isCallExpression(normalized) && isObjectAssignCall(normalized)) {
+				const lastArg = normalized.arguments[normalized.arguments.length - 1];
+				if (lastArg && !t.isSpreadElement(lastArg) && t.isExpression(lastArg)) {
+					const lastNormalized = unwrapTypeLikeExpression(lastArg);
+					if (t.isObjectExpression(lastNormalized)) return lastNormalized;
+				}
+			}
+		}
+	}
+	return null;
+}
+function hasStaticPropertyWithSpreads(target, keyName, program, visited = /* @__PURE__ */ new Set()) {
+	if (hasStaticProperty(target, keyName)) return true;
+	for (const prop of target.properties) {
+		if (!t.isSpreadElement(prop)) continue;
+		const spreadArg = prop.argument;
+		if (t.isObjectExpression(spreadArg) && hasStaticPropertyWithSpreads(spreadArg, keyName, program, visited)) return true;
+		if (!t.isIdentifier(spreadArg) || visited.has(spreadArg.name)) continue;
+		visited.add(spreadArg.name);
+		const resolved = resolveObjectExpressionFromProgram(program, spreadArg.name);
+		if (resolved && hasStaticPropertyWithSpreads(resolved, keyName, program, visited)) return true;
+	}
+	return false;
+}
+function hasStaticPropertyInComponentExpression(componentExpr, keyName, program) {
+	const normalized = unwrapTypeLikeExpression(componentExpr);
+	if (t.isObjectExpression(normalized)) return hasStaticPropertyWithSpreads(normalized, keyName, program);
+	if (!t.isCallExpression(normalized) || !isObjectAssignCall(normalized)) return false;
+	for (const arg of normalized.arguments) {
+		if (t.isSpreadElement(arg) || !t.isExpression(arg)) continue;
+		const expr = unwrapTypeLikeExpression(arg);
+		if (t.isObjectExpression(expr) && hasStaticPropertyWithSpreads(expr, keyName, program)) return true;
+		if (t.isIdentifier(expr)) {
+			const resolved = resolveObjectExpressionFromProgram(program, expr.name);
+			if (resolved && hasStaticPropertyWithSpreads(resolved, keyName, program, new Set([expr.name]))) return true;
+		}
+	}
+	return false;
+}
 function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializedWevuDefaults, parsedWevuDefaults) {
 	if (!state.defaultExportPath) return false;
 	const warn = resolveWarnHandler(options?.warn);
@@ -2719,6 +2784,11 @@ function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializ
 	const exportPath = state.defaultExportPath;
 	const componentExpr = resolveComponentExpression(exportPath.node.declaration, state.defineComponentDecls, state.defineComponentAliases);
 	const componentOptionsObject = resolveComponentOptionsObject(componentExpr);
+	const hasPageMarker = componentExpr ? hasStaticPropertyInComponentExpression(componentExpr, "__wevu_isPage", ast.program) : false;
+	if (componentOptionsObject && options?.isPage && !options?.isApp && !hasPageMarker) {
+		componentOptionsObject.properties.splice(0, 0, t.objectProperty(t.identifier("__wevu_isPage"), t.booleanLiteral(true)));
+		transformed = true;
+	}
 	if (componentOptionsObject && enabledPageFeatures.size) transformed = injectWevuPageFeatureFlagsIntoOptionsObject(componentOptionsObject, enabledPageFeatures) || transformed;
 	if (componentOptionsObject && parsedWevuDefaults) transformed = applyWevuDefaultsToComponentOptions({
 		componentExpr: componentOptionsObject,
@@ -3455,6 +3525,16 @@ async function compileJsxFile(source, filename, options) {
 	};
 }
 
+//#endregion
+//#region src/utils/text.ts
+/**
+* 统一文本换行符为 LF，消除不同系统（CRLF/CR/LF）差异。
+*/
+function normalizeLineEndings(source) {
+	if (!source.includes("\r")) return source;
+	return source.replace(/\r\n?/g, "\n");
+}
+
 //#endregion
 //#region src/plugins/utils/cache.ts
 const mtimeCache = /* @__PURE__ */ new Map();
@@ -3492,7 +3572,7 @@ async function readFile(id, options) {
 	if (!checkMtime) {
 		const cached = loadCache.get(id);
 		if (cached !== void 0) return cached;
-		const content = await fs.readFile(id, encoding);
+		const content = normalizeLineEndings(await fs.readFile(id, encoding));
 		loadCache.set(id, content);
 		return content;
 	}
@@ -3500,7 +3580,7 @@ async function readFile(id, options) {
 		const cached = loadCache.get(id);
 		if (cached !== void 0) return cached;
 	}
-	const content = await fs.readFile(id, encoding);
+	const content = normalizeLineEndings(await fs.readFile(id, encoding));
 	loadCache.set(id, content);
 	return content;
 }
@@ -3736,7 +3816,7 @@ async function resolveSfcBlockSrc(descriptor, filename, options) {
 */
 async function readAndParseSfc(filename, options) {
 	const checkMtime = options?.checkMtime ?? true;
-	const source = options?.source ?? await readFile(filename, { checkMtime });
+	const source = normalizeLineEndings(options?.source ?? await readFile(filename, { checkMtime }));
 	const normalizedSource = preprocessScriptSrc(preprocessScriptSetupSrc(source));
 	const signature = checkMtime ? (() => {
 		const cached = mtimeCache.get(filename);
@@ -6331,10 +6411,11 @@ function extractDefineOptionsHash(content) {
 	return createHash("sha256").update(macroSources.join("\n")).digest("hex").slice(0, 12);
 }
 async function parseVueFile(source, filename, options) {
-	const normalizedSource = preprocessScriptSrc(preprocessScriptSetupSrc(source));
+	const normalizedInputSource = normalizeLineEndings(source);
+	const normalizedSource = preprocessScriptSrc(preprocessScriptSetupSrc(normalizedInputSource));
 	const { descriptor, errors } = parse(normalizedSource, {
 		filename,
-		ignoreEmpty: normalizedSource === source
+		ignoreEmpty: normalizedSource === normalizedInputSource
 	});
 	restoreScriptSetupSrc(descriptor);
 	restoreScriptSrc(descriptor);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.6.12",
+  "version": "6.6.14",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",