@sap-ux/flp-config-sub-generator 0.2.55 → 0.3.0

package/generators/app/index.d.ts

@@ -1,5 +1,6 @@
 import Generator from 'yeoman-generator';
 import { promptNames } from '@sap-ux/flp-config-inquirer';
+import type { FLPConfigPromptOptions } from '@sap-ux/flp-config-inquirer';
 import type { FlpConfigOptions } from './types';
 /**
  * FLP config generator adds an inbound navigation config to an existing manifest.json.
@@ -15,7 +16,7 @@ export default class extends Generator {
     private abort;
     private manifest;
     private manifestPath;
-    private extensionPromptOpts?;
+    private promptOptions?;
     options: FlpConfigOptions;
     setPromptsCallback: (fn: object) => void;
     /**
@@ -55,5 +56,5 @@ export default class extends Generator {
     end(): Promise<void>;
 }
 export { promptNames };
-export type { FlpConfigOptions };
+export type { FlpConfigOptions, FLPConfigPromptOptions };
 //# sourceMappingURL=index.d.ts.map

package/generators/app/index.js

@@ -19,8 +19,8 @@ const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const constants_1 = require("../utils/constants");
 const utils_1 = require("../utils");
-const prompts_1 = require("../utils/prompts");
 const telemetryEvents_1 = require("../telemetryEvents");
+const flpConfigSubGenNamespace = '@sap-ux/flp-config-sub-generator';
 /**
  * FLP config generator adds an inbound navigation config to an existing manifest.json.
  */
@@ -35,7 +35,7 @@ class default_1 extends yeoman_generator_1.default {
     abort = false;
     manifest;
     manifestPath;
-    extensionPromptOpts;
+    promptOptions;
     options;
     setPromptsCallback;
     /**
@@ -50,12 +50,13 @@ class default_1 extends yeoman_generator_1.default {
         this.vscode = opts.vscode;
         this.launchFlpConfigAsSubGenerator = opts.launchFlpConfigAsSubGenerator ?? false;
         this.appRootPath = opts.data?.appRootPath ?? opts?.appRootPath ?? this.destinationRoot();
+        this.promptOptions = this.options?.inquirerPromptOptions;
         this.options = opts;
         logger_1.default.configureLogging(this.rootGeneratorName(), this.log, this.options.logWrapper, this.options.logLevel, this.options.logger, this.vscode);
         // If launched standalone, set the header, title and description
         if (!this.launchFlpConfigAsSubGenerator) {
             this.appWizard.setHeaderTitle(constants_1.generatorTitle);
-            this.prompts = new yeoman_ui_types_1.Prompts((0, prompts_1.getYUIDetails)(this.appRootPath));
+            this.prompts = new yeoman_ui_types_1.Prompts((0, utils_1.getYUIDetails)(this.appRootPath));
             this.setPromptsCallback = (fn) => {
                 if (this.prompts) {
                     this.prompts.setCallback(fn);
@@ -68,10 +69,14 @@ class default_1 extends yeoman_generator_1.default {
         if (this.env.conflicter) {
             this.env.conflicter.force = this.options.force ?? true;
         }
-        this.extensionPromptOpts = await (0, deploy_config_generator_shared_1.getExtensionGenPromptOpts)(this.env.create.bind(this.env), this.rootGeneratorName(), this.vscode);
+        const extensionPromptOpts = await (0, deploy_config_generator_shared_1.getExtensionGenPromptOpts)(this.env.create.bind(this.env), flpConfigSubGenNamespace, this.vscode);
+        this.promptOptions = {
+            ...extensionPromptOpts,
+            ...this.promptOptions
+        };
         await fiori_generator_shared_1.TelemetryHelper.initTelemetrySettings({
             consumerModule: {
-                name: '@sap-ux/flp-config-sub-generator',
+                name: flpConfigSubGenNamespace,
                 version: this.rootGeneratorVersion()
             },
             internalFeature: (0, feature_toggle_1.isInternalFeaturesSettingEnabled)(),
@@ -112,13 +117,10 @@ class default_1 extends yeoman_generator_1.default {
         const silentOverwrite = this.options.overwrite;
         let questions = (await (0, flp_config_inquirer_1.getPrompts)(inbounds, {
             silentOverwrite,
-            inboundId: { hide: true },
-            existingFlpConfigInfo: { hide: true },
-            icon: { hide: true },
-            additionalParameters: { hide: true }
+            ...(0, utils_1.getPromptOptions)(this.promptOptions)
         }));
-        if (this.extensionPromptOpts && !this.launchFlpConfigAsSubGenerator) {
-            questions = (0, inquirer_common_1.extendWithOptions)(questions, this.extensionPromptOpts);
+        if (this.promptOptions) {
+            questions = (0, inquirer_common_1.extendWithOptions)(questions, this.promptOptions);
         }
         this.answers = {};
         const answers = await this.prompt(questions);

package/generators/app/types.d.ts

@@ -2,6 +2,7 @@ import type Generator from 'yeoman-generator';
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { VSCodeInstance, TelemetryData, LogWrapper } from '@sap-ux/fiori-generator-shared';
 import type { ManifestNamespace } from '@sap-ux/project-access';
+import type { FLPConfigPromptOptions } from '@sap-ux/flp-config-inquirer';
 export interface FlpConfigOptions extends Generator.GeneratorOptions {
     /**
      * VSCode instance
@@ -52,5 +53,9 @@ export interface FlpConfigOptions extends Generator.GeneratorOptions {
      * Logger instance
      */
     logWrapper?: LogWrapper;
+    /**
+     * FLP configuration inqurier prompt options
+     */
+    inquirerPromptOptions?: FLPConfigPromptOptions;
 }
 //# sourceMappingURL=types.d.ts.map

