nativescript 9.1.0-alpha.14 → 9.1.0-alpha.16

package/lib/services/android-project-service.js

@@ -18,40 +18,7 @@ const constants_1 = require("../common/constants");
 const helpers_1 = require("../common/helpers");
 const decorators_1 = require(".././common/decorators");
 const yok_1 = require("../common/yok");
-//
-// we sort the native dependencies topologically to make sure they are processed in the right order
-// native dependenciess need to be sorted so the deepst dependencies are built before it's parents
-//
-// for example, given this dep structure (assuming these are all native dependencies that need to be built)
-// (note: we list all dependencies at the root level, so the leaf nodes are essentially references to the root nodes)
-//
-//   |- dep1
-//   |- dep2
-//   |- |- dep3
-//   |- |- dep4
-//   |- |- |- dep5
-//   |- dep3
-//   |- dep4
-//   |- |- dep5
-//   |- dep5
-//
-// It is sorted:
-//
-//   |- dep1
-//   |- dep3
-//   |- dep5
-//   |- dep4        # depends on dep5, so dep5 must be built first, ie above ^
-//   |- |- dep5
-//   |- dep2        # depends on dep3, dep4 (and dep5 through dep4) so all of them must be built first before dep2 is built
-//   |- |- dep3
-//   |- |- dep4
-//   |- |- |- dep5
-//
-// for more details see: https://wikiless.org/wiki/Topological_sorting?lang=en
-//
-function topologicalSortNativeDependencies(dependencies, start = [], depth = 0, total = 0 // do not pass in, we calculate it in the initial run!
-) {
-    // we set the total on the initial call - and never increment it, as it's used for esacaping the recursion
+function topologicalSortNativeDependencies(dependencies, start = [], depth = 0, total = 0) {
     if (total === 0) {
         total = dependencies.length;
     }
@@ -65,8 +32,6 @@ function topologicalSortNativeDependencies(dependencies, start = [], depth = 0,
         return sortedDeps;
     }, start);
     const remainingDeps = dependencies.filter((nativeDep) => !sortedDeps.includes(nativeDep));
-    // recurse if we still have remaining deps
-    // the second condition here prevents infinite recursion
     if (remainingDeps.length && sortedDeps.length < total) {
         return topologicalSortNativeDependencies(remainingDeps, sortedDeps, depth + 1, total);
     }
@@ -120,7 +85,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 constants.APK_DIR,
             ];
             const packageName = this.getProjectNameFromId(projectData);
-            const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, "android" /* constants.PlatformTypes.android */);
+            const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, constants.PlatformTypes.android);
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
                 normalizedPlatformName: "Android",
@@ -161,7 +126,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 configurationFileName: constants.MANIFEST_FILE_NAME,
                 configurationFilePath: path.join(...configurationsDirectoryArr),
                 relativeToFrameworkConfigurationFilePath: path.join(constants.SRC_DIR, constants.MAIN_DIR, constants.MANIFEST_FILE_NAME),
-                fastLivesyncFileExtensions: [".jpg", ".gif", ".png", ".bmp", ".webp"], // http://developer.android.com/guide/appendix/media-formats.html
+                fastLivesyncFileExtensions: [".jpg", ".gif", ".png", ".bmp", ".webp"],
             };
         }
         return this._platformData;
@@ -214,7 +179,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         const targetSdkVersion = androidToolsInfo && androidToolsInfo.targetSdkVersion;
         this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
         this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "*", "-R");
