@tsed/cli-core 6.0.4 → 6.1.2

package/lib/esm/packageManagers/supports/YarnBerryManager.js

@@ -1,7 +1,8 @@
-import { __decorate, __metadata } from "tslib";
-import { Inject, Injectable } from "@tsed/di";
+import { __decorate } from "tslib";
+import { inject, Injectable } from "@tsed/di";
 import { join } from "path";
 import { Observable } from "rxjs";
+import { CliFs } from "../../services/CliFs.js";
 import { CliYaml } from "../../services/CliYaml.js";
 import { BaseManager } from "./BaseManager.js";
 let YarnBerryManager = class YarnBerryManager extends BaseManager {
@@ -9,10 +10,20 @@ let YarnBerryManager = class YarnBerryManager extends BaseManager {
         super(...arguments);
         this.name = "yarn_berry";
         this.cmd = "yarn";
+        this.verboseOpt = "";
+        this.cliYaml = inject(CliYaml);
+        this.fs = inject(CliFs);
     }
     async init(options) {
+        const lockFile = join(String(options.cwd), "yarn.lock");
+        if (!this.fs.exists(lockFile)) {
+            this.fs.writeFileSync(lockFile, "");
+        }
         // init yarn v1
-        this.install(options);
+        try {
+            await this.install(options).toPromise();
+        }
+        catch (er) { }
         // then switch write file
         await this.cliYaml.write(join(String(options.cwd), ".yarnrc.yml"), {
             nodeLinker: "node-modules"
@@ -27,13 +38,9 @@ let YarnBerryManager = class YarnBerryManager extends BaseManager {
         return this.run("add", ["-D", ...deps], options);
     }
     install(options) {
-        return this.run("install", [options.verbose && "--verbose"], options);
+        return this.run("install", [], options);
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", CliYaml)
-], YarnBerryManager.prototype, "cliYaml", void 0);
 YarnBerryManager = __decorate([
     Injectable({
         type: "package:manager"

package/lib/esm/services/ProjectPackageJson.js

@@ -116,7 +116,9 @@ let ProjectPackageJson = class ProjectPackageJson {
     addDevDependencies(modules, scope = {}) {
         const replacer = (match, key) => getValue(key, scope);
         Object.entries(modules).forEach(([pkg, version]) => {
-            this.addDevDependency(pkg, (version || "").replace(/{{([\w.]+)}}/gi, replacer));
+            if (!this.dependencies[pkg]) {
+                this.addDevDependency(pkg, (version || "").replace(/{{([\w.]+)}}/gi, replacer));
+            }
         });
         return this;
     }

package/lib/types/packageManagers/supports/YarnBerryManager.d.ts

@@ -1,10 +1,13 @@
 import { Observable } from "rxjs";
+import { CliFs } from "../../services/CliFs.js";
 import { CliYaml } from "../../services/CliYaml.js";
 import { BaseManager, type ManagerCmdOpts } from "./BaseManager.js";
 export declare class YarnBerryManager extends BaseManager {
     readonly name = "yarn_berry";
     readonly cmd = "yarn";
+    protected verboseOpt: string;
     protected cliYaml: CliYaml;
+    protected fs: CliFs;
     init(options: ManagerCmdOpts): Promise<void>;
     add(deps: string[], options: ManagerCmdOpts): Observable<any>;
     addDev(deps: string[], options: ManagerCmdOpts): Observable<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "6.0.4",
+  "version": "6.1.2",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -66,7 +66,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "6.0.4",
+    "@tsed/typescript": "6.1.2",
     "@types/commander": "2.12.2",
     "@types/consolidate": "0.14.4",
     "@types/figures": "3.0.1",