resolve conflict

SAP · Oct 9, 2024 · 86566e3 · 86566e3
2 parents 2136a9c + 5580e99
commit 86566e3
Show file tree

Hide file tree

Showing 213 changed files with 4,534 additions and 690 deletions.
diff --git a/.gitignore b/.gitignore
@@ -118,6 +118,7 @@ out
 
 .nuxt
 dist
+generators
 
 # Gatsby files
 

diff --git a/examples/fe-fpm-cli/CHANGELOG.md b/examples/fe-fpm-cli/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @sap-ux/fe-fpm-cli
 
+## 0.0.34
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.31.7
+
+## 0.0.33
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.31.6
+
 ## 0.0.32
 
 ### Patch Changes

diff --git a/examples/fe-fpm-cli/package.json b/examples/fe-fpm-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/fe-fpm-cli",
-    "version": "0.0.32",
+    "version": "0.0.34",
     "description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
     "license": "Apache-2.0",
     "private": true,

diff --git a/examples/simple-generator/CHANGELOG.md b/examples/simple-generator/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @sap-ux/generator-simple-fe
 
+## 1.0.57
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/system-access@0.5.12
+-   @sap-ux/fiori-elements-writer@1.3.5
+-   @sap-ux/fiori-freestyle-writer@1.2.3
+
+## 1.0.56
+
+### Patch Changes
+
+-   @sap-ux/fiori-elements-writer@1.3.4
+-   @sap-ux/fiori-freestyle-writer@1.2.2
+
+## 1.0.55
+
+### Patch Changes
+
+-   @sap-ux/system-access@0.5.12
+-   @sap-ux/fiori-elements-writer@1.3.3
+
 ## 1.0.54
 
 ### Patch Changes

diff --git a/examples/simple-generator/package.json b/examples/simple-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/generator-simple-fe",
-    "version": "1.0.54",
+    "version": "1.0.57",
     "description": "Simple example of a yeoman generator for Fiori elements.",
     "license": "Apache-2.0",
     "private": true,

diff --git a/examples/ui-prompting-examples/CHANGELOG.md b/examples/ui-prompting-examples/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @sap-ux-private/ui-prompting-examples
 
+## 0.2.3
+
+### Patch Changes
+
+-   Updated dependencies [0b8a374]
+    -   @sap-ux/ui-prompting@0.2.3
+
+## 0.2.2
+
+### Patch Changes
+
+-   Updated dependencies [64aacf2]
+    -   @sap-ux/ui-components@1.18.6
+    -   @sap-ux/ui-prompting@0.2.2
+
+## 0.2.1
+
+### Patch Changes
+
+-   93f8a83: chore - upgrade typescript 5.6.2
+-   Updated dependencies [93f8a83]
+    -   @sap-ux/ui-components@1.18.5
+    -   @sap-ux/ui-prompting@0.2.1
+
 ## 0.2.0
 
 ### Minor Changes

diff --git a/examples/ui-prompting-examples/package.json b/examples/ui-prompting-examples/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux-private/ui-prompting-examples",
-    "version": "0.2.0",
+    "version": "0.2.3",
     "description": "This project contains UI storybook stories with exampleS with prompt ui and FPM based building blocks.",
     "license": "Apache-2.0",
     "private": true,
@@ -67,7 +67,7 @@
         "style-loader": "3.3.3",
         "ts-loader": "9.4.4",
         "ts-node": "10.9.2",
-        "typescript": "5.3.3",
+        "typescript": "5.6.2",
         "ws": "8.18.0"
     }
 }
