@cenk1cenk2/oclif-common 3.5.3 → 3.6.0

package/dist/hooks/index.js

@@ -108,13 +108,13 @@ var Logger = class {
     return this.parseMessage("TRACE" /* TRACE */, data, args);
   }
   run(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "RUN" /* RUN */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "run" /* RUN */ });
   }
   end(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "END" /* END */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "end" /* END */ });
   }
   stage(data, ...args) {
-    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "STAGE" /* STAGE */ });
+    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "stage" /* STAGE */ });
   }
   initiateLogger() {
     const logFormat = import_winston.format.printf(({ level, message, context, status }) => {
@@ -191,7 +191,7 @@ var Logger = class {
       case "VERBOSE" /* VERBOSE */:
         coloring = color.dim;
         if (this.options?.useIcons) {
-          icon = import_listr2.figures.squareSmallFilled;
+          icon = "\u2607";
         }
         break;
       case "DEBUG" /* DEBUG */:
@@ -205,7 +205,7 @@ var Logger = class {
         coloring = color.magenta;
         msgColoring = color.dim;
         if (this.options?.useIcons) {
-          icon = "\uF188";
+          icon = "\u26B1";
         }
         break;
     }
@@ -273,13 +273,12 @@ var CLI_FLAGS = {
 // src/lib/parser/json-parser.service.ts
 var _JsonParser = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (_JsonParser.instance) {
       return _JsonParser.instance;
-    } else {
-      _JsonParser.instance = this;
-      this.logger.trace("Created a new instance.");
     }
+    _JsonParser.instance = this;
+    this.logger = new Logger(this.constructor.name);
+    this.logger.trace("Created a new instance.");
   }
   parse(data) {
     try {
@@ -301,13 +300,12 @@ JsonParser.extensions = ["json"];
 var import_yaml = require("yaml");
 var _YamlParser = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (_YamlParser.instance) {
       return _YamlParser.instance;
-    } else {
-      _YamlParser.instance = this;
-      this.logger.trace("Created a new instance.");
     }
+    _YamlParser.instance = this;
+    this.logger = new Logger(this.constructor.name);
+    this.logger.trace("Created a new instance.");
   }
   parse(data) {
     try {

package/dist/hooks/not-found.hook.js

@@ -104,13 +104,13 @@ var Logger = class {
     return this.parseMessage("TRACE" /* TRACE */, data, args);
   }
   run(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "RUN" /* RUN */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "run" /* RUN */ });
   }
   end(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "END" /* END */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "end" /* END */ });
   }
   stage(data, ...args) {
-    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "STAGE" /* STAGE */ });
+    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "stage" /* STAGE */ });
   }
   initiateLogger() {
     const logFormat = import_winston.format.printf(({ level, message, context, status }) => {
@@ -187,7 +187,7 @@ var Logger = class {
       case "VERBOSE" /* VERBOSE */:
         coloring = color.dim;
         if (this.options?.useIcons) {
-          icon = import_listr2.figures.squareSmallFilled;
+          icon = "\u2607";
         }
         break;
       case "DEBUG" /* DEBUG */:
@@ -201,7 +201,7 @@ var Logger = class {
         coloring = color.magenta;
         msgColoring = color.dim;
         if (this.options?.useIcons) {
-          icon = "\uF188";
+          icon = "\u26B1";
         }
         break;
     }

package/dist/hooks/store.hook.js

@@ -110,13 +110,13 @@ var Logger = class {
     return this.parseMessage("TRACE" /* TRACE */, data, args);
   }
   run(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "RUN" /* RUN */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "run" /* RUN */ });
   }
   end(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "END" /* END */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "end" /* END */ });
   }
   stage(data, ...args) {
-    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "STAGE" /* STAGE */ });
+    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "stage" /* STAGE */ });
   }
   initiateLogger() {
     const logFormat = import_winston.format.printf(({ level, message, context, status }) => {
@@ -193,7 +193,7 @@ var Logger = class {
       case "VERBOSE" /* VERBOSE */:
         coloring = color.dim;
         if (this.options?.useIcons) {
-          icon = import_listr2.figures.squareSmallFilled;
+          icon = "\u2607";
         }
         break;
       case "DEBUG" /* DEBUG */:
@@ -207,7 +207,7 @@ var Logger = class {
         coloring = color.magenta;
         msgColoring = color.dim;
         if (this.options?.useIcons) {
-          icon = "\uF188";
+          icon = "\u26B1";
         }
         break;
     }
@@ -252,13 +252,12 @@ var CLI_FLAGS = {
 // src/lib/parser/json-parser.service.ts
 var _JsonParser = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (_JsonParser.instance) {
       return _JsonParser.instance;
-    } else {
-      _JsonParser.instance = this;
-      this.logger.trace("Created a new instance.");
     }
+    _JsonParser.instance = this;
+    this.logger = new Logger(this.constructor.name);
+    this.logger.trace("Created a new instance.");
   }
   parse(data) {
     try {
@@ -280,13 +279,12 @@ JsonParser.extensions = ["json"];
 var import_yaml = require("yaml");
 var _YamlParser = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (_YamlParser.instance) {
       return _YamlParser.instance;
-    } else {
-      _YamlParser.instance = this;
-      this.logger.trace("Created a new instance.");
     }
+    _YamlParser.instance = this;
+    this.logger = new Logger(this.constructor.name);
+    this.logger.trace("Created a new instance.");
   }
   parse(data) {
     try {

package/dist/index.d.ts

@@ -36,11 +36,11 @@ declare enum LogLevels {
     TRACE = "TRACE"
 }
 declare enum LogFieldStatus {
-    RUN = "RUN",
-    END = "END",
-    STAGE = "STAGE",
-    EXIT = "EXIT",
-    TERMINATE = "TERMINATE"
+    RUN = "run",
+    END = "end",
+    STAGE = "stage",
+    EXIT = "exit",
+    TERMINATE = "terminate"
 }
 
 interface LoggerOptions {
@@ -179,9 +179,9 @@ declare class LockerService<LockFile extends LockableData = LockableData> {
     private root?;
     private toLock;
     private toUnlock;
-    private readonly logger;
-    private readonly fs;
-    constructor(file: string, parser: GenericParser, root?: string);
+    private logger;
+    private fs;
+    constructor(file: string, parser: GenericParser, root?: string, context?: string);
     hasLock(): boolean;
     hasUnlock(): boolean;
     addLock<T extends LockableData = LockableData>(...data: LockData<T>[]): void;
@@ -201,8 +201,8 @@ declare class LockerService<LockFile extends LockableData = LockableData> {
 declare class ParserService {
     private static instance;
     parsers: ClassType<GenericParser>[];
-    private readonly logger;
-    private readonly fs;
+    private logger;
+    private fs;
     constructor(parsers?: ClassType<GenericParser>[]);
     getParser(file: string): GenericParser;
     setParsers(...parsers: ClassType<GenericParser>[]): void;
@@ -226,7 +226,7 @@ declare class ConfigService implements GlobalConfig {
     isSilent: boolean;
     ci: boolean;
     json: boolean;
-    private readonly logger;
+    private logger;
     constructor(oclif: Command['config'], command: Command['ctor'], config: Omit<GlobalConfig, 'isVerbose' | 'isDebug' | 'isSilent'>);
     read<T extends LockableData = LockableData>(path: string): Promise<T>;
     extend<T extends LockableData = LockableData>(paths: (string | Partial<T>)[], strategy?: MergeStrategy): Promise<T>;
@@ -238,7 +238,7 @@ declare class ConfigService implements GlobalConfig {
 
 declare class FileSystemService {
     private static instance;
-    private readonly logger;
+    private logger;
     constructor();
     exists(path: string): boolean;
     stats(path: string): fs.Stats;
@@ -261,7 +261,7 @@ declare class FileSystemService {
 declare class YamlParser implements GenericParser {
     static extensions: string[];
     private static instance;
-    private readonly logger;
+    private logger;
     constructor();
     parse<T = unknown>(data: string | Buffer): T;
     stringify<T = any>(data: T): string;
@@ -270,7 +270,7 @@ declare class YamlParser implements GenericParser {
 declare class JsonParser implements GenericParser {
     static extensions: string[];
     private static instance;
-    private readonly logger;
+    private logger;
     constructor();
     parse<T = unknown>(data: string | Buffer): T;
     stringify<T = any>(data: T): string;
@@ -283,10 +283,11 @@ interface ValidatorServiceOptions {
 
 declare class ValidatorService {
     options?: ValidatorServiceOptions;
-    private readonly logger;
+    private static instance;
+    private logger;
     constructor(options?: ValidatorServiceOptions);
-    validate<T extends Record<PropertyKey, any>>(classType: ClassType<T>, object: T): Promise<T>;
-    validateSync<T extends Record<PropertyKey, any>>(classType: ClassType<T>, object: T): T;
+    validate<T extends Record<PropertyKey, any>>(classType: ClassType<T>, object: T, options?: ValidatorServiceOptions): Promise<T>;
+    validateSync<T extends Record<PropertyKey, any>>(classType: ClassType<T>, object: T, options?: ValidatorServiceOptions): T;
     private logValidationError;
 }
 

package/dist/index.js

@@ -106,11 +106,11 @@ var LogLevels = /* @__PURE__ */ ((LogLevels2) => {
   return LogLevels2;
 })(LogLevels || {});
 var LogFieldStatus = /* @__PURE__ */ ((LogFieldStatus2) => {
-  LogFieldStatus2["RUN"] = "RUN";
-  LogFieldStatus2["END"] = "END";
-  LogFieldStatus2["STAGE"] = "STAGE";
-  LogFieldStatus2["EXIT"] = "EXIT";
-  LogFieldStatus2["TERMINATE"] = "TERMINATE";
+  LogFieldStatus2["RUN"] = "run";
+  LogFieldStatus2["END"] = "end";
+  LogFieldStatus2["STAGE"] = "stage";
+  LogFieldStatus2["EXIT"] = "exit";
+  LogFieldStatus2["TERMINATE"] = "terminate";
   return LogFieldStatus2;
 })(LogFieldStatus || {});
 
@@ -165,13 +165,13 @@ var Logger = class {
     return this.parseMessage("TRACE" /* TRACE */, data, args);
   }
   run(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "RUN" /* RUN */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "run" /* RUN */ });
   }
   end(data, ...args) {
-    return this.parseMessage("INFO" /* INFO */, data, args, { status: "END" /* END */ });
+    return this.parseMessage("INFO" /* INFO */, data, args, { status: "end" /* END */ });
   }
   stage(data, ...args) {
-    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "STAGE" /* STAGE */ });
+    return this.parseMessage("TRACE" /* TRACE */, data, args, { status: "stage" /* STAGE */ });
   }
   initiateLogger() {
     const logFormat = import_winston.format.printf(({ level, message, context, status }) => {
@@ -248,7 +248,7 @@ var Logger = class {
       case "VERBOSE" /* VERBOSE */:
         coloring = color.dim;
         if (this.options?.useIcons) {
-          icon = import_listr2.figures.squareSmallFilled;
+          icon = "\u2607";
         }
         break;
       case "DEBUG" /* DEBUG */:
@@ -262,7 +262,7 @@ var Logger = class {
         coloring = color.magenta;
         msgColoring = color.dim;
         if (this.options?.useIcons) {
-          icon = "\uF188";
+          icon = "\u26B1";
         }
         break;
     }
@@ -398,13 +398,12 @@ var import_path2 = require("path");
 // src/lib/parser/json-parser.service.ts
 var _JsonParser = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (_JsonParser.instance) {
       return _JsonParser.instance;
-    } else {
-      _JsonParser.instance = this;
-      this.logger.trace("Created a new instance.");
     }
+    _JsonParser.instance = this;
+    this.logger = new Logger(this.constructor.name);
+    this.logger.trace("Created a new instance.");
   }
   parse(data) {
     try {
@@ -426,13 +425,12 @@ JsonParser.extensions = ["json"];
 var import_yaml = require("yaml");
 var _YamlParser = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (_YamlParser.instance) {
       return _YamlParser.instance;
-    } else {
-      _YamlParser.instance = this;
-      this.logger.trace("Created a new instance.");
     }
+    _YamlParser.instance = this;
+    this.logger = new Logger(this.constructor.name);
+    this.logger.trace("Created a new instance.");
   }
   parse(data) {
     try {
@@ -455,11 +453,11 @@ var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = require("path");
 var FileSystemService = class {
   constructor() {
-    this.logger = new Logger(this.constructor.name);
     if (FileSystemService.instance) {
       return FileSystemService.instance;
     } else {
       FileSystemService.instance = this;
+      this.logger = new Logger(this.constructor.name);
       this.logger.trace("Created a new instance.");
     }
   }
@@ -568,14 +566,14 @@ __name(FileSystemService, "FileSystemService");
 var ParserService = class {
   constructor(parsers) {
     this.parsers = [YamlParser, JsonParser];
-    this.logger = new Logger(this.constructor.name);
-    this.fs = new FileSystemService();
     if (ParserService.instance) {
       return ParserService.instance;
     } else {
       if (parsers) {
         this.parsers = parsers;
       }
+      this.logger = new Logger(this.constructor.name);
+      this.fs = new FileSystemService();
       ParserService.instance = this;
       this.logger.trace("Created a new instance.");
     }
@@ -805,13 +803,13 @@ __name(ConfigService, "ConfigService");
 // src/lib/locker/locker.service.ts
 var import_object_path_immutable2 = __toESM(require("object-path-immutable"));
 var LockerService = class {
-  constructor(file, parser, root) {
+  constructor(file, parser, root, context) {
     this.file = file;
     this.parser = parser;
     this.root = root;
     this.toLock = [];
     this.toUnlock = [];
-    this.logger = new Logger(this.constructor.name);
+    this.logger = new Logger(context ?? this.constructor.name);
     this.fs = new FileSystemService();
   }
   hasLock() {
@@ -861,10 +859,10 @@ var LockerService = class {
             parsed = d.data;
           }
           lock = import_object_path_immutable2.default.set(lock, path, parsed);
-          this.logger.verbose("Merge lock: %s", path);
+          this.logger.verbose("Merge lock: %s -> %o", path, parsed);
         } else {
           lock = import_object_path_immutable2.default.set(lock, path, d.data);
-          this.logger.verbose("Override lock: %s", path);
+          this.logger.verbose("Override lock: %s -> %o", path, d.data);
         }
       })
     );
@@ -884,12 +882,12 @@ var LockerService = class {
           }
           const path = this.buildPath(d);
           lock = import_object_path_immutable2.default.del(lock, path);
-          this.logger.verbose("Unlocked: %s", path, { custom: "locker" });
+          this.logger.verbose("Unlocked: %s", path);
         })
       );
     } else {
       lock = import_object_path_immutable2.default.del(lock, this.root);
-      this.logger.verbose("Unlocked module: %s", this.root, { custom: "locker" });
+      this.logger.verbose("Unlocked module: %s", this.root);
     }
     await this.write(lock);
   }
@@ -952,7 +950,9 @@ var import_class_validator = require("class-validator");
 var ValidatorService = class {
   constructor(options) {
     this.options = options;
-    this.logger = new Logger(this.constructor.name);
+    if (ValidatorService.instance) {
+      return ValidatorService.instance;
+    }
     this.options = {
       validator: {
         skipMissingProperties: true,
@@ -963,10 +963,13 @@ var ValidatorService = class {
       transformer: { enableImplicitConversion: true },
       ...options ?? {}
     };
+    this.logger = new Logger(this.constructor.name);
+    ValidatorService.instance = this;
+    this.logger.trace("Created a new instance.");
   }
-  async validate(classType, object) {
-    const classObject = (0, import_class_transformer.plainToClass)(classType, object, this.options.transformer);
-    const errors = await (0, import_class_validator.validate)(classObject, this.options.validator);
+  async validate(classType, object, options) {
+    const classObject = (0, import_class_transformer.plainToClass)(classType, object, { ...this.options.transformer, ...options.transformer ?? {} });
+    const errors = await (0, import_class_validator.validate)(classObject, { ...this.options.validator, ...options.validator ?? {} });
     if (errors.length) {
       errors.forEach((error) => {
         this.logValidationError(error);
@@ -975,9 +978,9 @@ var ValidatorService = class {
     }
     return classObject;
   }
-  validateSync(classType, object) {
-    const classObject = (0, import_class_transformer.plainToClass)(classType, object, this.options.transformer);
-    const errors = (0, import_class_validator.validateSync)(classObject, this.options.validator);
+  validateSync(classType, object, options) {
+    const classObject = (0, import_class_transformer.plainToClass)(classType, object, { ...this.options.transformer, ...options.transformer ?? {} });
+    const errors = (0, import_class_validator.validateSync)(classObject, { ...this.options.validator, ...options.validator ?? {} });
     if (errors.length) {
       errors.forEach((error) => {
         this.logValidationError(error);
@@ -1031,7 +1034,6 @@ __name(setup, "setup");
 var Command = class extends import_core3.Command {
   constructor() {
     super(...arguments);
-    this.store = new StoreService();
     this.flags = {};
     this.args = {};
   }
@@ -1051,6 +1053,7 @@ var Command = class extends import_core3.Command {
     });
     const context = this.cs.command.id ? this.cs.command.id : this.cs.command.name;
     this.logger = new Logger(context, { level: this.cs.logLevel });
+    this.store = new StoreService();
     this.greet();
     if (err) {
       throw err;
@@ -1079,7 +1082,7 @@ var Command = class extends import_core3.Command {
       });
     }
     process.on("SIGINT", () => {
-      this.logger.fatal("Caught terminate signal.", { status: "TERMINATE" /* TERMINATE */ });
+      this.logger.fatal("Caught terminate signal.", { status: "terminate" /* TERMINATE */ });
       process.exit(1);
     });
     this.logger.stage("Running shouldRunBefore.");
@@ -1109,7 +1112,7 @@ var Command = class extends import_core3.Command {
     return;
   }
   exit(code) {
-    this.logger.trace("Code -> %d", code, { status: "EXIT" /* EXIT */ });
+    this.logger.trace("Code -> %d", code, { status: "exit" /* EXIT */ });
     process.exit(code ?? 0);
   }
   runTasks() {
@@ -1159,7 +1162,7 @@ var ConfigCommand = class extends Command {
     this.logger.stage("User selection for configuration.");
     const response = await this.select();
     this.logger.stage("Will run selection: %s", response);
-    return this.choices[response]();
+    return this.choices[response].bind(this)();
   }
   setup() {
     throw new Error("The command should be setup first!");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "author": {