@cenk1cenk2/oclif-common 3.4.3 → 3.5.1

package/dist/hooks/index.d.ts

@@ -1,4 +1,4 @@
 export { notFoundHook } from './not-found.hook.js';
 export { updateNotifierHook } from './update-notifier.hook.js';
-export { s as storeHook } from '../store.hook-06894aa2.js';
+export { s as storeHook } from '../store.hook-d02c3547.js';
 import '@oclif/core';

package/dist/hooks/index.js

@@ -66,7 +66,7 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    const parsed = process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */;
+    const parsed = (process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */).toUpperCase();
     const level = Object.values(LogLevels).includes(parsed) ? parsed : "INFO" /* INFO */;
     this.options = {
       useIcons: true,
@@ -74,7 +74,6 @@ var Logger = class {
       level
     };
     if (Logger.instance) {
-      Logger.instance.level = level;
       this.logger = Logger.instance;
     } else {
       this.logger = this.initiateLogger();
@@ -241,6 +240,33 @@ var updateNotifierHook = /* @__PURE__ */ __name(async (opts) => {
 var import_object_path_immutable = __toESM(require("object-path-immutable"));
 var import_path2 = require("path");
 
+// src/interfaces/oclif.interface.ts
+var import_core2 = require("@oclif/core");
+
+// src/constants/global-flags.constants.ts
+var CLI_FLAGS = {
+  ["log-level"]: import_core2.Flags.enum({
+    default: "INFO" /* INFO */,
+    env: "LOG_LEVEL",
+    description: "Set the log level of the application.",
+    options: [...Object.values(LogLevels), ...Object.values(LogLevels).map((level) => level.toLowerCase())],
+    helpGroup: "CLI" /* CLI */,
+    parse: async (input) => input?.toUpperCase()
+  }),
+  ci: import_core2.Flags.boolean({
+    default: false,
+    env: "CI",
+    description: "Instruct whether this is running the CI/CD configuration.",
+    helpGroup: "CLI" /* CLI */
+  }),
+  json: import_core2.Flags.boolean({
+    default: false,
+    env: "JSON",
+    description: "Put the CLI to respond in JSON.",
+    helpGroup: "CLI" /* CLI */
+  })
+};
+
 // src/lib/parser/json-parser.service.ts
 var _JsonParser = class {
   constructor() {
@@ -304,7 +330,7 @@ var import_path = require("path");
 var import_deepmerge = __toESM(require("deepmerge"));
 
 // src/utils/index.ts
-var import_core2 = require("@oclif/core");
+var import_core3 = require("@oclif/core");
 
 // src/lib/locker/locker.service.ts
 var import_object_path_immutable2 = __toESM(require("object-path-immutable"));

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

@@ -62,7 +62,7 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    const parsed = process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */;
+    const parsed = (process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */).toUpperCase();
     const level = Object.values(LogLevels).includes(parsed) ? parsed : "INFO" /* INFO */;
     this.options = {
       useIcons: true,
@@ -70,7 +70,6 @@ var Logger = class {
       level
     };
     if (Logger.instance) {
-      Logger.instance.level = level;
       this.logger = Logger.instance;
     } else {
       this.logger = this.initiateLogger();

package/dist/hooks/store.hook.d.ts

@@ -1,2 +1,2 @@
 import '@oclif/core';
-export { s as storeHook } from '../store.hook-06894aa2.js';
+export { s as storeHook } from '../store.hook-d02c3547.js';

package/dist/hooks/store.hook.js

@@ -34,6 +34,9 @@ module.exports = __toCommonJS(store_hook_exports);
 var import_object_path_immutable = __toESM(require("object-path-immutable"));
 var import_path2 = require("path");
 
+// src/interfaces/oclif.interface.ts
+var import_core = require("@oclif/core");
+
 // src/utils/logger/listr-logger.ts
 var import_listr22 = require("listr2");
 
@@ -65,7 +68,7 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    const parsed = process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */;
+    const parsed = (process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */).toUpperCase();
     const level = Object.values(LogLevels).includes(parsed) ? parsed : "INFO" /* INFO */;
     this.options = {
       useIcons: true,
@@ -73,7 +76,6 @@ var Logger = class {
       level
     };
     if (Logger.instance) {
-      Logger.instance.level = level;
       this.logger = Logger.instance;
     } else {
       this.logger = this.initiateLogger();
@@ -220,6 +222,30 @@ var import_through = __toESM(require("through"));
 // src/utils/logger/pipe/pipe-process-to-logger.ts
 var import_through2 = __toESM(require("through"));
 
+// src/constants/global-flags.constants.ts
+var CLI_FLAGS = {
+  ["log-level"]: import_core.Flags.enum({
+    default: "INFO" /* INFO */,
+    env: "LOG_LEVEL",
+    description: "Set the log level of the application.",
+    options: [...Object.values(LogLevels), ...Object.values(LogLevels).map((level) => level.toLowerCase())],
+    helpGroup: "CLI" /* CLI */,
+    parse: async (input) => input?.toUpperCase()
+  }),
+  ci: import_core.Flags.boolean({
+    default: false,
+    env: "CI",
+    description: "Instruct whether this is running the CI/CD configuration.",
+    helpGroup: "CLI" /* CLI */
+  }),
+  json: import_core.Flags.boolean({
+    default: false,
+    env: "JSON",
+    description: "Put the CLI to respond in JSON.",
+    helpGroup: "CLI" /* CLI */
+  })
+};
+
 // src/lib/parser/json-parser.service.ts
 var _JsonParser = class {
   constructor() {
@@ -283,7 +309,7 @@ var import_path = require("path");
 var import_deepmerge = __toESM(require("deepmerge"));
 
 // src/utils/index.ts
-var import_core = require("@oclif/core");
+var import_core2 = require("@oclif/core");
 
 // src/lib/locker/locker.service.ts
 var import_object_path_immutable2 = __toESM(require("object-path-immutable"));

package/dist/index.d.ts

@@ -1,16 +1,15 @@
-import * as _oclif_core_lib_interfaces from '@oclif/core/lib/interfaces';
-import { InferredFlags, ArgInput } from '@oclif/core/lib/interfaces';
-export { Arg, ArgInput, Flag, FlagInput, InferredFlags } from '@oclif/core/lib/interfaces';
 import { Command as Command$1, CliUx } from '@oclif/core';
 export { CliUx, Flags } from '@oclif/core';
 import { Logger as Logger$2, ListrTaskWrapper, 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';
-import { S as StoreService } from './store.hook-06894aa2.js';
-export { D as DataStore, S as StoreService, s as storeHook } from './store.hook-06894aa2.js';
+import { S as StoreService } from './store.hook-d02c3547.js';
+export { D as DataStore, S as StoreService, s as storeHook } from './store.hook-d02c3547.js';
 import { ClassTransformOptions } from 'class-transformer';
 import { ValidatorOptions } from 'class-validator';
+import { InferredFlags, FlagInput } from '@oclif/core/lib/interfaces';
+export { Arg, ArgInput, Flag, FlagInput, InferredFlags } from '@oclif/core/lib/interfaces';
 export { notFoundHook } from './hooks/not-found.hook.js';
 export { updateNotifierHook } from './hooks/update-notifier.hook.js';
 import { ExecaChildProcess } from 'execa';
@@ -52,7 +51,7 @@ declare type Winston = Logger$1 & Record<keyof typeof LogLevels, LeveledLogMetho
 declare class Logger {
     private context?;
     private options?;
-    static instance: Winston;
+    private static instance;
     private logger;
     constructor(context?: string, options?: LoggerOptions);
     log(level: LogLevels, data: string | Buffer, ...args: any): void;
@@ -189,7 +188,7 @@ declare class LockerService<LockFile extends LockableData = LockableData> {
 }
 
 declare class ParserService {
-    static instance: ParserService;
+    private static instance;
     parsers: ClassType<GenericParser>[];
     private readonly logger;
     private readonly fs;
@@ -206,7 +205,7 @@ declare class ParserService {
 declare class ConfigService implements GlobalConfig {
     oclif: Command['config'];
     command: Command['ctor'];
-    static instance: ConfigService;
+    private static instance;
     defaults: string;
     root: string;
     parser: ParserService;
@@ -227,7 +226,7 @@ declare class ConfigService implements GlobalConfig {
 }
 
 declare class FileSystemService {
-    static instance: FileSystemService;
+    private static instance;
     private readonly logger;
     constructor();
     exists(path: string): boolean;
@@ -250,7 +249,7 @@ declare class FileSystemService {
 
 declare class YamlParser implements GenericParser {
     static extensions: string[];
-    static instance: YamlParser;
+    private static instance;
     private readonly logger;
     constructor();
     parse<T = unknown>(data: string | Buffer): T;
@@ -259,7 +258,7 @@ declare class YamlParser implements GenericParser {
 
 declare class JsonParser implements GenericParser {
     static extensions: string[];
-    static instance: JsonParser;
+    private static instance;
     private readonly logger;
     constructor();
     parse<T = unknown>(data: string | Buffer): T;
@@ -299,11 +298,7 @@ declare type DeepPartial<T> = {
 };
 
 declare class Command<Ctx extends ListrContext = ListrContext, Flags extends Record<PropertyKey, any> = InferFlags<typeof Command>, Args extends Record<PropertyKey, any> = InferArgs<typeof Command>, Store extends Record<PropertyKey, any> = Record<PropertyKey, any>> extends Command$1 {
-    static globalFlags: {
-        "log-level": _oclif_core_lib_interfaces.OptionFlag<string>;
-        ci: _oclif_core_lib_interfaces.BooleanFlag<boolean>;
-    };
-    static args: ArgInput;
+    static globalFlags: FlagInput;
     logger: Logger;
     tasks: Manager<Ctx, 'default' | 'verbose' | 'silent' | 'simple'>;
     validator: ValidatorService;
@@ -341,6 +336,7 @@ declare class Command<Ctx extends ListrContext = ListrContext, Flags extends Rec
 }
 
 declare class ConfigCommand<CommandChoices extends string = string, LockFile = any, Ctx extends ListrContext = ListrContext, Flags extends Record<PropertyKey, any> = InferFlags<typeof ConfigCommand>, Args extends Record<PropertyKey, any> = InferArgs<typeof ConfigCommand>, Store extends Record<PropertyKey, any> = Record<PropertyKey, any>> extends Command<Ctx, Flags, Args, Store> {
+    static globalFlags: FlagInput;
     choices: ConfigCommandChoices<CommandChoices>;
     locker: LockerService<LockFile>;
     run(): Promise<void>;
@@ -353,8 +349,10 @@ declare enum FileConstants {
     CONFIG_SERVICE_DEFAULTS_DIR = "config"
 }
 
+declare const CLI_FLAGS: FlagInput;
+
 declare enum HelpGroups {
     CLI = "CLI"
 }
 
-export { ClassType, Command, CommonLockerData, ConfigCommand, ConfigCommandChoices, ConfigCommandSetup, ConfigIterator, ConfigService, DeepPartial, FileConstants, FileSystemService, GenericParser, GlobalConfig, GlobalConfigInit, HelpGroups, InferArgs, InferFlags, JsonParser, ListrLogger, LockData, LockableData, LockerService, LogFieldStatus, LogLevels, Logger, LoggerFormat, LoggerOptions, MergeStrategy, ParserService, PipeProcessToLoggerOptions, SetCtxAssignOptions, SetCtxDefaultsOptions, UnlockData, ValidatorService, ValidatorServiceOptions, Winston, YamlParser, color, isDebug, isSilent, isVerbose, merge, pipeProcessThroughListr, pipeProcessToLogger, setCtxAssign, setCtxDefaults, setup };
+export { CLI_FLAGS, ClassType, Command, CommonLockerData, ConfigCommand, ConfigCommandChoices, ConfigCommandSetup, ConfigIterator, ConfigService, DeepPartial, FileConstants, FileSystemService, GenericParser, GlobalConfig, GlobalConfigInit, HelpGroups, InferArgs, InferFlags, JsonParser, ListrLogger, LockData, LockableData, LockerService, LogFieldStatus, LogLevels, Logger, LoggerFormat, LoggerOptions, MergeStrategy, ParserService, PipeProcessToLoggerOptions, SetCtxAssignOptions, SetCtxDefaultsOptions, UnlockData, ValidatorService, ValidatorServiceOptions, Winston, YamlParser, color, isDebug, isSilent, isVerbose, merge, pipeProcessThroughListr, pipeProcessToLogger, setCtxAssign, setCtxDefaults, setup };

package/dist/index.js

@@ -26,13 +26,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  CliUx: () => import_core.CliUx,
+  CLI_FLAGS: () => CLI_FLAGS,
+  CliUx: () => import_core2.CliUx,
   Command: () => Command,
   ConfigCommand: () => ConfigCommand,
   ConfigService: () => ConfigService,
   FileConstants: () => FileConstants,
   FileSystemService: () => FileSystemService,
-  Flags: () => import_core4.Flags,
+  Flags: () => import_core.Flags,
   HelpGroups: () => HelpGroups,
   JsonParser: () => JsonParser,
   ListrLogger: () => ListrLogger,
@@ -63,7 +64,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/commands/base.command.ts
-var import_core2 = require("@oclif/core");
+var import_core3 = require("@oclif/core");
 var import_listr23 = require("listr2");
 var import_readline = require("readline");
 var import_reflect_metadata = require("reflect-metadata");
@@ -80,9 +81,8 @@ var HelpGroups = /* @__PURE__ */ ((HelpGroups2) => {
   return HelpGroups2;
 })(HelpGroups || {});
 
-// src/lib/config/config.service.ts
-var import_object_path_immutable = __toESM(require("object-path-immutable"));
-var import_path2 = require("path");
+// src/interfaces/oclif.interface.ts
+var import_core = require("@oclif/core");
 
 // src/utils/logger/listr-logger.ts
 var import_listr22 = require("listr2");
@@ -120,7 +120,7 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    const parsed = process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */;
+    const parsed = (process.env.LOG_LEVEL ?? options?.level ?? "INFO" /* INFO */).toUpperCase();
     const level = Object.values(LogLevels).includes(parsed) ? parsed : "INFO" /* INFO */;
     this.options = {
       useIcons: true,
@@ -128,7 +128,6 @@ var Logger = class {
       level
     };
     if (Logger.instance) {
-      Logger.instance.level = level;
       this.logger = Logger.instance;
     } else {
       this.logger = this.initiateLogger();
@@ -297,7 +296,7 @@ var ListrLogger = class extends import_listr22.Logger {
     this.logger.warn(message, { status: "retry" });
   }
   rollback(message) {
-    this.logger.warn(message, { status: "rollback" });
+    this.logger.error(message, { status: "rollback" });
   }
 };
 __name(ListrLogger, "ListrLogger");
@@ -362,6 +361,34 @@ function pipeProcessToLogger(logger, instance, options) {
 }
 __name(pipeProcessToLogger, "pipeProcessToLogger");
 
+// src/constants/global-flags.constants.ts
+var CLI_FLAGS = {
+  ["log-level"]: import_core.Flags.enum({
+    default: "INFO" /* INFO */,
+    env: "LOG_LEVEL",
+    description: "Set the log level of the application.",
+    options: [...Object.values(LogLevels), ...Object.values(LogLevels).map((level) => level.toLowerCase())],
+    helpGroup: "CLI" /* CLI */,
+    parse: async (input) => input?.toUpperCase()
+  }),
+  ci: import_core.Flags.boolean({
+    default: false,
+    env: "CI",
+    description: "Instruct whether this is running the CI/CD configuration.",
+    helpGroup: "CLI" /* CLI */
+  }),
+  json: import_core.Flags.boolean({
+    default: false,
+    env: "JSON",
+    description: "Put the CLI to respond in JSON.",
+    helpGroup: "CLI" /* CLI */
+  })
+};
+
+// src/lib/config/config.service.ts
+var import_object_path_immutable = __toESM(require("object-path-immutable"));
+var import_path2 = require("path");
+
 // src/lib/parser/json-parser.service.ts
 var _JsonParser = class {
   constructor() {
@@ -613,7 +640,9 @@ __name(merge, "merge");
 // src/utils/defaults.ts
 function setCtxDefaults(ctx, ...defaults) {
   defaults?.forEach((i) => {
-    Object.assign(ctx, i);
+    if (typeof i === "object" && !Array.isArray(i)) {
+      Object.assign(ctx, i);
+    }
   });
 }
 __name(setCtxDefaults, "setCtxDefaults");
@@ -629,7 +658,7 @@ function setCtxAssign(ctx, ...assigns) {
 __name(setCtxAssign, "setCtxAssign");
 
 // src/utils/index.ts
-var import_core = require("@oclif/core");
+var import_core2 = require("@oclif/core");
 
 // src/lib/config/config.service.ts
 var ConfigService = class {
@@ -993,7 +1022,7 @@ function setup() {
 __name(setup, "setup");
 
 // src/commands/base.command.ts
-var Command = class extends import_core2.Command {
+var Command = class extends import_core3.Command {
   constructor() {
     super(...arguments);
     this.store = new StoreService();
@@ -1003,7 +1032,7 @@ var Command = class extends import_core2.Command {
   async init() {
     let err;
     try {
-      const { flags, args } = await this.parse(this.ctor);
+      const { flags, args } = await this.parse();
       this.flags = flags;
       this.args = args;
     } catch (e) {
@@ -1020,6 +1049,7 @@ var Command = class extends import_core2.Command {
     if (err) {
       throw err;
     }
+    this.logger.trace("init", { status: "stage" });
     this.parser = new ParserService();
     this.fs = new FileSystemService();
     this.validator = new ValidatorService();
@@ -1046,6 +1076,7 @@ var Command = class extends import_core2.Command {
       this.logger.fatal("Caught terminate signal.", { context: "exit" });
       process.exit(1);
     });
+    this.logger.trace("should run before", { status: "stage" });
     await this.shouldRunBefore();
   }
   shouldRunBefore() {
@@ -1056,7 +1087,9 @@ var Command = class extends import_core2.Command {
     return;
   }
   async finally() {
+    this.logger.trace("tasks", { status: "stage" });
     const ctx = await this.runTasks();
+    this.logger.trace("should run after", { status: "stage" });
     await this.shouldRunAfter(ctx);
     return { ctx };
   }
@@ -1082,10 +1115,12 @@ var Command = class extends import_core2.Command {
     });
   }
   setCtxDefaults(...defaults) {
-    return setCtxDefaults(this.tasks.options.ctx, ...defaults);
+    setCtxDefaults(this.tasks.options.ctx, ...defaults);
+    this.logger.trace("updated  with defaults: %o", this.tasks.options.ctx, { status: "ctx" });
   }
   setCtxAssign(...assigns) {
-    return setCtxAssign(this.tasks.options.ctx, ...assigns);
+    setCtxAssign(this.tasks.options.ctx, ...assigns);
+    this.logger.trace("updated with assign: %o", this.tasks.options.ctx, { status: "ctx" });
   }
   greet() {
     if (this.cs.isSilent || this.cs.json) {
@@ -1099,23 +1134,7 @@ var Command = class extends import_core2.Command {
   }
 };
 __name(Command, "Command");
-Command.globalFlags = {
-  ["log-level"]: import_core2.Flags.enum({
-    default: "INFO" /* INFO */,
-    env: "LOG_LEVEL",
-    description: "Set the log level of the application.",
-    options: [...Object.values(LogLevels), ...Object.values(LogLevels).map((level) => level.toLowerCase())],
-    helpGroup: "CLI" /* CLI */,
-    parse: async (input) => input?.toUpperCase()
-  }),
-  ci: import_core2.Flags.boolean({
-    default: false,
-    env: "CI",
-    description: "Instruct whether this is running the CI/CD configuration.",
-    helpGroup: "CLI" /* CLI */
-  })
-};
-Command.args = [];
+Command.globalFlags = CLI_FLAGS;
 
 // src/commands/config.command.ts
 var ConfigCommand = class extends Command {
@@ -1129,7 +1148,7 @@ var ConfigCommand = class extends Command {
     throw new Error("The command should be setup first!");
   }
   table(...options) {
-    import_core.CliUx.ux.table(...options);
+    import_core2.CliUx.ux.table(...options);
   }
   async generate() {
     const response = await this.prompt({
@@ -1141,14 +1160,15 @@ var ConfigCommand = class extends Command {
   }
 };
 __name(ConfigCommand, "ConfigCommand");
+ConfigCommand.globalFlags = CLI_FLAGS;
 
 // src/hooks/not-found.hook.ts
-var import_core3 = require("@oclif/core");
+var import_core4 = require("@oclif/core");
 var notFoundHook = /* @__PURE__ */ __name(async (opts) => {
   const logger = new Logger(opts.config.name);
   logger.fatal("Command not found. Take a look at help. You can also use --[h]elp flag for subcommands.", { custom: opts.config.name });
   logger.direct("");
-  const help = new import_core3.Help(opts.config);
+  const help = new import_core4.Help(opts.config);
   await help.showHelp(["--all"]);
   process.exit(127);
 }, "notFoundHook");
@@ -1163,11 +1183,9 @@ var updateNotifierHook = /* @__PURE__ */ __name(async (opts) => {
 var storeHook = /* @__PURE__ */ __name((cb) => async (opts) => {
   cb(opts, new StoreService());
 }, "storeHook");
-
-// src/interfaces/oclif.interface.ts
-var import_core4 = require("@oclif/core");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  CLI_FLAGS,
   CliUx,
   Command,
   ConfigCommand,

package/dist/{store.hook-06894aa2.d.ts → store.hook-d02c3547.d.ts}

@@ -5,7 +5,7 @@ declare type DataStore<T extends Record<PropertyKey, any> = Record<PropertyKey,
 } & T;
 
 declare class StoreService<T extends Record<PropertyKey, any> = Record<PropertyKey, any>> {
-    static instance: StoreService;
+    private static instance;
     private store;
     constructor();
     has<K extends keyof DataStore<T>>(key: K): boolean;

package/package.json

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