@sap-ux/generator-adp 0.3.75 → 0.3.76

package/generators/app/extension-project/index.d.ts

@@ -1,6 +1,5 @@
 import { type AttributesAnswers, type ConfigAnswers, type SystemLookup } from '@sap-ux/adp-tooling';
 import type { ExtensionProjectData } from '../types';
-export declare const EXTENSIBILITY_GENERATOR_NS = "@bas-dev/generator-extensibility-sub/generators/app";
 /**
  * Prepares data required for generating an extension project.
  *
@@ -10,15 +9,4 @@ export declare const EXTENSIBILITY_GENERATOR_NS = "@bas-dev/generator-extensibil
  * @returns {Promise<ExtensionProjectData>} A promise resolving to the prepared extension project data object.
  */
 export declare function getExtensionProjectData(configAnswers: ConfigAnswers, attributeAnswers: AttributesAnswers, systemLookup: SystemLookup): Promise<ExtensionProjectData>;
-/**
- * Attempts to resolve the path to a specific node module generator from the NODE_PATH environment variable.
- * This is particularly used in the prompt for extension projects within SAP Business Application Studio (BAS)
- * when an application is not supported by the adaptation project. It functions by resolving the path to the
- * generator which is then utilized with `this.composeWith()` of the Yeoman generator. If the path to the generator
- * is found, it returns the path, allowing the extension project to continue. If no path is found, it indicates that
- * the Extensibility Generator is not installed in the development space, preventing the user from proceeding.
- *
- * @returns {string | undefined} The resolved path to the generator module if found, or undefined if not found.
- */
-export declare function resolveNodeModuleGenerator(): string | undefined;
 //# sourceMappingURL=index.d.ts.map

package/generators/app/extension-project/index.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTENSIBILITY_GENERATOR_NS = void 0;
 exports.getExtensionProjectData = getExtensionProjectData;
-exports.resolveNodeModuleGenerator = resolveNodeModuleGenerator;
-const path_1 = require("path");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const i18n_1 = require("../../utils/i18n");
-exports.EXTENSIBILITY_GENERATOR_NS = '@bas-dev/generator-extensibility-sub/generators/app';
 /**
  * Prepares data required for generating an extension project.
  *
@@ -41,33 +37,4 @@ async function getExtensionProjectData(configAnswers, attributeAnswers, systemLo
         namespace: application.id
     };
 }
-/**
- * Attempts to resolve the path to a specific node module generator from the NODE_PATH environment variable.
- * This is particularly used in the prompt for extension projects within SAP Business Application Studio (BAS)
- * when an application is not supported by the adaptation project. It functions by resolving the path to the
- * generator which is then utilized with `this.composeWith()` of the Yeoman generator. If the path to the generator
- * is found, it returns the path, allowing the extension project to continue. If no path is found, it indicates that
- * the Extensibility Generator is not installed in the development space, preventing the user from proceeding.
- *
- * @returns {string | undefined} The resolved path to the generator module if found, or undefined if not found.
- */
-function resolveNodeModuleGenerator() {
-    const nodePath = process.env['NODE_PATH'];
-    const nodePaths = nodePath?.split(':') ?? [];
-    let generator;
-    for (const path of nodePaths) {
-        try {
-            generator = require.resolve((0, path_1.resolve)(path, exports.EXTENSIBILITY_GENERATOR_NS));
-        }
-        catch (e) {
-            /**
-             * We don't care if there's an error while resolving the module, continue with the next node_module path
-             */
-        }
-        if (generator !== undefined) {
-            break;
-        }
-    }
-    return generator;
-}
 //# sourceMappingURL=index.js.map

package/generators/app/index.js

