@tsed/cli-core 6.0.0-alpha.9 → 6.0.0-beta.2

package/lib/esm/CliCore.js

@@ -1,7 +1,7 @@
 var CliCore_1;
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { Type } from "@tsed/core";
-import { Inject, InjectorService, Module } from "@tsed/di";
+import { inject, InjectorService, Module } from "@tsed/di";
 import chalk from "chalk";
 import { Command } from "commander";
 import { join, resolve } from "path";
@@ -19,6 +19,10 @@ function isHelpManual(argv) {
     return argv.includes("-h") || argv.includes("--help");
 }
 let CliCore = CliCore_1 = class CliCore {
+    constructor() {
+        this.injector = inject(InjectorService);
+        this.cliService = inject(CliService);
+    }
     static checkNodeVersion(wanted, id) {
         if (!semver.satisfies(process.version, wanted)) {
             console.log(chalk.red("You are using Node " +
@@ -35,7 +39,7 @@ let CliCore = CliCore_1 = class CliCore {
     static async create(settings, module = CliCore_1) {
         settings = resolveConfiguration(settings);
         const injector = this.createInjector(settings);
-        settings.plugins && (await loadPlugins(injector));
+        settings.plugins && (await loadPlugins());
         await this.loadInjector(injector, module);
         await injector.emit("$onReady");
         return injector.get(CliCore_1);
@@ -89,18 +93,9 @@ let CliCore = CliCore_1 = class CliCore {
         return this;
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], CliCore.prototype, "injector", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliService)
-], CliCore.prototype, "cliService", void 0);
 CliCore = CliCore_1 = __decorate([
     Module({
         imports: [CliPackageJson, ProjectPackageJson, CliService, CliConfiguration]
     })
 ], CliCore);
 export { CliCore };
-//# sourceMappingURL=CliCore.js.map

package/lib/esm/decorators/command.js

@@ -4,4 +4,3 @@ import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
 export function Command(options) {
     return useDecorators(Injectable({ type: "command" }), StoreSet(CommandStoreKeys.COMMAND, options));
 }
-//# sourceMappingURL=command.js.map

package/lib/esm/decorators/index.js

@@ -3,4 +3,3 @@ export * from "./onAdd.js";
 export * from "./onExec.js";
 export * from "./onPostInstall.js";
 export * from "./onPrompt.js";
-//# sourceMappingURL=index.js.map

package/lib/esm/decorators/on.js

@@ -6,4 +6,3 @@ export function On(hookName, name) {
         })(target);
     };
 }
-//# sourceMappingURL=on.js.map

package/lib/esm/decorators/onAdd.js

@@ -3,4 +3,3 @@ import { On } from "./on.js";
 export function OnAdd(cliPlugin) {
     return On(CommandStoreKeys.ADD, cliPlugin);
 }
-//# sourceMappingURL=onAdd.js.map

package/lib/esm/decorators/onExec.js

@@ -3,4 +3,3 @@ import { On } from "./on.js";
 export function OnExec(cmdName) {
     return On(CommandStoreKeys.EXEC_HOOKS, cmdName);
 }
-//# sourceMappingURL=onExec.js.map

package/lib/esm/decorators/onPostInstall.js

@@ -3,4 +3,3 @@ import { On } from "./on.js";
 export function OnPostInstall(cmdName) {
     return On(CommandStoreKeys.POST_INSTALL_HOOKS, cmdName);
 }
-//# sourceMappingURL=onPostInstall.js.map

package/lib/esm/decorators/onPrompt.js

@@ -3,4 +3,3 @@ import { On } from "./on.js";
 export function OnPrompt(cmdName) {
     return On(CommandStoreKeys.PROMPT_HOOKS, cmdName);
 }
-//# sourceMappingURL=onPrompt.js.map

package/lib/esm/domains/CliError.js

@@ -7,4 +7,3 @@ export class CliError extends Error {
         this.stack = origin.stack;
     }
 }
-//# sourceMappingURL=CliError.js.map

package/lib/esm/domains/CommandStoreKeys.js

@@ -6,4 +6,3 @@ export var CommandStoreKeys;
     CommandStoreKeys["POST_INSTALL_HOOKS"] = "$onPostInstall";
     CommandStoreKeys["PROMPT_HOOKS"] = "$onPrompt";
 })(CommandStoreKeys || (CommandStoreKeys = {}));
-//# sourceMappingURL=CommandStoreKeys.js.map

package/lib/esm/index.js

@@ -11,4 +11,3 @@ export * from "@tsed/di";
 export * from "@tsed/logger";
 export * from "@tsed/normalize-path";
 export { Inquirer };
