nativescript 8.9.0-alpha.2 → 8.9.0-dev.0

package/lib/services/ios/xcodebuild-args-service.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XcodebuildArgsService = void 0;
 const path = require("path");
@@ -25,81 +16,75 @@ class XcodebuildArgsService {
         this.$logger = $logger;
         this.$xcconfigService = $xcconfigService;
     }
-    getBuildForSimulatorArgs(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let args = yield this.getArchitecturesArgs(buildConfig);
-            if (this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
-                args = args.concat(["CODE_SIGNING_ALLOWED=NO"]);
-            }
-            else {
-                args = args.concat(["CODE_SIGN_IDENTITY="]);
-            }
-            let destination = "generic/platform=iOS Simulator";
-            let isvisionOS = this.$devicePlatformsConstants.isvisionOS(buildConfig.platform);
-            if (isvisionOS) {
-                destination = "platform=visionOS Simulator";
-                if (buildConfig._device) {
-                    destination += `,id=${buildConfig._device.deviceInfo.identifier}`;
-                }
+    async getBuildForSimulatorArgs(platformData, projectData, buildConfig) {
+        let args = await this.getArchitecturesArgs(buildConfig);
+        if (this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
+            args = args.concat(["CODE_SIGNING_ALLOWED=NO"]);
+        }
+        else {
+            args = args.concat(["CODE_SIGN_IDENTITY="]);
+        }
+        let destination = "generic/platform=iOS Simulator";
+        let isvisionOS = this.$devicePlatformsConstants.isvisionOS(buildConfig.platform);
+        if (isvisionOS) {
+            destination = "platform=visionOS Simulator";
+            if (buildConfig._device) {
+                destination += `,id=${buildConfig._device.deviceInfo.identifier}`;
             }
-            args = args
-                .concat([
-                "-destination",
-                destination,
-                "build",
-                "-configuration",
-                buildConfig.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug,
-            ])
-                .concat(this.getBuildCommonArgs(platformData, projectData, isvisionOS ? ios_project_service_1.VisionSimulatorPlatformSdkName : ios_project_service_1.SimulatorPlatformSdkName))
-                .concat(this.getBuildLoggingArgs())
-                .concat(this.getXcodeProjectArgs(platformData, projectData));
-            return args;
-        });
+        }
+        args = args
+            .concat([
+            "-destination",
+            destination,
+            "build",
+            "-configuration",
+            buildConfig.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug,
+        ])
+            .concat(this.getBuildCommonArgs(platformData, projectData, isvisionOS ? ios_project_service_1.VisionSimulatorPlatformSdkName : ios_project_service_1.SimulatorPlatformSdkName))
+            .concat(this.getBuildLoggingArgs())
+            .concat(this.getXcodeProjectArgs(platformData, projectData));
+        return args;
     }
-    getBuildForDeviceArgs(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const architectures = yield this.getArchitecturesArgs(buildConfig);
-            const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
-            let destination = "generic/platform=iOS";
-            let isvisionOS = this.$devicePlatformsConstants.isvisionOS(buildConfig.platform);
-            if (isvisionOS) {
-                destination = "platform=visionOS";
-                if (buildConfig._device) {
-                    destination += `,id=${buildConfig._device.deviceInfo.identifier}`;
-                }
+    async getBuildForDeviceArgs(platformData, projectData, buildConfig) {
+        const architectures = await this.getArchitecturesArgs(buildConfig);
+        const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
+        let destination = "generic/platform=iOS";
+        let isvisionOS = this.$devicePlatformsConstants.isvisionOS(buildConfig.platform);
+        if (isvisionOS) {
+            destination = "platform=visionOS";
+            if (buildConfig._device) {
+                destination += `,id=${buildConfig._device.deviceInfo.identifier}`;
             }
-            const args = [
-                "-destination",
-                destination,
-                "archive",
-                "-archivePath",
-                archivePath,
-                "-configuration",
-                buildConfig.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug,
-                "-allowProvisioningUpdates",
-            ]
-                .concat(this.getXcodeProjectArgs(platformData, projectData))
-                .concat(architectures)
-                .concat(this.getBuildCommonArgs(platformData, projectData, ios_project_service_1.DevicePlatformSdkName))
-                .concat(this.getBuildLoggingArgs());
-            return args;
-        });
+        }
+        const args = [
+            "-destination",
+            destination,
+            "archive",
+            "-archivePath",
+            archivePath,
+            "-configuration",
+            buildConfig.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug,
+            "-allowProvisioningUpdates",
+        ]
+            .concat(this.getXcodeProjectArgs(platformData, projectData))
+            .concat(architectures)
+            .concat(this.getBuildCommonArgs(platformData, projectData, ios_project_service_1.DevicePlatformSdkName))
+            .concat(this.getBuildLoggingArgs());
+        return args;
     }
