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

package/lib/services/ios-provision-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.IOSProvisionService = void 0;
 const mobileprovision = require("ios-mobileprovision-finder");
@@ -38,137 +29,125 @@ class IOSProvisionService {
         this.$devicesService = $devicesService;
         this.$mobileHelper = $mobileHelper;
     }
-    pick(uuidOrName, projectId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const match = (yield this.queryProvisioningProfilesAndDevices(projectId))
-                .match;
-            return (match.eligible.find((prov) => prov.UUID === uuidOrName) ||
-                match.eligible.find((prov) => prov.Name === uuidOrName) ||
-                match.nonEligible.find((prov) => prov.UUID === uuidOrName) ||
-                match.nonEligible.find((prov) => prov.Name === uuidOrName));
-        });
+    async pick(uuidOrName, projectId) {
+        const match = (await this.queryProvisioningProfilesAndDevices(projectId))
+            .match;
+        return (match.eligible.find((prov) => prov.UUID === uuidOrName) ||
+            match.eligible.find((prov) => prov.Name === uuidOrName) ||
+            match.nonEligible.find((prov) => prov.UUID === uuidOrName) ||
+            match.nonEligible.find((prov) => prov.Name === uuidOrName));
     }
-    listProvisions(projectId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this.queryProvisioningProfilesAndDevices(projectId);
-            const devices = data.devices;
-            const match = data.match;
-            function formatSupportedDeviceCount(prov) {
-                if (devices.length > 0 && prov.Type === "Development") {
-                    return (prov.ProvisionedDevices.filter((device) => devices.indexOf(device) >= 0).length +
-                        "/" +
-                        devices.length +
-                        " targets");
-                }
-                else {
-                    return "";
-                }
+    async listProvisions(projectId) {
+        const data = await this.queryProvisioningProfilesAndDevices(projectId);
+        const devices = data.devices;
+        const match = data.match;
+        function formatSupportedDeviceCount(prov) {
+            if (devices.length > 0 && prov.Type === "Development") {
+                return (prov.ProvisionedDevices.filter((device) => devices.indexOf(device) >= 0).length +
+                    "/" +
+                    devices.length +
+                    " targets");
             }
-            function formatTotalDeviceCount(prov) {
-                if (prov.Type === "Development" && prov.ProvisionedDevices) {
-                    return prov.ProvisionedDevices.length + " total";
-                }
-                else if (prov.Type === "AdHoc") {
-                    return "all";
-                }
-                else {
-                    return "";
-                }
+            else {
+                return "";
             }
-            const table = (0, helpers_1.createTable)([
-                "Provision Name / Provision UUID / App Id",
-                "Team",
-                "Type / Due",
-                "Devices",
-            ], []);
-            function pushProvision(prov) {
-                table.push(["", "", "", ""]);
-                table.push([
-                    (0, helpers_1.quoteString)(prov.Name),
-                    prov.TeamName,
-                    prov.Type,
-                    formatTotalDeviceCount(prov),
-                ]);
-                table.push([
-                    prov.UUID,
-                    prov.TeamIdentifier && prov.TeamIdentifier.length > 0
-                        ? "(" + prov.TeamIdentifier[0] + ")"
-                        : "",
-                    formatDate(prov.ExpirationDate),
-                    formatSupportedDeviceCount(prov),
-                ]);
-                table.push([prov.Entitlements["application-identifier"], "", "", ""]);
+        }
+        function formatTotalDeviceCount(prov) {
+            if (prov.Type === "Development" && prov.ProvisionedDevices) {
+                return prov.ProvisionedDevices.length + " total";
             }
-            match.eligible.forEach((prov) => pushProvision(prov));
-            this.$logger.info(table.toString());
-            this.$logger.info();
-            this.$logger.info("There are also " +
-                match.nonEligible.length +
-                " non-eligible provisioning profiles.");
-            this.$logger.info();
-        });
-    }
-    listTeams() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const teams = yield this.getDevelopmentTeams();
-            const table = (0, helpers_1.createTable)(["Team Name", "Team ID"], teams.map((team) => [(0, helpers_1.quoteString)(team.name), team.id]));
-            this.$logger.info(table.toString());
-        });
-    }
-    queryProvisioningProfilesAndDevices(projectId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const certificates = mobileprovision.cert.read();
-            const provisions = mobileprovision.provision.read();
-            const query = {
-                Certificates: certificates.valid,
-                Unique: true,
-                AppId: projectId,
-            };
-            let devices = [];
-            if (this.$options.device) {
-                devices = [this.$options.device];
+            else if (prov.Type === "AdHoc") {
+                return "all";
             }
             else {
-                yield this.$devicesService.initialize({
-                    platform: "ios",
-                    skipEmulatorStart: true,
-                });
-                devices = _(this.$devicesService.getDeviceInstances())
-                    .filter((d) => this.$mobileHelper.isiOSPlatform(d.deviceInfo.platform))
-                    .map((d) => d.deviceInfo.identifier)
-                    .toJSON();
+                return "";
             }
-            const match = mobileprovision.provision.select(provisions, query);
-            return { devices, match };
-        });
+        }
+        const table = (0, helpers_1.createTable)([
+            "Provision Name / Provision UUID / App Id",
+            "Team",
+            "Type / Due",
+            "Devices",
+        ], []);
+        function pushProvision(prov) {
+            table.push(["", "", "", ""]);
+            table.push([
+                (0, helpers_1.quoteString)(prov.Name),
+                prov.TeamName,
+                prov.Type,
+                formatTotalDeviceCount(prov),
+            ]);
+            table.push([
+                prov.UUID,
+                prov.TeamIdentifier && prov.TeamIdentifier.length > 0
+                    ? "(" + prov.TeamIdentifier[0] + ")"
+                    : "",
+                formatDate(prov.ExpirationDate),
+                formatSupportedDeviceCount(prov),
+            ]);
+            table.push([prov.Entitlements["application-identifier"], "", "", ""]);
+        }
+        match.eligible.forEach((prov) => pushProvision(prov));
+        this.$logger.info(table.toString());
+        this.$logger.info();
+        this.$logger.info("There are also " +
+            match.nonEligible.length +
+            " non-eligible provisioning profiles.");
+        this.$logger.info();
+    }
+    async listTeams() {
+        const teams = await this.getDevelopmentTeams();
+        const table = (0, helpers_1.createTable)(["Team Name", "Team ID"], teams.map((team) => [(0, helpers_1.quoteString)(team.name), team.id]));
+        this.$logger.info(table.toString());
     }
