@astralsight/astroforge-rsbuild-plugin 0.0.9 → 0.0.11

package/dist/index.mjs

@@ -7,10 +7,25 @@ import { parse } from "@babel/parser";
 function collectAssets(root, document) {
 	const assets = /* @__PURE__ */ new Map();
 	addAsset(root, document.manifest.icon, assets);
+	collectCommonAssets(root, assets);
 	for (const page of Object.values(document.pages)) collectPageAssets(root, page, assets);
 	for (const component of Object.values(document.components)) collectComponentAssets(root, component, assets);
 	return [...assets.values()];
 }
+function collectCommonAssets(root, assets) {
+	const commonRoot = resolve(root, "src", "common");
+	if (!existsSync(commonRoot)) return;
+	for (const file of walkFiles$1(commonRoot)) addAsset(root, `/${relative(resolve(root, "src"), file).split(sep).join("/")}`, assets);
+}
+function walkFiles$1(dir) {
+	const out = [];
+	for (const entry of readdirSync(dir, { withFileTypes: true })) {
+		const next = join(dir, entry.name);
+		if (entry.isDirectory()) out.push(...walkFiles$1(next));
+		else if (entry.isFile()) out.push(next);
+	}
+	return out;
+}
 function collectPageAssets(root, page, assets) {
 	collectNodeAssets(root, page.template, assets);
 	collectStyleAssets(root, page.style, assets);
@@ -853,6 +868,56 @@ function lowerVariableDeclaration(context, statement) {
 	});
 	return `${statement.kind} ${declarations.join(", ")};`;
 }
