nativescript 9.0.0-alpha.6 → 9.0.0-alpha.8

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

@@ -138,7 +138,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     ".ico",
                     ".cur",
                     ".xbm",
-                ], // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/
+                ],
             };
         }
         return this._platformData;
@@ -185,11 +185,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.ensureDirectoryExists(path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
         shell.cp("-R", path.join(frameworkDir, "*"), this.getPlatformData(projectData).projectRoot);
     }
-    //TODO: plamen5kov: revisit this method, might have unnecessary/obsolete logic
     async interpolateData(projectData) {
         const projectRootFilePath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
-        // Starting with NativeScript for iOS 1.6.0, the project Info.plist file resides not in the platform project,
-        // but in the hello-world app template as a platform specific resource.
         if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
             this.replaceFileName("-Info.plist", projectRootFilePath, projectData);
         }
@@ -292,32 +289,16 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             frameworkAddOptions["sign"] = true;
         }
         if (this.$options.hostProjectPath) {
-            // always mark xcframeworks for embedding
             frameworkAddOptions["embed"] = true;
             frameworkAddOptions["sign"] = false;
         }
-        // Note: we used to prepend "$(SRCROOT)/" to the framework path, but seems like it's not needed anymore
-        // "$(SRCROOT)/" +
         const frameworkRelativePath = this.getLibSubpathRelativeToProjectPath(frameworkPath, projectData);
         project.addFramework(frameworkRelativePath, frameworkAddOptions);
-        // filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath
-        // project.addBuildPhase(
-        // 	[],
-        // 	"PBXShellScriptBuildPhase",
-        // 	"Debug SRCROOT",
-        // 	undefined,
-        // 	{
-        // 		shellPath: "/bin/sh",
-        // 		shellScript: `echo "SRCROOT: $SRCROOT"`,
-        // 	}
-        // );
         this.savePbxProj(project, projectData);
     }
     async addStaticLibrary(staticLibPath, projectData) {
-        // Copy files to lib folder.
         const libraryName = path.basename(staticLibPath, ".a");
         const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
-        // Add static library to project file and setup header search paths
         const project = this.createPbxProj(projectData);
         const relativeStaticLibPath = this.getLibSubpathRelativeToProjectPath(staticLibPath, projectData);
         project.addFramework(relativeStaticLibPath);
@@ -352,58 +333,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     filesRelativeToProject: true,
                     uuid: "NATIVESCRIPTNATIVESCRIPT",
                 });
-                /**
-                 * 1. Add platforms/ios/{projectname}/app build to the host app
-                 */
-                // Note: allow customization of this targetFolderName
-                // const targetFolderName = "app";
                 const buildFolderPath = path.join(this.$options.hostProjectPath, projectData.projectName);
                 project.addResourceFile(buildFolderPath, {}, "NATIVESCRIPTNATIVESCRIPT");
-                // filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath
-                // project.addBuildPhase(
-                // 	[],
-                // 	"PBXShellScriptBuildPhase",
-                // 	"Copy Metadata (DEBUG)",
-                // 	undefined,
-                // 	{
-                // 		shellPath: "/bin/sh",
-                // 		shellScript: `cp ./platforms/ios/build/Debug-iphonesimulator/metadata-arm64.bin $CONFIGURATION_BUILD_DIR`,
-                // 		outputPaths: [
-                // 			JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-arm64.bin"),
-                // 			// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-arm64e.bin"),
-                // 			// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-i386.bin"),
-                // 			// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-x86_64.bin"),
-                // 		],
-                // 	}
-                // );
                 const metadataPath = path.relative(this.$options.hostProjectPath, buildFolderPath);
                 project.addToOtherLinkerFlags(JSON.stringify(`-sectcreate __DATA __TNSMetadata "${metadataPath}/metadata-arm64.bin"`));
