@sap-ux/fiori-app-sub-generator 0.13.21 → 0.13.22

package/generators/app-headless/index.js

@@ -6,6 +6,7 @@ const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const fiori_app_generator_1 = require("../fiori-app-generator");
 const i18n_1 = require("../utils/i18n");
 const transforms_1 = require("./transforms");
+const resolve_1 = require("./resolve");
 /**
  * Generator that allows the creation of a Fiori applications without prompting based on a provided app config.
  */
@@ -22,7 +23,11 @@ class FioriAppGeneratorHeadless extends fiori_app_generator_1.FioriAppGenerator
             generatorVersion: this.rootGeneratorVersion()
         }));
         try {
-            this.state = (0, transforms_1.transformExtState)(this.options.appConfig);
+            const appConfig = this.options.appConfig;
+            if (appConfig.service?.externalServices) {
+                appConfig.service.externalServices = (0, resolve_1.resolveExternalServices)(appConfig.service.externalServices);
+            }
+            this.state = (0, transforms_1.transformExtState)(appConfig);
         }
         catch (error) {
             this.log((0, i18n_1.t)('logMessages.generatorExiting'));

package/generators/app-headless/resolve.d.ts

@@ -0,0 +1,21 @@
+import type { EntitySetData, ExternalService } from '@sap-ux/axios-extension';
+import type { ExternalServiceConfig } from '@sap-ux/fiori-generator-shared';
+/**
+ * Returns inline XML, or reads and returns the contents of the file at the given path.
+ *
+ * @param metadata The metadata XML string or the path to the metadata file.
+ */
+export declare function resolveMetadata(metadata: string): string;
+/**
+ * Returns an inline array, or reads and parses the JSON file at the given path.
+ *
+ * @param entityData The entity data array or the path to the JSON file.
+ */
+export declare function resolveEntityData(entityData: EntitySetData[] | string): EntitySetData[];
+/**
+ * Resolves metadata and entityData entries based on their content.
+ *
+ * @param services External service configurations.
+ */
+export declare function resolveExternalServices(services: ExternalServiceConfig[]): ExternalService[];
+//# sourceMappingURL=resolve.d.ts.map

package/generators/app-headless/resolve.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveMetadata = resolveMetadata;
+exports.resolveEntityData = resolveEntityData;
+exports.resolveExternalServices = resolveExternalServices;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+/**
+ * Returns inline XML, or reads and returns the contents of the file at the given path.
+ *
+ * @param metadata The metadata XML string or the path to the metadata file.
+ */
+function resolveMetadata(metadata) {
+    if (metadata.trimStart().startsWith('<')) {
+        return metadata;
+    }
+    const filePath = (0, node_path_1.isAbsolute)(metadata) ? metadata : (0, node_path_1.resolve)(process.cwd(), metadata);
+    if (!(0, node_fs_1.existsSync)(filePath)) {
+        throw new Error(`Metadata file not found: ${filePath}`);
+    }
+    try {
+        return (0, node_fs_1.readFileSync)(filePath, 'utf-8');
+    }
+    catch (error) {
+        throw new Error(`Failed to read metadata file: ${filePath}. ${error instanceof Error ? error.message : error}`);
+    }
+}
+/**
+ * Returns an inline array, or reads and parses the JSON file at the given path.
+ *
+ * @param entityData The entity data array or the path to the JSON file.
+ */
+function resolveEntityData(entityData) {
+    if (Array.isArray(entityData)) {
+        return entityData;
+    }
+    const filePath = (0, node_path_1.isAbsolute)(entityData) ? entityData : (0, node_path_1.resolve)(process.cwd(), entityData);
+    if (!(0, node_fs_1.existsSync)(filePath)) {
+        throw new Error(`Entity data file not found: ${filePath}`);
+    }
+    try {
+        return JSON.parse((0, node_fs_1.readFileSync)(filePath, 'utf-8'));
+    }
+    catch (error) {
+        throw new Error(`Failed to read or parse entity data file: ${filePath}. ${error instanceof Error ? error.message : error}`);
+    }
+}
+/**
+ * Resolves metadata and entityData entries based on their content.
+ *
+ * @param services External service configurations.
+ */
+function resolveExternalServices(services) {
+    return services.map((entry) => ({
+        ...entry,
+        metadata: resolveMetadata(entry.metadata),
+        entityData: entry.entityData ? resolveEntityData(entry.entityData) : undefined
+    }));
+}
+//# sourceMappingURL=resolve.js.map

package/generators/app-headless/transforms.js

@@ -139,7 +139,8 @@ function _setServiceDefaults(floorplan, service) {
         servicePath: service?.servicePath,
         client: service?.client,
         edmx: service?.edmx,
-        version
+        version,
+        valueListMetadata: service?.externalServices
     };
     if (service?.destination) {
         serviceDefaults.destinationName = service.destination;

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.13.21",
+  "version": "0.13.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,21 +30,21 @@
     "uuid": "11.1.0",
     "yeoman-generator": "5.10.0",
     "@sap-ux/annotation-generator": "0.4.49",
-    "@sap-ux/axios-extension": "1.25.31",
+    "@sap-ux/axios-extension": "1.25.32",
     "@sap-ux/btp-utils": "1.1.14",
-    "@sap-ux/cap-config-writer": "0.12.91",
+    "@sap-ux/cap-config-writer": "0.12.92",
     "@sap-ux/feature-toggle": "0.3.8",
-    "@sap-ux/fiori-elements-writer": "2.8.126",
-    "@sap-ux/fiori-freestyle-writer": "2.5.95",
-    "@sap-ux/fiori-generator-shared": "0.13.99",
+    "@sap-ux/fiori-elements-writer": "2.8.127",
+    "@sap-ux/fiori-freestyle-writer": "2.5.96",
+    "@sap-ux/fiori-generator-shared": "0.13.100",
     "@sap-ux/fiori-tools-settings": "0.2.3",
     "@sap-ux/launch-config": "0.10.85",
-    "@sap-ux/odata-service-inquirer": "2.20.13",
+    "@sap-ux/odata-service-inquirer": "2.20.14",
     "@sap-ux/odata-service-writer": "0.31.7",
     "@sap-ux/project-access": "1.35.20",
     "@sap-ux/store": "1.5.13",
     "@sap-ux/telemetry": "0.6.99",
-    "@sap-ux/ui5-application-inquirer": "0.17.14",
+    "@sap-ux/ui5-application-inquirer": "0.17.15",
     "@sap-ux/ui5-info": "0.13.20"
   },
   "devDependencies": {
@@ -62,9 +62,9 @@
     "mock-spawn": "0.2.6",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.145",
-    "@sap-ux/flp-config-sub-generator": "0.3.189",
-    "@sap-ux/inquirer-common": "0.11.38",
+    "@sap-ux/deploy-config-sub-generator": "0.5.146",
+    "@sap-ux/flp-config-sub-generator": "0.3.190",
+    "@sap-ux/inquirer-common": "0.11.39",
     "@sap-ux/jest-file-matchers": "0.2.11",
     "@sap-ux/logger": "0.8.5"
   },