vxrn 2.0.0-beta.115.1 → 2.0.0-beta.120.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -5,6 +5,7 @@ import { pathToFileURL } from "node:url";
 import { validateNativeApp } from "@vxrn/utils/nativeAppManifest";
 import FSExtra from "fs-extra";
 import sharp from "sharp";
+import { kotlinSourceId, renderKotlinSourceGlue, swiftPodManifest, writeNativeSourceDeclaration, writeSwiftPackageArtifacts } from "../utils/nativeSourceContract.mjs";
 import { swiftPackageDirectories } from "../utils/swiftPackageId.mjs";
 
 const nativeProjectPatches = module.createRequire(import.meta.url)("../../native-project-patches.cjs");
@@ -1294,19 +1295,41 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
 			}
 		}
 		if (platform === "ios" && relativePath.endsWith("/Info.plist")) {
-			const usage = [];
+			const usage = /* @__PURE__ */ new Map();
 			if (app.imagePicker?.camera !== void 0) {
-				usage.push(["NSCameraUsageDescription", app.imagePicker.camera]);
+				usage.set("NSCameraUsageDescription", app.imagePicker.camera);
+			}
+			if (app.photoLibrary !== void 0) {
+				usage.set("NSPhotoLibraryAddUsageDescription", app.photoLibrary.addOnly);
+			}
+			if (app.location !== void 0) {
+				usage.set("NSLocationWhenInUseUsageDescription", app.location.whenInUse);
+			}
+			if (app.ios?.faceIdUsageDescription !== void 0) {
+				usage.set("NSFaceIDUsageDescription", app.ios.faceIdUsageDescription);
 			}
 			if (app.speech !== void 0) {
-				usage.push(["NSSpeechRecognitionUsageDescription", app.speech.recognition], ["NSMicrophoneUsageDescription", app.speech.microphone]);
+				usage.set("NSSpeechRecognitionUsageDescription", app.speech.recognition);
+				usage.set("NSMicrophoneUsageDescription", app.speech.microphone);
+			}
+			if (app.audio !== void 0) {
+				usage.set("NSMicrophoneUsageDescription", app.audio.microphone);
+			}
+			const additions = [];
+			for (const [key, text] of usage) {
+				const existing = new RegExp(`(<key>${key}</key>\\s*<string>)[^<]*(</string>)`);
+				if (existing.test(rendered)) {
+					rendered = rendered.replace(existing, (_match, before, after) => `${before}${escapeXml(text)}${after}`);
+				} else {
+					additions.push([key, text]);
+				}
 			}
-			if (usage.length) {
+			if (additions.length) {
 				const anchor = "	<key>LSRequiresIPhoneOS</key>";
 				if (!rendered.includes(anchor)) {
-					throw new Error(`[vxrn] cannot stamp ${usage[0][0]}: expected LSRequiresIPhoneOS in Info.plist`);
+					throw new Error(`[vxrn] cannot stamp ${additions[0][0]}: expected LSRequiresIPhoneOS in Info.plist`);
 				}
-				rendered = rendered.replace(anchor, `${usage.map(([key, text]) => `	<key>${key}</key>
+				rendered = rendered.replace(anchor, `${additions.map(([key, text]) => `	<key>${key}</key>
 	<string>${escapeXml(text)}</string>
 `).join("")}${anchor}`);
 			}
@@ -1458,7 +1481,42 @@ const generateForPlatform = async (root, platform, app, outDir = path.resolve(ro
 		root,
 		dest
 	});
+	if (platform === "android") generateKotlinSources({
+		root,
+		dest
+	});
 };
+function generateKotlinSources({ root, dest }) {
+	const skip = /* @__PURE__ */ new Set([
+		"node_modules",
+		"ios",
+		"android",
+		"dist",
+		"types",
+		"build",
+		"tests",
+		"__tests__",
+		"scripts"
+	]);
+	const collect = (dir) => {
+		for (const entry of FSExtra.readdirSync(dir, { withFileTypes: true })) {
+			if (entry.name.startsWith(".") || skip.has(entry.name)) continue;
+			const source = path.join(dir, entry.name);
+			if (entry.isDirectory()) collect(source);
+			else if (entry.isFile() && entry.name.endsWith(".kt")) {
+				const id = kotlinSourceId(root, source);
+				const target = path.join(dest, "app/src/main/java/one/source", id);
+				FSExtra.mkdirSync(target, { recursive: true });
+				FSExtra.copyFileSync(source, path.join(target, entry.name));
+				const contract = writeNativeSourceDeclaration(source);
+				if (contract.modules.length > 0) {
+					FSExtra.writeFileSync(path.join(target, `OneNativeSource_${id}.kt`), renderKotlinSourceGlue(id, contract).source);
+				}
+			}
+		}
+	};
+	collect(root);
+}
 function generateSwiftPackages({ root, dest }) {
 	const skip = /* @__PURE__ */ new Set([
 		"node_modules",
@@ -1470,6 +1528,7 @@ function generateSwiftPackages({ root, dest }) {
 	]);
 	for (const [id, packageDir] of swiftPackageDirectories(root)) {
 		const podDir = path.join(dest, "OneSwiftPackages", id);
+		const manifest = swiftPodManifest(path.join(packageDir, "Package.swift"), FSExtra.readFileSync(path.join(packageDir, "Package.swift"), "utf8"));
 		const sources = [];
 		const collect = (dir) => {
 			for (const entry of FSExtra.readdirSync(dir, { withFileTypes: true })) {
@@ -1480,11 +1539,20 @@ function generateSwiftPackages({ root, dest }) {
 			}
 		};
 		collect(packageDir);
+		const artifacts = writeSwiftPackageArtifacts(packageDir);
+		const contracts = artifacts.contracts;
+		const hasView = contracts.some((contract) => contract.defaultView);
+		if (contracts.filter((contract) => contract.defaultView).length > 1) {
+			throw new Error(`[vxrn] swift package ${packageDir} has more than one @main type`);
+		}
 		for (const source of sources) {
 			const link = path.join(podDir, "Sources", path.relative(packageDir, source));
 			FSExtra.mkdirSync(path.dirname(link), { recursive: true });
 			FSExtra.symlinkSync(FSExtra.realpathSync(source), link);
 		}
+		if (contracts.some((contract) => contract.modules.length > 0)) {
+			FSExtra.writeFileSync(path.join(podDir, "Sources", "OneNativeSource.generated.swift"), artifacts.glue);
+		}
 		FSExtra.writeFileSync(path.join(podDir, `${id}.podspec`), `Pod::Spec.new do |s|
   s.name = '${id}'
   s.version = '0.0.0'
@@ -1493,15 +1561,15 @@ function generateSwiftPackages({ root, dest }) {
   s.license = 'MIT'
   s.author = 'one'
   s.source = { :path => '.' }
-  s.swift_version = '6.0'
+  s.swift_version = '${manifest.languageMode}.0'
   s.source_files = 'Sources/**/*.swift', 'Register.m'
   s.dependency 'One'
   s.pod_target_xcconfig = {
-    'OTHER_SWIFT_FLAGS' => '$(inherited) -cxx-interoperability-mode=default -Xcc -std=c++20 -Xfrontend -import-module -Xfrontend One -Xfrontend -entry-point-function-name -Xfrontend ${id}_main',
+    'OTHER_SWIFT_FLAGS' => '$(inherited) -cxx-interoperability-mode=default -Xcc -std=c++20 -Xfrontend -import-module -Xfrontend One${manifest.mainActorIsolation ? " -default-isolation MainActor" : ""}${hasView ? ` -Xfrontend -entry-point-function-name -Xfrontend ${id}_main` : ""}',
   }
 end
 `);
-		FSExtra.writeFileSync(path.join(podDir, "Register.m"), `#import <Foundation/Foundation.h>
+		FSExtra.writeFileSync(path.join(podDir, "Register.m"), hasView ? `#import <Foundation/Foundation.h>
 
 extern int ${id}_main(int argc, char **argv);
 extern void OneSwiftRegisterPackage(const char *name, int (*entry)(int, char **));
@@ -1514,7 +1582,7 @@ extern void OneSwiftRegisterPackage(const char *name, int (*entry)(int, char **)
   OneSwiftRegisterPackage("${id}", ${id}_main);
 }
 @end
-`);
+` : "#import <Foundation/Foundation.h>\n");
 	}
 }
 function applyAndroidDependencyPatches(args) {
@@ -1523,7 +1591,7 @@ function applyAndroidDependencyPatches(args) {
 		return;
 	}
 	const activityPath = path.join(root, "android", "app", "src", "main", "java", ...app.android.applicationId.split("."), "MainActivity.kt");
-	const rendered = nativeProjectPatches.addReactNativeScreensFix(FSExtra.readFileSync(activityPath, "utf8"));
+	const rendered = nativeProjectPatches.holdLaunchScreenInMainActivity(nativeProjectPatches.addReactNativeScreensFix(FSExtra.readFileSync(activityPath, "utf8")));
 	if (!rendered.includes("RNScreensFragmentFactory")) {
 		throw new Error("[vxrn] failed to apply the react-native-screens activity patch");
 	}