-    getDevelopmentTeams() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const teams = {};
-            // NOTE: We are reading all provisioning profiles and collect team information from them.
-            // It would be better if we can check the Apple ID registered in Xcode and read the teams associated with it.
-            mobileprovision.provision.read().forEach((provision) => provision.TeamIdentifier &&
-                provision.TeamIdentifier.forEach((id) => {
-                    if (!teams[provision.TeamName]) {
-                        teams[provision.TeamName] = new Set();
-                    }
-                    teams[provision.TeamName].add(id);
-                }));
-            const teamsArray = Object.keys(teams).reduce((arr, name) => {
-                teams[name].forEach((id) => arr.push({ id, name }));
-                return arr;
-            }, []);
-            return teamsArray;
-        });
+    async queryProvisioningProfilesAndDevices(projectId) {
+        const certificates = mobileprovision.cert.read();
+        const provisions = mobileprovision.provision.read();
+        const query = {
+            Certificates: certificates.valid,
+            Unique: true,
+            AppId: projectId,
+        };
+        let devices = [];
+        if (this.$options.device) {
+            devices = [this.$options.device];
+        }
+        else {
+            await this.$devicesService.initialize({
+                platform: "ios",
+                skipEmulatorStart: true,
+            });
+            devices = _(this.$devicesService.getDeviceInstances())
+                .filter((d) => this.$mobileHelper.isiOSPlatform(d.deviceInfo.platform))
+                .map((d) => d.deviceInfo.identifier)
+                .toJSON();
+        }
+        const match = mobileprovision.provision.select(provisions, query);
+        return { devices, match };
+    }
+    async getDevelopmentTeams() {
+        const teams = {};
+        // NOTE: We are reading all provisioning profiles and collect team information from them.
+        // It would be better if we can check the Apple ID registered in Xcode and read the teams associated with it.
+        mobileprovision.provision.read().forEach((provision) => provision.TeamIdentifier &&
+            provision.TeamIdentifier.forEach((id) => {
+                if (!teams[provision.TeamName]) {
+                    teams[provision.TeamName] = new Set();
+                }
+                teams[provision.TeamName].add(id);
+            }));
+        const teamsArray = Object.keys(teams).reduce((arr, name) => {
+            teams[name].forEach((id) => arr.push({ id, name }));
+            return arr;
+        }, []);
+        return teamsArray;
     }
