@tsed/cli-core 7.0.0-beta.1 → 7.0.0-beta.2

package/lib/esm/CliCore.js

@@ -1,16 +1,13 @@
 import "@tsed/logger-std";
 import { join, resolve } from "node:path";
-import { Type } from "@tsed/core";
-import { inject, injectable, InjectorService } from "@tsed/di";
+import { constant, inject, injector } from "@tsed/di";
 import { $asyncEmit } from "@tsed/hooks";
 import chalk from "chalk";
 import { Command } from "commander";
 import semver from "semver";
 import updateNotifier from "update-notifier";
 import { CliError } from "./domains/CliError.js";
-import { CliPackageJson } from "./services/CliPackageJson.js";
 import { CliService } from "./services/CliService.js";
-import { ProjectPackageJson } from "./services/ProjectPackageJson.js";
 import { createInjector } from "./utils/createInjector.js";
 import { loadPlugins } from "./utils/loadPlugins.js";
 import { resolveConfiguration } from "./utils/resolveConfiguration.js";
@@ -18,9 +15,8 @@ function isHelpManual(argv) {
     return argv.includes("-h") || argv.includes("--help");
 }
 export class CliCore {
-    constructor() {
-        this.injector = inject(InjectorService);
-        this.cliService = inject(CliService);
+    constructor(settings) {
+        createInjector(settings);
     }
     static checkPrecondition(settings) {
         const { pkg } = settings;
@@ -48,51 +44,30 @@ export class CliCore {
         }
         return this;
     }
-    static async create(settings, module = CliCore) {
-        settings = resolveConfiguration(settings);
-        const injector = this.createInjector(settings);
-        settings.plugins && (await loadPlugins());
-        await this.loadInjector(injector, module);
-        await $asyncEmit("$onReady");
-        return inject(CliCore);
-    }
-    static async bootstrap(settings, module = CliCore) {
+    static async bootstrap(settings) {
         if (settings.checkPrecondition) {
             this.checkPrecondition(settings);
         }
         if (settings.updateNotifier) {
             await this.updateNotifier(settings.pkg);
         }
-        const cli = await this.create(settings, module);
-        return cli.bootstrap();
-    }
-    static async loadInjector(injector, module = CliCore) {
-        await $asyncEmit("$beforeInit");
-        injector.addProvider(CliCore, {
-            useClass: module
-        });
-        await injector.load();
-        await injector.invoke(module);
-        await $asyncEmit("$afterInit");
-        injector.settings.set("loaded", true);
-    }
-    static async updateNotifier(pkg) {
-        updateNotifier({ pkg, updateCheckInterval: 0 }).notify();
-        return this;
-    }
-    static createInjector(settings) {
+        settings = resolveConfiguration(settings);
         const argv = settings.argv || process.argv;
-        return createInjector({
+        return new CliCore({
             ...settings,
             name: settings.name || "tsed",
             argv,
             project: {
-                rootDir: this.getProjectRoot(argv),
+                // rootDir: this.getProjectRoot(argv),
                 srcDir: "src",
                 scriptsDir: "scripts",
                 ...(settings.project || {})
             }
-        });
+        }).bootstrap();
+    }
+    static async updateNotifier(pkg) {
+        updateNotifier({ pkg, updateCheckInterval: 0 }).notify();
+        return this;
     }
     static getProjectRoot(argv) {
         if (!isHelpManual(argv)) {
@@ -103,7 +78,14 @@ export class CliCore {
     }
     async bootstrap() {
         try {
-            await this.cliService.parseArgs(this.injector.settings.get("argv"));
+            const cliService = inject(CliService);
+            constant("plugins") && (await loadPlugins());
+            await $asyncEmit("$beforeInit");
+            await injector().load();
+            await $asyncEmit("$afterInit");
+            injector().settings.set("loaded", true);
+            await $asyncEmit("$onReady");
+            await cliService.parseArgs(constant("argv"));
         }
         catch (er) {
             throw new CliError({ origin: er, cli: this });
@@ -111,4 +93,3 @@ export class CliCore {
         return this;
     }
 }
-injectable(CliCore).imports([CliPackageJson, ProjectPackageJson, CliService]);

package/lib/esm/services/ProjectPackageJson.js

@@ -45,12 +45,21 @@ export class ProjectPackageJson {
     get path() {
         return join(this.dir, "package.json");
     }
+    /**
+     * @deprecated
+     */
     get dir() {
-        return String(constant("project.rootDir"));
+        return this.cwd;
     }
+    /**
+     * @deprecated
+     * @param dir
+     */
     set dir(dir) {
-        configuration().set("project.rootDir", dir);
-        this.read();
+        this.setCWD(dir);
+    }
+    get cwd() {
+        return String(constant("project.rootDir"));
     }
     get name() {
         return this.raw.name;
@@ -83,6 +92,10 @@ export class ProjectPackageJson {
     get preferences() {
         return this.raw[constant("name")];
     }
+    setCWD(dir) {
+        configuration().set("project.rootDir", dir);
+        this.read();
+    }
     fillWithPreferences(ctx) {
         return {
             ...ctx,
@@ -222,7 +235,7 @@ export class ProjectPackageJson {
     refresh() {
         this.reinstall = false;
         this.rewrite = false;
-        const cwd = constant("project.rootDir");
+        const cwd = this.cwd;
         const pkgPath = join(String(cwd), "package.json");
         const pkg = this.fs.readJsonSync(pkgPath, { encoding: "utf8" });
         pkg.scripts = {

package/lib/esm/utils/createInjector.js

@@ -14,7 +14,7 @@ export function createInjector(settings = {}) {
     inj.settings.set({
         ...settings,
         project: {
-            root: process.cwd(),
+            // root: process.cwd(),
             srcDir: "src",
             ...(settings.project || {})
         }

package/lib/types/CliCore.d.ts

@@ -1,18 +1,11 @@
 import "@tsed/logger-std";
-import { Type } from "@tsed/core";
-import { InjectorService } from "@tsed/di";
-import { CliService } from "./services/CliService.js";
 export declare class CliCore {
-    readonly injector: InjectorService;
-    readonly cliService: CliService;
+    protected constructor(settings: Partial<TsED.Configuration>);
     static checkPrecondition(settings: any): void;
     static checkPackage(pkg: any): void;
     static checkNodeVersion(wanted: string, id: string): typeof CliCore;
-    static create<Cli extends CliCore = CliCore>(settings: Partial<TsED.Configuration>, module?: Type): Promise<Cli>;
-    static bootstrap(settings: Partial<TsED.Configuration>, module?: Type): Promise<CliCore>;
-    static loadInjector(injector: InjectorService, module?: Type): Promise<void>;
+    static bootstrap(settings: Partial<TsED.Configuration>): Promise<CliCore>;
     static updateNotifier(pkg: any): Promise<typeof CliCore>;
-    protected static createInjector(settings: Partial<TsED.Configuration>): InjectorService;
     protected static getProjectRoot(argv: string[]): string;
     bootstrap(): Promise<this>;
 }

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

@@ -9,8 +9,16 @@ export declare class ProjectPackageJson {
     private raw;
     constructor();
     get path(): string;
+    /**
+     * @deprecated
+     */
     get dir(): string;
+    /**
+     * @deprecated
+     * @param dir
+     */
     set dir(dir: string);
+    get cwd(): string;
     get name(): string;
     set name(name: string);
     get version(): string;
@@ -28,6 +36,7 @@ export declare class ProjectPackageJson {
         [key: string]: string;
     };
     get preferences(): ProjectPreferences;
+    setCWD(dir: string): void;
     fillWithPreferences<T extends {}>(ctx: T): T & {
         packageManager: import("../interfaces/ProjectPreferences.js").PackageManager;
         runtime: any;

package/lib/types/utils/resolveConfiguration.d.ts

@@ -1 +1 @@
-export declare function resolveConfiguration(settings: any): any;
+export declare function resolveConfiguration(settings: Partial<TsED.Configuration>): Partial<TsED.Configuration>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0-beta.2",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -65,7 +65,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "7.0.0-beta.1",
+    "@tsed/typescript": "7.0.0-beta.2",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",

package/readme.md

@@ -216,7 +216,7 @@ website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]
 
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2023 Romain Lenzotti
+Copyright (c) 2016 - Today Romain Lenzotti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without limitation the