nativescript 8.9.0-dev.2 → 8.9.0-dev.3

package/lib/services/android-resources-migration-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.AndroidResourcesMigrationService = void 0;
 const path = require("path");
@@ -28,71 +19,61 @@ class AndroidResourcesMigrationService {
     hasMigrated(appResourcesDir) {
         return this.$fs.exists(path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR, constants.SRC_DIR, constants.MAIN_DIR));
     }
-    migrate(appResourcesDir, backupLocation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const originalAppResources = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR);
-            const appResourcesDestination = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_TEMP);
-            const appResourcesBackup = path.join(backupLocation || appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);
+    async migrate(appResourcesDir, backupLocation) {
+        const originalAppResources = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR);
+        const appResourcesDestination = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_TEMP);
+        const appResourcesBackup = path.join(backupLocation || appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);
+        try {
+            await this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);
+            this.$logger.info(`Successfully updated your project's application resources '/Android' directory structure.${os_1.EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
+        }
+        catch (error) {
             try {
-                yield this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);
-                this.$logger.info(`Successfully updated your project's application resources '/Android' directory structure.${os_1.EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
+                this.recover(originalAppResources, appResourcesDestination, appResourcesBackup);
+                this.$logger.info("Failed to update resources. They should be in their initial state.");
             }
-            catch (error) {
-                try {
-                    this.recover(originalAppResources, appResourcesDestination, appResourcesBackup);
-                    this.$logger.info("Failed to update resources. They should be in their initial state.");
-                }
-                catch (err) {
-                    this.$logger.trace(err);
-                    this.$logger.info(`Failed to update resources.${os_1.EOL} Backup of original content is inside "${appResourcesBackup}".${os_1.EOL}If "${originalAppResources} is missing copy from backup folder."`);
-                }
-                finally {
-                    this.$errors.fail(error.message);
-                }
+            catch (err) {
+                this.$logger.trace(err);
+                this.$logger.info(`Failed to update resources.${os_1.EOL} Backup of original content is inside "${appResourcesBackup}".${os_1.EOL}If "${originalAppResources} is missing copy from backup folder."`);
             }
-        });
+            finally {
+                this.$errors.fail(error.message);
+            }
+        }
     }
