@tsed/cli-core 3.12.0 → 3.13.0

package/lib/index.modern.js

@@ -12,9 +12,9 @@ import { Listr, Logger as Logger$1 } from 'listr2';
 import Fs, { existsSync } from 'fs-extra';
 import { join, dirname, relative, resolve } from 'path';
 import readPkgUp from 'read-pkg-up';
-import semver$1 from 'semver';
 import { EMPTY, throwError, Observable } from 'rxjs';
 import { merge, filter, catchError } from 'rxjs/operators';
+import semver$1 from 'semver';
 import execa from 'execa';
 import axios from 'axios';
 import querystring from 'querystring';
@@ -33,6 +33,7 @@ var PackageManager;
 (function (PackageManager) {
   PackageManager["YARN"] = "yarn";
   PackageManager["NPM"] = "npm";
+  PackageManager["PNPM"] = "pnpm";
 })(PackageManager || (PackageManager = {}));
 
 var CommandStoreKeys;
@@ -309,8 +310,16 @@ function mapPackagesWithValidVersion(deps) {
 }
 
 function defaultPreferences(pkg) {
+  let packageManager = PackageManager.YARN;
+
+  if (getValue(pkg, "scripts.build", "").includes("pnpm ")) {
+    packageManager = PackageManager.PNPM;
+  } else if (getValue(pkg, "scripts.build", "").includes("npm ")) {
+    packageManager = PackageManager.NPM;
+  }
+
   return {
-    packageManager: getValue(pkg, "scripts.build", "").includes("npm ") ? PackageManager.NPM : PackageManager.YARN
+    packageManager
   };
 }
 
@@ -399,7 +408,16 @@ let ProjectPackageJson = class ProjectPackageJson {
   }
 
   getRunCmd() {
-    return this.preferences.packageManager === "npm" ? "npm run" : "yarn run";
+    switch (this.preferences.packageManager) {
+      case "npm":
+        return "npm run";
+
+      case "pnpm":
+        return "pnpm run";
+
+      default:
+        return "yarn run";
+    }
   }
 
   addDevDependency(pkg, version) {
@@ -500,7 +518,21 @@ let ProjectPackageJson = class ProjectPackageJson {
 
   install(options = {}) {
     const packageManager = this.getPackageManager(options.packageManager);
-    const tasks = packageManager === "yarn" ? this.installWithYarn(options) : this.installWithNpm(options);
+    let tasks;
+
+    switch (packageManager) {
+      case "pnpm":
+        tasks = this.installWithPnpm(options);
+        break;
+
+      case "npm":
+        tasks = this.installWithNpm(options);
+        break;
+
+      default:
+        tasks = this.installWithYarn(options);
+    }
+
     return [{
       title: "Write package.json",
       enabled: () => this.rewrite,
@@ -623,6 +655,34 @@ let ProjectPackageJson = class ProjectPackageJson {
     }];
   }
 
+  installWithPnpm({
+    verbose
+  }) {
+    const devDeps = mapPackagesWithInvalidVersion(this.devDependencies);
+    const deps = mapPackagesWithInvalidVersion(this.dependencies);
+    const options = {
+      cwd: this.dir,
+      env: _extends({}, process.env, {
+        GH_TOKEN: this.GH_TOKEN
+      })
+    };
+    return [{
+      title: "Installing dependencies using pnpm",
+      skip: () => {
+        return !this.reinstall;
+      },
+      task: () => this.cliExeca.run(PackageManager.PNPM, ["install", "--dev", verbose && "--verbose"].filter(Boolean), options)
+    }, {
+      title: "Add dependencies using pnpm",
+      skip: () => !deps.length,
+      task: () => this.cliExeca.run(PackageManager.PNPM, ["add", "--save-prod", verbose && "--verbose", ...deps].filter(Boolean), options)
+    }, {
+      title: "Add devDependencies using pnpm",
+      skip: () => !devDeps.length,
+      task: () => this.cliExeca.run(PackageManager.PNPM, ["add", "--save-dev", verbose && "--verbose", ...devDeps].filter(Boolean), options)
+    }];
+  }
+
 };
 
 __decorate([Inject(CliExeca), __metadata("design:type", CliExeca)], ProjectPackageJson.prototype, "cliExeca", void 0);