nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/services/ios-device-debug-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.IOSDeviceDebugService = void 0;
 const path = require("path");
@@ -43,43 +34,35 @@ class IOSDeviceDebugService extends debug_service_base_1.DebugServiceBase {
     get platform() {
         return "ios";
     }
-    debug(debugData, debugOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.validateOptions(debugOptions);
-            const result = { debugUrl: null };
-            result.debugUrl = yield this.wireDebuggerClient(debugData, debugOptions);
-            return result;
-        });
+    async debug(debugData, debugOptions) {
+        await this.validateOptions(debugOptions);
+        const result = { debugUrl: null };
+        result.debugUrl = await this.wireDebuggerClient(debugData, debugOptions);
+        return result;
     }
-    debugStop() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$appDebugSocketProxyFactory.removeAllProxies();
-        });
+    async debugStop() {
+        this.$appDebugSocketProxyFactory.removeAllProxies();
     }
-    validateOptions(debugOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$hostInfo.isWindows && !this.$hostInfo.isDarwin) {
-                this.$errors.fail(`Debugging on iOS devices is not supported for ${(0, os_1.platform)()} yet.`);
-            }
-            if (debugOptions.debugBrk && debugOptions.start) {
-                this.$errors.fail("Expected exactly one of the --debug-brk or --start options.");
-            }
-            yield this.validateUSBConnectedDevice();
-        });
+    async validateOptions(debugOptions) {
+        if (!this.$hostInfo.isWindows && !this.$hostInfo.isDarwin) {
+            this.$errors.fail(`Debugging on iOS devices is not supported for ${(0, os_1.platform)()} yet.`);
+        }
+        if (debugOptions.debugBrk && debugOptions.start) {
+            this.$errors.fail("Expected exactly one of the --debug-brk or --start options.");
+        }
+        await this.validateUSBConnectedDevice();
     }
-    validateUSBConnectedDevice() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const device = yield this.$devicesService.getDevice(this.deviceIdentifier);
-            if (device.deviceInfo.connectionTypes.indexOf(constants_1.DeviceConnectionType.USB) ===
-                -1 &&
-                device.deviceInfo.connectionTypes.indexOf(constants_1.DeviceConnectionType.Local) ===
-                    -1) {
-                const deviceConnectionTypes = device.deviceInfo.connectionTypes
-                    .map((type) => constants_1.DeviceConnectionType[type])
-                    .join(", ");
-                this.$errors.fail(`Debugging application requires a USB or LOCAL connection while the target device "${this.deviceIdentifier}" has connection type "${deviceConnectionTypes}".`);
-            }
-        });
+    async validateUSBConnectedDevice() {
+        const device = await this.$devicesService.getDevice(this.deviceIdentifier);
+        if (device.deviceInfo.connectionTypes.indexOf(constants_1.DeviceConnectionType.USB) ===
+            -1 &&
+            device.deviceInfo.connectionTypes.indexOf(constants_1.DeviceConnectionType.Local) ===
+                -1) {
+            const deviceConnectionTypes = device.deviceInfo.connectionTypes
+                .map((type) => constants_1.DeviceConnectionType[type])
+                .join(", ");
+            this.$errors.fail(`Debugging application requires a USB or LOCAL connection while the target device "${this.deviceIdentifier}" has connection type "${deviceConnectionTypes}".`);
+        }
     }
     getProjectName(debugData) {
         let projectName = debugData.projectName;
@@ -89,71 +72,62 @@ class IOSDeviceDebugService extends debug_service_base_1.DebugServiceBase {
         }
         return projectName;
     }
-    killProcess(childProcess) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (childProcess) {
-                return new Promise((resolve, reject) => {
-                    childProcess.on("close", resolve);
-                    childProcess.kill();
-                });
-            }
-        });
+    async killProcess(childProcess) {
+        if (childProcess) {
+            return new Promise((resolve, reject) => {
+                childProcess.on("close", resolve);
+                childProcess.kill();
+            });
+        }
     }