@@ -117,7 +117,7 @@ class default_1 extends yeoman_generator_1.default {
         this.jsonInput = (0, parse_json_input_1.parseJsonInput)(jsonInputString, this.logger);
         if (!this.jsonInput) {
             this.env.lookup({
-                packagePatterns: ['@sap/generator-fiori']
+                packagePatterns: ['@sap/generator-fiori', '@bas-dev/generator-extensibility-sub']
             });
             (0, opts_1.setHeaderTitle)(opts, this.logger, generatorTitle);
             (0, appWizardCache_1.initCache)(this.logger, this.appWizard);
@@ -152,9 +152,11 @@ class default_1 extends yeoman_generator_1.default {
         if (this.jsonInput) {
             return;
         }
+        const isExtensibilityExtInstalled = (0, fiori_generator_shared_1.isExtensionInstalled)(this.vscode, 'SAP.vscode-bas-extensibility');
         const configQuestions = this.prompter.getPrompts({
             appValidationCli: { hide: !this.isCli },
-            systemValidationCli: { hide: !this.isCli }
+            systemValidationCli: { hide: !this.isCli },
+            shouldCreateExtProject: { isExtensibilityExtInstalled }
         });
         this.configAnswers = await this.prompt(configQuestions);
         this.shouldCreateExtProject = !!this.configAnswers.shouldCreateExtProject;

package/generators/app/questions/configuration.d.ts

@@ -193,7 +193,7 @@ export declare class ConfigPrompter {
      * Generates a confirmation prompt to decide whether to create an extension project based on the application's
      * sync capabilities and support status.
      *
-     * @param {ShouldCreateExtProjectPromptOptions} _ - Optional configuration for the confirm extension project prompt.
+     * @param {ShouldCreateExtProjectPromptOptions} options - Optional configuration for the confirm extension project prompt.
      * @returns The confirm extension project prompt as a {@link ConfigQuestion}.
      */
     private getShouldCreateExtProjectPrompt;

package/generators/app/questions/configuration.js

@@ -360,10 +360,10 @@ class ConfigPrompter {
      * Generates a confirmation prompt to decide whether to create an extension project based on the application's
      * sync capabilities and support status.
      *
-     * @param {ShouldCreateExtProjectPromptOptions} _ - Optional configuration for the confirm extension project prompt.
+     * @param {ShouldCreateExtProjectPromptOptions} options - Optional configuration for the confirm extension project prompt.
      * @returns The confirm extension project prompt as a {@link ConfigQuestion}.
      */
-    getShouldCreateExtProjectPrompt(_) {
+    getShouldCreateExtProjectPrompt(options) {
         return {
             type: 'confirm',
             name: types_1.configPromptNames.shouldCreateExtProject,
@@ -373,7 +373,12 @@ class ConfigPrompter {
                 applyDefaultWhenDirty: true
             },
             when: (answers) => (0, conditions_1.showExtensionProjectQuestion)(answers, this.flexUISystem, this.isCloudProject, this.isApplicationSupported, this.containsSyncViews),
-            validate: (value) => (0, validators_1.validateExtensibilityGenerator)(value, this.isApplicationSupported, this.containsSyncViews)
+            validate: (value) => (0, validators_1.validateExtensibilityExtension)({
+                value,
+                isApplicationSupported: this.isApplicationSupported,
+                hasSyncViews: this.containsSyncViews,
+                isExtensibilityExtInstalled: !!options?.isExtensibilityExtInstalled
+            })
         };
     }
     /**

package/generators/app/questions/helper/validators.d.ts

@@ -5,16 +5,24 @@ interface JsonInputParams {
     namespace: string;
     system: string;
 }
+interface ValidateExtensibilityExtParams {
+    value: boolean;
+    isApplicationSupported: boolean;
+    hasSyncViews: boolean;
+    isExtensibilityExtInstalled: boolean;
+}
 /**
- * Validates whether the extensibility sub-generator is available and sets it up if necessary.
- * If the generator is not found, an error message is returned advising on the necessary action.
+ * Validates whether the extensibility extension is available. If the extension is not found,
+ * an error message is returned advising on the necessary action.
  *
- * @param {boolean} value - A confirm flag indicating whether user wants to continue creating an extension project.
- * @param {boolean} isApplicationSupported - Whether the selected application is supported.
- * @param {boolean} hasSyncViews - Whether synchronized views exist for the app.
+ * @param {ValidateExtensibilityExtParams} params - The validation parameters.
+ * @param {boolean} params.value - A confirm flag indicating whether user wants to continue creating an extension project.
+ * @param {boolean} params.isApplicationSupported - Whether the selected application is supported.
+ * @param {boolean} params.hasSyncViews - Whether synchronized views exist for the app.
+ * @param {boolean} params.isExtensibilityExtInstalled - Whether the extensibility extension is installed.
  * @returns {boolean | string} Returns true if app is supported and contains sync views, or an error message if not.
  */
-export declare function validateExtensibilityGenerator(value: boolean, isApplicationSupported: boolean, hasSyncViews: boolean): boolean | string;
+export declare function validateExtensibilityExtension({ value, isApplicationSupported, hasSyncViews, isExtensibilityExtInstalled }: ValidateExtensibilityExtParams): boolean | string;
 /**
  * Validates the input parameters for an adaptation project configuration.
  *

package/generators/app/questions/helper/validators.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateExtensibilityGenerator = validateExtensibilityGenerator;
+exports.validateExtensibilityExtension = validateExtensibilityExtension;
 exports.validateJsonInput = validateJsonInput;
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const i18n_1 = require("../../../utils/i18n");
 const type_guards_1 = require("../../../utils/type-guards");
-const extension_project_1 = require("../../extension-project");
 /**
- * Validates whether the extensibility sub-generator is available and sets it up if necessary.
- * If the generator is not found, an error message is returned advising on the necessary action.
+ * Validates whether the extensibility extension is available. If the extension is not found,
+ * an error message is returned advising on the necessary action.
  *
- * @param {boolean} value - A confirm flag indicating whether user wants to continue creating an extension project.
- * @param {boolean} isApplicationSupported - Whether the selected application is supported.
- * @param {boolean} hasSyncViews - Whether synchronized views exist for the app.
+ * @param {ValidateExtensibilityExtParams} params - The validation parameters.
+ * @param {boolean} params.value - A confirm flag indicating whether user wants to continue creating an extension project.
+ * @param {boolean} params.isApplicationSupported - Whether the selected application is supported.
+ * @param {boolean} params.hasSyncViews - Whether synchronized views exist for the app.
+ * @param {boolean} params.isExtensibilityExtInstalled - Whether the extensibility extension is installed.
  * @returns {boolean | string} Returns true if app is supported and contains sync views, or an error message if not.
  */
-function validateExtensibilityGenerator(value, isApplicationSupported, hasSyncViews) {
+function validateExtensibilityExtension({ value, isApplicationSupported, hasSyncViews, isExtensibilityExtInstalled }) {
     if (value) {
-        const generator = (0, extension_project_1.resolveNodeModuleGenerator)();
-        if (!generator) {
-            return (0, i18n_1.t)('error.extensibilityGenNotFound');
+        if (!isExtensibilityExtInstalled) {
+            return (0, i18n_1.t)('error.extensibilityExtensionNotFound');
         }
         return true;
     }

package/generators/app/types.d.ts

@@ -71,6 +71,7 @@ export interface AchPromptOptions {
 }
 export interface ShouldCreateExtProjectPromptOptions {
     hide?: boolean;
+    isExtensibilityExtInstalled?: boolean;
 }
 /**
  * Options for the configuration inquirer & the prompts.

package/generators/translations/generator-adp.i18n.json

@@ -70,7 +70,7 @@
         "manifestCouldNotBeValidated": "The `manifest.json` file of the selected application cannot be validated. Please select a different application.",
         "appDoesNotSupportFlexibility": "The selected application does not support flexibility because it has (`flexEnabled=false`). SAPUI5 Adaptation Project only supports applications that support flexibility. Please select a different application.",
         "appDoesNotSupportManifest": "The selected application is not supported by SAPUI5 Adaptation Project because it does not have a `manifest.json` file. Please select a different application.",
-        "extensibilityGenNotFound": "The Extensibility Project generator plugin was not found in your dev space and it is required for this action. To proceed, please install the <SAPUI5 Layout Editor & Extensibility> extension.",
+        "extensibilityExtensionNotFound": "The Extensibility Project generator plugin was not found in your dev space and it is required for this action. To proceed, please install the <SAPUI5 Layout Editor & Extensibility> extension.",
         "creatingExtensionProjectError": "Creating the extension project failed. To see the error, view the logs.",
         "appParameterMissing": "Could not create an extension project because the application parameters are missing. Please select a different application.",
         "destinationInfoMissing": "Could not create an extension project because the destination info is missing. Please select a different system.",

package/generators/utils/subgenHelpers.js

@@ -107,8 +107,7 @@ function addDeployGen({ projectName, projectPath, connectedSystem, system }, com
 async function addExtProjectGen({ configAnswers, attributeAnswers, systemLookup }, composeWith, logger, appWizard) {
     try {
         const data = await (0, extension_project_1.getExtensionProjectData)(configAnswers, attributeAnswers, systemLookup);
-        const generator = (0, extension_project_1.resolveNodeModuleGenerator)();
-        composeWith(generator, {
+        composeWith('@bas-dev/extensibility-sub', {
             arguments: [JSON.stringify(data)],
             appWizard
         });

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.3.75",
+  "version": "0.3.76",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,15 +31,15 @@
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
     "@sap-ux/adp-tooling": "0.15.25",
+    "@sap-ux/feature-toggle": "0.3.1",
     "@sap-ux/axios-extension": "1.22.7",
     "@sap-ux/btp-utils": "1.1.1",
-    "@sap-ux/feature-toggle": "0.3.1",
-    "@sap-ux/inquirer-common": "0.7.39",
     "@sap-ux/logger": "0.7.0",
+    "@sap-ux/inquirer-common": "0.7.39",
     "@sap-ux/project-access": "1.30.13",
     "@sap-ux/store": "1.1.4",
-    "@sap-ux/system-access": "0.6.16",
     "@sap-ux/project-input-validator": "0.6.18",
+    "@sap-ux/system-access": "0.6.16",
     "@sap-ux/fiori-generator-shared": "0.13.12",
     "@sap-ux/odata-service-writer": "0.27.18"
   },