-    getArchitecturesArgs(buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = [];
-            if (this.$devicePlatformsConstants.isvisionOS(buildConfig.platform)) {
-                args.push("ONLY_ACTIVE_ARCH=YES");
-                return args;
-            }
-            const devicesArchitectures = buildConfig.buildForDevice
-                ? yield this.getArchitecturesFromConnectedDevices(buildConfig)
-                : [];
-            if (!buildConfig.buildForDevice || devicesArchitectures.length > 1) {
-                args.push("ONLY_ACTIVE_ARCH=NO");
-            }
+    async getArchitecturesArgs(buildConfig) {
+        const args = [];
+        if (this.$devicePlatformsConstants.isvisionOS(buildConfig.platform)) {
+            args.push("ONLY_ACTIVE_ARCH=YES");
             return args;
-        });
+        }
+        const devicesArchitectures = buildConfig.buildForDevice
+            ? await this.getArchitecturesFromConnectedDevices(buildConfig)
+            : [];
+        if (!buildConfig.buildForDevice || devicesArchitectures.length > 1) {
+            args.push("ONLY_ACTIVE_ARCH=NO");
+        }
+        return args;
     }
     getXcodeProjectArgs(platformData, projectData) {
         const xcworkspacePath = path.join(platformData.projectRoot, `${projectData.projectName}.xcworkspace`);
@@ -141,22 +126,20 @@ class XcodebuildArgsService {
         ]);
         return args;
     }
-    getArchitecturesFromConnectedDevices(buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
-            yield this.$devicesService.initialize({
-                platform,
-                deviceId: buildConfig.device,
-                skipEmulatorStart: true,
-            });
-            const instances = this.$devicesService.getDevicesForPlatform(platform);
-            const architectures = _(instances)
-                .map((d) => d.deviceInfo.activeArchitecture)
-                .filter((d) => !!d)
-                .uniq()
-                .value();
-            return architectures;
+    async getArchitecturesFromConnectedDevices(buildConfig) {
+        const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
+        await this.$devicesService.initialize({
+            platform,
+            deviceId: buildConfig.device,
+            skipEmulatorStart: true,
         });
+        const instances = this.$devicesService.getDevicesForPlatform(platform);
+        const architectures = _(instances)
+            .map((d) => d.deviceInfo.activeArchitecture)
+            .filter((d) => !!d)
+            .uniq()
+            .value();
+        return architectures;
     }
 }
 exports.XcodebuildArgsService = XcodebuildArgsService;

package/lib/services/ios/xcodebuild-command-service.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XcodebuildCommandService = void 0;
 const constants = require("../../constants");
@@ -18,22 +9,20 @@ class XcodebuildCommandService {
         this.$errors = $errors;
         this.$logger = $logger;
     }
-    executeCommand(args, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { message, cwd, stdio, spawnOptions } = options;
-            this.$logger.info(message || "Xcode build...");
-            const childProcessOptions = { cwd, stdio: stdio || "inherit" };
-            try {
-                const commandResult = yield this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", childProcessOptions, spawnOptions || {
-                    emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME },
-                    throwError: true,
-                });
-                return commandResult;
-            }
-            catch (err) {
-                this.$errors.fail(err.message);
-            }
-        });
+    async executeCommand(args, options) {
+        const { message, cwd, stdio, spawnOptions } = options;
+        this.$logger.info(message || "Xcode build...");
+        const childProcessOptions = { cwd, stdio: stdio || "inherit" };
+        try {
+            const commandResult = await this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", childProcessOptions, spawnOptions || {
+                emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME },
+                throwError: true,
+            });
+            return commandResult;
+        }
+        catch (err) {
+            this.$errors.fail(err.message);
+        }
     }
 }
 exports.XcodebuildCommandService = XcodebuildCommandService;

package/lib/services/ios/xcodebuild-service.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XcodebuildService = void 0;
 const path = require("path");
@@ -18,77 +9,67 @@ class XcodebuildService {
         this.$xcodebuildArgsService = $xcodebuildArgsService;
         this.$xcodebuildCommandService = $xcodebuildCommandService;
     }