-//# sourceMappingURL=index.js.map

package/lib/esm/interfaces/CliDefaultOptions.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=CliDefaultOptions.js.map

package/lib/esm/interfaces/CommandMetadata.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=CommandMetadata.js.map

package/lib/esm/interfaces/CommandParameters.js

@@ -1,2 +1 @@
 import { Type } from "@tsed/core";
-//# sourceMappingURL=CommandParameters.js.map

package/lib/esm/interfaces/CommandProvider.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=CommandProvider.js.map

package/lib/esm/interfaces/PackageJson.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=PackageJson.js.map

package/lib/esm/interfaces/ProjectPreferences.js

@@ -5,4 +5,3 @@ export var PackageManager;
     PackageManager["NPM"] = "npm";
     PackageManager["PNPM"] = "pnpm";
 })(PackageManager || (PackageManager = {}));
-//# sourceMappingURL=ProjectPreferences.js.map

package/lib/esm/interfaces/Tasks.js

@@ -1,2 +1 @@
 import {} from "listr2";
-//# sourceMappingURL=Tasks.js.map

package/lib/esm/interfaces/index.js

@@ -6,4 +6,3 @@ export * from "./CommandProvider.js";
 export * from "./PackageJson.js";
 export * from "./ProjectPreferences.js";
 export * from "./Tasks.js";
-//# sourceMappingURL=index.js.map

package/lib/esm/packageManagers/PackageManagersModule.js

@@ -68,17 +68,17 @@ let PackageManagersModule = class PackageManagersModule {
             {
                 title: `Installing dependencies using ${packageManager.name}`,
                 skip: () => !this.projectPackageJson.reinstall,
-                task: () => packageManager.install(options).pipe(errorPipe())
+                task: () => packageManager.install(options) // .pipe(errorPipe())
             },
             {
                 title: `Add dependencies using ${packageManager.name}`,
                 skip: () => !deps.length,
-                task: () => packageManager.add(deps, options).pipe(errorPipe())
+                task: () => packageManager.add(deps, options) //.pipe(errorPipe())
             },
             {
                 title: `Add devDependencies using ${packageManager.name}`,
                 skip: () => !devDeps.length,
-                task: () => packageManager.addDev(devDeps, options).pipe(errorPipe())
+                task: () => packageManager.addDev(devDeps, options) //.pipe(errorPipe())
             },
             {
                 title: "Refresh",
@@ -129,4 +129,3 @@ PackageManagersModule = __decorate([
     __metadata("design:paramtypes", [Array])
 ], PackageManagersModule);
 export { PackageManagersModule };
-//# sourceMappingURL=PackageManagersModule.js.map

package/lib/esm/packageManagers/index.js

@@ -3,4 +3,3 @@ export * from "./supports/BaseManager.js";
 export * from "./supports/NpmManager.js";
 export * from "./supports/PNpmManager.js";
 export * from "./supports/YarnManager.js";
-//# sourceMappingURL=index.js.map

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

@@ -20,14 +20,10 @@ export class BaseManager {
         return this.run("run", [script], options);
     }
     run(cmd, args, options) {
-        return this.cliExeca.run(this.cmd, [cmd, options.verbose && this.verboseOpt, ...args].filter(Boolean), {
-            ...options,
-            verbose: options.verbose ? "full" : undefined
-        });
+        return this.cliExeca.run(this.cmd, [cmd, options.verbose && this.verboseOpt, ...args].filter(Boolean), options);
     }
 }
 __decorate([
     Inject(CliExeca),
     __metadata("design:type", CliExeca)
 ], BaseManager.prototype, "cliExeca", void 0);
-//# sourceMappingURL=BaseManager.js.map

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

@@ -24,4 +24,3 @@ BunManager = __decorate([
     })
 ], BunManager);
 export { BunManager };
-//# sourceMappingURL=BunManager.js.map

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

@@ -24,4 +24,3 @@ NpmManager = __decorate([
     })
 ], NpmManager);
 export { NpmManager };
-//# sourceMappingURL=NpmManager.js.map

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

@@ -24,4 +24,3 @@ PNpmManager = __decorate([
     })
 ], PNpmManager);
 export { PNpmManager };
-//# sourceMappingURL=PNpmManager.js.map

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

@@ -40,4 +40,3 @@ YarnBerryManager = __decorate([
     })
 ], YarnBerryManager);
 export { YarnBerryManager };
-//# sourceMappingURL=YarnBerryManager.js.map

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

@@ -24,4 +24,3 @@ YarnManager = __decorate([
     })
 ], YarnManager);
 export { YarnManager };
