@sap-ux/fiori-app-sub-generator 0.0.21 → 0.0.23

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

@@ -116,7 +116,7 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                     showCollabDraftWarning: generatorOptions.showCollabDraftWarning,
                     workspaceFolders: generatorOptions.workspaceFolders
                 };
-                let serviceAnswers = await (0, prompting_1.promptOdataServiceAnswers)(options, FioriAppGenerator.logger, this.env.adapter);
+                let serviceAnswers = await (0, prompting_1.promptOdataServiceAnswers)(options, FioriAppGenerator.logger, this.env.adapter, cachedService?.connectedSystem);
                 /** Back button issue temp fix */
                 // Persist derived state to facilitate backwards navigation
                 if ((0, fiori_generator_shared_1.getHostEnvironment)() !== fiori_generator_shared_1.hostEnvironment.cli) {

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

@@ -1,5 +1,5 @@
 import type { Logger } from '@sap-ux/logger';
-import { type CapService, OdataVersion } from '@sap-ux/odata-service-inquirer';
+import { type CapService, type ConnectedSystem, 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';
@@ -47,9 +47,10 @@ export declare function promptUI5ApplicationAnswers({ service, projectName, targ
  * @param options
  * @param logger
  * @param adapter
+ * @param connectedSystem
  * @returns {Promise<Service>}
  */
-export declare function promptOdataServiceAnswers(options: OdataServiceInquirerOptions, logger: Logger, adapter: Adapter): Promise<Service>;
+export declare function promptOdataServiceAnswers(options: OdataServiceInquirerOptions, logger: Logger, adapter: Adapter, connectedSystem?: ConnectedSystem): Promise<Service>;
 /**
  * Creates the `UIApplicationPromptOptions`.
  * Note that setting 'default', the default prompt value or function, or 'hide', whether the prompt should be shown,

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

@@ -107,9 +107,10 @@ async function promptUI5ApplicationAnswers({ service, projectName, targetFolder,
  * @param options
  * @param logger
  * @param adapter
+ * @param connectedSystem
  * @returns {Promise<Service>}
  */
-async function promptOdataServiceAnswers(options, logger, adapter) {
+async function promptOdataServiceAnswers(options, logger, adapter, connectedSystem) {
     let inquirerAdapter;
     // type `any` will be replaced when we can import ESM modules
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -121,7 +122,7 @@ async function promptOdataServiceAnswers(options, logger, adapter) {
         inquirerAdapter = adapter;
     }
     const promptOptions = createOdataServicePromptOptions(options);
-    const answers = await (0, odata_service_inquirer_1.prompt)(inquirerAdapter, promptOptions, logger, (0, feature_toggle_1.isFeatureEnabled)(types_1.Features.enableGAIntegration), telemetry_1.ClientFactory.getTelemetryClient(), (0, fiori_generator_shared_1.getHostEnvironment)() !== fiori_generator_shared_1.hostEnvironment.cli);
+    const answers = await (0, odata_service_inquirer_1.prompt)(inquirerAdapter, promptOptions, logger, (0, feature_toggle_1.isFeatureEnabled)(types_1.Features.enableGAIntegration), telemetry_1.ClientFactory.getTelemetryClient(), (0, fiori_generator_shared_1.getHostEnvironment)() !== fiori_generator_shared_1.hostEnvironment.cli, connectedSystem);
     const service = {
         host: answers.origin,
         client: answers.sapClient,

package/generators/types/state.d.ts

@@ -33,7 +33,8 @@ export interface Credentials {
     password?: string;
 }
 /**
- * To be replaced with `@sap-ux/odata-service-inquirer`'s `OdataService` type once all data source flows are migrated ro open-ux-tools
+ * Fiori sub app generators internal representation of a service.
+ * May be possible to replace this type with `@sap-ux/odata-service-inquirer` `service` type in future.
  *
  */
 export interface Service {

package/generators/utils/common.d.ts

@@ -1,7 +1,7 @@
 import type { Annotations } 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 } from '@sap-ux/odata-service-inquirer';
+import { DatasourceType, OdataVersion, type ConnectedSystem } from '@sap-ux/odata-service-inquirer';
 import type { CdsAnnotationsInfo, EdmxAnnotationsInfo } from '@sap-ux/odata-service-writer';
 import type { CapProjectType, CdsUi5PluginInfo, CdsVersionInfo } from '@sap-ux/project-access';
 import type { Editor } from 'mem-fs-editor';
@@ -89,7 +89,7 @@ export declare function getCdsAnnotations(capService: CapService, projectName: s
  * @param connectedSystem - The connected system object.
  * @returns {boolean} `true` if the connected system is hosted on BTP, otherwise `false`.
  */
-export declare function isBTPHosted(connectedSystem?: Service['connectedSystem']): boolean;
+export declare function isBTPHosted(connectedSystem?: ConnectedSystem): boolean;
 /**
  * Retrieves the data source label.
  *

package/generators/utils/telemetry.d.ts

@@ -1,11 +1,12 @@
-import { ApiHubType, type TelemetryBusinessHubType, type Service, type TelemetrySapSystemType } from '../types';
+import { ApiHubType, type TelemetryBusinessHubType, type TelemetrySapSystemType } from '../types';
+import type { ConnectedSystem } from '@sap-ux/odata-service-inquirer';
 /**
  * Get the SAP system type as reported in telemetry events.
  *
  * @param connectedSystem
  * @returns
  */
-export declare function getTelemetrySapSystemType(connectedSystem: Service['connectedSystem']): TelemetrySapSystemType | undefined;
+export declare function getTelemetrySapSystemType(connectedSystem: ConnectedSystem): TelemetrySapSystemType | undefined;
 /**
  * Get the business hub type as reported in telemetry events.
  *

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.0.21",
+  "version": "0.0.23",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,23 +29,23 @@
     "mem-fs-editor": "9.4.0",
     "uuid": "11.0.5",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/annotation-generator": "0.3.27",
+    "@sap-ux/annotation-generator": "0.3.28",
     "@sap-ux/axios-extension": "1.20.0",
-    "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/cap-config-writer": "0.9.28",
     "@sap-ux/btp-utils": "1.0.3",
-    "@sap-ux/fiori-elements-writer": "2.3.2",
+    "@sap-ux/cap-config-writer": "0.9.28",
+    "@sap-ux/feature-toggle": "0.2.3",
+    "@sap-ux/fiori-elements-writer": "2.3.3",
+    "@sap-ux/fiori-freestyle-writer": "2.3.2",
     "@sap-ux/fiori-generator-shared": "0.11.2",
     "@sap-ux/fiori-tools-settings": "0.1.0",
     "@sap-ux/launch-config": "0.9.3",
+    "@sap-ux/odata-service-inquirer": "2.3.4",
     "@sap-ux/odata-service-writer": "0.26.16",
     "@sap-ux/project-access": "1.29.21",
     "@sap-ux/store": "1.0.0",
     "@sap-ux/telemetry": "0.5.77",
-    "@sap-ux/odata-service-inquirer": "2.3.3",
     "@sap-ux/ui5-application-inquirer": "0.12.1",
-    "@sap-ux/ui5-info": "0.9.1",
-    "@sap-ux/fiori-freestyle-writer": "2.3.2"
+    "@sap-ux/ui5-info": "0.9.1"
   },
   "devDependencies": {
     "@sap-devx/yeoman-ui-types": "1.16.9",
@@ -62,7 +62,7 @@
     "mock-spawn": "0.2.6",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/flp-config-sub-generator": "0.1.61",
+    "@sap-ux/flp-config-sub-generator": "0.1.62",
     "@sap-ux/inquirer-common": "0.6.39",
     "@sap-ux/jest-file-matchers": "0.2.1",
     "@sap-ux/logger": "0.6.0"