diff --git a/nx.json b/nx.json
@@ -30,7 +30,12 @@
     "targetDefaults": {
         "build": {
             "dependsOn": ["^build"],
-            "outputs": ["{projectRoot}/dist", "{projectRoot}/lib", "{projectRoot}/storybook"]
+            "outputs": [
+                "{projectRoot}/dist",
+                "{projectRoot}/generators",
+                "{projectRoot}/lib",
+                "{projectRoot}/storybook"
+            ]
         },
         "test": {
             "inputs": ["default", "^prod", "{workspaceRoot}/jest.base.js", "{projectRoot}/jest.config.js"],

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
         "pretty-quick": "3.1.3",
         "rimraf": "5.0.5",
         "ts-jest": "29.1.2",
-        "typescript": "5.3.3",
+        "typescript": "5.6.2",
         "update-ts-references": "3.2.1"
     },
     "scripts": {

diff --git a/packages/abap-deploy-config-inquirer/CHANGELOG.md b/packages/abap-deploy-config-inquirer/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @sap-ux/abap-deploy-config-inquirer
 
+## 0.0.25
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/fiori-generator-shared@0.6.1
+-   @sap-ux/system-access@0.5.12
+
+## 0.0.24
+
+### Patch Changes
+
+-   Updated dependencies [d40af34]
+    -   @sap-ux/fiori-generator-shared@0.6.0
+
+## 0.0.23
+
+### Patch Changes
+
+-   Updated dependencies [93f8a83]
+    -   @sap-ux/store@0.9.2
+    -   @sap-ux/system-access@0.5.12
+    -   @sap-ux/ui5-config@0.25.0
+
 ## 0.0.22
 
 ### Patch Changes

diff --git a/packages/abap-deploy-config-inquirer/package.json b/packages/abap-deploy-config-inquirer/package.json
@@ -6,7 +6,7 @@
         "url": "https://github.com/SAP/open-ux-tools.git",
         "directory": "packages/abap-deploy-config-inquirer"
     },
-    "version": "0.0.22",
+    "version": "0.0.25",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "scripts": {

diff --git a/packages/abap-deploy-config-writer/CHANGELOG.md b/packages/abap-deploy-config-writer/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @sap-ux/abap-deploy-config-writer
 
+## 0.0.47
+
+### Patch Changes
+
+-   Updated dependencies [eb74890]
+    -   @sap-ux/project-access@1.27.6
+    -   @sap-ux/system-access@0.5.12
+
+## 0.0.46
+
+### Patch Changes
+
+-   93f8a83: chore - upgrade typescript 5.6.2
+    -   @sap-ux/system-access@0.5.12
+    -   @sap-ux/ui5-config@0.25.0
+
 ## 0.0.45
 
 ### Patch Changes

diff --git a/packages/abap-deploy-config-writer/package.json b/packages/abap-deploy-config-writer/package.json
@@ -6,7 +6,7 @@
         "url": "https://github.com/SAP/open-ux-tools.git",
         "directory": "packages/abap-deploy-config-writer"
     },
-    "version": "0.0.45",
+    "version": "0.0.47",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "scripts": {

diff --git a/packages/abap-deploy-config-writer/test/unit/index.test.ts b/packages/abap-deploy-config-writer/test/unit/index.test.ts
@@ -12,7 +12,7 @@ const mockIsAppStudio = isAppStudio as jest.Mock;
 
 describe('generate', () => {
     const outputDir = join(__dirname, '../test-output');
-    const debug = true ?? !!process.env['UX_DEBUG'];
+    const debug = !!process.env['UX_DEBUG'];
 
     beforeAll(async () => {
         fsExtra.removeSync(outputDir);

diff --git a/packages/adp-tooling/CHANGELOG.md b/packages/adp-tooling/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @sap-ux/adp-tooling
 
+## 0.12.56
+
+### Patch Changes
+
+-   Updated dependencies [eb74890]
+    -   @sap-ux/project-access@1.27.6
+    -   @sap-ux/axios-extension@1.16.6
+    -   @sap-ux/system-access@0.5.12
+
+## 0.12.55
+
+### Patch Changes
+
+-   @sap-ux/system-access@0.5.12
+-   @sap-ux/ui5-config@0.25.0
+
 ## 0.12.54
 
 ### Patch Changes

diff --git a/packages/adp-tooling/package.json b/packages/adp-tooling/package.json
@@ -9,7 +9,7 @@
     "bugs": {
         "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
     },
-    "version": "0.12.54",
+    "version": "0.12.56",
     "license": "Apache-2.0",
     "author": "@SAP/ux-tools-team",
     "main": "dist/index.js",

diff --git a/packages/annotation-generator/CHANGELOG.md b/packages/annotation-generator/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @sap-ux/annotation-generator
 
+## 0.2.7
+
+### Patch Changes
+
+-   Updated dependencies [eb74890]
+    -   @sap-ux/project-access@1.27.6
+    -   @sap-ux/fiori-annotation-api@0.2.7
+
+## 0.2.6
+
+### Patch Changes
+
+-   Updated dependencies [93f8a83]
+    -   @sap-ux/odata-annotation-core-types@0.4.2
+    -   @sap-ux/odata-entity-model@0.3.1
+    -   @sap-ux/fiori-annotation-api@0.2.6
+
 ## 0.2.5
 
 ### Patch Changes

diff --git a/packages/annotation-generator/package.json b/packages/annotation-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/annotation-generator",
-    "version": "0.2.5",
+    "version": "0.2.7",
     "description": "Library that provides API for generation of annotations by SAP Fiori App Generator",
     "publisher": "SAPSE",
     "author": "SAP SE",

diff --git a/packages/app-config-writer/CHANGELOG.md b/packages/app-config-writer/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @sap-ux/app-config-writer
 
+## 0.4.39
+
+### Patch Changes
+
+-   Updated dependencies [eb74890]
+    -   @sap-ux/project-access@1.27.6
+    -   @sap-ux/axios-extension@1.16.6
+
+## 0.4.38
+
+### Patch Changes
+
+-   Updated dependencies [93f8a83]
+    -   @sap-ux/store@0.9.2
+    -   @sap-ux/ui5-config@0.25.0
+
+## 0.4.37
+
+### Patch Changes
+
+-   4904d67: extra input field validation
+
 ## 0.4.36
 
 ### Patch Changes

diff --git a/packages/app-config-writer/package.json b/packages/app-config-writer/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/app-config-writer",
     "description": "Add or update configuration for SAP Fiori tools application",
-    "version": "0.4.36",
+    "version": "0.4.39",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

diff --git a/packages/app-config-writer/src/index.ts b/packages/app-config-writer/src/index.ts
@@ -1,3 +1,3 @@
-export { getSmartLinksTargetFromPrompt, promptInboundNavigationConfig } from './prompt';
+export { getSmartLinksTargetFromPrompt, promptInboundNavigationConfig, validateText } from './prompt';
 export { generateSmartLinksConfig } from './smartlinks-config';
 export { generateInboundNavigationConfig } from './navigation-config';
diff --git a/packages/app-config-writer/src/prompt/index.ts b/packages/app-config-writer/src/prompt/index.ts
@@ -1,2 +1,2 @@
 export { getSmartLinksTargetFromPrompt, promptUserPass } from './smartlinks-config';
-export { promptInboundNavigationConfig } from './navigation-config';
+export { promptInboundNavigationConfig, validateText } from './navigation-config';
diff --git a/packages/app-config-writer/src/prompt/navigation-config.ts b/packages/app-config-writer/src/prompt/navigation-config.ts
@@ -6,6 +6,7 @@ import { create as createStorage } from 'mem-fs';
 import { create } from 'mem-fs-editor';
 import type { Editor } from 'mem-fs-editor';
 import { readManifest } from '../navigation-config';
+import type { AllowedCharacters } from '../types/';
 
 /**
  * Prompt for inbound navigation configuration values.
@@ -44,9 +45,15 @@ export async function promptInboundNavigationConfig(
  * @param input the text input to validate
  * @param inputName the name of the input as seen by the user
  * @param maxLength optional, the maximum length of text to allow
+ * @param allowedCharacters optional, define a list of special characters that should be allowed in the input field
  * @returns true, if all validation checks pass or a message explaining the validation failure
  */
-function validateText(input: string, inputName: string, maxLength = 0): boolean | string {
+export function validateText(
+    input: string,
+    inputName: string,
+    maxLength = 0,
+    allowedCharacters?: AllowedCharacters[]
+): boolean | string {
     if (input?.trim().length === 0) {
         return t('prompt.validationWarning.inputRequired', {
             inputName,
@@ -57,6 +64,19 @@ function validateText(input: string, inputName: string, maxLength = 0): boolean
     if (maxLength && input.length > maxLength) {
         return t('prompt.validationWarning.maxLength', { maxLength, ns: NAV_CONFIG_NS });
     }
+
+    // Asterisks is supported for the semantic object and action field but not the inbound title
+    if (allowedCharacters) {
+        const escapedChars = allowedCharacters.map((char) => `\\${char}`).join('');
+        const regex = new RegExp(`^[a-zA-Z0-9${escapedChars}]+$`);
+        if (!regex.test(input)) {
+            return t('prompt.validationWarning.supportedFormats', {
+                ns: NAV_CONFIG_NS,
+                allowedCharacters: allowedCharacters.join('')
+            });
+        }
+    }
+
     return true;
 }
 
@@ -77,14 +97,14 @@ function getPrompts(inboundKeys: string[]): PromptObject[] {
             type: 'text',
             message: semanticObjectInputMsg,
             format: (val) => val?.trim(),
-            validate: (val) => validateText(val, semanticObjectInputMsg, 30)
+            validate: (val) => validateText(val, semanticObjectInputMsg, 30, ['_'])
         },
         {
             name: 'action',
             type: 'text',
             message: actionInputMsg,
             format: (val) => val?.trim(),
-            validate: (val) => validateText(val, actionInputMsg, 60)
+            validate: (val) => validateText(val, actionInputMsg, 60, ['_'])
         },
         {
             type: (prev, values) =>

diff --git a/packages/app-config-writer/src/translations/navigation-config.json b/packages/app-config-writer/src/translations/navigation-config.json
@@ -7,7 +7,8 @@
     "prompt": {
         "validationWarning": {
             "inputRequired": "{{inputName}} input is required",
-            "maxLength": "Maximum length: {{maxLength}} characters"
+            "maxLength": "Maximum length: {{maxLength}} characters",
+            "supportedFormats": "Only alphanumeric and '{{allowedCharacters}}' characters are allowed"
         },
         "message": {
             "semanticObject": "Semantic Object",