-                // // no shorthand way to get UUID of build phase that i can tell
-                // // methods return the phase as an object but ommitted the actual key (uuid we need)
-                // // this does it same way nativescript-dev-xcode does but gets the uuid we need
-                // const resourcesBuildPhaseKeys = Object.keys(
-                // 	project.hash.project.objects["PBXResourcesBuildPhase"]
-                // );
-                // // console.log('resourcesBuildPhaseKeys:', resourcesBuildPhaseKeys);
-                // const buildPhaseUUID = resourcesBuildPhaseKeys[0];
-                // const comment = `${targetFolderName} in Resources`;
-                // project.hash.project.objects["PBXResourcesBuildPhase"][
-                // 	buildPhaseUUID
-                // ].files.forEach((f: any) => {
-                // 	console.log(f);
-                // });
-                // if (
-                // 	!project.hash.project.objects["PBXResourcesBuildPhase"][
-                // 		buildPhaseUUID
-                // 	].files.find((f: any) => f.comment === comment)
-                // ) {
-                // 	project.addResourceFile(buildFolderPath, {}, buildPhaseUUID);
-                // }
-                /**
-                 * 2. Ensure metadata is copied as a file
-                 * 		The apps metadata-{arch}.bin should be added as a file reference.
-                 */
-                // TODO
                 this.savePbxProj(project, projectData);
             }
             catch (err) {
@@ -456,12 +389,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.deleteDirectory(platformsAppResourcesPath);
         this.$fs.ensureDirectoryExists(platformsAppResourcesPath);
         const platformAppResourcesPath = path.join(projectAppResourcesPath, platformData.normalizedPlatformName);
-        // this allows App_Resources/visionOS
         if (this.$fs.exists(platformAppResourcesPath)) {
             this.$fs.copyFile(path.join(platformAppResourcesPath, "*"), platformsAppResourcesPath);
         }
         else {
-            // otherwise falls back to App_Resources/iOS
             this.$fs.copyFile(path.join(projectAppResourcesPath, this.$devicePlatformsConstants.iOS, "*"), platformsAppResourcesPath);
         }
         this.$fs.deleteFile(path.join(platformsAppResourcesPath, platformData.configurationFileName));
@@ -560,12 +491,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     getLibSubpathRelativeToProjectPath(targetPath, projectData) {
         const projectRoot = this.getPlatformData(projectData).projectRoot;
         const frameworkPath = path.relative(projectRoot, targetPath);
-        // console.log({
-        // 	targetPath,
-        // 	projectRoot,
-        // 	frameworkPath,
-        // 	resolved: path.resolve(projectRoot, frameworkPath),
-        // });
         return frameworkPath;
     }
     getPbxProjPath(projectData) {
@@ -613,10 +538,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
         if (this.$fs.exists(projectPodfilePath)) {
             await this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
-            // The `pod install` command adds a new target to the .pbxproject. This target adds additional build phases to Xcode project.
-            // Some of these phases relies on env variables (like PODS_PODFILE_DIR_PATH or PODS_ROOT).
-            // These variables are produced from merge of pod's xcconfig file and project's xcconfig file.
-            // So the correct order is `pod install` to be executed before merging pod's xcconfig file.
             await this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
         }
         const pluginSpmPackages = [];
@@ -642,7 +563,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         const hasProvision = provision !== undefined;
         const hasTeamId = teamId !== undefined;
         if (hasProvision || hasTeamId) {
-            // Check if the native project's signing is set to the provided provision...
             const pbxprojPath = this.getPbxProjPath(projectData);
             if (this.$fs.exists(pbxprojPath)) {
                 const xcode = this.$pbxprojDomXcode.Xcode.open(pbxprojPath);
@@ -658,9 +578,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                         }
                     }
                     else {
-                        // Specifying provisioning profile requires "Manual" signing style.
-                        // If the current signing style was not "Manual" it was probably "Automatic" or,
-                        // it was not uniform for the debug and release build configurations.
                         changesInfo.signingChanged = true;
                     }
                 }
@@ -674,8 +591,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                         }
                     }
                     else {
-                        // Specifying team id or name requires "Automatic" signing style.
-                        // If the current signing style was not "Automatic" it was probably "Manual".
                         changesInfo.signingChanged = true;
                     }
                 }