-        // TODO: Check if we actually need this and if it should be targetSdk or compileSdk
         this.cleanResValues(targetSdkVersion, projectData);
     }
     getResDestinationDir(projectData) {
@@ -246,7 +210,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         _.map(directoriesToClean, (dir) => this.$fs.deleteDirectory(dir));
     }
     async interpolateData(projectData) {
-        // Interpolate the apilevel and package
         this.interpolateConfigurationFile(projectData);
         const appResourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
         let stringsFilePath;
@@ -262,10 +225,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         const gradleSettingsFilePath = path.join(this.getPlatformData(projectData).projectRoot, "settings.gradle");
         shell.sed("-i", /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
         try {
-            // will replace applicationId in app/App_Resources/Android/app.gradle if it has not been edited by the user
             const appGradleContent = this.$fs.readText(projectData.appGradlePath);
             if (appGradleContent.indexOf(constants.PACKAGE_PLACEHOLDER_NAME) !== -1) {
-                //TODO: For compatibility with old templates. Once all templates are updated should delete.
                 shell.sed("-i", new RegExp(constants.PACKAGE_PLACEHOLDER_NAME), projectData.projectIdentifiers.android, projectData.appGradlePath);
             }
         }
@@ -319,7 +280,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return [".jar", ".dat"];
     }
     async prepareProject() {
-        // Intentionally left empty.
     }
     ensureConfigurationFileInAppResources(projectData) {
         const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
@@ -336,7 +296,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             this.$logger.warn("No manifest found in " + originalAndroidManifestFilePath);
             return;
         }
-        // Overwrite the AndroidManifest from runtime.
         if (!appResourcesDirStructureHasMigrated) {
             this.$fs.copyFile(originalAndroidManifestFilePath, this.getPlatformData(projectData).configurationFilePath);
         }
@@ -353,8 +312,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         }
         else {
             this.$fs.copyFile(path.join(projectAppResourcesPath, platformData.normalizedPlatformName, "*"), platformsAppResourcesPath);
-            // https://github.com/NativeScript/android-runtime/issues/899
-            // App_Resources/Android/libs is reserved to user's aars and jars, but they should not be copied as resources
             this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "libs"));
         }
         const androidToolsInfo = this.$androidToolsInfo.getToolsInfo({
@@ -364,7 +321,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         this.cleanResValues(compileSdkVersion, projectData);
     }
     async preparePluginNativeCode(pluginData, projectData) {
-        // build Android plugins which contain AndroidManifest.xml and/or resources
         const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
         if (this.$fs.exists(pluginPlatformsFolderPath)) {
             const options = {
@@ -386,7 +342,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return;
     }
     async removePluginNativeCode(pluginData, projectData) {
-        // not implemented
     }
     async beforePrepareAllPlugins(projectData, dependencies) {
         if (dependencies) {
@@ -400,7 +355,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     filterUniqueDependencies(dependencies) {
         const depsDictionary = dependencies.reduce((dict, dep) => {
             const collision = dict[dep.name];
-            // in case there are multiple dependencies to the same module, the one declared in the package.json takes precedence
             if (!collision || collision.depth > dep.depth) {
                 dict[dep.name] = dep;
             }
@@ -419,7 +373,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 name,
                 directory: path.relative(platformDir, directory),
                 dependencies: dependencies.filter((dep) => {
-                    // filter out transient dependencies that don't have native dependencies
                     return (nativeDependencyData.findIndex((nativeDep) => nativeDep.name === dep) !== -1);
                 }),
             };
@@ -427,7 +380,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         nativeDependencies = topologicalSortNativeDependencies(nativeDependencies);
         const jsonContent = JSON.stringify(nativeDependencies, null, 4);
         this.$fs.writeFile(dependenciesJsonPath, jsonContent);
-        // we sort all the dependencies to respect the topological sorting of the native dependencies
         return dependencies.sort(function (a, b) {
             return (nativeDependencies.findIndex((n) => n.name === a.name) -
                 nativeDependencies.findIndex((n) => n.name === b.name));
@@ -459,7 +411,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         await adb.executeShellCommand(["rm", "-rf", deviceRootPath]);
     }
     async checkForChanges() {
-        // Nothing android specific to check yet.
     }
     getDeploymentTarget(projectData) {
         return;
@@ -469,12 +420,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         shell.cp(cpArg, paths, projectRoot);
     }
     validatePackageName(packageName) {
-        //Make the package conform to Java package types
-        //Enforce underscore limitation
         if (!/^[a-zA-Z]+(\.[a-zA-Z0-9][a-zA-Z0-9_]*)+$/.test(packageName)) {
             this.$errors.fail(`Package name must look like: com.company.Name. Got: ${packageName}`);
         }
-        //Class is a reserved word
         if (/\b[Cc]lass\b/.test(packageName)) {
             this.$errors.fail("class is a reserved word");
         }
@@ -483,7 +431,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         if (projectName === "") {
             this.$errors.fail("Project name cannot be empty");
         }
-        //Classes in Java don't begin with numbers
         if (/^[0-9]/.test(projectName)) {
             this.$errors.fail("Project name must not begin with a number");
         }
@@ -504,19 +451,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         ];
         return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);
     }
-    /**
-     * The purpose of this method is to delete the previously prepared user resources.
-     * The content of the `<platforms>/android/.../res` directory is based on user's resources and gradle project template from android-runtime.
-     * During preparation of the `<path to user's App_Resources>/Android` we want to clean all the users files from previous preparation,
-     * but keep the ones that were introduced during `platform add` of the android-runtime.
-     * Currently the Gradle project template contains resources only in values and values-v21 directories.
-     * So the current logic of the method is cleaning al resources from `<platforms>/android/.../res` that are not in `values.*` directories
-     * and that exist in the `<path to user's App_Resources>/Android/.../res` directory
-     * This means that if user has a resource file in values-v29 for example, builds the project and then deletes this resource,
-     * it will be kept in platforms directory. Reference issue: `https://github.com/NativeScript/nativescript-cli/issues/5083`
-     * Same is valid for files in `drawable-<resolution>` directories - in case in user's resources there's drawable-hdpi directory,
-     * which is deleted after the first build of app, it will remain in platforms directory.
-     */
     cleanUpPreparedResources(projectData) {
         let resourcesDirPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName);
         if (this.$androidResourcesMigrationService.hasMigrated(projectData.appResourcesDirectoryPath)) {
@@ -541,7 +475,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 const hasUseKotlinPropertyInAppData = `hasUseKotlinPropertyInApp${analyticsDelimiter}${buildStatistics.kotlinUsage.hasUseKotlinPropertyInApp}`;
                 const hasKotlinRuntimeClassesData = `hasKotlinRuntimeClasses${analyticsDelimiter}${buildStatistics.kotlinUsage.hasKotlinRuntimeClasses}`;
                 await this.$analyticsService.trackEventActionInGoogleAnalytics({
-                    action: "Using Kotlin" /* constants.TrackActionNames.UsingKotlin */,
+                    action: constants.TrackActionNames.UsingKotlin,
                     additionalData: `${hasUseKotlinPropertyInAppData}${analyticsDelimiter}${hasKotlinRuntimeClassesData}`,
                 });
             }
@@ -574,4 +508,3 @@ __decorate([
     (0, helpers_1.hook)("buildAndroid")
 ], AndroidProjectService.prototype, "buildProject", null);
 yok_1.injector.register("androidProjectService", AndroidProjectService);
-//# sourceMappingURL=android-project-service.js.map

package/lib/services/android-resources-migration-service.js

@@ -46,7 +46,6 @@ class AndroidResourcesMigrationService {
         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));
@@ -60,25 +59,20 @@ class AndroidResourcesMigrationService {
         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);
     }
     recover(originalAppResources, appResourcesDestination, appResourcesBackup) {
@@ -95,4 +89,3 @@ AndroidResourcesMigrationService.ANDROID_DIR = "Android";
 AndroidResourcesMigrationService.ANDROID_DIR_TEMP = "Android-Updated";
 AndroidResourcesMigrationService.ANDROID_DIR_OLD = "Android-Pre-v4";
 yok_1.injector.register("androidResourcesMigrationService", AndroidResourcesMigrationService);
-//# sourceMappingURL=android-resources-migration-service.js.map

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

@@ -63,4 +63,3 @@ class ApplePortalApplicationService {
 }
 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

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

@@ -201,10 +201,10 @@ For more details how to set up your environment, please execute "ns publish ios
         const data = JSON.parse(authResponse.body);
         const isSMS = data.trustedPhoneNumbers &&
             data.trustedPhoneNumbers.length === 1 &&
-            data.noTrustedDevices; // 1 device and no trusted devices means sms was automatically sent.
+            data.noTrustedDevices;
         const multiSMS = data.trustedPhoneNumbers &&
             data.trustedPhoneNumbers.length !== 1 &&
-            data.noTrustedDevices; // Not handling more than 1 sms device and no trusted devices.
+            data.noTrustedDevices;
         let token;
         if (data.trustedPhoneNumbers &&
             data.trustedPhoneNumbers.length &&
@@ -218,7 +218,6 @@ For more details how to set up your environment, please execute "ns publish ios
             };
             let url = `https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode`;
             if (isSMS) {
-                // No trusted devices means it must be sms.
                 body.mode = "sms";
                 body.phoneNumber = {
                     id: data.trustedPhoneNumbers[0].id,
@@ -281,9 +280,8 @@ function checkBits(bits, digest) {
     return result;
 }
 function checkBit(position, buffer) {
-    const bitOffset = position & 7; // in byte
-    const byteIndex = position >> 3; // in buffer
+    const bitOffset = position & 7;
+    const byteIndex = position >> 3;
     const bit = (buffer[byteIndex] >> bitOffset) & 1;
     return bit === 0;
 }
-//# sourceMappingURL=apple-portal-session-service.js.map

package/lib/services/apple-portal/srp/srp-wrapper.js

@@ -28,9 +28,7 @@ class GSASRPAuthenticator {
     async getInit() {
         if (this.srpClient)
             throw new Error("Already initialized");
-        this.srpClient = await srp.newClient(stringToU8Array(this.username), 
-        // provide fake passsword because we need to get data from server
-        new Uint8Array());
+        this.srpClient = await srp.newClient(stringToU8Array(this.username), new Uint8Array());
         let a = Buffer.from(js_srp_1.util.bytesFromBigint(this.srpClient.A)).toString("base64");
         return {
             a,
@@ -61,4 +59,3 @@ class GSASRPAuthenticator {
     }
 }
 exports.GSASRPAuthenticator = GSASRPAuthenticator;
-//# sourceMappingURL=srp-wrapper.js.map

package/lib/services/assets-generation/assets-generation-service.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssetsGenerationService = void 0;
+exports.AssetsGenerationService = exports.Operations = void 0;
 const JimpModule = require("jimp");
 const Color = require("color");
 const decorators_1 = require("../../common/decorators");
@@ -14,6 +14,13 @@ const constants_1 = require("../../constants");
 const _ = require("lodash");
 const yok_1 = require("../../common/yok");
 const os_1 = require("os");
+var Operations;
+(function (Operations) {
+    Operations["OverlayWith"] = "overlayWith";
+    Operations["Blank"] = "blank";
+    Operations["Resize"] = "resize";
+    Operations["OuterScale"] = "outerScale";
+})(Operations || (exports.Operations = Operations = {}));
 class AssetsGenerationService {
     get propertiesToEnumerate() {
         return {
@@ -82,7 +89,7 @@ class AssetsGenerationService {
                 }
                 continue;
             }
-            const operation = assetItem.resizeOperation || "resize" /* Operations.Resize */;
+            const operation = assetItem.resizeOperation || Operations.Resize;
             let tempScale = null;
             if (assetItem.scale) {
                 if (_.isNumber(assetItem.scale)) {
@@ -107,31 +114,27 @@ class AssetsGenerationService {
             }
             let image;
             switch (operation) {
-                case "overlayWith" /* Operations.OverlayWith */:
+                case Operations.OverlayWith:
                     const overlayImageScale = assetItem.overlayImageScale ||
                         constants_1.AssetConstants.defaultOverlayImageScale;
                     const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
                     image = await this.resize(generationData.imagePath, imageResize, imageResize);
                     image = this.generateImage(background, width, height, image);
                     break;
-                case "blank" /* Operations.Blank */:
+                case Operations.Blank:
                     image = this.generateImage(background, width, height);
                     break;
-                case "resize" /* Operations.Resize */:
+                case Operations.Resize:
                     image = await this.resize(generationData.imagePath, width, height);
                     break;
-                case "outerScale" /* Operations.OuterScale */:
-                    // Resize image without applying scale
+                case Operations.OuterScale:
                     image = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
-                    // The scale will apply to the underlying layer of the generated image
                     image = this.generateImage("#00000000", width, height, image);
                     break;
                 default:
                     throw new Error(`Invalid image generation operation: ${operation}`);
             }
-            // This code disables the alpha chanel, as some images for the Apple App Store must not have transparency.
             if (assetItem.rgba === false) {
-                // Add an underlying white layer
                 image = this.generateImage("#FFFFFF", image.width, image.height, image);
             }
             if (this.isAssetFilePath(outputPath)) {
@@ -185,4 +188,3 @@ __decorate([
     (0, decorators_1.exported)("assetsGenerationService")
 ], AssetsGenerationService.prototype, "generateSplashScreens", null);
 yok_1.injector.register("assetsGenerationService", AssetsGenerationService);
-//# sourceMappingURL=assets-generation-service.js.map

package/lib/services/build-artifacts-service.js

@@ -64,7 +64,7 @@ class BuildArtifactsService {
         if (packages.length > 1) {
             this.$logger.warn(`More than one ${packageExtName} found in ${buildOutputPath} directory. Using the last one produced from build.`);
         }
-        packages = _.sortBy(packages, (pkg) => pkg.time).reverse(); // We need to reverse because sortBy always sorts in ascending order
+        packages = _.sortBy(packages, (pkg) => pkg.time).reverse();
         return packages[0];
     }
     getApplicationPackagesCore(candidates, validPackageNames) {
@@ -85,4 +85,3 @@ class BuildArtifactsService {
 }
 exports.BuildArtifactsService = BuildArtifactsService;
 yok_1.injector.register("buildArtifactsService", BuildArtifactsService);
-//# sourceMappingURL=build-artifacts-service.js.map

package/lib/services/build-data-service.js

@@ -18,4 +18,3 @@ class BuildDataService {
 }
 exports.BuildDataService = BuildDataService;
 yok_1.injector.register("buildDataService", BuildDataService);
-//# sourceMappingURL=build-data-service.js.map

package/lib/services/build-info-file-service.js

@@ -62,4 +62,3 @@ class BuildInfoFileService {
 }
 exports.BuildInfoFileService = BuildInfoFileService;
 yok_1.injector.register("buildInfoFileService", BuildInfoFileService);
-//# sourceMappingURL=build-info-file-service.js.map