@tsed/cli-core 3.19.1 → 3.19.4

package/lib/index.modern.js

@@ -9,13 +9,13 @@ export { Configuration, Constant, Container, DITest, Inject, Injectable, Injecto
 import { __decorate, __metadata, __param } from 'tslib';
 import { Command as Command$1, Argument } from 'commander';
 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 { EMPTY, throwError, Observable } from 'rxjs';
 import { merge, filter, catchError } from 'rxjs/operators';
 import semver$1 from 'semver';
 import execa from 'execa';
+import Fs, { existsSync } from 'fs-extra';
+import readPkgUp from 'read-pkg-up';
 import axios from 'axios';
 import querystring from 'querystring';
 import tunnel from 'tunnel';
@@ -245,6 +245,17 @@ let CliFs = class CliFs {
 };
 CliFs = __decorate([Injectable()], CliFs);
 
+function isValidVersion(version) {
+  version = version.replace(/[~>=<]/gi, "");
+  return !!semver$1.valid(version);
+}
+
+function useReadPkgUp(configuration) {
+  var _configuration$projec;
+
+  return !(process.argv.includes("init") && !Fs.existsSync(join(String((_configuration$projec = configuration.project) == null ? void 0 : _configuration$projec.rootDir), "package.json")));
+}
+
 function getEmptyPackageJson(configuration) {
   return {
     name: configuration.name,
@@ -256,12 +267,6 @@ function getEmptyPackageJson(configuration) {
   };
 }
 
-function useReadPkgUp(configuration) {
-  var _configuration$projec;
-
-  return !(process.argv.includes("init") && !Fs.existsSync(join(String((_configuration$projec = configuration.project) == null ? void 0 : _configuration$projec.rootDir), "package.json")));
-}
-
 function getPackageJson(configuration) {
   if (useReadPkgUp(configuration)) {
     var _configuration$projec2;
@@ -271,8 +276,12 @@ function getPackageJson(configuration) {
     });
 
     if (result && result.path) {
-      configuration.set("project.root", dirname(result.path));
-      return _extends({}, getEmptyPackageJson(configuration), result.packageJson);
+      const pkgPath = dirname(result.path);
+      configuration.set("project.root", pkgPath);
+      const pkg = Fs.readJsonSync(result.path, {
+        encoding: "utf8"
+      });
+      return _extends({}, getEmptyPackageJson(configuration), pkg);
     }
   }
 
@@ -299,7 +308,7 @@ function sortKeys(obj) {
 
 function mapPackagesWithValidVersion(deps) {
   return Object.entries(deps).reduce((deps, [key, version]) => {
-    if (semver$1.valid(version)) {
+    if (isValidVersion(version)) {
       return _extends({}, deps, {
         [key]: version
       });
@@ -396,7 +405,9 @@ let ProjectPackageJson = class ProjectPackageJson {
   }
 
   read() {
-    this.setRaw(getPackageJson(this.configuration));
+    const pkg = this.getPackageJson();
+    this.setRaw(pkg);
+    return this;
   }
 
   setRaw(pkg) {
@@ -491,20 +502,19 @@ let ProjectPackageJson = class ProjectPackageJson {
   }
 
   write() {
-    this.raw.devDependencies = sortKeys(this.raw.devDependencies);
-    this.raw.dependencies = sortKeys(this.raw.dependencies);
+    const originalPkg = this.getPackageJson();
     this.rewrite = false;
-
-    const json = _extends({}, this.raw, {
-      dependencies: _extends({}, mapPackagesWithValidVersion(this.raw.dependencies)),
-      devDependencies: _extends({}, mapPackagesWithValidVersion(this.raw.devDependencies)),
+    this.raw = _extends({}, originalPkg, this.raw, {
+      scripts: _extends({}, originalPkg.scripts || {}, this.raw.scripts || {}),
+      dependencies: sortKeys(_extends({}, originalPkg.dependencies, mapPackagesWithValidVersion(this.raw.dependencies))),
+      devDependencies: sortKeys(_extends({}, originalPkg.devDependencies, mapPackagesWithValidVersion(this.raw.devDependencies))),
       readme: undefined,
       _id: undefined
     });
-
-    return this.fs.writeFileSync(this.path, JSON.stringify(json, null, 2), {
+    this.fs.writeFileSync(this.path, JSON.stringify(this.raw, null, 2), {
       encoding: "utf8"
     });
+    return this;
   }
 
   hasYarn() {
@@ -536,7 +546,9 @@ let ProjectPackageJson = class ProjectPackageJson {
     return [{
       title: "Write package.json",
       enabled: () => this.rewrite,
-      task: () => this.write()
+      task: () => {
+        this.write();
+      }
     }, ...tasks, {
       title: "Clean",
       task: () => {
@@ -683,6 +695,10 @@ let ProjectPackageJson = class ProjectPackageJson {
     }];
   }
 
+  getPackageJson() {
+    return getPackageJson(this.configuration);
+  }
+
 };
 
 __decorate([Inject(CliExeca), __metadata("design:type", CliExeca)], ProjectPackageJson.prototype, "cliExeca", void 0);