From 8942ba6494ce180207c9b989eee70fffaab907c1 Mon Sep 17 00:00:00 2001 From: Lenny Kean Date: Mon, 15 Feb 2021 15:11:25 -0600 Subject: [PATCH] fix(cli): add install command name --- cli/global/services/mvf-manager.service.ts | 18 +++++++++++++----- cli/main.ts | 20 +++++++++++++++++++- core/platform.ts | 3 +++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/cli/global/services/mvf-manager.service.ts b/cli/global/services/mvf-manager.service.ts index bd2a742..f8ba6f5 100644 --- a/cli/global/services/mvf-manager.service.ts +++ b/cli/global/services/mvf-manager.service.ts @@ -24,7 +24,9 @@ export class MvfManagerService { * @param requestedVersion The requested version in the format of #.#.# (no v prefix) */ async update(requestedVersion: string | null) { - const installUrl = await this.getInstallUrlForRequestedVersion(requestedVersion); + const installUrl = await this.getInstallUrlForRequestedVersion( + requestedVersion, + ); await this.runInstall( installUrl, @@ -81,9 +83,11 @@ export class MvfManagerService { }; } - private async getInstallUrlForRequestedVersion(requestedVersion: string | null) { + private async getInstallUrlForRequestedVersion( + requestedVersion: string | null, + ) { let installUrl = "https://deno.land/x/momentum/cli/main.ts"; - + const versionInfo = await this.getVersionInfoFromDenoLand(); const version = versionInfo.latest; @@ -156,7 +160,9 @@ export class MvfManagerService { "--unstable", "-A", "-f", - `-c`, + "-n", + "mvf", + "-c", tsConfigAbsolutePath, cliMainTsUrl, ]); @@ -164,7 +170,9 @@ export class MvfManagerService { if (!results.status.success) { console.error(`Error installing: ${results.stderror}`); } else { - console.log("Successfully installed mvf! Run `mvf --version` to validate."); + console.log( + "Successfully installed mvf! Run `mvf --version` to validate.", + ); } } diff --git a/cli/main.ts b/cli/main.ts index 81b5152..a988c46 100644 --- a/cli/main.ts +++ b/cli/main.ts @@ -1,8 +1,26 @@ +import { LoggingFilter, LogLevel } from "../core/mod.ts"; +import { Injectable } from "../di/mod.ts"; import { CliModule } from "./cli/cli.module.ts"; import { CliService } from "./cli/cli.service.ts"; import { platformMomentum } from "./deps.ts"; -const platform = await platformMomentum().bootstrapModule(CliModule); +@Injectable() +class InternalLoggingFilter implements LoggingFilter { + filterLog( + _logTime: Date, + _level: LogLevel, + _data: unknown[], + _error?: unknown, + namespace?: string, + loggerName?: string, + ): boolean { + return namespace !== "Momentum" && loggerName != "Internal"; + } +} + +const platform = await platformMomentum() + .registerGlobalLoggingFilter(InternalLoggingFilter) + .bootstrapModule(CliModule); const program = await platform.resolve(CliService); diff --git a/core/platform.ts b/core/platform.ts index 05ed7fa..ddb81e7 100644 --- a/core/platform.ts +++ b/core/platform.ts @@ -138,6 +138,7 @@ export abstract class Platform { } else { this.#container.registerValue(LOGGING_PROVIDER, loggingProvider); } + return this; } /** @@ -151,6 +152,7 @@ export abstract class Platform { } else { this.#container.registerValue(LOGGING_FILTER, loggingFilter); } + return this; } /** @@ -164,6 +166,7 @@ export abstract class Platform { } else { this.#container.registerValue(LOGGING_FORMATTER, loggingFormatter); } + return this; } async preBootstrap(): Promise {}