@cenk1cenk2/oclif-common 3.9.5 → 3.9.6

package/dist/hooks/index.js

@@ -70,18 +70,20 @@ var CLI_FLAGS = {
     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())],
+    options: [...Object.values(LogLevels).map((level) => level.toLowerCase())],
     helpGroup: "CLI" /* CLI */,
     parse: async (input) => input?.toUpperCase()
   }),
   ci: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "CI",
     description: "Instruct whether this is running the CI/CD configuration.",
     helpGroup: "CLI" /* CLI */
   }),
   json: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "JSON",
     description: "Put the CLI to respond in JSON.",
     helpGroup: "CLI" /* CLI */
@@ -402,16 +404,14 @@ var ConfigService = class {
     this.oclif = oclif;
     this.command = command;
     if (ConfigService.instance) {
-      if (Object.entries(config).some(([key, value]) => value !== ConfigService.instance[key])) {
-        ConfigService.instance.recalculate(config);
-      }
       return ConfigService.instance;
     }
     this.root = this.oclif.root;
     this.defaults = (0, import_path2.join)(this.oclif.root, "config" /* CONFIG_SERVICE_DEFAULTS_DIR */);
     this.logger = new Logger(this.constructor.name, { level: config.logLevel });
+    Object.assign(this, config);
+    this.recalculate();
     this.parser = new ParserService();
-    this.recalculate(config);
     ConfigService.instance = this;
     this.logger.trace("Created a new instance.");
   }
@@ -524,13 +524,10 @@ var ConfigService = class {
   async write(path, data) {
     return this.parser.write(path, data);
   }
-  recalculate(config) {
-    this.ci = config.ci;
-    this.json = config.json;
-    this.logLevel = config.logLevel;
-    this.isVerbose = isVerbose(config.logLevel);
-    this.isDebug = isDebug(config.logLevel);
-    this.isSilent = isSilent(config.logLevel);
+  recalculate() {
+    this.isVerbose = isVerbose(this.logLevel);
+    this.isDebug = isDebug(this.logLevel);
+    this.isSilent = isSilent(this.logLevel);
   }
 };
 __name(ConfigService, "ConfigService");
@@ -570,19 +567,20 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    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,
-      ...options,
-      level
-    };
     if (Logger.instance) {
       this.logger = Logger.instance;
     } else if (context === ConfigService.name) {
+      const level = Object.values(LogLevels).includes(options?.level) ? options.level : "INFO" /* 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!");
     }
   }
   log(level, data, ...args) {

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

@@ -66,18 +66,20 @@ var CLI_FLAGS = {
     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())],
+    options: [...Object.values(LogLevels).map((level) => level.toLowerCase())],
     helpGroup: "CLI" /* CLI */,
     parse: async (input) => input?.toUpperCase()
   }),
   ci: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "CI",
     description: "Instruct whether this is running the CI/CD configuration.",
     helpGroup: "CLI" /* CLI */
   }),
   json: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "JSON",
     description: "Put the CLI to respond in JSON.",
     helpGroup: "CLI" /* CLI */
@@ -398,16 +400,14 @@ var ConfigService = class {
     this.oclif = oclif;
     this.command = command;
     if (ConfigService.instance) {
-      if (Object.entries(config).some(([key, value]) => value !== ConfigService.instance[key])) {
-        ConfigService.instance.recalculate(config);
-      }
       return ConfigService.instance;
     }
     this.root = this.oclif.root;
     this.defaults = (0, import_path2.join)(this.oclif.root, "config" /* CONFIG_SERVICE_DEFAULTS_DIR */);
     this.logger = new Logger(this.constructor.name, { level: config.logLevel });
+    Object.assign(this, config);
+    this.recalculate();
     this.parser = new ParserService();
-    this.recalculate(config);
     ConfigService.instance = this;
     this.logger.trace("Created a new instance.");
   }
