@sap-ux/fiori-app-sub-generator 0.4.22 → 0.4.23

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

@@ -182,7 +182,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                     localUI5Version
                 });
                 // Some extensions may reference this before the writing phase where normally the flpAppId is set
-                this.state.project.flpAppId = (0, utils_1.getFlpId)((0, utils_1.getAppId)(this.state.project.name, ui5AppAnswers.namespace ?? ''), this.state.floorplan === types_1.FloorplanFF.FF_SIMPLE ? types_1.defaultNavActionDisplay : types_1.defaultNavActionTile);
+                this.state.project.flpAppId = (0, fiori_generator_shared_1.getFlpId)((0, utils_1.getAppId)(this.state.project.name, ui5AppAnswers.namespace ?? ''), this.state.floorplan === types_1.FloorplanFF.FF_SIMPLE ? types_1.defaultNavActionDisplay : types_1.defaultNavActionTile);
             }
             if (this.state.project?.addDeployConfig) {
                 // Allows back nav where we have iinterdependent steps

package/generators/fiori-app-generator/subgenHelpers.d.ts

@@ -1,5 +1,5 @@
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
-import type { ILogWrapper } from '@sap-ux/fiori-generator-shared';
+import { type ILogWrapper } from '@sap-ux/fiori-generator-shared';
 import type Generator from 'yeoman-generator';
 import { type FioriAppGeneratorPromptSettings, type Service } from '../types';
 /**

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDeployGen = addDeployGen;
 exports.addFlpGen = addFlpGen;
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const path_1 = require("path");
 const types_1 = require("../types");
-const utils_1 = require("../utils");
 /**
  * Add the '@sap/fiori:fiori-deployment' generator as a subgenerator.
  *
@@ -62,7 +62,7 @@ function addFlpGen({ projectName, targetFolder, title, skipPrompt }, composeWith
             ...flpConfigOptions,
             skipPrompt: true,
             inboundConfig: {
-                semanticObject: (0, utils_1.getSemanticObject)(projectName),
+                semanticObject: (0, fiori_generator_shared_1.getSemanticObject)(projectName),
                 action: types_1.defaultNavActionDisplay,
                 title
             }

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

@@ -238,7 +238,6 @@ function getBaseAppConfig({ project, service, floorplan, entityRelatedConfig, vi
             id: appId,
             title: project.title,
             description: project.description,
-            flpAppId: (0, utils_1.getFlpId)(appId, floorplan === types_1.FloorplanFF.FF_SIMPLE ? types_1.defaultNavActionDisplay : types_1.defaultNavActionTile),
             sourceTemplate: {
                 toolsId: (0, utils_1.generateToolsId)()
             },

package/generators/utils/common.d.ts

@@ -24,15 +24,6 @@ export declare function getODataVersion(edmx: string): OdataVersion;
  * @returns AppId
  */
 export declare function getAppId(name: string, namespace?: string): string;
-/**
- * Creates a value suitable for use as a semantic object for navigation intents.
- * Removes specific characters that would break the navigation.
- *
- * @param appId
- * @returns
- */
-export declare const getSemanticObject: (appId: string) => string;
-export declare const getFlpId: (appId: string, action?: string | undefined) => string;
 /**
  * Builds the sap-client parameter for the URL.
  * If sapClient is not provided, returns an empty string.

package/generators/utils/common.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlpId = exports.getSemanticObject = void 0;
 exports.getODataVersion = getODataVersion;
 exports.getAppId = getAppId;
 exports.buildSapClientParam = buildSapClientParam;
@@ -56,22 +55,6 @@ function getAppId(name, namespace) {
     const fullyQualifiedProjectName = [namespace, name].filter((x) => !!x).join('.');
     return fullyQualifiedProjectName.replace(/[_-]/g, '');
 }
-/**
- * Creates a value suitable for use as a semantic object for navigation intents.
- * Removes specific characters that would break the navigation.
- *
- * @param appId
- * @returns
- */
-const getSemanticObject = (appId) => {
-    const semanticObject = appId.replace(/[-_.#]/g, '');
-    return semanticObject.length > 30 ? semanticObject.substring(0, 30) : semanticObject;
-};
-exports.getSemanticObject = getSemanticObject;
-const getFlpId = (appId, action) => {
-    return `${(0, exports.getSemanticObject)(appId)}${action ? '-' + action : ''}`;
-};
-exports.getFlpId = getFlpId;
 /**
  * Builds the sap-client parameter for the URL.
  * If sapClient is not provided, returns an empty string.

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.4.22",
+  "version": "0.4.23",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -32,19 +32,19 @@
     "@sap-ux/annotation-generator": "0.3.39",
     "@sap-ux/axios-extension": "1.21.4",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/cap-config-writer": "0.10.7",
+    "@sap-ux/cap-config-writer": "0.10.8",
     "@sap-ux/feature-toggle": "0.3.0",
-    "@sap-ux/fiori-elements-writer": "2.4.18",
-    "@sap-ux/fiori-freestyle-writer": "2.4.10",
-    "@sap-ux/fiori-generator-shared": "0.12.7",
+    "@sap-ux/fiori-elements-writer": "2.4.19",
+    "@sap-ux/fiori-freestyle-writer": "2.4.11",
+    "@sap-ux/fiori-generator-shared": "0.12.8",
     "@sap-ux/fiori-tools-settings": "0.2.0",
     "@sap-ux/launch-config": "0.10.4",
-    "@sap-ux/odata-service-inquirer": "2.4.21",
+    "@sap-ux/odata-service-inquirer": "2.4.22",
     "@sap-ux/odata-service-writer": "0.27.5",
     "@sap-ux/project-access": "1.30.2",
     "@sap-ux/store": "1.1.0",
     "@sap-ux/telemetry": "0.6.3",
-    "@sap-ux/ui5-application-inquirer": "0.14.12",
+    "@sap-ux/ui5-application-inquirer": "0.14.13",
     "@sap-ux/ui5-info": "0.12.0"
   },
   "devDependencies": {
@@ -62,10 +62,10 @@
     "mock-spawn": "0.2.6",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/abap-deploy-config-inquirer": "1.4.18",
-    "@sap-ux/cf-deploy-config-inquirer": "0.3.12",
-    "@sap-ux/flp-config-sub-generator": "0.2.27",
-    "@sap-ux/inquirer-common": "0.7.12",
+    "@sap-ux/abap-deploy-config-inquirer": "1.4.19",
+    "@sap-ux/cf-deploy-config-inquirer": "0.3.13",
+    "@sap-ux/flp-config-sub-generator": "0.2.28",
+    "@sap-ux/inquirer-common": "0.7.13",
     "@sap-ux/jest-file-matchers": "0.2.2",
     "@sap-ux/logger": "0.7.0"
   },