vxrn 2.6.9 → 2.6.11

package/dist/utils/nativeSourceContract.mjs

@@ -331,6 +331,16 @@ function declarationStart(list, floor, keyword) {
 	}
 	return first;
 }
+function declarationModifiers(list, floor, keyword) {
+	const words = [];
+	for (let i = declarationStart(list, floor, keyword), depth = 0; i < keyword; i++) {
+		const text = list[i].text;
+		if (text === "(") depth++;
+		else if (text === ")") depth--;
+		else if (depth === 0) words.push(text);
+	}
+	return words;
+}
 function subscriptionPayload(file, typeTokens, language, named) {
 	try {
 		if (typeTokens.at(-1)?.text === "?") return null;
@@ -375,7 +385,7 @@ function methods(file, list, start, end, language, named) {
 			i++;
 			continue;
 		}
-		const modifiers = list.slice(declarationStart(list, previous, i), i).map((token) => token.text);
+		const modifiers = declarationModifiers(list, previous, i);
 		const hidden = modifiers.includes("private") || modifiers.includes("fileprivate");
 		if (!hidden && (modifiers.includes("static") || modifiers.includes("class"))) {
 			fail(file, list[i], "static native exports are unsupported");
@@ -541,7 +551,7 @@ function storedProperty(file, list, i, previous, end, owner) {
 	};
 }
 function swiftView(file, list, keyword, floor, body, end, named) {
-	const modifiers = list.slice(declarationStart(list, floor, keyword), keyword).map((token) => token.text);
+	const modifiers = declarationModifiers(list, floor, keyword);
 	if (list[keyword].text !== "struct" || !modifiers.includes("public")) return null;
 	if (!list.slice(keyword + 2, body).some((token) => token.text === "View")) return null;
 	const name = list[keyword + 1].text;
@@ -605,7 +615,7 @@ function swiftView(file, list, keyword, floor, body, end, named) {
 	};
 }
 function collectDataClass(file, list, keyword, name, token, generic, packageName) {
-	const modifiers = list.slice(declarationStart(list, 0, keyword - 1), keyword).map((entry) => entry.text);
+	const modifiers = declarationModifiers(list, 0, keyword - 1);
 	let problem = null;
 	if (modifiers.includes("private")) {
 		problem = `data class ${name} must be public to cross the boundary`;
@@ -1048,7 +1058,7 @@ function collectNamedTypes(file, list, language, packageName) {
 		const header = list.slice(i + 2, body);
 		if (isSwiftStruct) {
 			const inherits = header.map((entry) => entry.text);
-			const modifiers = list.slice(declarationStart(list, 0, i), i).map((entry) => entry.text);
+			const modifiers = declarationModifiers(list, 0, i);
 			structs.push({
 				name,
 				token,
@@ -1081,7 +1091,7 @@ function collectNamedTypes(file, list, language, packageName) {
 	};
 }
 function composableView(file, list, keyword, floor, named) {
-	const modifiers = list.slice(declarationStart(list, floor, keyword), keyword).map((token) => token.text);
+	const modifiers = declarationModifiers(list, floor, keyword);
 	if (!modifiers.some((value, index) => value === "@" && modifiers[index + 1] === "Composable")) return null;
 	if (modifiers.includes("private") || modifiers.includes("internal")) return null;
 	const name = list[keyword + 1]?.text;