-//# sourceMappingURL=YarnManager.js.map

package/lib/esm/services/CliConfiguration.js

@@ -15,4 +15,3 @@ CliConfiguration = __decorate([
     __metadata("design:paramtypes", [])
 ], CliConfiguration);
 export { CliConfiguration };
-//# sourceMappingURL=CliConfiguration.js.map

package/lib/esm/services/CliDockerComposeYaml.js

@@ -1,12 +1,17 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { setValue } from "@tsed/core";
-import { Inject, Injectable } from "@tsed/di";
+import { inject, Injectable } from "@tsed/di";
 import { snakeCase } from "change-case";
 import { join } from "path";
 import { CliFs } from "./CliFs.js";
 import { CliYaml } from "./CliYaml.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
 let CliDockerComposeYaml = class CliDockerComposeYaml {
+    constructor() {
+        this.cliYaml = inject(CliYaml);
+        this.fs = inject(CliFs);
+        this.projectPackageJson = inject(ProjectPackageJson);
+    }
     read() {
         const path = "docker-compose.yml";
         const file = !this.fs.exists(path) ? this.fs.findUpFile(this.projectPackageJson.dir, path) : path;
@@ -80,20 +85,7 @@ let CliDockerComposeYaml = class CliDockerComposeYaml {
         }
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", CliYaml)
-], CliDockerComposeYaml.prototype, "cliYaml", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliFs)
-], CliDockerComposeYaml.prototype, "fs", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], CliDockerComposeYaml.prototype, "projectPackageJson", void 0);
 CliDockerComposeYaml = __decorate([
     Injectable()
 ], CliDockerComposeYaml);
 export { CliDockerComposeYaml };
-//# sourceMappingURL=CliDockerComposeYaml.js.map

package/lib/esm/services/CliExeca.js

@@ -36,4 +36,3 @@ CliExeca = __decorate([
     Injectable()
 ], CliExeca);
 export { CliExeca };
-//# sourceMappingURL=CliExeca.js.map

package/lib/esm/services/CliFs.js

@@ -65,4 +65,3 @@ CliFs = __decorate([
     Injectable()
 ], CliFs);
 export { CliFs };
-//# sourceMappingURL=CliFs.js.map

package/lib/esm/services/CliHooks.js