@@ -520,13 +520,10 @@ var ConfigService = class {
   async write(path, data) {
     return this.parser.write(path, data);
   }
-  recalculate(config) {
-    this.ci = config.ci;
-    this.json = config.json;
-    this.logLevel = config.logLevel;
-    this.isVerbose = isVerbose(config.logLevel);
-    this.isDebug = isDebug(config.logLevel);
-    this.isSilent = isSilent(config.logLevel);
+  recalculate() {
+    this.isVerbose = isVerbose(this.logLevel);
+    this.isDebug = isDebug(this.logLevel);
+    this.isSilent = isSilent(this.logLevel);
   }
 };
 __name(ConfigService, "ConfigService");
@@ -543,19 +540,20 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    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,
-      ...options,
-      level
-    };
     if (Logger.instance) {
       this.logger = Logger.instance;
     } else if (context === ConfigService.name) {
+      const level = Object.values(LogLevels).includes(options?.level) ? options.level : "INFO" /* 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!");
     }
   }
   log(level, data, ...args) {

package/dist/hooks/store.hook.js

@@ -68,19 +68,20 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    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,
-      ...options,
-      level
-    };
     if (Logger.instance) {
       this.logger = Logger.instance;
     } else if (context === ConfigService.name) {
+      const level = Object.values(LogLevels).includes(options?.level) ? options.level : "INFO" /* 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!");
     }
   }
   log(level, data, ...args) {
@@ -237,18 +238,20 @@ var CLI_FLAGS = {
     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())],
+    options: [...Object.values(LogLevels).map((level) => level.toLowerCase())],
     helpGroup: "CLI" /* CLI */,
     parse: async (input) => input?.toUpperCase()
   }),
   ci: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "CI",
     description: "Instruct whether this is running the CI/CD configuration.",
     helpGroup: "CLI" /* CLI */
   }),
   json: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "JSON",
     description: "Put the CLI to respond in JSON.",
     helpGroup: "CLI" /* CLI */
@@ -565,16 +568,14 @@ var ConfigService = class {
     this.oclif = oclif;
     this.command = command;
     if (ConfigService.instance) {
-      if (Object.entries(config).some(([key, value]) => value !== ConfigService.instance[key])) {
-        ConfigService.instance.recalculate(config);
-      }
       return ConfigService.instance;
     }
     this.root = this.oclif.root;
     this.defaults = (0, import_path2.join)(this.oclif.root, "config" /* CONFIG_SERVICE_DEFAULTS_DIR */);
     this.logger = new Logger(this.constructor.name, { level: config.logLevel });
+    Object.assign(this, config);
+    this.recalculate();
     this.parser = new ParserService();
-    this.recalculate(config);
     ConfigService.instance = this;
     this.logger.trace("Created a new instance.");
   }