@@ -892,14 +807,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         }
         for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
             if (!this.$fs.exists(pluginsXcconfigFilePath)) {
-                // We need the pluginsXcconfig file to exist in platforms dir as it is required in the native template:
-                // https://github.com/NativeScript/ios-runtime/blob/9c2b7b5f70b9bee8452b7a24aa6b646214c7d2be/build/project-template/__PROJECT_NAME__/build-debug.xcconfig#L3
-                // From Xcode 10 in case the file is missing, this include fails and the build itself fails (was a warning in previous Xcode versions).
                 this.$fs.writeFile(pluginsXcconfigFilePath, "");
             }
         }
         for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-            // Set Entitlements Property to point to default file if not set explicitly by the user.
             const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
             if (entitlementsPropertyValue === null &&
                 this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
@@ -944,4 +855,3 @@ __decorate([
     (0, helpers_2.hook)("buildIOS")
 ], IOSProjectService.prototype, "buildProject", null);
 yok_1.injector.register("iOSProjectService", IOSProjectService);
-//# sourceMappingURL=ios-project-service.js.map

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

@@ -127,8 +127,6 @@ class IOSProvisionService {
     }
     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]) {
@@ -152,4 +150,3 @@ class IOSProvisionService {
 }
 exports.IOSProvisionService = IOSProvisionService;
 yok_1.injector.register("iOSProvisionService", IOSProvisionService);
-//# sourceMappingURL=ios-provision-service.js.map

package/lib/services/ios-watch-app-service.js

@@ -63,4 +63,3 @@ exports.IOSWatchAppService = IOSWatchAppService;
 IOSWatchAppService.WATCH_APP_IDENTIFIER = "watchkitapp";
 IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
 yok_1.injector.register("iOSWatchAppService", IOSWatchAppService);
-//# sourceMappingURL=ios-watch-app-service.js.map

package/lib/services/ip-service.js

@@ -38,7 +38,6 @@ class IPService {
         return ipAddress;
     }
     async getIPAddressFromIpifyOrgAPI() {
-        // https://www.ipify.org/
         const ipifyOrgAPIEndpoint = "https://api.ipify.org";
         let ipAddress = null;
         try {
@@ -62,4 +61,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], IPService.prototype, "getCurrentIPv4Address", null);
 yok_1.injector.register("ipService", IPService);
-//# sourceMappingURL=ip-service.js.map

package/lib/services/itmstransporter-service.js

@@ -191,4 +191,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], ITMSTransporterService.prototype, "getITMSTransporterPath", null);
 yok_1.injector.register("itmsTransporterService", ITMSTransporterService);
-//# sourceMappingURL=itmstransporter-service.js.map

package/lib/services/karma-execution.js

@@ -9,10 +9,8 @@ process.on("message", (data) => {
         });
         const KarmaServer = require(path.join(pathToKarma, "lib/server"));
         const karma = new KarmaServer(data.karmaConfig, (exitCode) => {
-            // Exit with the correct exit code and signal the manager process.
             process.exit(exitCode);
         });
         karma.start();
     }
 });
-//# sourceMappingURL=karma-execution.js.map

package/lib/services/livesync/android-device-livesync-service-base.js

@@ -49,4 +49,3 @@ class AndroidDeviceLiveSyncServiceBase extends device_livesync_service_base_1.De
     }
 }
 exports.AndroidDeviceLiveSyncServiceBase = AndroidDeviceLiveSyncServiceBase;
-//# sourceMappingURL=android-device-livesync-service-base.js.map

package/lib/services/livesync/android-device-livesync-service.js

@@ -97,7 +97,6 @@ class AndroidDeviceLiveSyncService extends android_device_livesync_service_base_
         ]);
         const regex = new RegExp(`^-.*${deviceRootBasename}$`, "m");
         const matchingFile = (listResult || "").match(regex);
-        // Check if there is already a file with deviceRootBasename. If so, delete it as it breaks LiveSyncing.
         if (matchingFile && matchingFile[0] && _.startsWith(matchingFile[0], "-")) {
             await this.device.adb.executeShellCommand(["rm", "-f", deviceRootPath]);
         }