-    buildForDevice(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = yield this.$xcodebuildArgsService.getBuildForDeviceArgs(platformData, projectData, buildConfig);
-            yield this.$xcodebuildCommandService.executeCommand(args, {
-                cwd: platformData.projectRoot,
-                stdio: buildConfig && buildConfig.buildOutputStdio,
-            });
-            const archivePath = yield this.createDevelopmentArchive(platformData, projectData, buildConfig);
-            return archivePath;
+    async buildForDevice(platformData, projectData, buildConfig) {
+        const args = await this.$xcodebuildArgsService.getBuildForDeviceArgs(platformData, projectData, buildConfig);
+        await this.$xcodebuildCommandService.executeCommand(args, {
+            cwd: platformData.projectRoot,
+            stdio: buildConfig && buildConfig.buildOutputStdio,
         });
+        const archivePath = await this.createDevelopmentArchive(platformData, projectData, buildConfig);
+        return archivePath;
     }
-    buildForSimulator(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = yield this.$xcodebuildArgsService.getBuildForSimulatorArgs(platformData, projectData, buildConfig);
-            yield this.$xcodebuildCommandService.executeCommand(args, {
-                cwd: platformData.projectRoot,
-                stdio: buildConfig.buildOutputStdio,
-            });
+    async buildForSimulator(platformData, projectData, buildConfig) {
+        const args = await this.$xcodebuildArgsService.getBuildForSimulatorArgs(platformData, projectData, buildConfig);
+        await this.$xcodebuildCommandService.executeCommand(args, {
+            cwd: platformData.projectRoot,
+            stdio: buildConfig.buildOutputStdio,
         });
     }
-    buildForAppStore(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = yield this.$xcodebuildArgsService.getBuildForDeviceArgs(platformData, projectData, buildConfig);
-            yield this.$xcodebuildCommandService.executeCommand(args, {
-                cwd: platformData.projectRoot,
-                stdio: buildConfig && buildConfig.buildOutputStdio,
-            });
-            const archivePath = yield this.createDistributionArchive(platformData, projectData, buildConfig);
-            return archivePath;
+    async buildForAppStore(platformData, projectData, buildConfig) {
+        const args = await this.$xcodebuildArgsService.getBuildForDeviceArgs(platformData, projectData, buildConfig);
+        await this.$xcodebuildCommandService.executeCommand(args, {
+            cwd: platformData.projectRoot,
+            stdio: buildConfig && buildConfig.buildOutputStdio,
         });
+        const archivePath = await this.createDistributionArchive(platformData, projectData, buildConfig);
+        return archivePath;
     }
-    createDevelopmentArchive(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
-            const output = yield this.$exportOptionsPlistService.createDevelopmentExportOptionsPlist(archivePath, projectData, buildConfig);
-            const args = [
-                "-exportArchive",
-                "-archivePath",
-                archivePath,
-                "-exportPath",
-                output.exportFileDir,
-                "-exportOptionsPlist",
-                output.exportOptionsPlistFilePath,
-            ];
-            yield this.$xcodebuildCommandService.executeCommand(args, {
-                cwd: platformData.projectRoot,
-                stdio: buildConfig.buildOutputStdio,
-            });
-            return output.exportFilePath;
+    async createDevelopmentArchive(platformData, projectData, buildConfig) {
+        const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
+        const output = await this.$exportOptionsPlistService.createDevelopmentExportOptionsPlist(archivePath, projectData, buildConfig);
+        const args = [
+            "-exportArchive",
+            "-archivePath",
+            archivePath,
+            "-exportPath",
+            output.exportFileDir,
+            "-exportOptionsPlist",
+            output.exportOptionsPlistFilePath,
+        ];
+        await this.$xcodebuildCommandService.executeCommand(args, {
+            cwd: platformData.projectRoot,
+            stdio: buildConfig.buildOutputStdio,
         });
+        return output.exportFilePath;
     }
-    createDistributionArchive(platformData, projectData, buildConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
-            const output = yield this.$exportOptionsPlistService.createDistributionExportOptionsPlist(archivePath, projectData, buildConfig);
-            const provision = buildConfig.provision || buildConfig.mobileProvisionIdentifier;
-            const args = [
-                "-exportArchive",
-                "-archivePath",
-                archivePath,
-                "-exportPath",
-                output.exportFileDir,
-                "-exportOptionsPlist",
-                output.exportOptionsPlistFilePath,
-                provision ? "" : "-allowProvisioningUpdates",
-            ];
-            yield this.$xcodebuildCommandService.executeCommand(args, {
-                cwd: platformData.projectRoot,
-            });
-            return output.exportFilePath;
+    async createDistributionArchive(platformData, projectData, buildConfig) {
+        const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
+        const output = await this.$exportOptionsPlistService.createDistributionExportOptionsPlist(archivePath, projectData, buildConfig);
+        const provision = buildConfig.provision || buildConfig.mobileProvisionIdentifier;
+        const args = [
+            "-exportArchive",
+            "-archivePath",
+            archivePath,
+            "-exportPath",
+            output.exportFileDir,
+            "-exportOptionsPlist",
+            output.exportOptionsPlistFilePath,
+            provision ? "" : "-allowProvisioningUpdates",
+        ];
+        await this.$xcodebuildCommandService.executeCommand(args, {
+            cwd: platformData.projectRoot,
         });
+        return output.exportFilePath;
     }
 }
 exports.XcodebuildService = XcodebuildService;

package/lib/services/ios-debugger-port-service.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSDebuggerPortService = void 0;
 const constants_1 = require("../common/constants");
@@ -28,38 +19,34 @@ class IOSDebuggerPortService {
         this.$logger = $logger;
         this.mapDebuggerPortData = {};
     }
-    getPort(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = `${data.deviceId}${data.appId}`;
-                const retryInterval = 500;
-                let retryCount = Math.max((constants_2.APPLICATION_RESPONSE_TIMEOUT_SECONDS * 1000) / retryInterval, 10);
-                const interval = setInterval(() => {
-                    const port = this.getPortByKey(key);
-                    if (port || retryCount === 0) {
+    async getPort(data) {
+        return new Promise((resolve, reject) => {
+            const key = `${data.deviceId}${data.appId}`;
+            const retryInterval = 500;
+            let retryCount = Math.max((constants_2.APPLICATION_RESPONSE_TIMEOUT_SECONDS * 1000) / retryInterval, 10);
+            const interval = setInterval(() => {
+                const port = this.getPortByKey(key);
+                if (port || retryCount === 0) {
+                    clearInterval(interval);
+                    resolve(port);
+                }
+                else {
+                    if (this.mapDebuggerPortData[key] &&
+                        this.mapDebuggerPortData[key].error) {
                         clearInterval(interval);
-                        resolve(port);
+                        reject(this.mapDebuggerPortData[key].error);
                     }
                     else {
-                        if (this.mapDebuggerPortData[key] &&
-                            this.mapDebuggerPortData[key].error) {
-                            clearInterval(interval);
-                            reject(this.mapDebuggerPortData[key].error);
-                        }
-                        else {
-                            retryCount--;
-                        }
+                        retryCount--;
                     }
-                }, retryInterval);
-            });
+                }
+            }, retryInterval);
         });
     }
-    attachToDebuggerPortFoundEvent(appId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.currentAppId = appId;
-            this.attachToDebuggerPortFoundEventCore();
-            this.attachToAttachRequestEvent();
-        });
+    async attachToDebuggerPortFoundEvent(appId) {
+        this.currentAppId = appId;
+        this.attachToDebuggerPortFoundEventCore();
+        this.attachToAttachRequestEvent();
     }
     attachToDebuggerPortFoundEventCore() {
         this.$logParserService.addParseRule({
@@ -124,11 +111,12 @@ class IOSDebuggerPortService {
     }
     clearTimeout(data) {
         const storedData = this.mapDebuggerPortData[`${data.deviceId}${data.appId}`];
-        if (storedData && storedData.timer) {
+        if (storedData && typeof storedData.timer === "number") {
             clearTimeout(storedData.timer);
         }
     }
 }
+exports.IOSDebuggerPortService = IOSDebuggerPortService;
 IOSDebuggerPortService.DEBUG_PORT_LOG_REGEX = /NativeScript debugger has opened inspector socket on port (\d+?) for (.*)[.]/;
 __decorate([
     (0, decorators_1.cache)()
@@ -136,5 +124,4 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], IOSDebuggerPortService.prototype, "attachToAttachRequestEvent", null);
-exports.IOSDebuggerPortService = IOSDebuggerPortService;
 yok_1.injector.register("iOSDebuggerPortService", IOSDebuggerPortService);