@sap-ux/fiori-app-sub-generator 0.6.10 → 0.6.11

package/generators/fiori-app-generator/fioriAppGenerator.js

@@ -108,6 +108,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
             const isFioriFreestyleTemplate = this.state.floorplan === types_1.FloorplanFF.FF_SIMPLE;
             if ((0, utils_1.hasStep)(this.fioriSteps, types_1.STEP_DATASOURCE_AND_SERVICE)) {
                 const cachedService = (0, utils_1.getFromCache)(this.appWizard, 'service', FioriAppGenerator.logger);
+                (0, utils_1.restoreServiceProviderLoggers)(FioriAppGenerator.logger, cachedService?.connectedSystem?.serviceProvider);
                 const options = {
                     capService: cachedService?.capService ?? this.state.service?.capService,
                     requiredOdataVersion: (0, utils_1.getRequiredOdataVersion)(this.state.floorplan),
@@ -138,6 +139,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                         FioriAppGenerator.logger?.error((0, utils_1.t)('error.fatalError'));
                     }
                 }
+                (0, utils_1.restoreServiceProviderLoggers)(FioriAppGenerator.logger, serviceAnswers?.connectedSystem?.serviceProvider);
                 /** END: Back button temp fix */
                 this.state.service = { ...this.state?.service, ...serviceAnswers };
             }

package/generators/utils/common.d.ts

@@ -1,4 +1,4 @@
-import type { Annotations } from '@sap-ux/axios-extension';
+import type { Annotations, ServiceProvider } from '@sap-ux/axios-extension';
 import type { CapRuntime, CapService } from '@sap-ux/cap-config-writer';
 import type { Logger } from '@sap-ux/logger';
 import { DatasourceType, OdataVersion, type ConnectedSystem } from '@sap-ux/odata-service-inquirer';
@@ -135,4 +135,14 @@ export declare function convertCapRuntimeToCapProjectType(capRuntime?: CapRuntim
  * @returns {Promise<CdsAnnotationsInfo | EdmxAnnotationsInfo>} A promise that resolves to either CDS annotations info or EDMX annotations info.
  */
 export declare function getAnnotations(projectName: string, annotations?: Annotations, capService?: CapService): Promise<CdsAnnotationsInfo | EdmxAnnotationsInfo | undefined>;
+/**
+ * Restore the loggers for the service provider if they are missing.
+ * This is necessary because the service provider may have been serialized and deserialized, which can lead to missing loggers which contain circular refs.
+ * Not doing this will result in the loggers being undefined when trying to access them, and calling services will throw.
+ *
+ * @param logger - The logger instance to be restored.
+ * @param serviceProvider - The service provider object that may have missing loggers.
+ * @returns The service provider with restored loggers.
+ */
+export declare function restoreServiceProviderLoggers(logger: Logger, serviceProvider?: ServiceProvider): ServiceProvider | undefined;
 //# sourceMappingURL=common.d.ts.map

package/generators/utils/common.js

@@ -14,6 +14,7 @@ exports.getLaunchText = getLaunchText;
 exports.generateLaunchConfig = generateLaunchConfig;
 exports.convertCapRuntimeToCapProjectType = convertCapRuntimeToCapProjectType;
 exports.getAnnotations = getAnnotations;
+exports.restoreServiceProviderLoggers = restoreServiceProviderLoggers;
 const annotation_converter_1 = require("@sap-ux/annotation-converter");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const cap_config_writer_1 = require("@sap-ux/cap-config-writer");
@@ -267,4 +268,25 @@ async function getAnnotations(projectName, annotations, capService) {
         };
     }
 }
+/**
+ * Restore the loggers for the service provider if they are missing.
+ * This is necessary because the service provider may have been serialized and deserialized, which can lead to missing loggers which contain circular refs.
+ * Not doing this will result in the loggers being undefined when trying to access them, and calling services will throw.
+ *
+ * @param logger - The logger instance to be restored.
+ * @param serviceProvider - The service provider object that may have missing loggers.
+ * @returns The service provider with restored loggers.
+ */
+function restoreServiceProviderLoggers(logger, serviceProvider) {
+    // Restore the loggers if missing.
+    for (const service in serviceProvider?.services) {
+        if (serviceProvider.services?.[service].log && !serviceProvider.services[service].log.info) {
+            serviceProvider.services[service].log = logger;
+        }
+    }
+    if (serviceProvider?.log && !serviceProvider.log.info) {
+        serviceProvider.log = logger;
+    }
+    return serviceProvider;
+}
 //# sourceMappingURL=common.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-app-sub-generator",
   "description": "A yeoman (sub) generator that can generate Fiori applications. Not for standalone use.",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,7 +30,7 @@
     "uuid": "11.0.5",
     "yeoman-generator": "5.10.0",
     "@sap-ux/annotation-generator": "0.3.50",
-    "@sap-ux/axios-extension": "1.22.4",
+    "@sap-ux/axios-extension": "1.22.5",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/cap-config-writer": "0.10.24",
     "@sap-ux/feature-toggle": "0.3.0",
@@ -39,7 +39,7 @@
     "@sap-ux/fiori-generator-shared": "0.13.6",
     "@sap-ux/fiori-tools-settings": "0.2.0",
     "@sap-ux/launch-config": "0.10.17",
-    "@sap-ux/odata-service-inquirer": "2.5.28",
+    "@sap-ux/odata-service-inquirer": "2.5.29",
     "@sap-ux/odata-service-writer": "0.27.15",
     "@sap-ux/project-access": "1.30.10",
     "@sap-ux/store": "1.1.2",
@@ -62,8 +62,8 @@
     "mock-spawn": "0.2.6",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.3.54",
-    "@sap-ux/flp-config-sub-generator": "0.3.8",
+    "@sap-ux/deploy-config-sub-generator": "0.3.55",
+    "@sap-ux/flp-config-sub-generator": "0.3.9",
     "@sap-ux/inquirer-common": "0.7.31",
     "@sap-ux/jest-file-matchers": "0.2.4",
     "@sap-ux/logger": "0.7.0"