@sap-ux/fiori-app-sub-generator 0.6.0 → 0.6.1

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

@@ -112,7 +112,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                     capService: cachedService?.capService ?? this.state.service?.capService,
                     requiredOdataVersion: (0, utils_1.getRequiredOdataVersion)(this.state.floorplan),
                     allowNoDatasource: isFioriFreestyleTemplate,
-                    promptOptions: generatorOptions.promptSettings,
+                    promptOptions: generatorOptions.promptSettings?.['@sap/generator-fiori'],
                     showCollabDraftWarning: generatorOptions.showCollabDraftWarning,
                     workspaceFolders: generatorOptions.workspaceFolders
                 };
@@ -174,7 +174,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                     targetFolder: this.state.project?.targetFolder,
                     service: this.state.service,
                     floorplan: this.state.floorplan,
-                    promptSettings: generatorOptions.promptSettings,
+                    promptSettings: generatorOptions.promptSettings?.['@sap/generator-fiori'],
                     promptExtension: generatorOptions.extensions
                 }, [this.yeomanUiStepConfig], this.env.adapter);
                 this.state.project = Object.assign(this.state.project ?? {}, ui5AppAnswers, {

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

@@ -1,9 +1,9 @@
 import type { Logger } from '@sap-ux/logger';
-import { type CapService, type ConnectedSystem, OdataVersion } from '@sap-ux/odata-service-inquirer';
+import { type CapService, type ConnectedSystem, type OdataServicePromptOptions, OdataVersion } from '@sap-ux/odata-service-inquirer';
 import type { UI5ApplicationAnswers, UI5ApplicationPromptOptions } from '@sap-ux/ui5-application-inquirer';
 import type { Question } from 'inquirer';
 import type { Adapter } from 'yeoman-environment';
-import type { FioriAppGeneratorPromptSettings, Floorplan, Project, Service, YeomanUiStepConfig } from '../types';
+import type { Floorplan, Project, Service, YeomanUiStepConfig } from '../types';
 declare const viewNamePromptName = "viewName";
 export interface ViewNameAnswer {
     [viewNamePromptName]: string;
@@ -16,7 +16,7 @@ type PromptUI5AppAnswersOptions = {
     projectName?: Project['name'];
     targetFolder?: Project['targetFolder'];
     service: Partial<Service>;
-    promptSettings?: FioriAppGeneratorPromptSettings;
+    promptSettings?: UI5ApplicationPromptOptions;
     floorplan: Floorplan;
     promptExtension?: UI5ApplicationPromptOptions;
 };
@@ -63,7 +63,7 @@ export declare function promptOdataServiceAnswers(options: OdataServiceInquirerO
  * @param extensions
  * @returns {Promise<UI5ApplicationPromptOptions>} prompt options that may be used to configure UI5 application prompting
  */
-export declare function createUI5ApplicationPromptOptions(service: Partial<Readonly<Service>>, appGenStepConfigList: YeomanUiStepConfig[], floorplan: Floorplan, projectName?: Project['name'], targetFolder?: Project['targetFolder'], promptSettings?: FioriAppGeneratorPromptSettings, extensions?: UI5ApplicationPromptOptions): Promise<UI5ApplicationPromptOptions>;
+export declare function createUI5ApplicationPromptOptions(service: Partial<Readonly<Service>>, appGenStepConfigList: YeomanUiStepConfig[], floorplan: Floorplan, projectName?: Project['name'], targetFolder?: Project['targetFolder'], promptSettings?: UI5ApplicationPromptOptions, extensions?: UI5ApplicationPromptOptions): Promise<UI5ApplicationPromptOptions>;
 /**
  * Convienience type for the options of the `createOdataServicePromptOptions` function.
  */
@@ -75,7 +75,7 @@ export interface OdataServiceInquirerOptions {
      * Note: only some of the allowed prompt options are currently supported.
      * Eventually all should be supported by merging the options with the prompt specific options.
      */
-    promptOptions?: FioriAppGeneratorPromptSettings;
+    promptOptions?: OdataServicePromptOptions;
     showCollabDraftWarning?: boolean;
     workspaceFolders?: string[];
 }

package/generators/types/common.d.ts

@@ -21,9 +21,9 @@ export interface SubGeneratorPromptSettings {
     '@sap-ux/flp-config-sub-generator'?: FLPConfigPromptOptions;
 }
 export interface FioriGeneratorPromptSettings {
-    '@sap/generator-fiori': OdataServicePromptOptions & UI5ApplicationPromptOptions;
+    '@sap/generator-fiori'?: OdataServicePromptOptions & UI5ApplicationPromptOptions;
 }
-export type FioriAppGeneratorPromptSettings = FioriGeneratorPromptSettings['@sap/generator-fiori'] & SubGeneratorPromptSettings;
+export type FioriAppGeneratorPromptSettings = FioriGeneratorPromptSettings & SubGeneratorPromptSettings;
 /**
  * Custom environment type until yeoman-environment provides one
  */

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.0",
+  "version": "0.6.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,21 +30,21 @@
     "uuid": "11.0.5",
     "yeoman-generator": "5.10.0",
     "@sap-ux/annotation-generator": "0.3.46",
-    "@sap-ux/axios-extension": "1.22.3",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/cap-config-writer": "0.10.21",
     "@sap-ux/feature-toggle": "0.3.0",
+    "@sap-ux/axios-extension": "1.22.3",
+    "@sap-ux/cap-config-writer": "0.10.21",
     "@sap-ux/fiori-elements-writer": "2.5.14",
-    "@sap-ux/fiori-freestyle-writer": "2.4.25",
     "@sap-ux/fiori-generator-shared": "0.13.3",
+    "@sap-ux/fiori-freestyle-writer": "2.4.25",
     "@sap-ux/fiori-tools-settings": "0.2.0",
     "@sap-ux/launch-config": "0.10.14",
     "@sap-ux/odata-service-inquirer": "2.5.22",
     "@sap-ux/odata-service-writer": "0.27.12",
     "@sap-ux/project-access": "1.30.7",
     "@sap-ux/store": "1.1.2",
-    "@sap-ux/telemetry": "0.6.10",
     "@sap-ux/ui5-application-inquirer": "0.14.31",
+    "@sap-ux/telemetry": "0.6.10",
     "@sap-ux/ui5-info": "0.12.1"
   },
   "devDependencies": {
@@ -63,10 +63,10 @@
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
     "@sap-ux/deploy-config-sub-generator": "0.3.47",
-    "@sap-ux/flp-config-sub-generator": "0.3.0",
     "@sap-ux/inquirer-common": "0.7.27",
-    "@sap-ux/jest-file-matchers": "0.2.4",
-    "@sap-ux/logger": "0.7.0"
+    "@sap-ux/logger": "0.7.0",
+    "@sap-ux/flp-config-sub-generator": "0.3.0",
+    "@sap-ux/jest-file-matchers": "0.2.4"
   },
   "engines": {
     "node": ">=20.x"