-    tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const appMainSourceSet = path.join(appResourcesDestination, constants.SRC_DIR, constants.MAIN_DIR);
-            const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, constants.RESOURCES_DIR);
-            this.$fs.ensureDirectoryExists(appResourcesDestination);
-            this.$fs.ensureDirectoryExists(appMainSourceSet);
-            // create /java, /res and /assets in the App_Resources/Android/src/main directory
-            this.$fs.ensureDirectoryExists(appResourcesMainSourceSetResourcesDestination);
-            this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "java"));
-            this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, constants.ASSETS_DIR));
-            const isDirectory = (source) => this.$fs.getLsStats(source).isDirectory();
-            const getAllFiles = (source) => this.$fs.readDirectory(source).map((name) => path.join(source, name));
-            const getDirectories = (files) => files.filter(isDirectory);
-            const getFiles = (files) => files.filter((file) => !isDirectory(file));
-            this.$fs.copyFile(path.join(originalAppResources, constants.APP_GRADLE_FILE_NAME), path.join(appResourcesDestination, constants.APP_GRADLE_FILE_NAME));
-            const appResourcesFiles = getAllFiles(originalAppResources);
-            const resourceDirectories = getDirectories(appResourcesFiles);
-            const resourceFiles = getFiles(appResourcesFiles);
-            resourceDirectories.forEach((dir) => {
-                if (path.basename(dir) !== "libs") {
-                    // don't copy /App_Resources/Android/libs into the src/main/res/libs directory
-                    this.$fs.copyFile(dir, appResourcesMainSourceSetResourcesDestination);
-                }
-                else {
-                    // copy App_Resources/Android/libs to App_ResourcesNew/Android/libs
-                    this.$fs.copyFile(dir, path.join(appResourcesDestination));
-                }
-            });
-            resourceFiles.forEach((file) => {
-                const fileName = path.basename(file);
-                if (fileName !== constants.MANIFEST_FILE_NAME) {
-                    // don't copy AndroidManifest into /App_Resources/Android as it needs to be inside src/main/
-                    this.$fs.copyFile(file, path.join(appResourcesDestination, fileName));
-                }
-            });
-            this.$fs.copyFile(path.join(originalAppResources, constants.MANIFEST_FILE_NAME), path.join(appMainSourceSet, constants.MANIFEST_FILE_NAME));
-            // rename the legacy app_resources to ANDROID_DIR_OLD
-            this.$fs.rename(originalAppResources, appResourcesBackup);
-            // move the new, updated app_resources to App_Resources/Android, as  the de facto resources
-            this.$fs.rename(appResourcesDestination, originalAppResources);
+    async tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup) {
+        const appMainSourceSet = path.join(appResourcesDestination, constants.SRC_DIR, constants.MAIN_DIR);
+        const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, constants.RESOURCES_DIR);
+        this.$fs.ensureDirectoryExists(appResourcesDestination);
+        this.$fs.ensureDirectoryExists(appMainSourceSet);
+        this.$fs.ensureDirectoryExists(appResourcesMainSourceSetResourcesDestination);
+        this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "java"));
+        this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, constants.ASSETS_DIR));
+        const isDirectory = (source) => this.$fs.getLsStats(source).isDirectory();
+        const getAllFiles = (source) => this.$fs.readDirectory(source).map((name) => path.join(source, name));
+        const getDirectories = (files) => files.filter(isDirectory);
+        const getFiles = (files) => files.filter((file) => !isDirectory(file));
+        this.$fs.copyFile(path.join(originalAppResources, constants.APP_GRADLE_FILE_NAME), path.join(appResourcesDestination, constants.APP_GRADLE_FILE_NAME));
+        const appResourcesFiles = getAllFiles(originalAppResources);
+        const resourceDirectories = getDirectories(appResourcesFiles);
+        const resourceFiles = getFiles(appResourcesFiles);
+        resourceDirectories.forEach((dir) => {
+            if (path.basename(dir) !== "libs") {
+                this.$fs.copyFile(dir, appResourcesMainSourceSetResourcesDestination);
+            }
+            else {
+                this.$fs.copyFile(dir, path.join(appResourcesDestination));
+            }
+        });
+        resourceFiles.forEach((file) => {
+            const fileName = path.basename(file);
+            if (fileName !== constants.MANIFEST_FILE_NAME) {
+                this.$fs.copyFile(file, path.join(appResourcesDestination, fileName));
+            }
         });
+        this.$fs.copyFile(path.join(originalAppResources, constants.MANIFEST_FILE_NAME), path.join(appMainSourceSet, constants.MANIFEST_FILE_NAME));
+        this.$fs.rename(originalAppResources, appResourcesBackup);
+        this.$fs.rename(appResourcesDestination, originalAppResources);
     }
     recover(originalAppResources, appResourcesDestination, appResourcesBackup) {
         if (!this.$fs.exists(originalAppResources)) {
@@ -103,9 +84,8 @@ class AndroidResourcesMigrationService {
         }
     }
 }
+exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 AndroidResourcesMigrationService.ANDROID_DIR = "Android";
 AndroidResourcesMigrationService.ANDROID_DIR_TEMP = "Android-Updated";
 AndroidResourcesMigrationService.ANDROID_DIR_OLD = "Android-Pre-v4";
-exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 yok_1.injector.register("androidResourcesMigrationService", AndroidResourcesMigrationService);
-//# sourceMappingURL=android-resources-migration-service.js.map

package/lib/services/apple-portal/apple-portal-application-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.ApplePortalApplicationService = void 0;
 const yok_1 = require("../../common/yok");
@@ -18,66 +9,57 @@ class ApplePortalApplicationService {
         this.$errors = $errors;
         this.$httpClient = $httpClient;
     }
