Update folder structure on scaffolding (#35)

Fixes #33 & #34

Author: TheZoker

generator-jsonforms/README.md

@@ -18,32 +18,32 @@ This Yeoman Generator brings you all the functions of the tooling to your termin
 
 If you want to avoid the interface, you can use the following parameters:
 
-### Path
+### Name
 
-Enter the path where you want to install the project. (Default: current working directory)
+This name will be used inside the `package.json`. (Default: `jsonforms-react-seed`)
+*Note!* Only a url like schema is allowed here (e.g. no uppercase characters, no whitespaces etc.)
 
 Command:
 ```shell
-yo jsonforms --path "~/Documents/Project/Seed"
+yo jsonforms --name "my-project"
 ```
 
-### Schema Path
+### Path
 
-Enter the path where the JSON schema is located. If not provided, a default schema will be used.
+Enter the path where you want to install the project. (Default: current working directory + the name of the project)
 
 Command:
 ```shell
-yo jsonforms --schemaPath "~/MyProject/schema.json"
+yo jsonforms --path "~/Documents/Project/Seed"
 ```
 
-### Name
+### Schema Path
 
-This name will be used inside the `package.json`. (Default: `jsonforms-react-seed`)
-*Note!* Only a url like schema is allowed here (e.g. no uppercase characters, no whitespaces etc.)
+Enter the path where the JSON schema is located. If not provided, a default schema will be used.
 
 Command:
 ```shell
-yo jsonforms --name "my-project"
+yo jsonforms --schemaPath "~/MyProject/schema.json"
 ```
 
 ### All together

generator-jsonforms/src/generators/app/index.ts

@@ -45,35 +45,63 @@ export class JsonformsGenerator extends Generator {
   }
 
   async prompting() {
+
     if (!this.skipPrompting) {
       clear();
       this.log(
-        chalk.blue(
-          textSync('JSONForms Tooling', { horizontalLayout: 'full' }),
-        ),
+        textSync('JSONForms Tooling', { horizontalLayout: 'full' }),
       );
       this.answers = await this.prompt([
         {
-          name: 'path',
+          name: 'name',
           type: 'input',
-          message: 'Enter the path where the project will be installed (default: current folder):',
-          validate: async value => {
+          message: 'Enter a name for your seed project:',
+          default: 'jsonforms-react-seed',
+          validate: (value: any) => {
             if (value !== '') {
-              try {
-                await statWithPromise(value);
-              } catch (err) {
-                return 'Folder does not exists';
-              }
+              const valid = validate(value);
+              return valid.validForNewPackages || 'Sorry, the name can only contain URL-friendly ' +
+              'characters and cannot contain capital letters.';
             }
             return true;
           },
+          when: () => {
+            if (this.name === undefined) {
+              return true;
+            }
+            if (!validate(this.name).validForNewPackages) {
+              this.log(chalk.red('Sorry, the name can only contain URL-friendly ' +
+              'characters and cannot contain capital letters.'));
+              return true;
+            }
+            return false;
+          }
+        },
+        {
+          name: 'path',
+          type: 'input',
+          message: `Enter the path where the project will be installed:`,
+          default: ( answers: any) => {
+            if (this.name !== undefined) {
+              return join(process.cwd(), this.name);
+            }
+            return join(process.cwd(), answers.name);
+          },
+          validate: async (value: any) => {
+            try {
+              await statWithPromise(value);
+            } catch (err) {
+              return true;
+            }
+            return 'Folder does already exists. Please enter a different path.';
+          },
           when: (this.path == null)
         },
         {
           name: 'schemaPath',
           type: 'input',
           message: 'Enter the path of schema from which the ui schema will be generated (leave empty for default schema):',
-          validate: async value => {
+          validate: async (value: any) => {
             if (value !== '') {
               try {
                 await statWithPromise(value);
@@ -85,30 +113,6 @@ export class JsonformsGenerator extends Generator {
           },
           when: (this.schemaPath == null)
         },
-        {
-          name: 'name',
-          type: 'input',
-          message: `Enter a name for your seed project (default: jsonforms-react-seed):`,
-          validate: value => {
-            if (value !== '') {
-              const valid = validate(value);
-              return valid.validForNewPackages || 'Sorry, name can only contain URL-friendly ' +
-              'characters and name can no longer contain capital letters.';
-            }
-            return true;
-          },
-          when: () => {
-            if (this.name === undefined) {
-              return true;
-            }
-            if (!validate(this.name).validForNewPackages) {
-              this.log(chalk.red('Sorry, name can only contain URL-friendly ' +
-              'characters and name can no longer contain capital letters.'));
-              return true;
-            }
-            return false;
-          }
-        }
       ]);
       if (this.answers && this.answers.path === '' || this.path === '') {
         this.path = process.cwd();