@loopback/cli 4.1.1 → 4.1.2

package/generators/copyright/index.js

@@ -8,7 +8,6 @@ const BaseGenerator = require('../../lib/base-generator');
 const {updateFileHeaders} = require('./header');
 const {spdxLicenseList, updateLicense} = require('./license');
 const g = require('../../lib/globalize');
-const _ = require('lodash');
 const chalk = require('chalk');
 const autocomplete = require('inquirer-autocomplete-prompt');
 
@@ -77,19 +76,19 @@ module.exports = class CopyrightGenerator extends BaseGenerator {
 
   async promptOwnerAndLicense() {
     const pkgFile = this.destinationPath('package.json');
-    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
-    if (pkg == null) {
+    if (!this.existsDestination('package.json')) {
       this.exit(`${pkgFile} does not exist.`);
       return;
     }
-    this.packageJson = pkg;
-    let author = _.get(pkg, 'author');
+    let author = this.packageJson.get('author');
     if (typeof author === 'object') {
       author = author.name;
     }
     const owner =
-      this.options.copyrightOwner || _.get(pkg, 'copyright.owner', author);
-    let license = this.options.license || _.get(pkg, 'license');
+      this.options.copyrightOwner ||
+      this.packageJson.get('copyright.owner') ||
+      author;
+    let license = this.options.license || this.packageJson.get('license');
     const licenses = [...this.licenseList];
     if (license != null) {
       // find the matching license by id and move it to the front of the list

package/generators/copyright/license.js

@@ -86,13 +86,12 @@ async function updateLicense(projectRoot, pkg, options) {
   if (typeof licenseId === 'object') {
     licenseId = licenseId.id;
   }
-  pkg.license = licenseId;
-  pkg['copyright.owner'] = options.copyrightOwner;
-  await fs.writeJSON(path.join(projectRoot, 'package.json'), pkg);
+  pkg.set('license', licenseId);
+  pkg.set('copyright.owner', options.copyrightOwner);
   await fs.write(
     path.join(projectRoot, 'LICENSE'),
     renderLicense({
-      name: pkg.name,
+      name: pkg.get('name'),
       owner: options.copyrightOwner,
       license: options.license,
       years: await getYears(projectRoot),

package/lib/base-generator.js

@@ -5,6 +5,7 @@
 
 'use strict';
 
+const _ = require('lodash');
 const Generator = require('yeoman-generator');
 const chalk = require('chalk');
 const {StatusConflicter, readTextFromStdin} = require('./utils');
@@ -15,6 +16,8 @@ const updateIndex = require('./update-index');
 const {checkLoopBackProject} = require('./version-helper');
 const g = require('./globalize');
 
+_.extend(Generator.prototype, require('yeoman-generator/lib/actions/install'));
+
 const supportedPackageManagers = ['npm', 'yarn'];
 
 debug('Is stdin interactive (isTTY)?', process.stdin.isTTY);
@@ -47,10 +50,9 @@ module.exports = class BaseGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
     debug('Initializing generator', this.constructor.name);
-    this.conflicter = new StatusConflicter(
-      this.env.adapter,
-      this.options.force,
-    );
+    this.conflicter = new StatusConflicter(this.env.adapter, {
+      force: this.options.force,
+    });
     this._setupGenerator();
   }
 
@@ -479,14 +481,15 @@ module.exports = class BaseGenerator extends Generator {
 
   // Check all files being generated to ensure they succeeded
   _isGenerationSuccessful() {
-    const generationStatus = !!Object.entries(
-      this.conflicter.generationStatus,
-    ).find(([key, val]) => {
-      // If a file was modified, update the indexes and say stuff about it
-      return val !== 'skip' && val !== 'identical';
-    });
-    debug(`Generation status: ${generationStatus}`);
-    return generationStatus;
+    // const generationStatus = !!Object.entries(
+    //   this.conflicter.generationStatus,
+    // ).find(([key, val]) => {
+    //   // If a file was modified, update the indexes and say stuff about it
+    //   return val !== 'skip' && val !== 'identical';
+    // });
+    // debug(`Generation status: ${generationStatus}`);
+    // return generationStatus;
+    return true; // FixMe: Conflicter does not work
   }
 
   async _updateIndexFile(dir, file) {

package/lib/debug.js

@@ -12,5 +12,5 @@ const debug = require('debug');
  * @param {String=} scope The scope to use for the debug statement.
  */
 module.exports = function (scope) {
-  return debug(`loopback:cli${scope ? `:${scope}` : ''}`);
+  return debug('loopback:cli').extend(scope);
 };

package/lib/project-generator.js

@@ -96,7 +96,7 @@ module.exports = class ProjectGenerator extends BaseGenerator {
    * from files that have it during project generation.
    */
   _setupRenameTransformer() {
-    this.registerTransformStream(utils.renameEJS());
+    this.queueTransformStream(utils.renameEJS());
   }
 
   async setOptions() {

package/lib/utils.js

@@ -23,7 +23,7 @@ const toVarName = require('change-case').camelCase;
 const pluralize = require('pluralize');
 const urlSlug = require('url-slug');
 const validate = require('validate-npm-package-name');
-const Conflicter = require('yeoman-generator/lib/util/conflicter');
+const Conflicter = require('yeoman-environment/conflicter');
 const connectors = require('./connectors.json');
 const tsquery = require('./ast-helper');
 const stringifyObject = require('stringify-object');
@@ -300,8 +300,8 @@ exports.validateUrlSlug = function (name) {
  * Extends conflicter so that it keeps track of conflict status
  */
 exports.StatusConflicter = class StatusConflicter extends Conflicter {
-  constructor(adapter, force) {
-    super(adapter, force);
+  constructor(adapter, opts) {
+    super(adapter, opts);
     this.generationStatus = {}; // keeps track of file conflict history
   }
 

package/lib/version-helper.js

@@ -35,7 +35,6 @@ function printVersions(log = console.log) {
  */
 async function checkDependencies(generator) {
   const pkg = generator.fs.readJSON(generator.destinationPath('package.json'));
-  generator.packageJson = pkg;
 
   const isUpdate = generator.command === 'update';
   const pkgDeps = pkg
@@ -131,7 +130,7 @@ async function checkDependencies(generator) {
     return;
   }
 
-  const originalCliVersion = generator.config.get('update') || '<unknown>';
+  const originalCliVersion = generator.config.get('version') || '<unknown>';
   generator.log(
     chalk.red(
       g.f(
@@ -169,7 +168,7 @@ async function checkDependencies(generator) {
  */
 function updateDependencies(generator) {
   const pkg =
-    generator.packageJson ||
+    generator.packageJson.getAll() ||
     generator.fs.readJSON(generator.destinationPath('package.json'));
   const depUpdates = [];
   for (const d in templateDeps) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loopback/cli",
   "description": "Yeoman generator for LoopBack 4",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "keywords": [
     "LoopBack",
     "CLI",
@@ -39,7 +39,7 @@
     ".yo-rc.json"
   ],
   "dependencies": {
-    "@lerna/project": "^5.1.6",
+    "@lerna/project": "^5.4.0",
     "@openapi-contrib/openapi-schema-to-json-schema": "^3.2.0",
     "@phenomnomnominal/tsquery": "^4.2.0",
     "camelcase-keys": "^7.0.2",
@@ -77,8 +77,8 @@
     "url-slug": "^3.0.4",
     "validate-npm-package-name": "^4.0.0",
     "write-file-atomic": "^4.0.1",
-    "yeoman-environment": "^2.10.3",
-    "yeoman-generator": "^4.13.0"
+    "yeoman-environment": "^3.10.0",
+    "yeoman-generator": "^5.7.0"
   },
   "devDependencies": {
     "@loopback/build": "^9.0.2",
@@ -87,17 +87,19 @@
     "@types/ejs": "^3.1.1",
     "@types/fs-extra": "^9.0.13",
     "@types/minimatch": "^3.0.5",
-    "@types/node": "^14.18.21",
+    "@types/node": "^14.18.23",
+    "@types/yeoman-environment": "^2.10.7",
+    "@types/yeoman-generator": "^5.2.10",
     "loopback": "^3.28.0",
     "loopback-datasource-juggler": "^4.27.1",
     "mem-fs": "^2.2.1",
-    "mem-fs-editor": "^9.4.0",
+    "mem-fs-editor": "^9.5.0",
     "mock-stdin": "^1.0.0",
     "rimraf": "^3.0.2",
     "sinon": "^11.1.2",
     "strong-globalize-cli": "7.1.0",
     "yeoman-assert": "^3.1.1",
-    "yeoman-test": "^4.0.2"
+    "yeoman-test": "^6.3.0"
   },
   "config": {
     "templateDependencies": {
@@ -194,5 +196,5 @@
       "@loopback/example-references-many": "^6.0.2"
     }
   },
-  "gitHead": "d2eddfc1319810f4c0126e613c24499b5685f7e4"
+  "gitHead": "cc63323e20cf39c62402f1dee108bf9e9d23e133"
 }