@tsed/cli-core 6.0.0 → 6.0.1

package/lib/esm/services/CliPackageJson.js

@@ -10,6 +10,6 @@ registerProvider({
     provide: CliPackageJson,
     deps: [Configuration],
     useFactory(configuration) {
-        return configuration.pkg || {};
+        return configuration.get("pkg", {});
     }
 });

package/lib/esm/services/CliService.js

@@ -1,6 +1,7 @@
 import { __decorate } from "tslib";
 import { classOf } from "@tsed/core";
-import { $emit, configuration, constant, destroyInjector, DIContext, getContext, inject, Injectable, injector, logger, Provider, runInContext } from "@tsed/di";
+import { configuration, constant, destroyInjector, DIContext, getContext, inject, Injectable, injector, logger, Provider, runInContext } from "@tsed/di";
+import { $asyncEmit } from "@tsed/hooks";
 import { Argument, Command } from "commander";
 import Inquirer from "inquirer";
 // @ts-ignore
@@ -44,7 +45,7 @@ let CliService = class CliService {
      */
     runLifecycle(cmdName, data = {}, $ctx) {
         return runInContext($ctx, async () => {
-            await $emit("$loadPackageJson");
+            await $asyncEmit("$loadPackageJson");
             data = await this.beforePrompt(cmdName, data);
             $ctx.set("data", data);
             data = await this.prompt(cmdName, data);
@@ -58,11 +59,11 @@ let CliService = class CliService {
             await this.exec(cmdName, data, $ctx);
         }
         catch (er) {
-            await $emit("$onFinish", er);
+            await $asyncEmit("$onFinish", er);
             await destroyInjector();
             throw er;
         }
-        await $emit("$onFinish");
+        await $asyncEmit("$onFinish");
         await destroyInjector();
     }
     async exec(cmdName, data, $ctx) {

package/lib/esm/services/ProjectPackageJson.js

@@ -50,7 +50,7 @@ let ProjectPackageJson = class ProjectPackageJson {
         return String(constant("project.rootDir"));
     }
     set dir(dir) {
-        configuration().project.rootDir = dir;
+        configuration().set("project.rootDir", dir);
         this.read();
     }
     get name() {
@@ -97,11 +97,11 @@ let ProjectPackageJson = class ProjectPackageJson {
     }
     setRaw(pkg) {
         const config = configuration();
-        const projectPreferences = config.defaultProjectPreferences;
-        const preferences = getValue(pkg, config.name);
+        const projectPreferences = config.get("defaultProjectPreferences");
+        const preferences = getValue(pkg, config.get("name"));
         this.raw = {
             ...pkg,
-            [config.name]: {
+            [config.get("name")]: {
                 ...(projectPreferences && projectPreferences(pkg)),
                 ...preferences
             }

package/lib/esm/services/Renderer.js

@@ -1,7 +1,7 @@
 import { __decorate } from "tslib";
 import "../utils/hbs/index.js";
 import { isString } from "@tsed/core";
-import { Configuration, constant, inject, Injectable } from "@tsed/di";
+import { constant, inject, Injectable } from "@tsed/di";
 import { normalizePath } from "@tsed/normalize-path";
 import Consolidate from "consolidate";
 import fs from "fs-extra";
@@ -17,7 +17,6 @@ export class Renderer {
         this.templateDir = constant("templateDir", "");
         this.fs = inject(CliFs);
         this.cache = new Set();
-        this.configuration = inject(Configuration);
     }
     async loadPartials(cwd) {
         if (this.cache.has(cwd)) {
@@ -136,7 +135,7 @@ export class Renderer {
 }
 let RootRendererService = class RootRendererService extends Renderer {
     get rootDir() {
-        return this.configuration.project?.rootDir;
+        return constant("project.rootDir", "");
     }
 };
 RootRendererService = __decorate([
@@ -145,7 +144,7 @@ RootRendererService = __decorate([
 export { RootRendererService };
 let SrcRendererService = class SrcRendererService extends Renderer {
     get rootDir() {
-        return join(...[this.configuration.project?.rootDir, this.configuration.project?.srcDir].filter(Boolean));
+        return join(...[constant("project.rootDir"), constant("project.srcDir")].filter(Boolean));
     }
 };
 SrcRendererService = __decorate([
@@ -154,7 +153,7 @@ SrcRendererService = __decorate([
 export { SrcRendererService };
 let ScriptsRendererService = class ScriptsRendererService extends Renderer {
     get rootDir() {
-        return join(...[this.configuration.project?.rootDir, this.configuration.project?.scriptsDir].filter(Boolean));
+        return join(...[constant("project.rootDir"), constant("project.scriptsDir")].filter(Boolean));
     }
 };
 ScriptsRendererService = __decorate([

package/lib/types/services/Renderer.d.ts

@@ -14,7 +14,6 @@ export declare abstract class Renderer {
     templateDir: string;
     readonly fs: CliFs;
     readonly cache: Set<string>;
-    protected configuration: any;
     abstract get rootDir(): string;
     loadPartials(cwd: string): Promise<void>;
     render(path: string, data: any, options?: Partial<RenderOptions>): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -66,7 +66,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "6.0.0",
+    "@tsed/typescript": "6.0.1",
     "@types/commander": "2.12.2",
     "@types/consolidate": "0.14.4",
     "@types/figures": "3.0.1",
@@ -83,8 +83,9 @@
     "vitest": "2.1.1"
   },
   "peerDependencies": {
-    "@tsed/core": ">=8.0.0-beta.5",
-    "@tsed/di": ">=8.0.0-beta.5"
+    "@tsed/core": ">=8.0.0-rc.6",
+    "@tsed/di": ">=8.0.0-rc.6",
+    "@tsed/hooks": ">=8.0.0-rc.6"
   },
   "repository": "https://github.com/tsedio/tsed-cli",
   "bugs": {