Merge branch 'NativeScript:main' into fix-doctor-issue-with-asdf

Author: apburgess

.github/workflows/scorecard.yml

@@ -42,11 +42,10 @@ jobs:
         with:
           results_file: results.sarif
           results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # (Optional) PAT token. Add `repo_token: ${{ secrets.SCORECARD_TOKEN }}` if:
           # - you want to enable the Branch-Protection check on a *public* repository, or
           # - you are installing Scorecards on a *private* repository
           # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          repo_token: ${{ secrets.SCORECARD_TOKEN }}
 
           # Public repositories:
           #   - Publish results to OpenSSF REST API for easy access by consumers
@@ -70,4 +69,4 @@ jobs:
       - name: "Upload to code-scanning"
         uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
         with:
-          sarif_file: results.sarif
+          sarif_file: results.sarif

lib/common/definitions/mobile.d.ts

@@ -258,8 +258,7 @@ declare global {
 		 * Describes different options for filtering device logs.
 		 */
 		interface IDeviceLogOptions
-			extends IDictionary<string | boolean>,
-				Partial<IProjectDir> {
+			extends IDictionary<string | boolean>, Partial<IProjectDir> {
 			/**
 			 * Process id of the application on the device.
 			 */
@@ -284,8 +283,7 @@ declare global {
 		 * Describes required methods for getting iOS Simulator's logs.
 		 */
 		interface IiOSSimulatorLogProvider
-			extends NodeJS.EventEmitter,
-				IShouldDispose {
+			extends NodeJS.EventEmitter, IShouldDispose {
 			/**
 			 * Starts the process for getting simulator logs and emits and DEVICE_LOG_EVENT_NAME event.
 			 * @param {string} deviceId The unique identifier of the device.
@@ -429,6 +427,16 @@ declare global {
 
 		interface IDeviceFileSystem {
 			listFiles(devicePath: string, appIdentifier?: string): Promise<any>;
+			/**
+			 * Returns the entries of a directory inside the application's
+			 * sandbox, or null when the directory cannot be read. Currently
+			 * implemented only for physical iOS devices (AFC), where it backs
+			 * the post-transfer livesync verification.
+			 */
+			getDirectoryEntries?(
+				devicePath: string,
+				appIdentifier: string,
+			): Promise<string[] | null>;
 			getFile(
 				deviceFilePath: string,
 				appIdentifier: string,
@@ -533,8 +541,7 @@ declare global {
 		/**
 		 * Describes options that can be passed to devices service's initialization method.
 		 */
-		interface IDevicesServicesInitializationOptions
-			extends Partial<IDeviceLookingOptions> {
+		interface IDevicesServicesInitializationOptions extends Partial<IDeviceLookingOptions> {
 			/**
 			 * If passed will start an emulator if necesasry.
 			 */
@@ -1261,8 +1268,7 @@ declare global {
 		}
 
 		interface IDeviceLookingOptions
-			extends IHasEmulatorOption,
-				IHasDetectionInterval {
+			extends IHasEmulatorOption, IHasDetectionInterval {
 			shouldReturnImmediateResult: boolean;
 			platform: string;
 			fullDiscovery?: boolean;
@@ -1388,8 +1394,7 @@ declare global {
 		/**
 		 * Describes information about application on device.
 		 */
-		interface IDeviceApplicationInformation
-			extends IDeviceApplicationInformationBase {
+		interface IDeviceApplicationInformation extends IDeviceApplicationInformationBase {
 			/**
 			 * The framework of the project (Cordova or NativeScript).
 			 */

lib/common/mobile/emulator-helper.ts

@@ -6,6 +6,7 @@ export class EmulatorHelper implements Mobile.IEmulatorHelper {
 	// https://developer.android.com/guide/topics/manifest/uses-sdk-element
 	public mapAndroidApiLevelToVersion = {
 		"android-36": "16.0.0",
+		"android-36.1": "16.0.0",
 		"android-35": "15.0.0",
 		"android-34": "14.0.0",
 		"android-33": "13.0.0",

lib/common/mobile/ios/device/ios-device-file-system.ts

@@ -9,12 +9,12 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 		private device: Mobile.IDevice,
 		private $logger: ILogger,
 		private $iosDeviceOperations: IIOSDeviceOperations,
-		private $fs: IFileSystem
+		private $fs: IFileSystem,
 	) {}
 
 	public async listFiles(
 		devicePath: string,
-		appIdentifier: string
+		appIdentifier: string,
 	): Promise<void> {
 		if (!devicePath) {
 			devicePath = ".";
@@ -31,10 +31,33 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 		this.$logger.info(children.join(EOL));
 	}
 
+	public async getDirectoryEntries(
+		devicePath: string,
+		appIdentifier: string,
+	): Promise<string[] | null> {
+		try {
+			const result = await this.$iosDeviceOperations.listDirectory([
+				{
+					deviceId: this.device.deviceInfo.identifier,
+					path: devicePath,
+					appId: appIdentifier,
+				},
+			]);
+			const entries =
+				result?.[this.device.deviceInfo.identifier]?.[0]?.response;
+			return Array.isArray(entries) ? entries : null;
+		} catch (err) {
+			this.$logger.trace(
+				`Unable to list directory '${devicePath}' for application ${appIdentifier}: ${err.message}`,
+			);
+			return null;
+		}
+	}
+
 	public async getFile(
 		deviceFilePath: string,
 		appIdentifier: string,
-		outputFilePath?: string
+		outputFilePath?: string,
 	): Promise<void> {
 		if (outputFilePath) {
 			await this.$iosDeviceOperations.downloadFiles([
@@ -50,14 +73,14 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 
 		const fileContent = await this.getFileContent(
 			deviceFilePath,
-			appIdentifier
+			appIdentifier,
 		);
 		this.$logger.info(fileContent);
 	}
 
 	public async getFileContent(
 		deviceFilePath: string,
-		appIdentifier: string
+		appIdentifier: string,
 	): Promise<string> {
 		const result = await this.$iosDeviceOperations.readFiles([
 			{
@@ -73,7 +96,7 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 	public async putFile(
 		localFilePath: string,
 		deviceFilePath: string,
-		appIdentifier: string
+		appIdentifier: string,
 	): Promise<void> {
 		await this.uploadFilesCore([
 			{
@@ -86,7 +109,7 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 
 	public async deleteFile(
 		deviceFilePath: string,
-		appIdentifier: string
+		appIdentifier: string,
 	): Promise<void> {
 		await this.$iosDeviceOperations.deleteFiles(
 			[
@@ -98,25 +121,25 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 			],
 			(err: IOSDeviceLib.IDeviceError) => {
 				this.$logger.trace(
-					`Error while deleting file: ${deviceFilePath}: ${err.message} with code: ${err.code}`
+					`Error while deleting file: ${deviceFilePath}: ${err.message} with code: ${err.code}`,
 				);
 
 				if (err.code !== IOSDeviceFileSystem.AFC_DELETE_FILE_NOT_FOUND_ERROR) {
 					this.$logger.warn(
-						`Cannot delete file: ${deviceFilePath}. Reason: ${err.message}`
+						`Cannot delete file: ${deviceFilePath}. Reason: ${err.message}`,
 					);
 				}
-			}
+			},
 		);
 	}
 
 	public async transferFiles(
 		deviceAppData: Mobile.IDeviceAppData,
-		localToDevicePaths: Mobile.ILocalToDevicePathData[]
+		localToDevicePaths: Mobile.ILocalToDevicePathData[],
 	): Promise<Mobile.ILocalToDevicePathData[]> {
 		const filesToUpload: Mobile.ILocalToDevicePathData[] = _.filter(
 			localToDevicePaths,
-			(l) => this.$fs.getFsStats(l.getLocalPath()).isFile()
+			(l) => this.$fs.getFsStats(l.getLocalPath()).isFile(),
 		);
 		const files: IOSDeviceLib.IFileData[] = filesToUpload.map((l) => ({
 			source: l.getLocalPath(),
@@ -137,29 +160,43 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 	public async transferDirectory(
 		deviceAppData: Mobile.IDeviceAppData,
 		localToDevicePaths: Mobile.ILocalToDevicePathData[],
-		projectFilesPath: string
+		projectFilesPath: string,
 	): Promise<Mobile.ILocalToDevicePathData[]> {
 		await this.transferFiles(deviceAppData, localToDevicePaths);
 		return localToDevicePaths;
 	}
 
 	public async updateHashesOnDevice(
 		hashes: IStringDictionary,
-		appIdentifier: string
+		appIdentifier: string,
 	): Promise<void> {
 		return;
 	}
 
 	private async uploadFilesCore(
-		filesToUpload: IOSDeviceLib.IUploadFilesData[]
+		filesToUpload: IOSDeviceLib.IUploadFilesData[],
 	): Promise<void> {
 		await this.$iosDeviceOperations.uploadFiles(
 			filesToUpload,
 			(err: IOSDeviceLib.IDeviceError) => {
-				if (err.deviceId === this.device.deviceInfo.identifier) {
+				// Previously an error whose deviceId did not exactly match was
+				// dropped on the floor — including errors with NO deviceId at
+				// all (some ios-device-lib error paths don't attribute one).
+				// That left "Successfully synced" printed over a failed
+				// transfer and the app silently running stale JavaScript.
+				// Rethrow unless the error is positively attributed to a
+				// DIFFERENT device; surface even those at warn level so a
+				// failed upload is never invisible.
+				if (
+					!err.deviceId ||
+					err.deviceId === this.device.deviceInfo.identifier
+				) {
 					throw err;
 				}
-			}
+				this.$logger.warn(
+					`File upload error reported for another device (${err.deviceId}): ${err.message}`,
+				);
+			},
 		);
 	}
 }

lib/constants.ts

@@ -409,6 +409,7 @@ export enum IOSNativeTargetTypes {
 	watchApp = "watch_app",
 	watchExtension = "watch_extension",
 	appExtension = "app_extension",
+	application = 'application',
 }
 
 const pathToLoggerAppendersDir = join(

lib/definitions/nativescript-dev-xcode.d.ts

@@ -8,16 +8,27 @@ declare module "nativescript-dev-xcode" {
 	}
 
 	class project {
+		hash: any;
+		filepath: string;
 		constructor(filename: string);
 
 		parse(callback: () => void): void;
 		parseSync(): void;
 
+		generateUuid(): string;
+
 		writeSync(options: any): string;
 
 		addFramework(filepath: string, options?: Options): void;
 		removeFramework(filePath: string, options?: Options): void;
 
+
+		getProductFile(watchApptarget: target): any;
+		addToPbxFrameworksBuildPhase(file);
+		addToPbxCopyfilesBuildPhase(file, comment: string, targetid: string);
+		pbxFrameworksBuildPhaseObj(targetid: string): any;
+		pbxBuildFileSection(): {[k: string] : any};
+
 		addPbxGroup(
 			filePathsArray: any[],
 			name: string,
@@ -27,17 +38,30 @@ declare module "nativescript-dev-xcode" {
 
 		removePbxGroup(groupName: string, path: string): void;
 
+		addTargetDependency(target: string, dependencyTargets: string[]);
+
+		findTargetKey(name: string);
+		pbxTargetByName(name: string): target;
+		pbxNativeTargetSection(): {[key: string]: any};
+
 		addToHeaderSearchPaths(options?: Options): void;
 		removeFromHeaderSearchPaths(options?: Options): void;
 		updateBuildProperty(key: string, value: any): void;
 
 		pbxXCBuildConfigurationSection(): any;
 
+		buildPhaseObject(
+			buildPhaseType: string,
+			comment: string,
+			target: tstring
+		)
+
 		addTarget(
 			targetName: string,
 			targetType: string,
 			targetPath?: string,
-			parentTarget?: string
+			parentTarget?: string,
+			productTargetType?: string
 		): target;
 		addBuildPhase(
 			filePathsArray: string[],

lib/definitions/project.d.ts

@@ -880,6 +880,7 @@ interface IAddExtensionsFromPathOptions extends IAddTargetFromPathOptions {
 
 interface IAddWatchAppFromPathOptions extends IAddTargetFromPathOptions {
 	watchAppFolderPath: string;
+	disableStubBinary?: boolean;
 }
 
 interface IRemoveExtensionsOptions {
@@ -888,6 +889,37 @@ interface IRemoveExtensionsOptions {
 
 interface IRemoveWatchAppOptions extends IRemoveExtensionsOptions {}
 
+interface IWatchAppJSONConfigModule {
+	name?: string;
+	path: string;
+	targetType?: string;
+	embed?: boolean;
+	frameworks?: Array<string | Record<string, string>>;
+	dependencies?: string[];
+	headerSearchPaths?: string[];
+	resources?: string[];
+	src?: string[];
+	linkerFlags?: string[];
+	buildConfigurationProperties?: Record<string, string>;
+	SPMPackages?: Array<IOSSPMPackage | string>;
+}
+interface IWatchAppJSONConfig {
+	targetType?: string;
+	forceAddEmbedWatchContent?: boolean;
+	sharedModulesBuildConfigurationProperties?: Record<string, string>;
+	basedir?: string;
+	infoPlistPath?: string;
+	xcprivacyPath?: string;
+	importSourcesFromMainFolder?: boolean;
+	importResourcesFromMainFolder?: boolean;
+	resources?: string[];
+	src?: string[];
+	resourcesExclude?: string[];
+	srcExclude?: string[];
+	modules: IWatchAppConfigModule[];
+	SPMPackages?: Array<IOSSPMPackage>;
+}
+
 interface IRubyFunction {
 	functionName: string;
 	functionParameters?: string;

lib/services/ios-project-service.ts

@@ -877,7 +877,6 @@ export class IOSProjectService
 			}
 		}
 
-		this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
 		const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({
 			watchAppFolderPath: path.join(
 				resourcesDirectoryPath,