-    getTeamIdsWithName(teamName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const allTeams = yield this.getDevelopmentTeams();
-            const matchingTeamIds = allTeams
-                .filter((team) => team.name === teamName)
-                .map((team) => team.id);
-            return matchingTeamIds;
-        });
+    async getTeamIdsWithName(teamName) {
+        const allTeams = await this.getDevelopmentTeams();
+        const matchingTeamIds = allTeams
+            .filter((team) => team.name === teamName)
+            .map((team) => team.id);
+        return matchingTeamIds;
     }
 }
 exports.IOSProvisionService = IOSProvisionService;

package/lib/services/ios-watch-app-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.IOSWatchAppService = void 0;
 const path = require("path");
@@ -20,28 +11,26 @@ class IOSWatchAppService {
         this.$xcode = $xcode;
         this.$iOSNativeTargetService = $iOSNativeTargetService;
     }
-    addWatchAppFromPath({ watchAppFolderPath, projectData, platformData, pbxProjPath, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const targetUuids = [];
-            const appPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_FOLDER);
-            const extensionPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_EXTENSION_FOLDER);
-            if (!this.$fs.exists(appPath) || !this.$fs.exists(extensionPath)) {
-                return false;
-            }
-            const appFolder = this.$iOSNativeTargetService.getTargetDirectories(appPath)[0];
-            const extensionFolder = this.$iOSNativeTargetService.getTargetDirectories(extensionPath)[0];
-            const project = new this.$xcode.project(pbxProjPath);
-            project.parseSync();
-            const watchApptarget = this.$iOSNativeTargetService.addTargetToProject(appPath, appFolder, constants_1.IOSNativeTargetTypes.watchApp, project, platformData, project.getFirstTarget().uuid);
-            this.configureTarget(appFolder, path.join(appPath, appFolder), `${projectData.projectIdentifiers.ios}.${IOSWatchAppService.WATCH_APP_IDENTIFIER}`, "watchapp.json", watchApptarget, project);
-            targetUuids.push(watchApptarget.uuid);
-            const watchExtensionTarget = this.$iOSNativeTargetService.addTargetToProject(extensionPath, extensionFolder, constants_1.IOSNativeTargetTypes.watchExtension, project, platformData, watchApptarget.uuid);
-            this.configureTarget(extensionFolder, path.join(extensionPath, extensionFolder), `${projectData.projectIdentifiers.ios}.${IOSWatchAppService.WATCH_APP_IDENTIFIER}.${IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER}`, "extension.json", watchExtensionTarget, project);
-            targetUuids.push(watchExtensionTarget.uuid);
-            this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
-            this.$iOSNativeTargetService.prepareSigning(targetUuids, projectData, pbxProjPath);
-            return true;
-        });
+    async addWatchAppFromPath({ watchAppFolderPath, projectData, platformData, pbxProjPath, }) {
+        const targetUuids = [];
+        const appPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_FOLDER);
+        const extensionPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_EXTENSION_FOLDER);
+        if (!this.$fs.exists(appPath) || !this.$fs.exists(extensionPath)) {
+            return false;
+        }
+        const appFolder = this.$iOSNativeTargetService.getTargetDirectories(appPath)[0];
+        const extensionFolder = this.$iOSNativeTargetService.getTargetDirectories(extensionPath)[0];
+        const project = new this.$xcode.project(pbxProjPath);
+        project.parseSync();
+        const watchApptarget = this.$iOSNativeTargetService.addTargetToProject(appPath, appFolder, constants_1.IOSNativeTargetTypes.watchApp, project, platformData, project.getFirstTarget().uuid);
+        this.configureTarget(appFolder, path.join(appPath, appFolder), `${projectData.projectIdentifiers.ios}.${IOSWatchAppService.WATCH_APP_IDENTIFIER}`, "watchapp.json", watchApptarget, project);
+        targetUuids.push(watchApptarget.uuid);
+        const watchExtensionTarget = this.$iOSNativeTargetService.addTargetToProject(extensionPath, extensionFolder, constants_1.IOSNativeTargetTypes.watchExtension, project, platformData, watchApptarget.uuid);
+        this.configureTarget(extensionFolder, path.join(extensionPath, extensionFolder), `${projectData.projectIdentifiers.ios}.${IOSWatchAppService.WATCH_APP_IDENTIFIER}.${IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER}`, "extension.json", watchExtensionTarget, project);
+        targetUuids.push(watchExtensionTarget.uuid);
+        this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
+        this.$iOSNativeTargetService.prepareSigning(targetUuids, projectData, pbxProjPath);
+        return true;
     }
     removeWatchApp({ pbxProjPath }) {
         const project = new this.$xcode.project(pbxProjPath);
@@ -70,8 +59,8 @@ class IOSWatchAppService {
         project.addToHeaderSearchPaths(targetPath, target.pbxNativeTarget.productName);
     }
 }
