@cenk1cenk2/oclif-common 5.0.0 → 5.0.2

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Command as Command$1, ux, Hook } from '@oclif/core';
 export { Flags, ux } from '@oclif/core';
 import { ExecaChildProcess } from 'execa';
-import { ListrTaskWrapper, ListrContext, Manager, PromptOptions } from 'listr2';
+import { ListrTaskWrapper, splat, ListrContext, Manager, PromptOptions } from 'listr2';
 import { Logger as Logger$1, LeveledLogMethod } from 'winston';
 import fs from 'fs-extra';
 export { default as fs } from 'fs-extra';
@@ -11,7 +11,6 @@ import { InferredFlags } from '@oclif/core/lib/interfaces';
 export { Flag, InferredFlags } from '@oclif/core/lib/interfaces';
 import { FlagInput } from '@oclif/core/lib/interfaces/parser';
 export { Arg, ArgInput, FlagInput } from '@oclif/core/lib/interfaces/parser';
-import * as colorette from 'colorette';
 
 type ClassType<T> = new (...args: any[]) => T;
 
@@ -69,7 +68,8 @@ type Winston = Logger$1 & Record<keyof typeof LogLevels, LeveledLogMethod>;
 declare class Logger {
     private context?;
     private options?;
-    static instance: Winston;
+    private static instance;
+    private static initiated;
     private logger;
     constructor(context?: string, options?: LoggerOptions);
     log(level: LogLevels, data: string | Buffer, ...args: any): void;
@@ -84,6 +84,7 @@ declare class Logger {
     run(data: string | Buffer, ...args: any): void;
     end(data: string | Buffer, ...args: any): void;
     stage(data: string | Buffer, ...args: any): void;
+    splat(...args: Parameters<typeof splat>): ReturnType<typeof splat>;
     private initiateLogger;
     private parseMessage;
     private logColoring;
@@ -106,8 +107,6 @@ interface ConfigIterator {
     extensions?: ConfigIterator[];
 }
 
-declare const color: colorette.Colorette;
-
 declare function isVerbose(logLevel: LogLevels): boolean;
 declare function isDebug(logLevel: LogLevels): boolean;
 declare function isSilent(logLevel: LogLevels): boolean;
@@ -360,7 +359,7 @@ declare class ConfigCommand<CommandChoices extends string = string, LockFile = a
     run(): Promise<any>;
     setup(): ConfigCommandSetup<CommandChoices, LockFile> | Promise<ConfigCommandSetup<CommandChoices, LockFile>>;
     protected table(...options: Parameters<typeof ux.table>): void;
-    protected select(): Promise<string>;
+    protected select(): Promise<CommandChoices>;
 }
 
 declare enum FileConstants {
@@ -379,4 +378,4 @@ declare const updateNotifierHook: Hook<'init'>;
 
 declare const storeHook: <T extends Record<PropertyKey, any> = Record<PropertyKey, any>>(cb: (opts: any, store: StoreService<T>) => void) => Hook<'init'>;
 
-export { CLI_FLAGS, ClassType, Command, CommonLockerData, ConfigCommand, ConfigCommandChoices, ConfigCommandSetup, ConfigIterator, ConfigService, DataStore, DeepPartial, EnvironmentVariableParser, FileConstants, FileSystemService, GenericParser, GlobalConfig, HelpGroups, InferArgs, InferFlags, JsonParser, LockData, LockableData, LockerService, LogFieldStatus, LogLevels, Logger, LoggerFormat, LoggerOptions, MergeStrategy, ParserService, PipeProcessToLoggerOptions, SetCtxAssignOptions, SetCtxDefaultsOptions, StoreService, UnlockData, ValidatorService, ValidatorServiceOptions, Winston, YamlParser, color, isDebug, isSilent, isVerbose, merge, notFoundHook, pipeProcessThroughListr, pipeProcessToLogger, setCtxAssign, setCtxDefaults, setup, storeHook, uniqueFilter, updateNotifierHook };
+export { CLI_FLAGS, ClassType, Command, CommonLockerData, ConfigCommand, ConfigCommandChoices, ConfigCommandSetup, ConfigIterator, ConfigService, DataStore, DeepPartial, EnvironmentVariableParser, FileConstants, FileSystemService, GenericParser, GlobalConfig, HelpGroups, InferArgs, InferFlags, JsonParser, LockData, LockableData, LockerService, LogFieldStatus, LogLevels, Logger, LoggerFormat, LoggerOptions, MergeStrategy, ParserService, PipeProcessToLoggerOptions, SetCtxAssignOptions, SetCtxDefaultsOptions, StoreService, UnlockData, ValidatorService, ValidatorServiceOptions, Winston, YamlParser, isDebug, isSilent, isVerbose, merge, notFoundHook, pipeProcessThroughListr, pipeProcessToLogger, setCtxAssign, setCtxDefaults, setup, storeHook, uniqueFilter, updateNotifierHook };

package/dist/index.js

@@ -452,12 +452,6 @@ var ParserService = _ParserService;
 __name(ParserService, "ParserService");
 __publicField(ParserService, "instance");
 
-// src/utils/color.ts
-var _colorette = require('colorette'); var colorette = _interopRequireWildcard(_colorette);
-var color = colorette.createColors({
-  useColor: true
-});
-
 // src/utils/environment.ts
 function isVerbose(logLevel) {
   return logLevel === LogLevels.VERBOSE;
@@ -968,21 +962,20 @@ var _Logger = class {
     __publicField(this, "logger");
     this.context = context;
     this.options = options;
-    if (_Logger.instance) {
+    if (_Logger.instance && _Logger.initiated === ConfigService.name) {
       this.logger = _Logger.instance;
-    } else if (context === ConfigService.name) {
-      const level = Object.values(LogLevels).includes(_optionalChain([options, 'optionalAccess', _22 => _22.level])) ? options.level : LogLevels.INFO;
-      this.options = {
-        useIcons: true,
-        ...options,
-        level
-      };
-      this.logger = this.initiateLogger();
-      this.trace("Logger singleton initiated from context: %s", context);
-      _Logger.instance = this.logger;
-    } else {
-      throw new Error("Logger can only be initiated inside the config service context!");
+      return this;
     }
+    const level = Object.values(LogLevels).includes(_optionalChain([options, 'optionalAccess', _22 => _22.level])) ? options.level : LogLevels.INFO;
+    this.options = {
+      useIcons: true,
+      ...options,
+      level
+    };
+    this.logger = this.initiateLogger();
+    this.trace("Logger singleton initiated from context: %s", context);
+    _Logger.initiated = context;
+    _Logger.instance = this.logger;
   }
   log(level, data, ...args) {
     return this.parseMessage(level, data, args);
@@ -1027,32 +1020,38 @@ var _Logger = class {
       status: LogFieldStatus.STAGE
     });
   }
+  splat(...args) {
+    const message = args.shift();
+    if (typeof message === "undefined") {
+      return "";
+    }
+    if (args.length === 0) {
+      return message;
+    }
+    return _listr2.splat.call(void 0, message, args);
+  }
   initiateLogger() {
     const logFormat = _winston.format.printf(({ level, message, context, status }) => {
-      let multiLineMessage;
-      multiLineMessage = message.split(_os.EOL);
-      multiLineMessage = multiLineMessage.filter((msg) => msg.trim() !== "").filter(Boolean);
-      multiLineMessage = multiLineMessage.map((msg) => {
+      return message.split(_os.EOL).filter((msg) => !msg || msg.trim() !== "").map((msg) => {
         return this.logColoring({
           level,
           message: msg,
           context,
           status
         });
-      });
-      return multiLineMessage.join(_os.EOL);
+      }).join(_os.EOL);
     });
     const logger = _winston2.default.createLogger({
       level: this.options.level,
       format: _winston.format.combine(_winston.format.splat(), _winston.format.json({
         space: 2
       }), _winston.format.prettyPrint(), logFormat),
-      levels: Object.values(LogLevels).reduce((o, level, i) => {
-        return {
-          ...o,
-          [level]: i
-        };
-      }, {}),
+      levels: Object.fromEntries(Object.values(LogLevels).map((level, i) => {
+        return [
+          level,
+          i
+        ];
+      })),
       silent: this.options.level === LogLevels.SILENT,
       transports: [
         new _winston.transports.Console({
@@ -1091,45 +1090,45 @@ var _Logger = class {
       case LogLevels.DIRECT:
         return message;
       case LogLevels.FATAL:
-        coloring = /* @__PURE__ */ __name((input) => color.red(input), "coloring");
+        coloring = /* @__PURE__ */ __name((input) => _listr2.color.red(input), "coloring");
         if (_optionalChain([this, 'access', _23 => _23.options, 'optionalAccess', _24 => _24.useIcons])) {
           icon = _listr2.figures.checkboxOn;
         }
         break;
       case LogLevels.ERROR:
-        coloring = color.red;
+        coloring = _listr2.color.red;
         if (_optionalChain([this, 'access', _25 => _25.options, 'optionalAccess', _26 => _26.useIcons])) {
           icon = _listr2.figures.cross;
         }
         break;
       case LogLevels.WARN:
-        coloring = color.yellow;
+        coloring = _listr2.color.yellow;
         if (_optionalChain([this, 'access', _27 => _27.options, 'optionalAccess', _28 => _28.useIcons])) {
           icon = _listr2.figures.warning;
         }
         break;
       case LogLevels.INFO:
-        coloring = color.green;
+        coloring = _listr2.color.green;
         if (_optionalChain([this, 'access', _29 => _29.options, 'optionalAccess', _30 => _30.useIcons])) {
           icon = _listr2.figures.pointerSmall;
         }
         break;
       case LogLevels.VERBOSE:
-        coloring = color.dim;
+        coloring = _listr2.color.dim;
         if (_optionalChain([this, 'access', _31 => _31.options, 'optionalAccess', _32 => _32.useIcons])) {
           icon = "\u2607";
         }
         break;
       case LogLevels.DEBUG:
-        coloring = color.cyan;
-        msgColoring = color.dim;
+        coloring = _listr2.color.cyan;
+        msgColoring = _listr2.color.dim;
         if (_optionalChain([this, 'access', _33 => _33.options, 'optionalAccess', _34 => _34.useIcons])) {
           icon = "\uF188";
         }
         break;
       case LogLevels.TRACE:
-        coloring = color.magenta;
-        msgColoring = color.dim;
+        coloring = _listr2.color.magenta;
+        msgColoring = _listr2.color.dim;
         if (_optionalChain([this, 'access', _35 => _35.options, 'optionalAccess', _36 => _36.useIcons])) {
           icon = "\u26B1";
         }
@@ -1144,6 +1143,7 @@ var _Logger = class {
 var Logger = _Logger;
 __name(Logger, "Logger");
 __publicField(Logger, "instance");
+__publicField(Logger, "initiated");
 
 // src/constants/global-flags.constants.ts
 var CLI_FLAGS = {
@@ -1211,6 +1211,7 @@ var Command = class extends _core.Command {
   }
   // eslint-disable-next-line @typescript-eslint/naming-convention
   async _run() {
+    this.constructor.prototype.baseFlags = {};
     let result;
     try {
       delete process.env[this.config.scopedEnvVarKey("REDIRECTED")];
@@ -1459,5 +1460,4 @@ var storeHook = /* @__PURE__ */ __name((cb) => async (opts) => {
 
 
 
-
-exports.CLI_FLAGS = CLI_FLAGS; exports.Command = Command; exports.ConfigCommand = ConfigCommand; exports.ConfigService = ConfigService; exports.EnvironmentVariableParser = EnvironmentVariableParser; exports.FileConstants = FileConstants; exports.FileSystemService = FileSystemService; exports.Flags = _core.Flags; exports.HelpGroups = HelpGroups; exports.JsonParser = JsonParser; exports.LockerService = LockerService; exports.LogFieldStatus = LogFieldStatus; exports.LogLevels = LogLevels; exports.Logger = Logger; exports.MergeStrategy = MergeStrategy; exports.ParserService = ParserService; exports.StoreService = StoreService; exports.ValidatorService = ValidatorService; exports.YamlParser = YamlParser; exports.color = color; exports.fs = _fsextra2.default; exports.isDebug = isDebug; exports.isSilent = isSilent; exports.isVerbose = isVerbose; exports.merge = merge; exports.notFoundHook = notFoundHook; exports.pipeProcessThroughListr = pipeProcessThroughListr; exports.pipeProcessToLogger = pipeProcessToLogger; exports.setCtxAssign = setCtxAssign; exports.setCtxDefaults = setCtxDefaults; exports.setup = setup; exports.storeHook = storeHook; exports.uniqueFilter = uniqueFilter; exports.updateNotifierHook = updateNotifierHook; exports.ux = _core.ux;
+exports.CLI_FLAGS = CLI_FLAGS; exports.Command = Command; exports.ConfigCommand = ConfigCommand; exports.ConfigService = ConfigService; exports.EnvironmentVariableParser = EnvironmentVariableParser; exports.FileConstants = FileConstants; exports.FileSystemService = FileSystemService; exports.Flags = _core.Flags; exports.HelpGroups = HelpGroups; exports.JsonParser = JsonParser; exports.LockerService = LockerService; exports.LogFieldStatus = LogFieldStatus; exports.LogLevels = LogLevels; exports.Logger = Logger; exports.MergeStrategy = MergeStrategy; exports.ParserService = ParserService; exports.StoreService = StoreService; exports.ValidatorService = ValidatorService; exports.YamlParser = YamlParser; exports.fs = _fsextra2.default; exports.isDebug = isDebug; exports.isSilent = isSilent; exports.isVerbose = isVerbose; exports.merge = merge; exports.notFoundHook = notFoundHook; exports.pipeProcessThroughListr = pipeProcessThroughListr; exports.pipeProcessToLogger = pipeProcessToLogger; exports.setCtxAssign = setCtxAssign; exports.setCtxDefaults = setCtxDefaults; exports.setup = setup; exports.storeHook = storeHook; exports.uniqueFilter = uniqueFilter; exports.updateNotifierHook = updateNotifierHook; exports.ux = _core.ux;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "author": {
@@ -41,10 +41,10 @@
     "class-transformer": ">= 0.5.0",
     "class-validator": ">= 0.14.0",
     "enquirer": ">= 2",
-    "execa": ">= 5",
+    "execa": ">= 5 < 6",
     "fs-extra": ">= 10",
     "listr2": ">= 6",
-    "update-notifier": ">= ^5"
+    "update-notifier": ">= 5"
   },
   "peerDependenciesMeta": {
     "execa": {
@@ -55,12 +55,11 @@
     }
   },
   "dependencies": {
-    "colorette": "^2.0.19",
     "deepmerge": "^4.3.1",
     "object-path-immutable": "^4.1.2",
     "reflect-metadata": "^0.1.13",
     "through": "^2.3.8",
-    "update-notifier": "^5.1.0",
+    "update-notifier": "^6.0.2",
     "winston": "^3.8.2",
     "yaml": "^2.2.1"
   },
@@ -74,6 +73,6 @@
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
     "fs-extra": "^11.1.1",
-    "listr2": "^6.0.1"
+    "listr2": "^6.0.4"
   }
 }