chore: unit tests

Author: NathanWalker

lib/definitions/pacote-service.d.ts

@@ -1,4 +1,3 @@
-import * as pacote from "pacote";
 import * as tar from "tar";
 import { IProxySettingsBase } from "../common/declarations";
 

lib/definitions/pacote.d.ts

@@ -56,7 +56,9 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 				let smc: any = null;
 				if (sourceMapRaw && sourceMapRaw.sourcemap) {
 					const sourceMap = sourceMapRaw.sourcemap;
-					smc = new sourcemap.SourceMapConsumer(sourceMap);
+					smc = await sourcemap.SourceMapConsumer.with(sourceMap, filePath, (smc) => {
+            return smc;
+          });
 				}
 
 				this.cache[filePath] = smc;

lib/services/log-source-map-service.ts

@@ -1,6 +1,7 @@
 import * as pacote from "pacote";
 import * as tar from "tar";
 import * as path from "path";
+import { PassThrough } from 'stream';
 import * as _ from 'lodash';
 import { cache } from "../common/decorators";
 import { INpmConfigService, INodePackageManager } from "../declarations";
@@ -49,18 +50,20 @@ export class PacoteService implements IPacoteService {
 		packageName = this.getRealPackageName(packageName);
 		const pacoteOptions = await this.getPacoteBaseOptions();
 
-		return new Promise<void>((resolve, reject) => {
+		return new Promise<void>(async (resolve, reject) => {
 			this.$logger.trace(`Calling pacoteService.extractPackage for packageName: '${packageName}', destinationDir: '${destinationDirectory}' and options: ${options}`);
 
-			const source = pacote.tarball.stream(packageName, pacoteOptions);
-			source.on("error", (err: Error) => {
+			const source = await pacote.tarball(packageName, pacoteOptions).catch((err: Error) => {
 				this.$logger.trace(`Error in source while trying to extract stream from ${packageName}. Error is ${err}`);
 				reject(err);
 			});
 
 			this.$logger.trace(`Creating extract tar stream with options: ${JSON.stringify(extractOptions, null, 2)}`);
-			const destination = tar.x(extractOptions);
-			source.pipe(destination);
+      const destination = tar.x(extractOptions);
+      // Initiate the source
+      const sourceStream = new PassThrough();
+      sourceStream.end(source);
+      sourceStream.pipe(destination);
 
 			destination.on("error", (err: Error) => {
 				this.$logger.trace(`Error in destination while trying to extract stream from ${packageName}. Error is ${err}`);

lib/services/pacote-service.ts

@@ -2,15 +2,18 @@ import * as path from "path";
 import { PROJECT_FRAMEWORK_FOLDER_NAME, TrackActionNames, AnalyticsEventLabelDelimiter } from "../../constants";
 import { performanceLog } from "../../common/decorators";
 import { IAddPlatformService, IPlatformData } from "../../definitions/platform";
-import { IProjectDataService, IProjectData, INativePrepare } from "../../definitions/project";
+import { IProjectData, INativePrepare } from "../../definitions/project";//IProjectDataService
 import { IFileSystem, IAnalyticsService } from "../../common/declarations";
 import { injector } from "../../common/yok";
+import { IPackageManager, IOptions } from "../../declarations";
 
 export class AddPlatformService implements IAddPlatformService {
 	constructor(
 		private $fs: IFileSystem,
 		private $pacoteService: IPacoteService,
-		private $projectDataService: IProjectDataService,
+    // private $projectDataService: IProjectDataService,
+    private $options: IOptions,
+    private $packageManager: IPackageManager,
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $analyticsService: IAnalyticsService,
 		private $tempService: ITempService
@@ -20,15 +23,27 @@ export class AddPlatformService implements IAddPlatformService {
 		const spinner = this.$terminalSpinnerService.createSpinner();
 
 		try {
-			spinner.start();
+      spinner.start();
 
-			const frameworkDirPath = await this.extractPackage(packageToInstall);
-			const frameworkPackageJsonContent = this.$fs.readJson(path.join(frameworkDirPath, "..", "package.json"));
-			const frameworkVersion = frameworkPackageJsonContent.version;
-
-			await this.setPlatformVersion(platformData, projectData, frameworkVersion);
-			await this.trackPlatformVersion(frameworkVersion, platformData);
+      let frameworkDirPath: string;
+      let frameworkVersion: string;
+      if (this.$options.frameworkPath) {
+        frameworkDirPath = await this.extractPackage(packageToInstall);
+  			const frameworkPackageJsonContent = this.$fs.readJson(path.join(frameworkDirPath, "..", "package.json"));
+  			frameworkVersion = frameworkPackageJsonContent.version;
 
+  			await this.setPlatformVersion(platformData, projectData, frameworkVersion);
+  			await this.trackPlatformVersion(frameworkVersion, platformData);
+      } else {
+        const [ name, version ] = packageToInstall.split('@');
+        frameworkDirPath = path.join(projectData.projectDir, 'node_modules', name, PROJECT_FRAMEWORK_FOLDER_NAME);
+        frameworkVersion = version;
+        if (!projectData.devDependencies[name]) {
+          await this.setPlatformVersion(platformData, projectData, version);
+        }
+        await this.trackPlatformVersion(version, platformData);
+      }
+      
 			if (!nativePrepare || !nativePrepare.skipNativePrepare) {
 				await this.addNativePlatform(platformData, projectData, frameworkDirPath, frameworkVersion);
 			}
@@ -44,8 +59,14 @@ export class AddPlatformService implements IAddPlatformService {
 	}
 
 	public async setPlatformVersion(platformData: IPlatformData, projectData: IProjectData, frameworkVersion: string): Promise<void> {
-		const frameworkPackageNameData = { version: frameworkVersion };
-		this.$projectDataService.setNSValue(projectData.projectDir, platformData.frameworkPackageName, frameworkPackageNameData);
+		// const frameworkPackageNameData = { version: frameworkVersion };
+    // this.$projectDataService.setNSValue(projectData.projectDir, platformData.frameworkPackageName, frameworkPackageNameData);
+    await this.$packageManager.install(`${platformData.frameworkPackageName}@${frameworkVersion}`, projectData.projectDir, {
+			'save-dev': true,
+      disableNpmInstall: true,
+			frameworkPath: null,
+			ignoreScripts: false
+		});
 	}
 
 	private async extractPackage(pkg: string): Promise<string> {

lib/services/platform/add-platform-service.ts

@@ -412,7 +412,6 @@ export class ProjectDataService implements IProjectDataService {
   }
 
   public getRuntimePackage(projectDir: string, platform: constants.SupportedPlatform): IBasePluginData {
-    console.log('projectdataservice getRuntimePackage platform:', platform)
     return this.$pluginsService.getDependenciesFromPackageJson(projectDir).devDependencies.find(d => {
       if (platform === constants.PlatformTypes.ios) {
         return [constants.SCOPED_IOS_RUNTIME_NAME, constants.TNS_IOS_RUNTIME_NAME].includes(d.name);