package/generators/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './i18n';
+export { getYUIDetails, getPromptOptions } from './prompts';
 //# sourceMappingURL=index.d.ts.map

package/generators/utils/index.js

@@ -14,5 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPromptOptions = exports.getYUIDetails = void 0;
 __exportStar(require("./i18n"), exports);
+var prompts_1 = require("./prompts");
+Object.defineProperty(exports, "getYUIDetails", { enumerable: true, get: function () { return prompts_1.getYUIDetails; } });
+Object.defineProperty(exports, "getPromptOptions", { enumerable: true, get: function () { return prompts_1.getPromptOptions; } });
 //# sourceMappingURL=index.js.map

package/generators/utils/prompts.d.ts

@@ -1,3 +1,4 @@
+import { type FLPConfigPromptOptions } from '@sap-ux/flp-config-inquirer';
 /**
  * Returns the details for the YUI prompt.
  *
@@ -8,4 +9,11 @@ export declare function getYUIDetails(appRootPath: string): {
     name: string;
     description: string;
 }[];
+/**
+ * Adds the provided prompt options to the default FLP config prompt options.
+ *
+ * @param promptOptions - FLP configuration prompt options
+ * @returns - FLP configuration prompt options with defaults applied
+ */
+export declare function getPromptOptions(promptOptions?: FLPConfigPromptOptions): FLPConfigPromptOptions;
 //# sourceMappingURL=prompts.d.ts.map

package/generators/utils/prompts.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getYUIDetails = getYUIDetails;
+exports.getPromptOptions = getPromptOptions;
 const path_1 = require("path");
+const flp_config_inquirer_1 = require("@sap-ux/flp-config-inquirer");
 /**
  * Returns the details for the YUI prompt.
  *
@@ -16,4 +18,19 @@ function getYUIDetails(appRootPath) {
         }
     ];
 }
+/**
+ * Adds the provided prompt options to the default FLP config prompt options.
+ *
+ * @param promptOptions - FLP configuration prompt options
+ * @returns - FLP configuration prompt options with defaults applied
+ */
+function getPromptOptions(promptOptions) {
+    return {
+        ...promptOptions,
+        [flp_config_inquirer_1.promptNames.inboundId]: { hide: true, ...promptOptions?.inboundId },
+        [flp_config_inquirer_1.promptNames.existingFlpConfigInfo]: { hide: true, ...promptOptions?.existingFlpConfigInfo },
+        [flp_config_inquirer_1.promptNames.icon]: { hide: true, ...promptOptions?.icon },
+        [flp_config_inquirer_1.promptNames.additionalParameters]: { hide: true, ...promptOptions?.additionalParameters }
+    };
+}
 //# sourceMappingURL=prompts.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/flp-config-sub-generator",
   "description": "Generator for creating Fiori Launcpad configuration",
-  "version": "0.2.55",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,13 +27,13 @@
     "@sap-ux/deploy-config-generator-shared": "0.1.22",
     "@sap-ux/feature-toggle": "0.3.0",
     "@sap-ux/fiori-generator-shared": "0.13.3",
-    "@sap-ux/flp-config-inquirer": "0.3.49",
+    "@sap-ux/flp-config-inquirer": "0.4.0",
     "@sap-ux/i18n": "0.3.1",
     "@sap-ux/inquirer-common": "0.7.27",
     "@sap-ux/project-access": "1.30.7"
   },
   "devDependencies": {
-    "@jest/types": "29.6.3",
+    "@jest/types": "30.0.1",
     "@types/inquirer": "8.2.6",
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
@@ -59,7 +59,7 @@
     "watch": "tsc --watch",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "test": "jest --ci --forceExit --detectOpenHandles --colors --passWithNoTests",
+    "test": "jest --ci --forceExit --detectOpenHandles --colors",
     "test-u": "jest --ci --forceExit --detectOpenHandles --colors -u",
     "link": "pnpm link --global",
     "unlink": "pnpm unlink --global"