@@ -1,12 +1,13 @@
-import { __decorate, __metadata } from "tslib";
-import { Inject, Injectable, InjectorService } from "@tsed/di";
+import { __decorate } from "tslib";
+import { Injectable, injector } from "@tsed/di";
 let CliHooks = class CliHooks {
     async emit(hookName, cmd, ...args) {
-        const providers = this.injector.getProviders();
+        const inj = injector();
+        const providers = inj.getProviders();
         let results = [];
         for (const provider of providers) {
             if (provider.useClass) {
-                const instance = this.injector.get(provider.token);
+                const instance = inj.get(provider.token);
                 if (provider.store.has(hookName)) {
                     const props = provider.store.get(hookName)[cmd];
                     if (props) {
@@ -20,12 +21,7 @@ let CliHooks = class CliHooks {
         return results.filter((o) => o !== undefined);
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], CliHooks.prototype, "injector", void 0);
 CliHooks = __decorate([
     Injectable()
 ], CliHooks);
 export { CliHooks };
-//# sourceMappingURL=CliHooks.js.map

package/lib/esm/services/CliHttpClient.js

@@ -1,13 +1,17 @@
 var CliHttpClient_1;
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { cleanObject } from "@tsed/core";
-import { Inject, Injectable } from "@tsed/di";
+import { inject, Injectable } from "@tsed/di";
 import axios, {} from "axios";
 import { stringify } from "querystring";
 import { URL } from "url";
 import { CliHttpLogClient } from "./CliHttpLogClient.js";
 import { CliProxyAgent } from "./CliProxyAgent.js";
 let CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClient {
+    constructor() {
+        super(...arguments);
+        this.cliProxyAgent = inject(CliProxyAgent);
+    }
     static getParamsSerializer(params) {
         return stringify(cleanObject(params));
     }
@@ -93,12 +97,7 @@ let CliHttpClient = CliHttpClient_1 = class CliHttpClient extends CliHttpLogClie
         return withHeaders ? { data, headers: result?.headers } : data;
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", CliProxyAgent)
-], CliHttpClient.prototype, "cliProxyAgent", void 0);
 CliHttpClient = CliHttpClient_1 = __decorate([
     Injectable()
 ], CliHttpClient);
 export { CliHttpClient };
-//# sourceMappingURL=CliHttpClient.js.map

package/lib/esm/services/CliHttpLogClient.js

@@ -1,12 +1,13 @@
 import { __decorate, __metadata, __param } from "tslib";
 import { getValue } from "@tsed/core";
-import { Inject, Opts } from "@tsed/di";
+import { inject, Opts } from "@tsed/di";
 import { Logger } from "@tsed/logger";
 import querystring from "querystring";
 import { logToCurl } from "../utils/logToCurl.js";
 let CliHttpLogClient = class CliHttpLogClient {
     // @ts-ignore
     constructor(options = {}) {
+        this.logger = inject(Logger);
         this.callee = options.callee || "http";
     }
     onSuccess(options) {
@@ -68,13 +69,8 @@ let CliHttpLogClient = class CliHttpLogClient {
         };
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", Logger)
-], CliHttpLogClient.prototype, "logger", void 0);
 CliHttpLogClient = __decorate([
     __param(0, Opts),
     __metadata("design:paramtypes", [Object])
 ], CliHttpLogClient);
 export { CliHttpLogClient };
-//# sourceMappingURL=CliHttpLogClient.js.map

package/lib/esm/services/CliLoadFile.js

@@ -1,5 +1,5 @@
 import { __decorate, __metadata } from "tslib";
-import { Inject, Injectable } from "@tsed/di";
+import { inject, Injectable } from "@tsed/di";
 import { default as Ajv } from "ajv";
 import { extname } from "path";
 import { CliFs } from "./CliFs.js";
@@ -8,6 +8,8 @@ let CliLoadFile = class CliLoadFile {
     // @ts-ignore
     #ajv;
     constructor() {
+        this.cliYaml = inject(CliYaml);
+        this.cliFs = inject(CliFs);
         const options = {
             verbose: false,
             coerceTypes: true,
@@ -48,17 +50,8 @@ let CliLoadFile = class CliLoadFile {
         return config;
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", CliYaml)
-], CliLoadFile.prototype, "cliYaml", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliFs)
-], CliLoadFile.prototype, "cliFs", void 0);
 CliLoadFile = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [])
 ], CliLoadFile);
 export { CliLoadFile };
-//# sourceMappingURL=CliLoadFile.js.map

package/lib/esm/services/CliPackageJson.js

@@ -1,8 +1,11 @@
-import { Configuration, Inject, registerProvider } from "@tsed/di";
+import { Configuration, Inject, inject, registerProvider } from "@tsed/di";
 import {} from "../interfaces/PackageJson.js";
 export function CliPackageJson() {
     return Inject(CliPackageJson);
 }
+export function cliPackageJson() {
+    return inject(CliPackageJson);
+}
 registerProvider({
     provide: CliPackageJson,
     deps: [Configuration],
@@ -10,4 +13,3 @@ registerProvider({
         return configuration.pkg || {};
     }
 });
-//# sourceMappingURL=CliPackageJson.js.map

package/lib/esm/services/CliPlugins.js

@@ -1,5 +1,5 @@
-import { __decorate, __metadata } from "tslib";
-import { Constant, Inject, Injectable, InjectorService } from "@tsed/di";
+import { __decorate } from "tslib";
+import { constant, inject, Injectable } from "@tsed/di";
 import chalk from "chalk";
 import { CommandStoreKeys } from "../domains/CommandStoreKeys.js";
 import { PackageManagersModule } from "../packageManagers/PackageManagersModule.js";
@@ -16,13 +16,18 @@ function mapPlugins({ package: { name, description = "", ...otherProps } }) {
     };
 }
 let CliPlugins = class CliPlugins {
+    constructor() {
+        this.name = constant("name", "");
+        this.loadPlugins = loadPlugins;
+        this.npmRegistryClient = inject(NpmRegistryClient);
+        this.cliHooks = inject(CliHooks);
+        this.packageJson = inject(ProjectPackageJson);
+        this.packageManagers = inject(PackageManagersModule);
+    }
     async searchPlugins(keyword = "", options = {}) {
         const result = await this.npmRegistryClient.search(this.getKeyword(keyword), options);
         return result.filter(({ package: { name } }) => this.isPlugin(name)).map(mapPlugins);
     }
-    loadPlugins() {
-        return loadPlugins(this.injector);
-    }
     addPluginsDependencies(ctx) {
         const plugins = Object.keys(this.packageJson.devDependencies).filter((name) => this.isPlugin(name));
         const tasks = plugins.map((plugin) => {
@@ -53,32 +58,7 @@ let CliPlugins = class CliPlugins {
         return name.startsWith(`@${this.name}/cli-plugin`) || name.includes(`${this.name}-cli-plugin`);
     }
 };
-__decorate([
-    Constant("name"),
-    __metadata("design:type", String)
-], CliPlugins.prototype, "name", void 0);
-__decorate([
-    Inject(NpmRegistryClient),
-    __metadata("design:type", NpmRegistryClient)
-], CliPlugins.prototype, "npmRegistryClient", void 0);
-__decorate([
-    Inject(InjectorService),
-    __metadata("design:type", InjectorService)
-], CliPlugins.prototype, "injector", void 0);
-__decorate([
-    Inject(CliHooks),
-    __metadata("design:type", CliHooks)
-], CliPlugins.prototype, "cliHooks", void 0);
-__decorate([
-    Inject(ProjectPackageJson),
-    __metadata("design:type", ProjectPackageJson)
-], CliPlugins.prototype, "packageJson", void 0);
-__decorate([
-    Inject(PackageManagersModule),
-    __metadata("design:type", PackageManagersModule)
-], CliPlugins.prototype, "packageManagers", void 0);
 CliPlugins = __decorate([
     Injectable()
 ], CliPlugins);
 export { CliPlugins };
-//# sourceMappingURL=CliPlugins.js.map

package/lib/esm/services/CliProxyAgent.js

@@ -1,5 +1,5 @@
-import { __decorate, __metadata } from "tslib";
-import { Configuration, Inject, Injectable, Value } from "@tsed/di";
+import { __decorate } from "tslib";
+import { Configuration, Inject, inject, Injectable, refValue } from "@tsed/di";
 import { camelCase } from "change-case";
 import tunnel from "tunnel";
 import { URL } from "url";
@@ -7,13 +7,18 @@ import { coerce } from "../utils/coerce.js";
 import { CliExeca } from "./CliExeca.js";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
 let CliProxyAgent = class CliProxyAgent {
+    constructor() {
+        this.proxySettings = refValue("proxy", {});
+        this.projectPackageJson = Inject(ProjectPackageJson);
+        this.cliExeca = inject(CliExeca);
+    }
     hasProxy() {
-        return !!this.proxySettings.url;
+        return !!this.proxySettings.value.url;
     }
     get(type) {
         if (this.hasProxy()) {
-            const { strictSsl = true } = this.proxySettings;
-            const url = new URL(this.proxySettings.url);
+            const { strictSsl = true } = this.proxySettings.value;
+            const url = new URL(this.proxySettings.value.url);
             const protocol = url.protocol.replace(":", "");
             const options = {
                 proxy: {
@@ -60,25 +65,13 @@ let CliProxyAgent = class CliProxyAgent {
         const [proxy, httpProxy, httpsProxy, strictSsl] = result.map(coerce);
         const url = httpsProxy || httpProxy || proxy;
         if (url) {
-            this.proxySettings = {
+            this.proxySettings.value = {
                 url,
                 strictSsl: coerce(strictSsl) !== false
             };
         }
     }
 };
-__decorate([
-    Value("proxy", {}),
-    __metadata("design:type", Object)
-], CliProxyAgent.prototype, "proxySettings", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], CliProxyAgent.prototype, "projectPackageJson", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliExeca)
-], CliProxyAgent.prototype, "cliExeca", void 0);
 CliProxyAgent = __decorate([
     Injectable(),
     Configuration({
@@ -89,4 +82,3 @@ CliProxyAgent = __decorate([
     })
 ], CliProxyAgent);
 export { CliProxyAgent };
-//# sourceMappingURL=CliProxyAgent.js.map

package/lib/esm/services/CliRunScript.js

@@ -1,7 +1,7 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 // @ts-ignore
 import runScript from "@npmcli/run-script";
-import { Inject, Injectable } from "@tsed/di";
+import { inject, Injectable } from "@tsed/di";
 import { ProjectPackageJson } from "./ProjectPackageJson.js";
 let CliRunScript = class CliRunScript {
     run(cmd, args, options = {}) {
@@ -9,19 +9,14 @@ let CliRunScript = class CliRunScript {
             event: "run",
             ...options,
             cmd: `${cmd} ${args.join(" ")}`,
-            path: options.cwd || this.projectPackageJson.dir,
+            path: options.cwd || inject(ProjectPackageJson).dir,
             env: options.env || {},
             stdio: options.stdio || "inherit",
             banner: false
         });
     }
 };
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], CliRunScript.prototype, "projectPackageJson", void 0);
 CliRunScript = __decorate([
     Injectable()
 ], CliRunScript);
 export { CliRunScript };
-//# sourceMappingURL=CliRunScript.js.map