@@ -687,13 +688,10 @@ var ConfigService = class {
   async write(path, data) {
     return this.parser.write(path, data);
   }
-  recalculate(config) {
-    this.ci = config.ci;
-    this.json = config.json;
-    this.logLevel = config.logLevel;
-    this.isVerbose = isVerbose(config.logLevel);
-    this.isDebug = isDebug(config.logLevel);
-    this.isSilent = isSilent(config.logLevel);
+  recalculate() {
+    this.isVerbose = isVerbose(this.logLevel);
+    this.isDebug = isDebug(this.logLevel);
+    this.isSilent = isSilent(this.logLevel);
   }
 };
 __name(ConfigService, "ConfigService");

package/dist/index.d.ts

@@ -319,8 +319,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 get globalFlags(): FlagInput;
-    static set globalFlags(flags: FlagInput);
+    context: string;
     logger: Logger;
     tasks: Manager<Ctx, 'default' | 'verbose' | 'silent' | 'simple'>;
     validator: ValidatorService;

package/dist/index.js

@@ -461,16 +461,14 @@ var ConfigService = class {
     this.oclif = oclif;
     this.command = command;
     if (ConfigService.instance) {
-      if (Object.entries(config).some(([key, value]) => value !== ConfigService.instance[key])) {
-        ConfigService.instance.recalculate(config);
-      }
       return ConfigService.instance;
     }
     this.root = this.oclif.root;
     this.defaults = (0, import_path2.join)(this.oclif.root, "config" /* CONFIG_SERVICE_DEFAULTS_DIR */);
     this.logger = new Logger(this.constructor.name, { level: config.logLevel });
+    Object.assign(this, config);
+    this.recalculate();
     this.parser = new ParserService();
-    this.recalculate(config);
     ConfigService.instance = this;
     this.logger.trace("Created a new instance.");
   }
@@ -583,13 +581,10 @@ var ConfigService = class {
   async write(path, data) {
     return this.parser.write(path, data);
   }
-  recalculate(config) {
-    this.ci = config.ci;
-    this.json = config.json;
-    this.logLevel = config.logLevel;
-    this.isVerbose = isVerbose(config.logLevel);
-    this.isDebug = isDebug(config.logLevel);
-    this.isSilent = isSilent(config.logLevel);
+  recalculate() {
+    this.isVerbose = isVerbose(this.logLevel);
+    this.isDebug = isDebug(this.logLevel);
+    this.isSilent = isSilent(this.logLevel);
   }
 };
 __name(ConfigService, "ConfigService");
@@ -843,19 +838,20 @@ var Logger = class {
   constructor(context, options) {
     this.context = context;
     this.options = options;
-    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,
-      ...options,
-      level
-    };
     if (Logger.instance) {
       this.logger = Logger.instance;
     } else if (context === ConfigService.name) {
+      const level = Object.values(LogLevels).includes(options?.level) ? options.level : "INFO" /* 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!");
     }
   }
   log(level, data, ...args) {
@@ -1099,18 +1095,20 @@ var CLI_FLAGS = {
     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())],
+    options: [...Object.values(LogLevels).map((level) => level.toLowerCase())],
     helpGroup: "CLI" /* CLI */,
     parse: async (input) => input?.toUpperCase()
   }),
   ci: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "CI",
     description: "Instruct whether this is running the CI/CD configuration.",
     helpGroup: "CLI" /* CLI */
   }),
   json: import_core.Flags.boolean({
     default: false,
+    hidden: true,
     env: "JSON",
     description: "Put the CLI to respond in JSON.",
     helpGroup: "CLI" /* CLI */
@@ -1124,13 +1122,6 @@ var Command = class extends import_core3.Command {
     this.flags = {};
     this.args = {};
   }
-  static get globalFlags() {
-    return { ...CLI_FLAGS, ...this._globalFlags };
-  }
-  static set globalFlags(flags) {
-    this._globalFlags = Object.assign({}, this.globalFlags, flags);
-    this.flags = {};
-  }
   shouldRunBefore() {
   }
   shouldRunAfter(_ctx) {
@@ -1175,6 +1166,7 @@ var Command = class extends import_core3.Command {
     this.logger.trace("Updated context with assign: %o", this.tasks.options.ctx, { status: "ctx" });
   }
   async init() {
+    this.constructor.flags = Object.assign({}, CLI_FLAGS, this.constructor.flags);
     await super.init();
     let err;
     try {
@@ -1189,7 +1181,7 @@ var Command = class extends import_core3.Command {
       ci: this.flags.ci,
       json: this.flags.json
     });
-    const context = this.cs.command.id ? this.cs.command.id : this.cs.command.name;
+    this.context = this.cs.command.id ? this.cs.command.id : this.cs.command.name;
     this.logger = new Logger(null, { level: this.cs.logLevel });
     this.store = new StoreService();
     this.greet();
@@ -1206,8 +1198,7 @@ var Command = class extends import_core3.Command {
       nonTTYRendererOptions: {
         logEmptyTitle: false,
         logTitleChange: false,
-        logger: ListrLogger,
-        options: [context]
+        logger: ListrLogger
       },
       ctx: {}
     });
@@ -1239,6 +1230,11 @@ var Command = class extends import_core3.Command {
     return { ctx };
   }
   catch(e, exit) {
+    if (!this.logger) {
+      console.error("Logger has not been initiated yet!");
+      console.error(e.message);
+      console.debug(e.stack);
+    }
     this.logger.fatal(e.message);
     this.logger.debug(e.stack, { context: "crash" });
     if (exit > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "3.9.5",
+  "version": "3.9.6",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "author": {
@@ -69,7 +69,7 @@
     "@oclif/core": "^1.20.4",
     "@types/fs-extra": "^9.0.13",
     "@types/through": "^0.0.30",
-    "@types/update-notifier": "^5",
+    "@types/update-notifier": "^6",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
     "enquirer": "^2.3.6",