@@ -173,4 +172,3 @@ __decorate([
 __decorate([
     (0, decorators_1.performanceLog)()
 ], AndroidDeviceLiveSyncService.prototype, "removeFiles", null);
-//# sourceMappingURL=android-device-livesync-service.js.map

package/lib/services/livesync/android-device-livesync-sockets-service.js

@@ -95,8 +95,6 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
                 await this.$cleanupService.removeCleanupCommand(cleanupCommand);
             };
             await this.$cleanupService.addCleanupCommand(cleanupCommand);
-            // We need to clear resources when the action fails
-            // But we also need the real result of the action.
             await doSyncPromise.then(actionOnEnd.bind(this), actionOnEnd.bind(this));
             result = await doSyncPromise;
         }
@@ -166,4 +164,3 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
 exports.AndroidDeviceSocketsLiveSyncService = AndroidDeviceSocketsLiveSyncService;
 AndroidDeviceSocketsLiveSyncService.STATUS_UPDATE_INTERVAL = 10000;
 AndroidDeviceSocketsLiveSyncService.MINIMAL_VERSION_LONG_LIVING_CONNECTION = "0.2.0";
-//# sourceMappingURL=android-device-livesync-sockets-service.js.map

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

@@ -53,4 +53,3 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], AndroidLiveSyncService.prototype, "fullSync", null);
 yok_1.injector.register("androidLiveSyncService", AndroidLiveSyncService);
-//# sourceMappingURL=android-livesync-service.js.map

package/lib/services/livesync/android-livesync-tool.js

@@ -140,12 +140,9 @@ class AndroidLivesyncTool {
             error =
                 error ||
                     this.getErrorWithMessage("Socket connection ended before sync operation is complete.");
-            //remove listeners and delete this.socketConnection
             this.cleanState(socketUid);
-            //call end of the connection (close and error callbacks won't be called - listeners removed)
             socket.end();
             socket.destroy();
-            //reject all pending sync requests and clear timeouts
             this.rejectPendingSyncOperations(socketUid, error);
         }
     }
@@ -295,7 +292,9 @@ class AndroidLivesyncTool {
                     socket.removeAllListeners();
                     this.pendingConnectionData.socketTimer = setTimeout(tryConnect, 1000);
                 };
