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

package/lib/esm/CliCore.js

@@ -58,7 +58,7 @@ export class CliCore {
             name: settings.name || "tsed",
             argv,
             project: {
-                // rootDir: this.getProjectRoot(argv),
+                rootDir: this.getProjectRoot(argv),
                 srcDir: "src",
                 scriptsDir: "scripts",
                 ...(settings.project || {})

package/lib/esm/packageManagers/PackageManagersModule.js

@@ -1,5 +1,4 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { Inject, injectable } from "@tsed/di";
+import { Inject, inject, injectable, injectMany } from "@tsed/di";
 import { EMPTY, throwError } from "rxjs";
 import { catchError } from "rxjs/operators";
 import { ProjectPackageJson } from "../services/ProjectPackageJson.js";
@@ -18,17 +17,19 @@ function mapPackagesWithInvalidVersion(deps) {
         .filter(([, version]) => !isValidVersion(version))
         .map(toString);
 }
-let PackageManagersModule = class PackageManagersModule {
-    constructor(packageManagers) {
-        this.packageManagers = packageManagers;
-        this.packageManagers = packageManagers.filter((manager) => manager.has());
+export class PackageManagersModule {
+    constructor() {
+        this.projectPackageJson = inject(ProjectPackageJson);
+        this.packageManagers = injectMany("package:manager").filter((manager) => {
+            return manager.has();
+        });
     }
     init(options = {}) {
         const packageManager = this.get(options.packageManager);
         options.packageManager = packageManager.name;
         options = {
             ...options,
-            cwd: this.projectPackageJson.dir,
+            cwd: this.projectPackageJson.cwd,
             env: {
                 ...process.env,
                 GH_TOKEN: this.projectPackageJson.GH_TOKEN
@@ -45,7 +46,7 @@ let PackageManagersModule = class PackageManagersModule {
         const deps = mapPackagesWithInvalidVersion(this.projectPackageJson.dependencies);
         options = {
             ...options,
-            cwd: this.projectPackageJson.dir,
+            cwd: this.projectPackageJson.cwd,
             env: {
                 ...process.env,
                 GH_TOKEN: this.projectPackageJson.GH_TOKEN
@@ -101,6 +102,7 @@ let PackageManagersModule = class PackageManagersModule {
             selectedPackageManager = this.packageManagers.find((manager) => manager.name === "npm");
         }
         this.projectPackageJson.setPreference("packageManager", selectedPackageManager.name);
+        console.log("==", name, selectedPackageManager);
         return selectedPackageManager;
     }
     runScript(scriptName, { ignoreError, ...opts } = {}) {
@@ -116,14 +118,5 @@ let PackageManagersModule = class PackageManagersModule {
         });
         return this.get().runScript(scriptName, options).pipe(errorPipe());
     }
-};
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], PackageManagersModule.prototype, "projectPackageJson", void 0);
-PackageManagersModule = __decorate([
-    __param(0, Inject("package:manager")),
-    __metadata("design:paramtypes", [Array])
-], PackageManagersModule);
-export { PackageManagersModule };
+}
 injectable(PackageManagersModule).imports([YarnManager, YarnBerryManager, NpmManager, PNpmManager, BunManager]);

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

@@ -1,10 +1,10 @@
-import { __decorate, __metadata } from "tslib";
-import { Inject } from "@tsed/di";
+import { inject } from "@tsed/di";
 import { Observable } from "rxjs";
 import { CliExeca } from "../../services/CliExeca.js";
 export class BaseManager {
     constructor() {
         this.verboseOpt = "--verbose";
+        this.cliExeca = inject(CliExeca);
     }
     has() {
         try {
@@ -23,7 +23,3 @@ export class BaseManager {
         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);

package/lib/esm/services/CliHttpClient.js

@@ -41,10 +41,11 @@ export class CliHttpClient extends CliHttpLogClient {
         return this.mapResponse(result, options);
     }
     getRequestParameters(method, endpoint, options) {
+        const url = (this.host || "") + endpoint.replace(this.host || "", "");
         options = {
             method,
-            url: (this.host || "") + endpoint.replace(this.host || "", ""),
             ...options,
+            url,
             params: options.params || options.qs,
             data: options.data,
             headers: {
@@ -53,7 +54,7 @@ export class CliHttpClient extends CliHttpLogClient {
                 ...(options.headers || {})
             }
         };
-        this.configureProxy(endpoint, options);
+        this.configureProxy(url, options);
         return options;
     }
     configureProxy(endpoint, options) {

package/lib/esm/services/CliHttpLogClient.js

@@ -11,7 +11,7 @@ let CliHttpLogClient = class CliHttpLogClient {
         this.callee = options.callee || "http";
     }
     onSuccess(options) {
-        return this.logger.debug({
+        this.logger.debug({
             ...this.formatLog(options),
             status: "OK"
         });

package/lib/esm/services/CliLoadFile.js

@@ -1,21 +1,12 @@
 import { extname } from "node:path";
 import { inject, injectable } from "@tsed/di";
-import { default as Ajv } from "ajv";
+import { validate } from "../utils/validate.js";
 import { CliFs } from "./CliFs.js";
 import { CliYaml } from "./CliYaml.js";
 export class CliLoadFile {
-    // @ts-ignore
-    #ajv;
     constructor() {
         this.cliYaml = inject(CliYaml);
         this.cliFs = inject(CliFs);
-        const options = {
-            verbose: false,
-            coerceTypes: true,
-            strict: false
-        };
-        // @ts-ignore
-        this.#ajv = new Ajv(options);
     }
     /**
      * Load a configuration file from yaml, json
@@ -33,18 +24,14 @@ export class CliLoadFile {
             throw new Error("Unsupported format file");
         }
         if (schema) {
-            const validate = this.#ajv.compile(schema);
-            const isValid = validate(config);
+            const { isValid, errors, value } = validate(config, schema);
             if (!isValid) {
-                const [error] = validate.errors;
-                throw new Error([
-                    `${error.instancePath.replace(/\//gi, ".")} `,
-                    error.message,
-                    error.params?.allowedValues && `. Allowed values: ${error.params?.allowedValues}`
-                ]
+                const [error] = errors;
+                throw new Error([`${error.path.replace(/\//gi, ".")} `, error.message, error.expected && `. Allowed values: ${error.expected}`]
                     .filter(Boolean)
                     .join(""));
             }
+            return value;
         }
         return config;
     }

package/lib/esm/services/CliService.js

@@ -44,29 +44,25 @@ export class CliService {
      */
     runLifecycle(cmdName, data = {}, $ctx) {
         return runInContext($ctx, async () => {
-            await $asyncEmit("$loadPackageJson");
-            data = await this.beforePrompt(cmdName, data);
-            $ctx.set("data", data);
-            data = await this.prompt(cmdName, data);
-            await this.dispatch(cmdName, data, $ctx);
-        });
-    }
-    async dispatch(cmdName, data, $ctx) {
-        try {
             $ctx.set("dispatchCmd", cmdName);
-            $ctx.set("data", data);
-            await this.exec(cmdName, data, $ctx);
-        }
-        catch (er) {
-            await $asyncEmit("$onFinish", er);
+            await $asyncEmit("$loadPackageJson");
+            data = await this.beforePrompt(cmdName, data, $ctx);
+            data = await this.prompt(cmdName, data, $ctx);
+            try {
+                await this.exec(cmdName, data, $ctx);
+            }
+            catch (er) {
+                await $asyncEmit("$onFinish", [data, er]);
+                await destroyInjector();
+                throw er;
+            }
+            await $asyncEmit("$onFinish", [data]);
             await destroyInjector();
-            throw er;
-        }
-        await $asyncEmit("$onFinish");
-        await destroyInjector();
+        });
     }
     async exec(cmdName, data, $ctx) {
         const initialTasks = await this.getTasks(cmdName, data);
+        $ctx.set("data", data);
         if (initialTasks.length) {
             const tasks = [
                 ...initialTasks,
@@ -77,45 +73,53 @@ export class CliService {
                 },
                 ...(await this.getPostInstallTasks(cmdName, data))
             ];
-            return createTasksRunner(tasks, this.mapData(cmdName, data, $ctx));
+            data = this.mapData(cmdName, data, $ctx);
+            $ctx.set("data", data);
+            return createTasksRunner(tasks, data);
         }
     }
     /**
      * Run prompt for a given command
      * @param cmdName
      * @param data Initial data
+     * @param $ctx
      */
-    async beforePrompt(cmdName, data = {}) {
+    async beforePrompt(cmdName, data = {}, $ctx) {
         const provider = this.commands.get(cmdName);
         const instance = inject(provider.useClass);
         const verbose = data.verbose;
+        $ctx.set("data", data);
         if (instance.$beforePrompt) {
             data = await instance.$beforePrompt(JSON.parse(JSON.stringify(data)));
             data.verbose = verbose;
         }
+        $ctx.set("data", data);
         return data;
     }
     /**
      * Run prompt for a given command
      * @param cmdName
-     * @param ctx Initial data
+     * @param data
+     * @param $ctx
      */
-    async prompt(cmdName, ctx = {}) {
+    async prompt(cmdName, data = {}, $ctx) {
         const provider = this.commands.get(cmdName);
         const instance = inject(provider.useClass);
+        $ctx.set("data", data);
         if (instance.$prompt) {
             const questions = [
-                ...(await instance.$prompt(ctx)),
-                ...(await this.hooks.emit(CommandStoreKeys.PROMPT_HOOKS, cmdName, ctx))
+                ...(await instance.$prompt(data)),
+                ...(await this.hooks.emit(CommandStoreKeys.PROMPT_HOOKS, cmdName, data))
             ];
             if (questions.length) {
-                ctx = {
-                    ...ctx,
+                data = {
+                    ...data,
                     ...(await Inquirer.prompt(questions))
                 };
             }
         }
-        return ctx;
+        $ctx.set("data", data);
+        return data;
     }
     /**
      * Run lifecycle

package/lib/esm/services/ProjectPackageJson.js

@@ -59,7 +59,7 @@ export class ProjectPackageJson {
         this.setCWD(dir);
     }
     get cwd() {
-        return String(constant("project.rootDir"));
+        return String(constant("project.rootDir", ""));
     }
     get name() {
         return this.raw.name;

package/lib/esm/utils/index.js

@@ -8,3 +8,4 @@ export * from "./mapCommanderArgs.js";
 export * from "./mapCommanderOptions.js";
 export * from "./parseOption.js";
 export * from "./resolveConfiguration.js";
+export * from "./validate.js";

package/lib/esm/utils/validate.js

@@ -0,0 +1,23 @@
+import { Ajv } from "ajv";
+const ajv = new Ajv({
+    verbose: false,
+    coerceTypes: true,
+    strict: false,
+    allErrors: true
+});
+export function validate(value, schema) {
+    const validate = ajv.compile(schema.toJSON());
+    const result = validate(value);
+    if (!result) {
+        const errors = (validate.errors || []).map((e) => ({
+            path: e.instancePath || e.schemaPath,
+            message: e.message,
+            expected: (e.params && e.params.type) || undefined
+        }));
+        return {
+            isValid: false,
+            errors: errors
+        };
+    }
+    return { isValid: true, value: value };
+}

package/lib/types/packageManagers/PackageManagersModule.d.ts

@@ -5,9 +5,8 @@ export interface InstallOptions {
     [key: string]: any;
 }
 export declare class PackageManagersModule {
-    protected packageManagers: BaseManager[];
     protected projectPackageJson: ProjectPackageJson;
-    constructor(packageManagers: BaseManager[]);
+    protected packageManagers: BaseManager[];
     init(options?: InstallOptions): Promise<void>;
     install(options?: InstallOptions): ({
         title: string;

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

@@ -6,7 +6,7 @@ export declare class CliHttpLogClient {
     callee: string;
     protected logger: Logger;
     constructor(options?: Partial<BaseLogClientOptions>);
-    protected onSuccess(options: Record<string, unknown>): Logger;
+    protected onSuccess(options: Record<string, unknown>): void;
     protected onError(error: any, options: any): void;
     protected logToCurl(options: any): string;
     protected getStatusCodeFromError(error: any): any;

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

@@ -1,13 +1,11 @@
-import { type Schema } from "ajv";
+import type { JsonSchema } from "@tsed/schema";
 import { CliFs } from "./CliFs.js";
 import { CliYaml } from "./CliYaml.js";
 export declare class CliLoadFile {
-    #private;
     protected cliYaml: CliYaml;
     protected cliFs: CliFs;
-    constructor();
     /**
      * Load a configuration file from yaml, json
      */
-    loadFile<Model = any>(path: string, schema?: Schema): Promise<Model>;
+    loadFile<Model = any>(path: string, schema?: JsonSchema<Model>): Promise<Model>;
 }

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

@@ -26,20 +26,21 @@ export declare class CliService {
      * @param $ctx
      */
     runLifecycle(cmdName: string, data: CommandData | undefined, $ctx: DIContext): Promise<Promise<void>>;
-    dispatch(cmdName: string, data: CommandData, $ctx: DIContext): Promise<void>;
     exec(cmdName: string, data: any, $ctx: DIContext): Promise<any>;
     /**
      * Run prompt for a given command
      * @param cmdName
      * @param data Initial data
+     * @param $ctx
      */
-    beforePrompt(cmdName: string, data?: CommandData): Promise<CommandData>;
+    beforePrompt(cmdName: string, data: CommandData | undefined, $ctx: DIContext): Promise<CommandData>;
     /**
      * Run prompt for a given command
      * @param cmdName
-     * @param ctx Initial data
+     * @param data
+     * @param $ctx
      */
-    prompt(cmdName: string, ctx?: CommandData): Promise<CommandData>;
+    prompt(cmdName: string, data: CommandData | undefined, $ctx: DIContext): Promise<CommandData>;
     /**
      * Run lifecycle
      * @param cmdName

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

@@ -8,3 +8,4 @@ export * from "./mapCommanderArgs.js";
 export * from "./mapCommanderOptions.js";
 export * from "./parseOption.js";
 export * from "./resolveConfiguration.js";
+export * from "./validate.js";

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

@@ -0,0 +1,14 @@
+import type { JsonSchema } from "@tsed/schema";
+export declare function validate<Value>(value: unknown, schema: JsonSchema<Value>): {
+    isValid: boolean;
+    errors: {
+        path: string;
+        message: string | undefined;
+        expected: any;
+    }[];
+    value?: undefined;
+} | {
+    isValid: boolean;
+    value: Value;
+    errors?: undefined;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "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.2",
+    "@tsed/typescript": "7.0.0-beta.3",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",