@cenk1cenk2/oclif-common 2.1.2 → 2.3.0

package/dist/hooks/index.js

@@ -54,9 +54,6 @@ var LogLevels = /* @__PURE__ */ ((LogLevels2) => {
   return LogLevels2;
 })(LogLevels || {});
 
-// src/utils/logger/logger.interface.ts
-var WINSTON_INSTANCE = "WINSTON_DEFAULT_LOGGER";
-
 // src/utils/logger/logger.ts
 var import_os = require("os");
 var import_winston = __toESM(require("winston"));
@@ -134,7 +131,7 @@ var Logger = class {
       });
       return multiLineMessage.join(import_os.EOL);
     });
-    const logger = import_winston.default.loggers.add(WINSTON_INSTANCE, {
+    const logger = import_winston.default.createLogger({
       level: this.options.level,
       format: import_winston.format.combine(import_winston.format.splat(), import_winston.format.json({ space: 2 }), import_winston.format.prettyPrint(), logFormat),
       levels: Object.values(LogLevels).reduce((o, level, i) => {

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

@@ -51,9 +51,6 @@ var LogLevels = /* @__PURE__ */ ((LogLevels2) => {
   return LogLevels2;
 })(LogLevels || {});
 
-// src/utils/logger/logger.interface.ts
-var WINSTON_INSTANCE = "WINSTON_DEFAULT_LOGGER";
-
 // src/utils/logger/logger.ts
 var import_os = require("os");
 var import_winston = __toESM(require("winston"));
@@ -131,7 +128,7 @@ var Logger = class {
       });
       return multiLineMessage.join(import_os.EOL);
     });
-    const logger = import_winston.default.loggers.add(WINSTON_INSTANCE, {
+    const logger = import_winston.default.createLogger({
       level: this.options.level,
       format: import_winston.format.combine(import_winston.format.splat(), import_winston.format.json({ space: 2 }), import_winston.format.prettyPrint(), logFormat),
       levels: Object.values(LogLevels).reduce((o, level, i) => {

package/dist/index.d.ts

@@ -41,7 +41,6 @@ interface LoggerFormat {
     status: string;
 }
 declare type Winston = Logger$1 & Record<keyof typeof LogLevels, LeveledLogMethod>;
-declare const WINSTON_INSTANCE = "WINSTON_DEFAULT_LOGGER";
 
 /**
  * A general logger for the the CLI applications.
@@ -134,15 +133,6 @@ declare class GenericParser {
     stringify<T = any>(data: T): string | Promise<string>;
 }
 
-declare class YamlParser implements GenericParser {
-    static extensions: string[];
-    static instance: YamlParser;
-    private readonly logger;
-    constructor();
-    parse<T = unknown>(data: string | Buffer): T;
-    stringify<T = any>(data: T): string;
-}
-
 declare class LockerService<LockFile extends LockableData = LockableData> {
     private file;
     private parser;
@@ -154,12 +144,12 @@ declare class LockerService<LockFile extends LockableData = LockableData> {
     constructor(file: string, parser: GenericParser, root?: string);
     hasLock(): boolean;
     hasUnlock(): boolean;
-    addLock<T extends LockableData>(data: LockData<T> | LockData<T>[]): void;
-    addUnlock(data?: UnlockData | UnlockData[]): void;
+    addLock<T extends LockableData = LockableData>(...data: LockData<T>[]): void;
+    addUnlock(...data: UnlockData[]): void;
     lockAll(): Promise<void>;
     unlockAll(): Promise<void>;
-    lock<T extends LockableData = LockableData>(data: LockData<T> | LockData<T>[]): Promise<void>;
-    unlock(data?: UnlockData | UnlockData[]): Promise<void>;
+    lock<T extends LockableData = LockableData>(...data: LockData<T>[]): Promise<void>;
+    unlock(...data: UnlockData[]): Promise<void>;
     read(): Promise<LockFile>;
     write(data: LockFile): Promise<void>;
     private buildPath;
@@ -190,7 +180,8 @@ declare class ConfigService<Config extends BaseConfig = BaseConfig> {
     parser: ParserService;
     private readonly logger;
     constructor(command: Command<any, Config>);
-    read<T extends LockableData = LockableData>(paths: string): Promise<T>;
+    read<T extends LockableData = LockableData>(path: string): Promise<T>;
+    extend<T extends LockableData = LockableData>(strategy: MergeStrategy, ...paths: string[]): Promise<T>;
     write<T extends LockableData = LockableData>(path: string, data: T): Promise<void>;
 }
 
@@ -216,6 +207,15 @@ declare class FileSystemService {
     mkdirSync(directory: string): void;
 }
 
+declare class YamlParser implements GenericParser {
+    static extensions: string[];
+    static instance: YamlParser;
+    private readonly logger;
+    constructor();
+    parse<T = unknown>(data: string | Buffer): T;
+    stringify<T = any>(data: T): string;
+}
+
 interface ValidatorServiceOptions {
     validator?: ValidatorOptions;
     transformer?: ClassTransformOptions;
@@ -266,6 +266,13 @@ declare class Command<Ctx extends ListrContext = ListrContext, Config extends Ba
     catch(e: Error): Promise<void>;
     /** Gets prompt from user. */
     prompt<T = any>(options: PromptOptions): Promise<T>;
+    setDefaultsInCtx<T = Ctx, K = Record<string, any>>(options: {
+        assign?: {
+            from: K;
+            keys: (keyof K)[];
+        };
+        default?: Partial<T>[];
+    }): void;
     exit(code?: number): void;
     private greet;
 }
@@ -288,4 +295,4 @@ declare enum FileConstants {
     CONFIG_SERVICE_DEFAULTS_DIR = "defaults"
 }
 
-export { BaseConfig, ClassType, Command, CommonLockerData, ConfigCommand, ConfigCommandChoices, ConfigCommandSetup, ConfigService, FileConstants, FileSystemService, GenericParser, LockData, LockableData, LockerService, LogFieldStatus, LogLevels, Logger, LoggerFormat, LoggerOptions, MergeStrategy, PipeProcessToLoggerOptions, UnlockData, ValidatorService, ValidatorServiceOptions, WINSTON_INSTANCE, Winston, YamlParser, color, isDebug, isSilent, isVerbose, merge, pipeProcessThroughListr, pipeProcessToLogger, setup };
+export { BaseConfig, ClassType, Command, CommonLockerData, ConfigCommand, ConfigCommandChoices, ConfigCommandSetup, ConfigService, FileConstants, FileSystemService, GenericParser, LockData, LockableData, LockerService, LogFieldStatus, LogLevels, Logger, LoggerFormat, LoggerOptions, MergeStrategy, PipeProcessToLoggerOptions, UnlockData, ValidatorService, ValidatorServiceOptions, Winston, YamlParser, color, isDebug, isSilent, isVerbose, merge, pipeProcessThroughListr, pipeProcessToLogger, setup };

package/dist/index.js

@@ -141,10 +141,8 @@ var init_pipe = __esm({
 });
 
 // src/utils/logger/logger.interface.ts
-var WINSTON_INSTANCE;
 var init_logger_interface = __esm({
   "src/utils/logger/logger.interface.ts"() {
-    WINSTON_INSTANCE = "WINSTON_DEFAULT_LOGGER";
   }
 });
 
@@ -172,7 +170,6 @@ var init_logger = __esm({
     import_os = require("os");
     import_winston = __toESM(require("winston"));
     init_logger_constants();
-    init_logger_interface();
     init_color();
     init_figures();
     Logger = class {
@@ -240,7 +237,7 @@ var init_logger = __esm({
           });
           return multiLineMessage.join(import_os.EOL);
         });
-        const logger = import_winston.default.loggers.add(WINSTON_INSTANCE, {
+        const logger = import_winston.default.createLogger({
           level: this.options.level,
           format: import_winston.format.combine(import_winston.format.splat(), import_winston.format.json({ space: 2 }), import_winston.format.prettyPrint(), logFormat),
           levels: Object.values(LogLevels).reduce((o, level, i) => {
@@ -334,7 +331,6 @@ __export(logger_exports, {
   LogFieldStatus: () => LogFieldStatus,
   LogLevels: () => LogLevels,
   Logger: () => Logger,
-  WINSTON_INSTANCE: () => WINSTON_INSTANCE,
   pipeProcessThroughListr: () => pipeProcessThroughListr,
   pipeProcessToLogger: () => pipeProcessToLogger
 });
@@ -397,7 +393,6 @@ __export(src_exports, {
   Logger: () => Logger,
   MergeStrategy: () => MergeStrategy,
   ValidatorService: () => ValidatorService,
-  WINSTON_INSTANCE: () => WINSTON_INSTANCE,
   YamlParser: () => YamlParser,
   color: () => color,
   config: () => import_config.util,
@@ -614,7 +609,7 @@ var _ParserService = class {
   }
   getParser(file) {
     const ext = this.fs.extname(file);
-    const Parser = this.parsers.find((parser) => parser.extensions.includes(ext.substring(1)));
+    const Parser = this.parsers.find((parser) => parser.extensions.includes(ext.replace(/^\./, "")));
     if (!Parser) {
       throw new Error(`Parser for the extension is not configured: ${ext}`);
     }
@@ -697,10 +692,11 @@ var ConfigService = class {
     this.parser = new ParserService();
     this.logger.trace("Created a new instance.");
   }
-  async read(strategy, ...paths) {
-    if (!Array.isArray(paths)) {
-      paths = [paths];
-    }
+  async read(path) {
+    const config2 = await this.parser.read(path);
+    return config2;
+  }
+  async extend(strategy, ...paths) {
     const configs = await Promise.all(
       paths.map(async (path) => {
         try {
@@ -712,7 +708,7 @@ var ConfigService = class {
         }
       })
     );
-    return merge(strategy ?? "OVERWRITE" /* OVERWRITE */, {}, ...configs);
+    return merge(strategy, {}, ...configs);
   }
   async write(path, data) {
     return this.parser.write(path, data);
@@ -742,28 +738,25 @@ var LockerService = class {
   hasUnlock() {
     return this.toUnlock.length > 0;
   }
-  addLock(data) {
-    this.toLock = [...this.toLock, ...Array.isArray(data) ? data : [data]];
+  addLock(...data) {
+    this.toLock = [...this.toLock, ...data];
   }
-  addUnlock(data) {
-    this.toUnlock = [...this.toUnlock, ...Array.isArray(data) ? data : [data]];
+  addUnlock(...data) {
+    this.toUnlock = [...this.toUnlock, ...data];
   }
   async lockAll() {
     if (this.hasLock()) {
-      await this.lock(this.toLock);
+      await this.lock(...this.toLock);
       this.toLock = [];
     }
   }
   async unlockAll() {
     if (this.toUnlock.length > 0) {
-      await this.unlock(this.toUnlock);
+      await this.unlock(...this.toUnlock);
       this.toUnlock = [];
     }
   }
-  async lock(data) {
-    if (!Array.isArray(data)) {
-      data = [data];
-    }
+  async lock(...data) {
     let lock = await this.read() ?? {};
     await Promise.all(
       data.map(async (d) => {
@@ -782,25 +775,22 @@ var LockerService = class {
             parsed = d.data;
           }
           lock = import_object_path_immutable.default.set(lock, path, parsed);
-          this.logger.verbose(`Merge lock: "${path}"`);
+          this.logger.verbose("Merge lock: %s", path);
         } else {
           lock = import_object_path_immutable.default.set(lock, path, d.data);
-          this.logger.verbose(`Override lock: "${path}"`);
+          this.logger.verbose("Override lock: %s", path);
         }
       })
     );
     await this.write(lock);
   }
-  async unlock(data) {
-    if (data && !Array.isArray(data)) {
-      data = [data];
-    }
+  async unlock(...data) {
     let lock = await this.read();
     if (!lock) {
       this.logger.verbose("Lock file not found. Nothing to unlock.");
       return;
     }
-    if (Array.isArray(data) && data.length > 0) {
+    if (data.length > 0) {
       await Promise.all(
         data.map(async (d) => {
           if (d?.enabled === false) {
@@ -808,12 +798,12 @@ var LockerService = class {
           }
           const path = this.buildPath(d);
           lock = import_object_path_immutable.default.del(lock, path);
-          this.logger.verbose(`Unlocked: ${path}`, { custom: "locker" });
+          this.logger.verbose("Unlocked: %s", path, { custom: "locker" });
         })
       );
     } else {
       lock = import_object_path_immutable.default.del(lock, this.root);
-      this.logger.verbose(`Unlocked module: ${this.root}`, { custom: "locker" });
+      this.logger.verbose("Unlocked module: %s", this.root, { custom: "locker" });
     }
     await this.write(lock);
   }
@@ -992,6 +982,16 @@ var Command = class extends import_core.Command {
       throw e;
     }
   }
+  setDefaultsInCtx(options) {
+    options.assign?.keys.forEach((i) => {
+      if (options.assign.from[i]) {
+        this.tasks.ctx[i] = options.assign.from[i];
+      }
+    });
+    options.default?.forEach((i) => {
+      Object.assign(this.tasks.ctx, i);
+    });
+  }
   exit(code) {
     this.logger.trace("Exitting with code: %d", code);
     process.exit(code ?? 0);
@@ -1059,7 +1059,6 @@ __reExport(src_exports, lib_exports, module.exports);
   Logger,
   MergeStrategy,
   ValidatorService,
-  WINSTON_INSTANCE,
   YamlParser,
   color,
   config,

package/package.json

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