-    getApplications(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = [];
-            for (const account of user.associatedAccounts) {
-                const contentProviderId = account.contentProvider.contentProviderId;
-                const applications = yield this.getApplicationsByProvider(contentProviderId);
-                result = result.concat(applications.summaries);
-            }
-            return result;
-        });
+    async getApplications(user) {
+        let result = [];
+        for (const account of user.associatedAccounts) {
+            const contentProviderId = account.contentProvider.contentProviderId;
+            const applications = await this.getApplicationsByProvider(contentProviderId);
+            result = result.concat(applications.summaries);
+        }
+        return result;
     }
-    getApplicationsByProvider(contentProviderId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const webSessionCookie = yield this.$applePortalSessionService.createWebSession(contentProviderId);
-            const summaries = [];
-            yield this.getApplicationsByUrl(webSessionCookie, "https://appstoreconnect.apple.com/iris/v1/apps?include=appStoreVersions", summaries);
-            return { summaries: summaries };
-        });
+    async getApplicationsByProvider(contentProviderId) {
+        const webSessionCookie = await this.$applePortalSessionService.createWebSession(contentProviderId);
+        const summaries = [];
+        await this.getApplicationsByUrl(webSessionCookie, "https://appstoreconnect.apple.com/iris/v1/apps?include=appStoreVersions", summaries);
+        return { summaries: summaries };
     }
-    getApplicationsByUrl(webSessionCookie, url, summaries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.$httpClient.httpRequest({
-                url,
-                method: "GET",
-                headers: {
-                    "Content-Type": "application/json",
-                    Cookie: webSessionCookie,
-                },
-            });
-            const result = JSON.parse(response.body);
-            const data = result.data;
-            for (const app of data) {
-                let summary;
-                summary = {
-                    bundleId: app.attributes.bundleId,
-                    adamId: app.id,
-                    name: app.attributes.name,
-                    versionSets: [],
-                };
-                summaries.push(summary);
-            }
-            if (result.links.next) {
-                yield this.getApplicationsByUrl(webSessionCookie, result.links.next, summaries);
-            }
+    async getApplicationsByUrl(webSessionCookie, url, summaries) {
+        const response = await this.$httpClient.httpRequest({
+            url,
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+                Cookie: webSessionCookie,
+            },
         });
+        const result = JSON.parse(response.body);
+        const data = result.data;
+        for (const app of data) {
+            let summary;
+            summary = {
+                bundleId: app.attributes.bundleId,
+                adamId: app.id,
+                name: app.attributes.name,
+                versionSets: [],
+            };
+            summaries.push(summary);
+        }
+        if (result.links.next) {
+            await this.getApplicationsByUrl(webSessionCookie, result.links.next, summaries);
+        }
     }
-    getApplicationByBundleId(user, bundleId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const applications = yield this.getApplications(user);
-            if (!applications || !applications.length) {
-                this.$errors.fail(`Cannot find any registered applications for Apple ID ${user.userName} in iTunes Connect.`);
-            }
-            const application = _.find(applications, (app) => app.bundleId === bundleId);
-            if (!application) {
-                this.$errors.fail(`Cannot find registered applications that match the specified identifier ${bundleId} in iTunes Connect.`);
-            }
-            return application;
-        });
+    async getApplicationByBundleId(user, bundleId) {
+        const applications = await this.getApplications(user);
+        if (!applications || !applications.length) {
+            this.$errors.fail(`Cannot find any registered applications for Apple ID ${user.userName} in iTunes Connect.`);
+        }
+        const application = _.find(applications, (app) => app.bundleId === bundleId);
+        if (!application) {
+            this.$errors.fail(`Cannot find registered applications that match the specified identifier ${bundleId} in iTunes Connect.`);
+        }
+        return application;
     }
 }
 exports.ApplePortalApplicationService = ApplePortalApplicationService;
 yok_1.injector.register("applePortalApplicationService", ApplePortalApplicationService);
-//# sourceMappingURL=apple-portal-application-service.js.map

package/lib/services/apple-portal/apple-portal-cookie-service.js

@@ -51,4 +51,3 @@ class ApplePortalCookieService {
 }
 exports.ApplePortalCookieService = ApplePortalCookieService;
 yok_1.injector.register("applePortalCookieService", ApplePortalCookieService);
-//# sourceMappingURL=apple-portal-cookie-service.js.map