fix: fix conflict

Author: Agnes Lin

packages/cli/lib/project-generator.js

@@ -7,7 +7,11 @@
 const BaseGenerator = require('./base-generator');
 const utils = require('./utils');
 const chalk = require('chalk');
+<<<<<<< HEAD
 const cliVersion = require('../package.json').version;
+=======
+const path = require('path');
+>>>>>>> af20999f... fix(cli): fix app default project name. relevant test added
 
 module.exports = class ProjectGenerator extends BaseGenerator {
   // Note: arguments and options should be defined in the constructor.
@@ -132,7 +136,8 @@ module.exports = class ProjectGenerator extends BaseGenerator {
         name: 'name',
         message: 'Project name:',
         when: this.projectInfo.name == null,
-        default: this.options.name || this.appname,
+        default:
+          this.options.name || utils.toFileName(path.basename(process.cwd())),
         validate: utils.validate,
       },
       {

packages/cli/lib/utils.js

@@ -26,6 +26,8 @@ const connectors = require('../generators/datasource/connectors.json');
 const stringifyObject = require('stringify-object');
 const camelCase = _.camelCase;
 const kebabCase = _.kebabCase;
+const untildify = require('untildify');
+const tildify = require('tildify');
 const readdirAsync = promisify(fs.readdir);
 const toFileName = name => {
   return kebabCase(name).replace(/\-(\d+)$/g, '$1');
@@ -127,6 +129,8 @@ exports.camelCase = camelCase;
 exports.toVarName = toVarName;
 exports.pluralize = pluralize;
 exports.urlSlug = urlSlug;
+exports.untildify = untildify;
+exports.tildify = tildify;
 
 exports.validate = function(name) {
   const isValid = validate(name).validForNewPackages;

packages/cli/package-lock.json

@@ -63,6 +63,8 @@
     "unicode-10.0.0": "^0.7.5",
     "update-notifier": "^3.0.1",
     "url-slug": "^2.1.1",
+    "untildify": "^4.0.0",
+    "tildify": "^2.0.0",
     "validate-npm-package-name": "^3.0.0",
     "yeoman-generator": "^4.0.1"
   },

packages/cli/package.json

@@ -6,12 +6,18 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const {promisify} = require('util');
 const path = require('path');
+const tildify = require('tildify');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
 const generator = path.join(__dirname, '../../../generators/app');
+<<<<<<< HEAD
 const cliVersion = require('../../../package.json').version;
+=======
+const build = require('@loopback/build');
+>>>>>>> af20999f... fix(cli): fix app default project name. relevant test added
 const props = {
   name: 'my-app',
   description: 'My app for LoopBack 4',
@@ -210,3 +216,38 @@ function testFormat() {
 process.env.CI && !process.env.DEBUG
   ? describe.skip
   : describe('app-generator with --format', testFormat);
+
+/** For testing if the generator handles default values properly */
+describe('app-generator with default values', () => {
+  const rootDir = path.join(__dirname, '../../../..');
+  const defaultValProjPath = path.join(rootDir, 'sandbox/default-value-app');
+  const sandbox = path.join(rootDir, 'sandbox');
+  const pathToDefValApp = path.join(defaultValProjPath, 'default-value-app');
+  const defaultValProps = {
+    name: '',
+    description: 'An app to test out default values',
+    outdir: '',
+  };
+
+  before(async () => {
+    // default-value-app should not exist at this point
+    assert.equal(fs.existsSync(defaultValProjPath), false);
+    assert.equal(fs.existsSync(pathToDefValApp), false);
+    return (
+      helpers
+        .run(generator)
+        .inDir(defaultValProjPath)
+        // Mark it private to prevent accidental npm publication
+        .withOptions({private: true})
+        .withPrompts(defaultValProps)
+    );
+  });
+  it('scaffold a new app for default-value-app', async () => {
+    // default-value-app should be created at this point
+    assert.equal(fs.existsSync(pathToDefValApp), true);
+  });
+  after(() => {
+    process.chdir(sandbox);
+    build.clean(['node', 'run-clean', defaultValProjPath]);
+  });
+});