@sap-ux/flp-config-sub-generator 0.0.9 → 0.0.12

package/generators/app/index.js

@@ -48,7 +48,7 @@ class default_1 extends yeoman_generator_1.default {
         this.launchFlpConfigAsSubGenerator = opts.launchFlpConfigAsSubGenerator ?? false;
         this.appRootPath = opts.data?.appRootPath ?? opts?.appRootPath ?? this.destinationRoot();
         this.options = opts;
-        logger_1.default.configureLogging(this.options.logger, this.rootGeneratorName(), this.log, this.options.logWrapper, this.options.logLevel);
+        logger_1.default.configureLogging(this.rootGeneratorName(), this.log, this.options.logWrapper, this.options.logLevel, this.options.logger, this.vscode);
         // If launched standalone, set the header, title and description
         if (!this.launchFlpConfigAsSubGenerator) {
             this.appWizard.setHeaderTitle(constants_1.generatorTitle);

package/generators/utils/i18n.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.t = exports.initI18n = void 0;
 const i18next_1 = __importDefault(require("i18next"));
 const flp_config_sub_generator_i18n_json_1 = __importDefault(require("../translations/flp-config-sub-generator.i18n.json"));
-const ui5LibGeneratorNs = 'ui5-lib-generator';
+const flpConfigGeneratorNs = 'flp-config-generator';
 /**
  * Initialize i18next with the translations for this module.
  */
 async function initI18n() {
-    await i18next_1.default.init({ lng: 'en', fallbackLng: 'en' }, () => i18next_1.default.addResourceBundle('en', ui5LibGeneratorNs, flp_config_sub_generator_i18n_json_1.default));
+    await i18next_1.default.init({ lng: 'en', fallbackLng: 'en' }, () => i18next_1.default.addResourceBundle('en', flpConfigGeneratorNs, flp_config_sub_generator_i18n_json_1.default));
 }
 exports.initI18n = initI18n;
 /**
@@ -23,7 +23,7 @@ exports.initI18n = initI18n;
  */
 function t(key, options) {
     if (!options?.ns) {
-        options = Object.assign(options ?? {}, { ns: ui5LibGeneratorNs });
+        options = Object.assign(options ?? {}, { ns: flpConfigGeneratorNs });
     }
     return i18next_1.default.t(key, options);
 }

package/generators/utils/logger.d.ts

@@ -1,4 +1,4 @@
-import { type ILogWrapper } from '@sap-ux/fiori-generator-shared';
+import { LogWrapper, type ILogWrapper } from '@sap-ux/fiori-generator-shared';
 import type { Logger } from 'yeoman-environment';
 import type { IVSCodeExtLogger, LogLevel } from '@vscode-logging/logger';
 /**
@@ -19,14 +19,15 @@ export default class FlpGenLogger {
      */
     static set logger(value: ILogWrapper);
     /**
-     * Configures the vscode logger.
+     * Configures the logger.
      *
-     * @param vscLogger - the vscode logger
      * @param loggerName - the logger name
      * @param yoLogger - the yeoman logger
-     * @param vscode - the vscode instance
+     * @param logWrapper - log wrapper instance
      * @param logLevel - the log level
+     * @param vscLogger - the vscode logger
+     * @param vscode - the vscode instance
      */
-    static configureLogging(vscLogger: IVSCodeExtLogger, loggerName: string, yoLogger: Logger, vscode?: unknown, logLevel?: LogLevel): void;
+    static configureLogging(loggerName: string, yoLogger: Logger, logWrapper?: LogWrapper, logLevel?: LogLevel, vscLogger?: IVSCodeExtLogger, vscode?: unknown): void;
 }
 //# sourceMappingURL=logger.d.ts.map

package/generators/utils/logger.js

@@ -23,17 +23,18 @@ class FlpGenLogger {
         FlpGenLogger._logger = value;
     }
     /**
-     * Configures the vscode logger.
+     * Configures the logger.
      *
-     * @param vscLogger - the vscode logger
      * @param loggerName - the logger name
      * @param yoLogger - the yeoman logger
-     * @param vscode - the vscode instance
+     * @param logWrapper - log wrapper instance
      * @param logLevel - the log level
+     * @param vscLogger - the vscode logger
+     * @param vscode - the vscode instance
      */
-    static configureLogging(vscLogger, loggerName, yoLogger, vscode, logLevel) {
-        const logWrapper = new fiori_generator_shared_1.LogWrapper(loggerName, yoLogger, logLevel, vscLogger, vscode);
-        FlpGenLogger.logger = logWrapper;
+    static configureLogging(loggerName, yoLogger, logWrapper, logLevel, vscLogger, vscode) {
+        const logger = logWrapper ?? new fiori_generator_shared_1.LogWrapper(loggerName, yoLogger, logLevel, vscLogger, vscode);
+        FlpGenLogger.logger = logger;
     }
 }
 exports.default = FlpGenLogger;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/flp-config-sub-generator",
   "description": "Generator for creating Fiori Launcpad configuration",
-  "version": "0.0.9",
+  "version": "0.0.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,7 +27,7 @@
     "@sap-ux/deploy-config-generator-shared": "0.0.9",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/fiori-generator-shared": "0.7.18",
-    "@sap-ux/flp-config-inquirer": "0.2.11",
+    "@sap-ux/flp-config-inquirer": "0.2.13",
     "@sap-ux/i18n": "0.2.0",
     "@sap-ux/inquirer-common": "0.6.3",
     "@sap-ux/project-access": "1.28.10"