+exports.IOSWatchAppService = IOSWatchAppService;
 IOSWatchAppService.WATCH_APP_IDENTIFIER = "watchkitapp";
 IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
-exports.IOSWatchAppService = IOSWatchAppService;
 yok_1.injector.register("iOSWatchAppService", IOSWatchAppService);
 //# sourceMappingURL=ios-watch-app-service.js.map

package/lib/services/ip-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.IPService = void 0;
 const decorators_1 = require("../common/decorators");
@@ -23,58 +14,52 @@ class IPService {
         this.$httpClient = $httpClient;
         this.$logger = $logger;
     }
-    getCurrentIPv4Address() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ipAddress = (yield this.getIPAddressFromServiceReturningJSONWithIPProperty("https://api.myip.com")) ||
-                (yield this.getIPAddressFromIpifyOrgAPI()) ||
-                null;
-            return ipAddress;
-        });
+    async getCurrentIPv4Address() {
+        const ipAddress = (await this.getIPAddressFromServiceReturningJSONWithIPProperty("https://api.myip.com")) ||
+            (await this.getIPAddressFromIpifyOrgAPI()) ||
+            null;
+        return ipAddress;
     }
-    getIPAddressFromServiceReturningJSONWithIPProperty(apiEndpoint) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ipAddress = null;
-            try {
-                const response = yield this.$httpClient.httpRequest({
-                    method: "GET",
-                    url: apiEndpoint,
-                    timeout: IPService.GET_IP_TIMEOUT,
-                });
-                this.$logger.trace(`${apiEndpoint} returns ${response.body}`);
-                const jsonData = JSON.parse(response.body);
-                ipAddress = jsonData.ip;
-            }
-            catch (err) {
-                this.$logger.trace(`Unable to get information about current IP Address from ${apiEndpoint} Error is:`, err);
-            }
-            return ipAddress;
-        });
+    async getIPAddressFromServiceReturningJSONWithIPProperty(apiEndpoint) {
+        let ipAddress = null;
+        try {
+            const response = await this.$httpClient.httpRequest({
+                method: "GET",
+                url: apiEndpoint,
+                timeout: IPService.GET_IP_TIMEOUT,
+            });
+            this.$logger.trace(`${apiEndpoint} returns ${response.body}`);
+            const jsonData = JSON.parse(response.body);
+            ipAddress = jsonData.ip;
+        }
+        catch (err) {
+            this.$logger.trace(`Unable to get information about current IP Address from ${apiEndpoint} Error is:`, err);
+        }
+        return ipAddress;
     }
-    getIPAddressFromIpifyOrgAPI() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // https://www.ipify.org/
-            const ipifyOrgAPIEndpoint = "https://api.ipify.org";
-            let ipAddress = null;
-            try {
-                const response = yield this.$httpClient.httpRequest({
-                    method: "GET",
-                    url: ipifyOrgAPIEndpoint,
-                    timeout: IPService.GET_IP_TIMEOUT,
-                });
-                this.$logger.trace(`${ipifyOrgAPIEndpoint} returns ${response.body}`);
-                ipAddress = (response.body || "").toString();
-            }
-            catch (err) {
-                this.$logger.trace(`Unable to get information about current IP Address from ${ipifyOrgAPIEndpoint} Error is:`, err);
-            }
-            return ipAddress;
-        });
+    async getIPAddressFromIpifyOrgAPI() {
+        // https://www.ipify.org/
+        const ipifyOrgAPIEndpoint = "https://api.ipify.org";
+        let ipAddress = null;
+        try {
+            const response = await this.$httpClient.httpRequest({
+                method: "GET",
+                url: ipifyOrgAPIEndpoint,
+                timeout: IPService.GET_IP_TIMEOUT,
+            });
+            this.$logger.trace(`${ipifyOrgAPIEndpoint} returns ${response.body}`);
+            ipAddress = (response.body || "").toString();
+        }
+        catch (err) {
+            this.$logger.trace(`Unable to get information about current IP Address from ${ipifyOrgAPIEndpoint} Error is:`, err);
+        }
+        return ipAddress;
     }
 }
+exports.IPService = IPService;
 IPService.GET_IP_TIMEOUT = 1000;
 __decorate([
     (0, decorators_1.cache)()
 ], IPService.prototype, "getCurrentIPv4Address", null);
-exports.IPService = IPService;
 yok_1.injector.register("ipService", IPService);
 //# sourceMappingURL=ip-service.js.map