chore: fix pr comments

Author: DimitarTachev

docs/man_pages/project/creation/create.md

@@ -7,29 +7,49 @@ position: 1
 
 Usage | Synopsis
 ---|---
-Create from default JavaScript template | `$ tns create <App Name> [--path <Directory>] [--appid <App ID>]`
-Create from default TypeScript template | `$ tns create <App Name> --template typescript [--path <Directory>] [--appid <App ID>]` OR `$ tns create <App Name> --tsc [--path <Directory>] [--appid <App ID>]` OR `$ tns create <App Name> --template tsc [--path <Directory>] [--appid <App ID>]`
-Create from default Angular template | `$ tns create <App Name> --template angular [--path <Directory>] [--appid <App ID>]` OR `$ tns create <App Name> --template ng [--path <Directory>] [--appid <App ID>]` OR `$ tns create <App Name> --ng [--path <Directory>] [--appid <App ID>]`
-Copy from existing project | `$ tns create <App Name> [--path <Directory>] [--appid <App ID>]`
-Create from custom template | `$ tns create <App Name> [--path <Directory>] [--appid <App ID>] --template <Template>`
+Create from default JavaScript template | `$ tns create [<App Name>] [--js] [--path <Directory>] [--appid <App ID>]`
+Create from default TypeScript template | `$ tns create [<App Name>] --ts [--path <Directory>] [--appid <App ID>]`
+Create from default Angular template | `$ tns create [<App Name>] --ng [--path <Directory>] [--appid <App ID>]`
+Create from default Vue.js template | `$ tns create [<App Name>] --vue [--path <Directory>] [--appid <App ID>]`
+Create from custom template | `$ tns create [<App Name>] [--path <Directory>] [--appid <App ID>] --template <Template>`
 
-Creates a new project for native development with NativeScript.
+Interactively creates a new NativeScript app.
 
 ### Options
 * `--path` - Specifies the directory where you want to create the project, if different from the current directory. The directory must be empty.
 * `--appid` - Sets the application identifier for your project.
-* `--template` - Specifies a valid npm package which you want to use to create your project. If `--template` is not set, the NativeScript CLI creates the project from the default JavaScript hello-world template.<% if(isHtml) { %> If one or more application assets are missing from the `App_Resources` directory in the package, the CLI adds them using the assets available in the default hello-world template.<% } %>
-* `--ng` - Sets the template for your project to the Angular template.
-* `--tsc` - Sets the template for your project to the TypeScript template.
+* `--template` - Specifies a valid npm package which you want to use to create your project. If `--template` is not set, the NativeScript CLI will ask you to pick one from a predefined list afterwards.<% if(isHtml) { %> If one or more application assets are missing from the `App_Resources` directory in the package, the CLI adds them using the assets available in the default hello-world template.<% } %>
+* `--js`, `--javascript` - Sets the template for your project to the JavaScript template.
+* `--ts`, `--tsc`, `--typescript` - Sets the template for your project to the TypeScript template.
+* `--ng`, `--angular` - Sets the template for your project to the Angular template.
+* `--vue`, `--vuejs` - Sets the template for your project to the Vue.js template.
 
 ### Attributes