+function expressionPrecedence(expression) {
+	const node = unwrapExpression(expression);
+	switch (node.type) {
+		case "Identifier":
+		case "StringLiteral":
+		case "NumericLiteral":
+		case "BooleanLiteral":
+		case "NullLiteral":
+		case "TemplateLiteral":
+		case "ArrayExpression":
+		case "ObjectExpression": return 20;
+		case "MemberExpression":
+		case "OptionalMemberExpression": return 19;
+		case "CallExpression":
+		case "OptionalCallExpression": return 18;
+		case "UpdateExpression": return 17;
+		case "UnaryExpression": return 16;
+		case "BinaryExpression": return binaryOperatorPrecedence(node.operator);
+		case "LogicalExpression": return logicalOperatorPrecedence(node.operator);
+		case "ConditionalExpression": return 4;
+		case "AssignmentExpression": return 3;
+		default: return 20;
+	}
+}
+function binaryOperatorPrecedence(operator) {
+	if (operator === "*" || operator === "/" || operator === "%") return 14;
+	if (operator === "+" || operator === "-") return 13;
+	if (operator === "<<" || operator === ">>" || operator === ">>>") return 12;
+	if (operator === "<" || operator === "<=" || operator === ">" || operator === ">=" || operator === "in" || operator === "instanceof") return 11;
+	if (operator === "==" || operator === "!=" || operator === "===" || operator === "!==") return 10;
+	if (operator === "&") return 9;
+	if (operator === "^") return 8;
+	if (operator === "|") return 7;
+	return 13;
+}
+function logicalOperatorPrecedence(operator) {
+	if (operator === "&&") return 6;
+	if (operator === "||" || operator === "??") return 5;
+	return 5;
+}
+function needsExpressionParens(expression, parentPrecedence, side) {
+	const precedence = expressionPrecedence(expression);
+	if (precedence < parentPrecedence) return true;
+	if (precedence > parentPrecedence) return false;
+	return side === "right";
+}
+function lowerExpressionOperand(context, expression, aliases, parentPrecedence, side) {
+	const code = lowerExpression(context, expression, aliases);
+	return needsExpressionParens(expression, parentPrecedence, side) ? `(${code})` : code;
+}
 function lowerExpression(context, expression, aliases = /* @__PURE__ */ new Map()) {
 	const node = unwrapExpression(expression);
 	switch (node.type) {
@@ -867,9 +932,12 @@ function lowerExpression(context, expression, aliases = /* @__PURE__ */ new Map(
 		case "BooleanLiteral": return String(node.value);
 		case "NullLiteral": return "null";
 		case "BinaryExpression":
-		case "LogicalExpression": return `${lowerExpression(context, node.left, aliases)} ${node.operator} ${lowerExpression(context, node.right, aliases)}`;
-		case "UnaryExpression": return `${node.operator}${lowerExpression(context, node.argument, aliases)}`;
-		case "AssignmentExpression": return `${lowerExpression(context, node.left, aliases)} ${node.operator} ${lowerExpression(context, node.right, aliases)}`;
+		case "LogicalExpression": {
+			const precedence = expressionPrecedence(node);
+			return `${lowerExpressionOperand(context, node.left, aliases, precedence, "left")} ${node.operator} ${lowerExpressionOperand(context, node.right, aliases, precedence, "right")}`;
+		}
+		case "UnaryExpression": return `${node.operator}${lowerExpressionOperand(context, node.argument, aliases, expressionPrecedence(node), "operand")}`;
+		case "AssignmentExpression": return `${lowerExpressionOperand(context, node.left, aliases, expressionPrecedence(node), "left")} ${node.operator} ${lowerExpressionOperand(context, node.right, aliases, expressionPrecedence(node), "right")}`;
 		case "UpdateExpression": {
 			const argument = lowerExpression(context, node.argument, aliases);
 			return node.prefix ? `${node.operator}${argument}` : `${argument}${node.operator}`;
@@ -888,7 +956,7 @@ function lowerExpression(context, expression, aliases = /* @__PURE__ */ new Map(
 	}
 }
 function lowerMemberExpression(context, node, aliases) {
-	const object = lowerExpression(context, node.object, aliases);
+	const object = lowerExpressionOperand(context, node.object, aliases, expressionPrecedence(node), "operand");
 	if (node.computed) return `${object}[${lowerExpression(context, node.property, aliases)}]`;
 	return `${object}.${sourceForNode(context.source, node.property)}`;
 }
@@ -950,6 +1018,10 @@ function lowerTemplateStatementAsBlock(context, statement) {
 	if (statement.type === "BlockStatement") return lowerTemplateStatement(context, statement);
 	return `{\n  ${lowerTemplateStatement(context, statement)}\n}`;
 }
+function lowerTemplateExpressionOperand(context, expression, parentPrecedence, side) {
+	const code = lowerTemplateExpression(context, expression);
+	return needsExpressionParens(expression, parentPrecedence, side) ? `(${code})` : code;
+}
 function lowerTemplateExpression(context, expression) {
 	const node = unwrapExpression(expression);
 	switch (node.type) {
@@ -961,9 +1033,12 @@ function lowerTemplateExpression(context, expression) {
 		case "TemplateLiteral": return lowerTemplateLiteral(context, node);
 		case "ConditionalExpression": return `${lowerTemplateExpression(context, node.test)} ? ${lowerTemplateExpression(context, node.consequent)} : ${lowerTemplateExpression(context, node.alternate)}`;
 		case "BinaryExpression":
-		case "LogicalExpression": return `${lowerTemplateExpression(context, node.left)} ${node.operator} ${lowerTemplateExpression(context, node.right)}`;
-		case "UnaryExpression": return `${node.operator}${lowerTemplateExpression(context, node.argument)}`;
-		case "AssignmentExpression": return `${lowerTemplateExpression(context, node.left)} ${node.operator} ${lowerTemplateExpression(context, node.right)}`;
+		case "LogicalExpression": {
+			const precedence = expressionPrecedence(node);
+			return `${lowerTemplateExpressionOperand(context, node.left, precedence, "left")} ${node.operator} ${lowerTemplateExpressionOperand(context, node.right, precedence, "right")}`;
+		}
+		case "UnaryExpression": return `${node.operator}${lowerTemplateExpressionOperand(context, node.argument, expressionPrecedence(node), "operand")}`;
+		case "AssignmentExpression": return `${lowerTemplateExpressionOperand(context, node.left, expressionPrecedence(node), "left")} ${node.operator} ${lowerTemplateExpressionOperand(context, node.right, expressionPrecedence(node), "right")}`;
 		case "UpdateExpression": {
 			const argument = lowerTemplateExpression(context, node.argument);
 			return node.prefix ? `${node.operator}${argument}` : `${argument}${node.operator}`;
@@ -989,7 +1064,7 @@ function lowerTemplateMemberExpression(context, node) {
 	const object = unwrapExpression(node.object);
 	let base;
 	if (object.type === "Identifier" && object.name === "props") base = "_vm_";
-	else base = lowerTemplateExpression(context, object);
+	else base = lowerTemplateExpressionOperand(context, object, expressionPrecedence(node), "operand");
 	const operator = node.optional ? "?." : ".";
 	if (node.computed) return `${base}${node.optional ? "?." : ""}[${lowerTemplateExpression(context, node.property)}]`;
 	const property = sourceForNode(context.source, node.property);
@@ -999,7 +1074,7 @@ function lowerTemplateCallExpression(context, node) {
 	const setterTarget = node.callee.type === "Identifier" ? context.scriptContext.stateSetters.get(node.callee.name) : void 0;
 	if (setterTarget) return lowerTemplateStateSetterCall(context, setterTarget, node);
 	const optional = node.optional ? "?." : "";
-	return `${lowerTemplateExpression(context, node.callee)}${optional}(${node.arguments.map((arg) => {
+	return `${lowerTemplateExpressionOperand(context, node.callee, expressionPrecedence(node), "operand")}${optional}(${node.arguments.map((arg) => {
 		if (arg.type === "SpreadElement") return `...${lowerTemplateExpression(context, arg.argument)}`;
 		return lowerTemplateExpression(context, arg);
 	}).join(", ")})`;
@@ -1048,18 +1123,28 @@ const TEMPLATE_GLOBALS = new Set([
 	"Object",
 	"Promise",
 	"String",
+	"app",
+	"audio",
+	"cipher",
 	"console",
+	"device",
 	"false",
+	"file",
+	"geolocation",
 	"isFinite",
 	"isNaN",
 	"null",
 	"parseFloat",
 	"parseInt",
+	"prompt",
 	"network",
+	"record",
 	"router",
+	"sensor",
 	"storage",
 	"true",
 	"undefined",
+	"vibrator",
 	"velaBattery",
 	"velaBluetoothBLE",
 	"velaBrightness",
@@ -1077,7 +1162,8 @@ const TEMPLATE_GLOBALS = new Set([
 	"velaProtobuf",
 	"velaServiceClient",
 	"velaVolume",
-	"velaZlib"
+	"velaZlib",
+	"zip"
 ]);
 function findTopLevelBinding(body, name) {
 	for (const statement of body) {
@@ -1637,7 +1723,8 @@ function defaultIrOutFile(root, cacheDir) {
 function createIrDocument(manifestInput, pages) {
 	const routerPages = {};
 	for (const page of pages) routerPages[page.route] = { component: page.component };
-	const source = manifestSource(manifestInput, pages[0].route, routerPages);
+	const entry = typeof manifestInput.router === "object" && manifestInput.router !== null && !Array.isArray(manifestInput.router) && typeof manifestInput.router.entry === "string" && routerPages[manifestInput.router.entry] ? manifestInput.router.entry : pages[0].route;
+	const source = manifestSource(manifestInput, entry, routerPages);
 	return {
 		ir_version: 1,
 		manifest: {
@@ -1655,7 +1742,7 @@ function createIrDocument(manifestInput, pages) {
 				design_width: manifestInput.config?.designWidth
 			},
 			router: {
-				entry: pages[0].route,
+				entry,
 				pages: routerPages
 			},
 			source

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astralsight/astroforge-rsbuild-plugin",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "AstroForge Plugin for RsBuild",
   "license": "MIT",
   "repository": {
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.3",
-    "@astralsight/astroforge-core": "^0.0.9"
+    "@astralsight/astroforge-core": "^0.0.11"
   },
   "scripts": {
     "build": "tsdown"