-    wireDebuggerClient(debugData, debugOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if ((debugOptions.inspector || !debugOptions.client) &&
-                this.$hostInfo.isDarwin) {
-                return yield this.setupTcpAppDebugProxy(debugData, debugOptions);
-            }
-            else {
-                return yield this.setupWebAppDebugProxy(debugOptions, debugData);
-            }
-        });
+    async wireDebuggerClient(debugData, debugOptions) {
+        if ((debugOptions.inspector || !debugOptions.client) &&
+            this.$hostInfo.isDarwin) {
+            return await this.setupTcpAppDebugProxy(debugData, debugOptions);
+        }
+        else {
+            return await this.setupWebAppDebugProxy(debugOptions, debugData);
+        }
     }
-    setupWebAppDebugProxy(debugOptions, debugData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (debugOptions.chrome) {
-                this.$logger.info("'--chrome' is the default behavior. Use --inspector to debug iOS applications using the Safari Web Inspector.");
-            }
-            const projectName = this.getProjectName(debugData);
-            const webSocketProxy = yield this.$appDebugSocketProxyFactory.ensureWebSocketProxy(this.device, debugData.applicationIdentifier, projectName, debugData.projectDir);
-            return this.getChromeDebugUrl(debugOptions, webSocketProxy.options.port);
-        });
+    async setupWebAppDebugProxy(debugOptions, debugData) {
+        if (debugOptions.chrome) {
+            this.$logger.info("'--chrome' is the default behavior. Use --inspector to debug iOS applications using the Safari Web Inspector.");
+        }
+        const projectName = this.getProjectName(debugData);
+        const webSocketProxy = await this.$appDebugSocketProxyFactory.ensureWebSocketProxy(this.device, debugData.applicationIdentifier, projectName, debugData.projectDir);
+        return this.getChromeDebugUrl(debugOptions, webSocketProxy.options.port);
     }
-    setupTcpAppDebugProxy(debugData, debugOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectName = this.getProjectName(debugData);
-            const existingTcpProxy = this.$appDebugSocketProxyFactory.getTCPSocketProxy(this.deviceIdentifier, debugData.applicationIdentifier);
-            const tcpSocketProxy = existingTcpProxy ||
-                (yield this.$appDebugSocketProxyFactory.addTCPSocketProxy(this.device, debugData.applicationIdentifier, projectName, debugData.projectDir));
-            if (!existingTcpProxy) {
-                const inspectorProcess = yield this.openAppInspector(tcpSocketProxy.address(), debugData, debugOptions);
-                if (inspectorProcess) {
-                    tcpSocketProxy.on("close", () => __awaiter(this, void 0, void 0, function* () {
-                        yield this.killProcess(inspectorProcess);
-                    }));
-                }
+    async setupTcpAppDebugProxy(debugData, debugOptions) {
+        const projectName = this.getProjectName(debugData);
+        const existingTcpProxy = this.$appDebugSocketProxyFactory.getTCPSocketProxy(this.deviceIdentifier, debugData.applicationIdentifier);
+        const tcpSocketProxy = existingTcpProxy ||
+            (await this.$appDebugSocketProxyFactory.addTCPSocketProxy(this.device, debugData.applicationIdentifier, projectName, debugData.projectDir));
+        if (!existingTcpProxy) {
+            const inspectorProcess = await this.openAppInspector(tcpSocketProxy.address(), debugData, debugOptions);
+            if (inspectorProcess) {
+                tcpSocketProxy.on("close", async () => {
+                    await this.killProcess(inspectorProcess);
+                });
             }
-            return null;
-        });
+        }
+        return null;
     }