-                this.pendingConnectionData.socket = socket;
+                if (this.pendingConnectionData) {
+                    this.pendingConnectionData.socket = socket;
+                }
                 socket.once("data", (data) => {
                     socket.removeListener("close", tryConnectAfterTimeout);
                     socket.removeListener("error", tryConnectAfterTimeout);
@@ -405,4 +404,3 @@ AndroidLivesyncTool.SOCKET_CONNECTION_ALREADY_EXISTS_ERROR = "Socket connection
 AndroidLivesyncTool.SOCKET_CONNECTION_TIMED_OUT_ERROR = "Socket connection timed out.";
 AndroidLivesyncTool.NO_SOCKET_CONNECTION_AVAILABLE_ERROR = "No socket connection available.";
 yok_1.injector.register("androidLivesyncTool", AndroidLivesyncTool);
-//# sourceMappingURL=android-livesync-tool.js.map

package/lib/services/livesync/device-livesync-service-base.js

@@ -40,7 +40,6 @@ class DeviceLiveSyncServiceBase {
         return transferredFiles;
     }
     async finalizeSync(liveSyncInfo, projectData) {
-        //implement in case a sync point for all remove/create operation is needed
         return {
             didRefresh: true,
             operationId: "",
@@ -55,4 +54,3 @@ __decorate([
 __decorate([
     (0, decorators_2.performanceLog)()
 ], DeviceLiveSyncServiceBase.prototype, "transferFiles", null);
-//# sourceMappingURL=device-livesync-service-base.js.map

package/lib/services/livesync/ios-device-livesync-service.js

@@ -37,13 +37,11 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
         return canRefresh;
     }
     async setupSocketIfNeeded(projectData) {
-        // TODO: persist the sockets per app in order to support LiveSync on multiple apps on the same device
         if (this.socket) {
             return true;
         }
         const appId = projectData.projectIdentifiers.ios;
         try {
-            // TODO: temp workaround till we setup the sockets along with the app start
             const ensureAppStarted = true;
             this.socket = await this.device.getDebugSocket(appId, projectData.projectName, projectData.projectDir, ensureAppStarted);
         }
@@ -123,7 +121,6 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
             projectDir: projectData.projectDir,
         });
         if (liveSyncInfo.useHotModuleReload) {
-            // enable HOT updates
             await this.setupSocketIfNeeded(projectData);
         }
     }
@@ -180,9 +177,6 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
     }
     async destroySocket() {
         if (this.socket) {
-            // we do not support LiveSync on multiple apps on the same device
-            // in order to do that, we should cache the socket per app
-            // and destroy just the current app socket when possible
             await this.device.destroyAllSockets();
             this.socket = null;
         }
@@ -193,4 +187,3 @@ IOSDeviceLiveSyncService.MIN_RUNTIME_VERSION_WITH_REFRESH_NOTIFICATION = "6.1.0"
 __decorate([
     (0, decorators_1.performanceLog)()
 ], IOSDeviceLiveSyncService.prototype, "removeFiles", null);
-//# sourceMappingURL=ios-device-livesync-service.js.map

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

@@ -58,7 +58,6 @@ class IOSLiveSyncService extends platform_livesync_service_base_1.PlatformLiveSy
     }
     async syncAfterInstall(device, liveSyncInfo) {
         if (!device.isEmulator) {
-            // In this case we should execute fullsync because iOS Runtime requires the full content of app dir to be extracted in the root of sync dir.
             await this.fullSync({
                 projectData: liveSyncInfo.projectData,
                 device,
@@ -78,4 +77,3 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], IOSLiveSyncService.prototype, "fullSync", null);
 yok_1.injector.register("iOSLiveSyncService", IOSLiveSyncService);
-//# sourceMappingURL=ios-livesync-service.js.map

package/lib/services/livesync/livesync-socket.js

@@ -12,4 +12,3 @@ class LiveSyncSocket extends net.Socket {
 }
 exports.LiveSyncSocket = LiveSyncSocket;
 yok_1.injector.register("LiveSyncSocket", LiveSyncSocket, false);
-//# sourceMappingURL=livesync-socket.js.map

package/lib/services/livesync/platform-livesync-service-base.js

@@ -40,7 +40,6 @@ class PlatformLiveSyncServiceBase {
         return shouldRestart;
     }
     async syncAfterInstall(device, liveSyncInfo) {
-        /* intentionally left blank */
     }
     async restartApplication(projectData, liveSyncInfo) {
         const deviceLiveSyncService = this.getDeviceLiveSyncService(liveSyncInfo.deviceAppData.device, projectData);
@@ -86,8 +85,6 @@ class PlatformLiveSyncServiceBase {
         let modifiedLocalToDevicePaths = [];
         if (liveSyncInfo.filesToSync.length) {
             const filesToSync = liveSyncInfo.filesToSync;
-            // const mappedFiles = _.map(filesToSync, filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData));
-            // Some plugins modify platforms dir on afterPrepare (check nativescript-dev-sass) - we want to sync only existing file.
             const existingFiles = filesToSync.filter((m) => m && this.$fs.exists(m));
             this.$logger.trace("Will execute livesync for files: ", existingFiles);
             const skippedFiles = _.difference(filesToSync, existingFiles);
@@ -106,7 +103,6 @@ class PlatformLiveSyncServiceBase {
             const filePaths = liveSyncInfo.filesToRemove;
             const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
             const mappedFiles = _(filePaths)
-                // .map(filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData))
                 .filter((filePath) => !!filePath)
                 .value();
             const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME);
@@ -158,4 +154,3 @@ exports.PlatformLiveSyncServiceBase = PlatformLiveSyncServiceBase;
 __decorate([
     (0, decorators_1.performanceLog)()
 ], PlatformLiveSyncServiceBase.prototype, "liveSyncWatchAction", null);
-//# sourceMappingURL=platform-livesync-service-base.js.map

package/lib/services/livesync-process-data-service.js

@@ -41,4 +41,3 @@ class LiveSyncProcessDataService {
 }
 exports.LiveSyncProcessDataService = LiveSyncProcessDataService;
 yok_1.injector.register("liveSyncProcessDataService", LiveSyncProcessDataService);
-//# sourceMappingURL=livesync-process-data-service.js.map

package/lib/services/log-parser-service.js

@@ -50,4 +50,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], LogParserService.prototype, "startParsingLogCore", null);
 yok_1.injector.register("logParserService", LogParserService);
-//# sourceMappingURL=log-parser-service.js.map

package/lib/services/log-source-map-service.js

@@ -31,7 +31,6 @@ class LogSourceMapService {
             if (!this.$fs.getFsStats(filePath).isDirectory()) {
                 const mapFile = filePath + ".map";
                 let sourceMapRaw;
-                // Skip files bigger than 50MB
                 if (this.$fs.getFileSize(filePath) > 50 * 1000 * 1000) {
                     this.$logger.trace(`Skipping source map for file ${filePath} because it is too big (> 50MB).`);
                     return;
@@ -156,8 +155,6 @@ class LogSourceMapService {
         }
     }
     parseAndroidLog(projectData, rawMessage) {
-        // "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap (file:///data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)"
-        // "System.err: File: "file:///data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
         const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
         const deviceProjectPath = util.format(constants_1.ANDROID_DEVICE_APP_ROOT_TEMPLATE, projectData.projectIdentifiers.android);
         let separator = ",";
@@ -165,25 +162,18 @@ class LogSourceMapService {
         let parts, filePath, line, column, messagePrefix;
         if (fileIndex >= 0) {
             const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
-            //"data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
             parts = fileSubstring.split(separator);
             if (parts.length >= 3) {
-                // "data/data/org.nativescript.sourceMap/files/app/bundle.js"
                 parts[0] = parts[0].replace("'", "");
-                // " line: 304"
                 parts[1] = parts[1].replace(" line: ", "");
-                // " column: 8"
                 parts[2] = parts[2].replace(" column: ", "");
             }
             else {
-                // "data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)"
                 separator = ":";
                 parts = fileSubstring.split(separator);
             }
             if (parts.length >= 3) {
-                // "/data/data/org.nativescript.sourceMap/files/app/"
                 const devicePath = `${deviceProjectPath}/${constants_1.APP_FOLDER_NAME}/`;
-                // "bundle.js"
                 filePath = path.relative(devicePath, `${"/"}${parts[0]}`);
                 line = parseInt(parts[1]);
                 column = parseInt(parts[2]);
@@ -191,24 +181,20 @@ class LogSourceMapService {
                 for (let i = 3; i < parts.length; i++) {
                     messageSuffix += `${parts[i]}${i === parts.length - 1 ? "" : separator}`;
                 }
-                // "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap ("
                 messagePrefix = _.trimEnd(messagePrefix, "(");
             }
         }
         return { filePath, line, column, messagePrefix, messageSuffix };
     }
     parseIosLog(rawMessage) {
-        // "CONSOLE INFO file:///app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
         const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
         let messageSuffix = "";
         let parts, filePath, line, column, messagePrefix;
         if (fileIndex >= 0) {
-            // "app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
             const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
             parts = fileSubstring.split(":");
             if (parts && parts.length >= 3) {
                 filePath = parts[0];
-                // "app/vendor.js"
                 if (_.startsWith(filePath, constants_1.APP_FOLDER_NAME)) {
                     filePath = path.relative(constants_1.APP_FOLDER_NAME, parts[0]);
                 }
@@ -237,4 +223,3 @@ LogSourceMapService.FILE_PREFIX = "file:///";
 LogSourceMapService.FILE_PREFIX_REPLACEMENT = "file: ";
 LogSourceMapService.MEMOIZE_FUNCTION_RANDOM_KEY_FOR_JOIN = "__some_random_value__";
 yok_1.injector.register("logSourceMapService", LogSourceMapService);
-//# sourceMappingURL=log-source-map-service.js.map

package/lib/services/marking-mode-service.js

@@ -6,7 +6,7 @@ const constants_1 = require("../constants");
 const yok_1 = require("../common/yok");
 const semver = require("semver/preload");
 const MARKING_MODE_PROP = "markingMode";
-const MARKING_MODE_FULL_DEPRECATION_MSG = `In the current version of NativeScript "${MARKING_MODE_PROP}:${"full" /* MarkingMode.Full */}" is no longer supported.`;
+const MARKING_MODE_FULL_DEPRECATION_MSG = `In the current version of NativeScript "${MARKING_MODE_PROP}:${"full"}" is no longer supported.`;
 class MarkingModeService {
     constructor($logger, $projectConfigService, $projectHelper, $projectDataService) {
         this.$logger = $logger;
@@ -18,13 +18,11 @@ class MarkingModeService {
         const markingModeValue = this.$projectConfigService.getValue("android.markingMode");
         const { skipWarnings, forceSwitch } = options;
         if (forceSwitch) {
-            await this.setMarkingMode("none" /* MarkingMode.None */);
+            await this.setMarkingMode("none");
             return;
         }
-        if (!skipWarnings && (markingModeValue === null || markingModeValue === void 0 ? void 0 : markingModeValue.toLowerCase()) !== "none" /* MarkingMode.None */) {
-            // only warn if runtime is less than 7.0.0-rc.5 - where the default has been changed to None
-            // if version is null - we are about to add the latest runtime, so no need to warn
-            const { version } = this.$projectDataService.getRuntimePackage(this.$projectHelper.projectDir, "android" /* PlatformTypes.android */);
+        if (!skipWarnings && (markingModeValue === null || markingModeValue === void 0 ? void 0 : markingModeValue.toLowerCase()) !== "none") {
+            const { version } = this.$projectDataService.getRuntimePackage(this.$projectHelper.projectDir, "android");
             const isMarkingModeFullDefault = version && semver.lt(semver.coerce(version), "7.0.0-rc.5");
             if (isMarkingModeFullDefault) {
                 this.showMarkingModeFullWarning();
@@ -35,7 +33,7 @@ class MarkingModeService {
         await this.$projectConfigService.setValue("android.markingMode", newMode);
     }
     showMarkingModeFullWarning() {
-        const markingModeFullWarning = `You are using the deprecated "${MARKING_MODE_PROP}:${"full" /* MarkingMode.Full */}".${os_1.EOL}${os_1.EOL}${MARKING_MODE_FULL_DEPRECATION_MSG}${os_1.EOL}${os_1.EOL}You should update your marking mode by executing 'ns update --markingMode'.`;
+        const markingModeFullWarning = `You are using the deprecated "${MARKING_MODE_PROP}:${"full"}".${os_1.EOL}${os_1.EOL}${MARKING_MODE_FULL_DEPRECATION_MSG}${os_1.EOL}${os_1.EOL}You should update your marking mode by executing 'ns update --markingMode'.`;
         this.$logger.warn(markingModeFullWarning, {
             [constants_1.LoggerConfigData.wrapMessageWithBorders]: true,
         });
@@ -43,4 +41,3 @@ class MarkingModeService {
 }
 exports.MarkingModeService = MarkingModeService;
 yok_1.injector.register("markingModeService", MarkingModeService);
-//# sourceMappingURL=marking-mode-service.js.map

package/lib/services/metadata-filtering-service.js

@@ -103,4 +103,3 @@ class MetadataFilteringService {
 }
 exports.MetadataFilteringService = MetadataFilteringService;
 yok_1.injector.register("metadataFilteringService", MetadataFilteringService);
-//# sourceMappingURL=metadata-filtering-service.js.map

package/lib/services/npm-config-service.js

@@ -21,11 +21,8 @@ class NpmConfigService {
     readConfig() {
         try {
             const res = (0, child_process_1.execSync)("npm config list --json --global");
-            // const data: any = npmconfig.read();
             const data = JSON.parse(res.toString());
-            // todo: remove if not needed with npm config list --json?
             Object.entries(data).forEach(([key, value]) => {
-                // replace env ${VARS} in strings with the process.env value
                 this.config[key] =
                     typeof value !== "string"
                         ? value
@@ -40,4 +37,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], NpmConfigService.prototype, "readConfig", null);
 yok_1.injector.register("npmConfigService", NpmConfigService);
-//# sourceMappingURL=npm-config-service.js.map

package/lib/services/pacote-service.js

@@ -24,7 +24,6 @@ class PacoteService {
         this.$proxyService = $proxyService;
     }
     get $packageManager() {
-        // need to be resolved here due to cyclic dependency
         return this.$injector.resolve("packageManager");
     }
     async manifest(packageName, options) {
@@ -40,8 +39,6 @@ class PacoteService {
         return result;
     }
     async extractPackage(packageName, destinationDirectory, options) {
-        // strip: Remove the specified number of leading path elements. Pathnames with fewer elements will be silently skipped. More info: https://github.com/npm/node-tar/blob/e89c4d37519b1c20133a9f49d5f6b85fa34c203b/README.md
-        // C: Create an archive
         this.$logger.trace(`Calling pacoteService.extractPackage for packageName: '${packageName}', destinationDir: '${destinationDirectory}' and options: ${options}`);
         const extractOptions = { strip: 1, C: destinationDirectory };
         if (options) {
@@ -59,7 +56,6 @@ class PacoteService {
             });
             this.$logger.trace(`Creating extract tar stream with options: ${JSON.stringify(extractOptions, null, 2)}`);
             const destination = tar.x(extractOptions);
-            // Initiate the source
             const sourceStream = new stream_1.PassThrough();
             sourceStream.end(source);
             sourceStream.pipe(destination);
@@ -74,9 +70,7 @@ class PacoteService {
         });
     }
     async getPacoteBaseOptions() {
-        // In case `tns create myapp --template https://github.com/NativeScript/template-hello-world.git` command is executed, pacote module throws an error if cache option is not provided.
         const cachePath = await this.$packageManager.getCachePath();
-        // Add NPM Configuration to our Manifest options
         const npmConfig = this.$npmConfigService.getConfig();
         const pacoteOptions = _.extend(npmConfig, { cache: cachePath, Arborist: arborist_1.Arborist });
         const proxySettings = await this.$proxyService.getCache();
@@ -98,4 +92,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], PacoteService.prototype, "$packageManager", null);
 yok_1.injector.register("pacoteService", PacoteService);
-//# sourceMappingURL=pacote-service.js.map

package/lib/services/performance-service.js

@@ -41,7 +41,7 @@ class PerformanceService {
     trackAnalyticsData(methodInfo, executionTime) {
         this.$analyticsService
             .trackEventActionInGoogleAnalytics({
-            action: "Performance" /* TrackActionNames.Performance */,
+            action: "Performance",
             additionalData: methodInfo,
             value: executionTime,
         })
@@ -71,7 +71,6 @@ class PerformanceService {
             this.$logger.info(PerformanceService.LOG_MESSAGE_TEMPLATE, methodInfo, executionTime);
         }
     }
-    //removes any injected members of the arguments and excludes the options object even if it was renamed
     getJsonSanitizer() {
         const seen = new WeakSet();
         seen.add(this.$options);
@@ -91,4 +90,3 @@ PerformanceService.LOG_MESSAGE_TEMPLATE = `Execution of method "%s" took %s ms.`
 PerformanceService.FAIL_LOG_MESSAGE_TEMPLATE = `Failed to log pefromance data in file for method %s.`;
 PerformanceService.MIN_NODE_PERFORMANCE_MODULE_VERSION = "8.5.0";
 yok_1.injector.register("performanceService", PerformanceService);
-//# sourceMappingURL=performance-service.js.map