Cleanup

Author: pichfl

src/index.js

@@ -23,11 +23,21 @@ const resolvePackage = require('./resolve-package');
 const { defaultTo } = require('./constants');
 const normalizeBlueprintArgs = require('./normalize-blueprint-args');
 
+/**
+ * @typedef {Object} Blueprint
+ * @property {string} name
+ * @property {string[]} options - args passed to the blueprint
+ * @property {string} packageName - The name of the package containing the blueprint
+ * @property {string} location
+ * @property {string} version
+ * @property {boolean} isBaseBlueprint
+ */
+
 /**
  * If `version` attribute exists in the `blueprint` object and URL is empty, skip. Otherwise resolve the details of
  * the blueprint
  *
- * @param {Object} blueprint - Expected to contain `name`, `options` array, `packageName`, `location`, and `version`
+ * @param {Blueprint} blueprint - Expected to contain `name`, `options` array, `packageName`, `location`, and `version`
  * attributes
  * @param {String} url - Optional parameter that links to package
  * @param {String} range - Version range i.e. 1.0.2
@@ -64,11 +74,11 @@ module.exports = async function emberCliUpdate({
   // so we can no longer look it up on the fly after the run.
   // We must rely on a lookup before the run.
   let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
-
   let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
 
   let { blueprints } = emberCliUpdateJson;
 
+  /** @type {Blueprint} */
   let blueprint;
   let packageUrl;
 
@@ -77,14 +87,14 @@ module.exports = async function emberCliUpdate({
       packageName,
       blueprintName: _blueprint
     });
-
     let parsedPackage = await parseBlueprintPackage({
       cwd,
       packageName: blueprintArgs.packageName
     });
-    packageUrl = parsedPackage.url;
 
+    packageUrl = parsedPackage.url;
     packageName = parsedPackage.name;
+
     if (!packageName) {
       let downloadedPackage = await downloadPackage(
         null,
@@ -190,15 +200,16 @@ module.exports = async function emberCliUpdate({
     );
   }
 
-  let endBlueprint;
+  /** @type {Blueprint} */
+  let startBlueprint = { ...blueprint };
+  /** @type {Blueprint} */
+  let endBlueprint = { ...blueprint };
 
   let { promise, resolveConflictsProcess } = await boilerplateUpdate({
     cwd,
     projectOptions: ({ packageJson }) =>
       getProjectOptions(packageJson, blueprint),
     mergeOptions: async function mergeOptions({ packageJson, projectOptions }) {
-      let startBlueprint = { ...blueprint };
-      endBlueprint = { ...blueprint };
       delete endBlueprint.version;
 
       if (isCustomBlueprint) {
@@ -207,6 +218,7 @@ module.exports = async function emberCliUpdate({
           _resolvePackage(endBlueprint, packageUrl, to)
         ]);
       } else {
+      startBlueprint = { ...blueprint };
         let packageName = getPackageName(projectOptions);
         let versions = await getVersions(packageName);
         let getTagVersion = _getTagVersion(versions, packageName);