-    openAppInspector(fileDescriptor, debugData, debugOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (debugOptions.client) {
-                const inspectorPath = yield this.$packageInstallationManager.getInspectorFromCache(inspectorNpmPackageName, debugData.projectDir);
-                const inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
-                const inspectorApplicationPath = path.join(inspectorPath, inspectorAppName, "Contents", "MacOS", inspectorAppName, "Contents", "MacOS", "NativeScript Inspector");
-                const inspectorProcess = this.$childProcess.spawn(inspectorApplicationPath, [inspectorSourceLocation, debugData.projectName, fileDescriptor]);
-                inspectorProcess.on("error", (e) => this.$logger.trace(e));
-                return inspectorProcess;
-            }
-            else {
-                this.$logger.info("Suppressing debugging client.");
-                return null;
-            }
-        });
+    async openAppInspector(fileDescriptor, debugData, debugOptions) {
+        if (debugOptions.client) {
+            const inspectorPath = await this.$packageInstallationManager.getInspectorFromCache(inspectorNpmPackageName, debugData.projectDir);
+            const inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
+            const inspectorApplicationPath = path.join(inspectorPath, inspectorAppName, "Contents", "MacOS", inspectorAppName, "Contents", "MacOS", "NativeScript Inspector");
+            const inspectorProcess = this.$childProcess.spawn(inspectorApplicationPath, [inspectorSourceLocation, debugData.projectName, fileDescriptor]);
+            inspectorProcess.on("error", (e) => this.$logger.trace(e));
+            return inspectorProcess;
+        }
+        else {
+            this.$logger.info("Suppressing debugging client.");
+            return null;
+        }
     }
 }
+exports.IOSDeviceDebugService = IOSDeviceDebugService;
 __decorate([
     (0, decorators_1.performanceLog)()
 ], IOSDeviceDebugService.prototype, "debug", null);