-* `<App Name>` is the name of project. The specified name must meet the requirements of all platforms that you want to target. <% if(isConsole) { %>For more information about the `<App Name>` requirements, run `$ tns help create`<% } %><% if(isHtml) { %>For projects that target Android, you can use uppercase or lowercase letters, numbers, and underscores. The name must start with a letter.
+* `<App Name>` is the name of project. The specified name must meet the requirements of all platforms that you want to target. If not specified, the NativeScript CLI will ask you for it afterwards. <% if(isConsole) { %>For more information about the `<App Name>` requirements, run `$ tns help create`<% } %><% if(isHtml) { %>For projects that target Android, you can use uppercase or lowercase letters, numbers, and underscores. The name must start with a letter.
 For projects that target iOS, you can use uppercase or lowercase letters, numbers, and hyphens.<% } %>
 * `<App ID>` is the application identifier for your project. It must be a domain name in reverse and must meet the requirements of all platforms that you want to target. If not specified, the application identifier is set to `org.nativescript.<App name>` <% if(isConsole) { %>For more information about the `<App ID>` requirements, run `$ tns help create`<% } %><% if(isHtml) { %>For projects that target Android, you can use uppercase or lowercase letters, numbers, and underscores in the strings of the reversed domain name, separated by a dot. Strings must be separated by a dot and must start with a letter. For example: `com.nativescript.My_Andro1d_App`
 For projects that target iOS, you can use uppercase or lowercase letters, numbers, and hyphens in the strings of the reversed domain name. Strings must be separated by a dot. For example: `com.nativescript.My-i0s-App`.
 * `<Template>` is a valid npm package which you want to use as template for your app. You can specify the package by name in the npm registry or by local path or GitHub URL to a directory or .tar.gz containing a package.json file. The contents of the package will be copied to the `app` directory of your project.<% } %>
 
 <% if(isHtml) { %>
+
+### Templates Usage
+
+Based on the selected options, the NativeScript CLI will use the project templates below:
+
+Selected Option | Template 
+----------|----------
+`Plain JavaScript - Hello World`, `--js`, `--javascript` | tns-template-hello-world
+`Plain JavaScript - SideDrawer` | tns-template-drawer-navigation
+`Plain JavaScript - Tabs` | tns-template-tab-navigation
+`Plain TypeScript - Hello World`, `--ts`, `--tsc`, `--typescript` | tns-template-hello-world-ts
+`Plain TypeScript - SideDrawer` | tns-template-drawer-navigation-ts
+`Plain TypeScript - Tabs` | tns-template-tab-navigation-ts
+`Angular - Hello World`, `--ng`, `--angular` | tns-template-hello-world-ng
+`Angular - SideDrawer` | tns-template-drawer-navigation-ng
+`Angular - Tabs` | tns-template-tab-navigation-ng
+`Vue.js`, `--vue`, `--vuejs` | tns-template-blank-vue
+
 ### Related Commands
 
 Command | Description

test/project-commands.ts

@@ -12,6 +12,17 @@ let isProjectCreated: boolean;
 let createProjectCalledWithForce: boolean;
 let validateProjectCallsCount: number;
 const dummyArgs = ["dummyArgsString"];
+const expectedFlavorChoices = [
+	{ key: "Angular", description: "Learn more at https://angular.io/" },
+	{ key: "Vue.js", description: "Learn more at https://vuejs.org/" },
+	{ key: "Plain TypeScript", description: "Learn more at https://www.typescriptlang.org/" },
+	{ key: "Plain JavaScript", description: "Learn more at https://www.javascript.com/" }
+];
+const expectedTemplateChoices = [
+	{ key: "Hello World", description: "A Hello World app" },
+	{ key: "SideDrawer", description: "An app with pre-built pages that uses a drawer for navigation" },
+	{ key: "Tabs", description: "An app with pre-built pages that uses tabs for navigation" }
+];
 
 class ProjectServiceMock implements IProjectService {
 	async validateProjectName(opts: { projectName: string, force: boolean, pathToProject: string }): Promise<string> {
@@ -68,19 +79,25 @@ describe("Project commands tests", () => {
 		templateAnswer?: string,
 	}) {
 		const prompterStub = <stubs.PrompterStub>testInjector.resolve("$prompter");
-		const choices: IDictionary<string> = {};
+		const answers: IDictionary<string> = {};
+		const questionChoices: IDictionary<any[]> = {};
 		if (opts.projectNameAnswer) {
-			choices["First, what will be the name of your app?"] = opts.projectNameAnswer;
+			answers["First, what will be the name of your app?"] = opts.projectNameAnswer;
 		}
 		if (opts.flavorAnswer) {
-			choices[opts.projectNameAnswer ? "Next" : "First" + ", which flavor would you like to use?"] = opts.flavorAnswer;
+			const flavorQuestion = opts.projectNameAnswer ? "Next" : "First" + ", which flavor would you like to use?";
+			answers[flavorQuestion] = opts.flavorAnswer;
+			questionChoices[flavorQuestion] = expectedFlavorChoices;
 		}
 		if (opts.templateAnswer) {
-			choices[opts.projectNameAnswer ? "Finally" : "Next" + ", which template would you like to start from?"] = opts.templateAnswer;
+			const templateQuestion = opts.projectNameAnswer ? "Finally" : "Next" + ", which template would you like to start from?";
+			answers[templateQuestion] = opts.templateAnswer;
+			questionChoices[templateQuestion] = expectedTemplateChoices;
 		}
 
 		prompterStub.expect({
-			choices
+			answers,
+			questionChoices
 		});
 	}
 
@@ -171,21 +188,21 @@ describe("Project commands tests", () => {
 		});
 
 		it("should ask for a template when ts flavor is selected.", async () => {
-			setupAnswers({ flavorAnswer: constants.TsFlavorName, templateAnswer:  "Hello World" });
+			setupAnswers({ flavorAnswer: constants.TsFlavorName, templateAnswer:  "SideDrawer" });
 
 			await createProjectCommand.execute(dummyArgs);
 
-			assert.deepEqual(selectedTemplateName, "tns-template-hello-world-ts");
+			assert.deepEqual(selectedTemplateName, "tns-template-drawer-navigation-ts");
 			assert.equal(validateProjectCallsCount, 1);
 			assert.isTrue(createProjectCalledWithForce);
 		});
 
 		it("should ask for a template when js flavor is selected.", async () => {
-			setupAnswers({ flavorAnswer: constants.JsFlavorName, templateAnswer:  "Hello World" });
+			setupAnswers({ flavorAnswer: constants.JsFlavorName, templateAnswer:  "Tabs" });
 
 			await createProjectCommand.execute(dummyArgs);
 
-			assert.deepEqual(selectedTemplateName, "tns-template-hello-world");
+			assert.deepEqual(selectedTemplateName, "tns-template-tab-navigation");
 			assert.equal(validateProjectCallsCount, 1);
 			assert.isTrue(createProjectCalledWithForce);
 		});

test/stubs.ts

@@ -514,13 +514,15 @@ export class LockFile {
 export class PrompterStub implements IPrompter {
 	private strings: IDictionary<string> = {};
 	private passwords: IDictionary<string> = {};
-	private choices: IDictionary<string> = {};
+	private answers: IDictionary<string> = {};
+	private questionChoices: IDictionary<any[]> = {};
 
-	expect(options?: { strings?: IDictionary<string>, passwords?: IDictionary<string>, choices?: IDictionary<string> }) {
+	expect(options?: { strings?: IDictionary<string>, passwords?: IDictionary<string>, answers?: IDictionary<string>, questionChoices?: IDictionary<any[]> }) {
 		if (options) {
 			this.strings = options.strings || this.strings;
 			this.passwords = options.passwords || this.passwords;
-			this.choices = options.choices || this.choices;
+			this.answers = options.answers || this.answers;
+			this.questionChoices = options.questionChoices || this.questionChoices;
 		}
 	}
 
@@ -543,9 +545,10 @@ export class PrompterStub implements IPrompter {
 		throw unreachable();
 	}
 	async promptForDetailedChoice(question: string, choices: any[]): Promise<string> {
-		chai.assert.ok(question in this.choices, `PrompterStub didn't expect to be asked: ${question}`);
-		const result = this.choices[question];
-		delete this.choices[question];
+		chai.assert.ok(question in this.answers, `PrompterStub didn't expect to be asked: ${question}`);
+		chai.assert.deepEqual(choices, this.questionChoices[question]);
+		const result = this.answers[question];
+		delete this.answers[question];
 		return result;
 	}
 	async confirm(prompt: string, defaultAction?: () => boolean): Promise<boolean> {