feat: nativescript 7 support

Author: NathanWalker

README.md

@@ -1,10 +1,10 @@
-# nativescript-doctor
+# @nativescript/doctor
 Library that helps identifying if the environment can be used for development of {N} apps.
 
 # Installation
 1. Using npm
 	```bash
-	$ npm install nativescript-doctor --save
+	$ npm install @nativescript/doctor --save
 	```
 
 # Requirements
@@ -14,7 +14,7 @@ Library that helps identifying if the environment can be used for development of
 * Module `doctor`:
 	- Usage:
 	```TypeScript
-	import { doctor } from "nativescript-doctor"
+	import { doctor } from "@nativescript/doctor"
 
 	async function main() {
 		const canExecuteLocalBuildForAndroid = await doctor.canExecuteLocalBuild("Android");
@@ -47,7 +47,7 @@ Library that helps identifying if the environment can be used for development of
 	}
 
 	/**
-	 * Describes warning returned from nativescript-doctor check.
+	 * Describes warning returned from @nativescript/doctor check.
 	 */
 	interface IWarning {
 		/**
@@ -73,7 +73,7 @@ Library that helps identifying if the environment can be used for development of
 * Module `sysInfo`:
 	- Usage:
 	```TypeScript
-	import { sysInfo, setShouldCacheSysInfo } from "nativescript-doctor";
+	import { sysInfo, setShouldCacheSysInfo } from "@nativescript/doctor";
 
 	async function main() {
 		// The default value is true. If set to false the result of each check for each element
@@ -451,7 +451,7 @@ Library that helps identifying if the environment can be used for development of
 * Module `androidToolsInfo`:
 	- Usage:
 	```TypeScript
-	import { androidToolsInfo } from "nativescript-doctor"
+	import { androidToolsInfo } from "@nativescript/doctor"
 
 	function main() {
 		const projectDir = "/Users/username/myProject";
@@ -542,7 +542,7 @@ Library that helps identifying if the environment can be used for development of
 * Module `constants`:
 	- Usage:
 	```TypeScript
-	import { constants } from "nativescript-doctor"
+	import { constants } from "@nativescript/doctor"
 
 	function main() {
 		for(let constantName in constants) {

lib/android-tools-info.ts

@@ -373,8 +373,17 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 			const pathToPackageJson = path.join(projectDir, Constants.PACKAGE_JSON);
 
 			if (this.fs.exists(pathToPackageJson)) {
-				const content = this.fs.readJson<INativeScriptProjectPackageJson>(pathToPackageJson);
-				runtimeVersion = content && content.nativescript && content.nativescript["tns-android"] && content.nativescript["tns-android"].version;
+        const content = this.fs.readJson<INativeScriptProjectPackageJson>(pathToPackageJson);
+        const scopedRuntime = "@nativescript/android";
+        const oldRuntime = "tns-android";
+        if (content) {
+          if (content.devDependencies && content.devDependencies[scopedRuntime]) {
+            runtimeVersion = content.devDependencies[scopedRuntime];
+          } else if (content.nativescript && content.nativescript[oldRuntime] && content.nativescript[oldRuntime].version) {
+            runtimeVersion = content && content.nativescript && content.nativescript[oldRuntime] && content.nativescript[oldRuntime].version;
+          }
+        }
+				
 			}
 		}
 

lib/declarations.d.ts

@@ -77,5 +77,7 @@ interface INativeScriptNode {
 }
 
 interface INativeScriptProjectPackageJson {
-	nativescript: INativeScriptNode;
+  nativescript: INativeScriptNode;
+  dependencies?: any;
+  devDependencies?: any;
 }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "nativescript-doctor",
-  "version": "1.14.2",
+  "name": "@nativescript/doctor",
+  "version": "2.0.1",
   "description": "Library that helps identifying if the environment can be used for development of {N} apps.",
   "main": "lib/index.js",
   "types": "./typings/nativescript-doctor.d.ts",

test/android-tools-info.ts

@@ -33,7 +33,10 @@ describe("androidToolsInfo", () => {
 						"tns-android": {
 							version: runtimeVersion
 						}
-					}
+          },
+          devDependencies: {
+            "@nativescript/android": runtimeVersion
+          }
 				} : null;
 			},
 			readDirectory: (path: string) => {
@@ -231,7 +234,10 @@ describe("androidToolsInfo", () => {
 								"tns-android": {
 									version: runtimeVersion
 								}
-							}
+              },
+              devDependencies: {
+                "@nativescript/android": runtimeVersion
+              }
 						})
 				};
 

typings/interfaces.ts

@@ -366,7 +366,7 @@ declare module NativeScriptDoctor {
 	interface ISysInfoData extends ICommonSysInfoData, IiOSSysInfoData, IAndroidSysInfoData { }
 
 	/**
-	 * Describes warning returned from nativescript-doctor check.
+	 * Describes warning returned from @nativescript/doctor check.
 	 */
 	interface IWarning {
 		/**

typings/nativescript-doctor.d.ts

@@ -1,7 +1,7 @@
 /// <reference path="./interfaces.ts" />
 
 
-declare module "nativescript-doctor" {
+declare module "@nativescript/doctor" {
 	export const doctor: NativeScriptDoctor.IDoctor;
 	export const sysInfo: NativeScriptDoctor.ISysInfo;
 	export const constants: NativeScriptDoctor.IConstants;