@@ -163,6 +137,5 @@ __decorate([
 __decorate([
     (0, decorators_1.performanceLog)()
 ], IOSDeviceDebugService.prototype, "openAppInspector", null);
-exports.IOSDeviceDebugService = IOSDeviceDebugService;
 yok_1.injector.register("iOSDeviceDebugService", IOSDeviceDebugService, false);
 //# sourceMappingURL=ios-device-debug-service.js.map

package/lib/services/ios-entitlements-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.IOSEntitlementsService = void 0;
 const path = require("path");
@@ -35,45 +26,43 @@ class IOSEntitlementsService {
     getPlatformsEntitlementsRelativePath(projectData) {
         return path.join(projectData.projectName, projectData.projectName + ".entitlements");
     }
-    merge(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const session = new plist_merge_patch_1.PlistSession({
-                log: (txt) => this.$logger.trace("App.entitlements: " + txt),
-            });
-            const projectDir = projectData.projectDir;
-            const makePatch = (plistPath) => {
-                if (!this.$fs.exists(plistPath)) {
-                    this.$logger.trace("No plist found at: " + plistPath);
-                    return;
-                }
-                this.$logger.trace("Schedule merge plist at: " + plistPath);
-                session.patch({
-                    name: path.relative(projectDir, plistPath),
-                    read: () => this.$fs.readText(plistPath),
-                });
-            };
-            const allPlugins = yield this.getAllInstalledPlugins(projectData);
-            for (const plugin of allPlugins) {
-                const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(this.$devicePlatformsConstants.iOS), IOSEntitlementsService.DefaultEntitlementsName);
-                makePatch(pluginInfoPlistPath);
-            }
-            const appEntitlementsPath = this.getDefaultAppEntitlementsPath(projectData);
-            if (this.$fs.exists(appEntitlementsPath)) {
-                makePatch(appEntitlementsPath);
-            }
-            if (session.patches && session.patches.length > 0) {
-                const plistContent = session.build();
-                this.$logger.trace("App.entitlements: Write to: " +
-                    this.getPlatformsEntitlementsPath(projectData));
-                this.$fs.writeFile(this.getPlatformsEntitlementsPath(projectData), plistContent);
-            }
+    async merge(projectData) {
+        const session = new plist_merge_patch_1.PlistSession({
+            log: (txt) => this.$logger.trace("App.entitlements: " + txt),
         });
+        const projectDir = projectData.projectDir;
+        const makePatch = (plistPath) => {
+            if (!this.$fs.exists(plistPath)) {
+                this.$logger.trace("No plist found at: " + plistPath);
+                return;
+            }
+            this.$logger.trace("Schedule merge plist at: " + plistPath);
+            session.patch({
+                name: path.relative(projectDir, plistPath),
+                read: () => this.$fs.readText(plistPath),
+            });
+        };
+        const allPlugins = await this.getAllInstalledPlugins(projectData);
+        for (const plugin of allPlugins) {
+            const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(this.$devicePlatformsConstants.iOS), IOSEntitlementsService.DefaultEntitlementsName);
+            makePatch(pluginInfoPlistPath);
+        }
+        const appEntitlementsPath = this.getDefaultAppEntitlementsPath(projectData);
+        if (this.$fs.exists(appEntitlementsPath)) {
+            makePatch(appEntitlementsPath);
+        }
+        if (session.patches && session.patches.length > 0) {
+            const plistContent = session.build();
+            this.$logger.trace("App.entitlements: Write to: " +
+                this.getPlatformsEntitlementsPath(projectData));
+            this.$fs.writeFile(this.getPlatformsEntitlementsPath(projectData), plistContent);
+        }
     }
     getAllInstalledPlugins(projectData) {
         return this.$pluginsService.getAllInstalledPlugins(projectData);
     }
 }
-IOSEntitlementsService.DefaultEntitlementsName = "app.entitlements";
 exports.IOSEntitlementsService = IOSEntitlementsService;
+IOSEntitlementsService.DefaultEntitlementsName = "app.entitlements";
 yok_1.injector.register("iOSEntitlementsService", IOSEntitlementsService);
 //# sourceMappingURL=ios-entitlements-service.js.map

package/lib/services/ios-extensions-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.IOSExtensionsService = void 0;
 const path = require("path");
@@ -20,27 +11,25 @@ class IOSExtensionsService {
         this.$xcode = $xcode;
         this.$iOSNativeTargetService = $iOSNativeTargetService;
     }
-    addExtensionsFromPath({ extensionsFolderPath, projectData, platformData, pbxProjPath, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const targetUuids = [];
-            let addedExtensions = false;
-            if (!this.$fs.exists(extensionsFolderPath)) {
-                return false;
-            }
-            const project = new this.$xcode.project(pbxProjPath);
-            project.parseSync();
-            this.$iOSNativeTargetService
-                .getTargetDirectories(extensionsFolderPath)
-                .forEach((extensionFolder) => {
-                const target = this.$iOSNativeTargetService.addTargetToProject(extensionsFolderPath, extensionFolder, constants_1.IOSNativeTargetTypes.appExtension, project, platformData);
-                this.configureTarget(extensionFolder, path.join(extensionsFolderPath, extensionFolder), target, project, projectData);
-                targetUuids.push(target.uuid);
-                addedExtensions = true;
-            });
-            this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
-            this.$iOSNativeTargetService.prepareSigning(targetUuids, projectData, pbxProjPath);
-            return addedExtensions;
+    async addExtensionsFromPath({ extensionsFolderPath, projectData, platformData, pbxProjPath, }) {
+        const targetUuids = [];
+        let addedExtensions = false;
+        if (!this.$fs.exists(extensionsFolderPath)) {
+            return false;
+        }
+        const project = new this.$xcode.project(pbxProjPath);
+        project.parseSync();
+        this.$iOSNativeTargetService
+            .getTargetDirectories(extensionsFolderPath)
+            .forEach((extensionFolder) => {
+            const target = this.$iOSNativeTargetService.addTargetToProject(extensionsFolderPath, extensionFolder, constants_1.IOSNativeTargetTypes.appExtension, project, platformData);
+            this.configureTarget(extensionFolder, path.join(extensionsFolderPath, extensionFolder), target, project, projectData);
+            targetUuids.push(target.uuid);
+            addedExtensions = true;
         });
+        this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
+        this.$iOSNativeTargetService.prepareSigning(targetUuids, projectData, pbxProjPath);
+        return addedExtensions;
     }
     configureTarget(extensionName, extensionPath, target, project, projectData) {
         const extJsonPath = path.join(extensionPath, "extension.json");