@tsed/cli-core 3.19.3 → 3.19.4

package/lib/index.js

@@ -5,13 +5,13 @@ var di = require('@tsed/di');
 var tslib = require('tslib');
 var commander = require('commander');
 var listr2 = require('listr2');
-var Fs = require('fs-extra');
 var path = require('path');
-var readPkgUp = require('read-pkg-up');
 var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
 var semver$1 = require('semver');
 var execa = require('execa');
+var Fs = require('fs-extra');
+var readPkgUp = require('read-pkg-up');
 var axios = require('axios');
 var querystring = require('querystring');
 var tunnel = require('tunnel');
@@ -47,10 +47,10 @@ function _interopNamespace(e) {
 }
 
 var Inquirer__default = /*#__PURE__*/_interopDefaultLegacy(Inquirer);
-var Fs__default = /*#__PURE__*/_interopDefaultLegacy(Fs);
-var readPkgUp__default = /*#__PURE__*/_interopDefaultLegacy(readPkgUp);
 var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver$1);
 var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
+var Fs__default = /*#__PURE__*/_interopDefaultLegacy(Fs);
+var readPkgUp__default = /*#__PURE__*/_interopDefaultLegacy(readPkgUp);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var querystring__default = /*#__PURE__*/_interopDefaultLegacy(querystring);
 var tunnel__default = /*#__PURE__*/_interopDefaultLegacy(tunnel);
@@ -279,6 +279,17 @@ exports.CliFs = class CliFs {
 };
 exports.CliFs = tslib.__decorate([di.Injectable()], exports.CliFs);
 
+function isValidVersion(version) {
+  version = version.replace(/[~>=<]/gi, "");
+  return !!semver__default['default'].valid(version);
+}
+
+function useReadPkgUp(configuration) {
+  var _configuration$projec;
+
+  return !(process.argv.includes("init") && !Fs__default['default'].existsSync(path.join(String((_configuration$projec = configuration.project) == null ? void 0 : _configuration$projec.rootDir), "package.json")));
+}
+
 function getEmptyPackageJson(configuration) {
   return {
     name: configuration.name,
@@ -290,12 +301,6 @@ function getEmptyPackageJson(configuration) {
   };
 }
 
-function useReadPkgUp(configuration) {
-  var _configuration$projec;
-
-  return !(process.argv.includes("init") && !Fs__default['default'].existsSync(path.join(String((_configuration$projec = configuration.project) == null ? void 0 : _configuration$projec.rootDir), "package.json")));
-}
-
 function getPackageJson(configuration) {
   if (useReadPkgUp(configuration)) {
     var _configuration$projec2;
@@ -305,8 +310,12 @@ function getPackageJson(configuration) {
     });
 
     if (result && result.path) {
-      configuration.set("project.root", path.dirname(result.path));
-      return _extends({}, getEmptyPackageJson(configuration), result.packageJson);
+      const pkgPath = path.dirname(result.path);
+      configuration.set("project.root", pkgPath);
+      const pkg = Fs__default['default'].readJsonSync(result.path, {
+        encoding: "utf8"
+      });
+      return _extends({}, getEmptyPackageJson(configuration), pkg);
     }
   }
 
@@ -333,7 +342,7 @@ function sortKeys(obj) {
 
 function mapPackagesWithValidVersion(deps) {
   return Object.entries(deps).reduce((deps, [key, version]) => {
-    if (semver__default['default'].valid(version)) {
+    if (isValidVersion(version)) {
       return _extends({}, deps, {
         [key]: version
       });
@@ -430,7 +439,9 @@ exports.ProjectPackageJson = class ProjectPackageJson {
   }
 
   read() {
-    this.setRaw(getPackageJson(this.configuration));
+    const pkg = this.getPackageJson();
+    this.setRaw(pkg);
+    return this;
   }
 
   setRaw(pkg) {
@@ -525,20 +536,19 @@ exports.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() {
@@ -570,7 +580,9 @@ exports.ProjectPackageJson = class ProjectPackageJson {
     return [{
       title: "Write package.json",
       enabled: () => this.rewrite,
-      task: () => this.write()
+      task: () => {
+        this.write();
+      }
     }, ...tasks, {
       title: "Clean",
       task: () => {
@@ -717,6 +729,10 @@ exports.ProjectPackageJson = class ProjectPackageJson {
     }];
   }
 
+  getPackageJson() {
+    return getPackageJson(this.configuration);
+  }
+
 };
 
 tslib.__decorate([di.Inject(exports.CliExeca), tslib.__metadata("design:type", exports.CliExeca)], exports.ProjectPackageJson.prototype, "cliExeca", void 0);