@sap-ux/generator-adp 0.3.65 → 0.3.67

package/generators/add-annotations-to-odata/index.js

@@ -8,7 +8,7 @@ const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const i18n_1 = require("../utils/i18n");
 const types_1 = require("../types");
 const sub_gen_auth_base_1 = __importDefault(require("../base/sub-gen-auth-base"));
-const path_1 = __importDefault(require("path"));
+const templates_1 = require("../utils/templates");
 /**
  * Generator for adding annotations to OData services.
  */
@@ -58,7 +58,7 @@ class AddAnnotationsToDataGenerator extends sub_gen_auth_base_1.default {
             const metadata = await this.manifestService.getDataSourceMetadata(this.answers.id);
             changeData.annotation.namespaces = (0, odata_service_writer_1.getAnnotationNamespaces)({ metadata });
         }
-        await (0, adp_tooling_1.generateChange)(this.projectPath, "appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */, changeData, this.fs, path_1.default.join(__dirname, 'templates'));
+        await (0, adp_tooling_1.generateChange)(this.projectPath, "appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */, changeData, this.fs, (0, templates_1.getTemplatesOverwritePath)());
         this.logger.log('Change written to changes folder');
         if (this.answers.fileSelectOption === 2 /* AnnotationFileSelectType.NewEmptyFile */) {
             this.appWizard.showInformation((0, i18n_1.t)('prompts.emptyAnnotationFile'), yeoman_ui_types_1.MessageType.notification);

package/generators/app/index.js

@@ -25,6 +25,7 @@ const appWizardCache_1 = require("../utils/appWizardCache");
 const default_values_1 = require("./questions/helper/default-values");
 const steps_1 = require("../utils/steps");
 const workspace_1 = require("../utils/workspace");
+const templates_1 = require("../utils/templates");
 const generatorTitle = 'Adaptation Project';
 /**
  * Generator for creating an Adaptation Project.
@@ -116,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', '@sap-ux/adp-flp-config-sub-generator']
+                packagePatterns: ['@sap/generator-fiori']
             });
             (0, opts_1.setHeaderTitle)(opts, this.logger, generatorTitle);
             (0, appWizardCache_1.initCache)(this.logger, this.appWizard);
@@ -229,6 +230,9 @@ class default_1 extends yeoman_generator_1.default {
                 packageJson,
                 logger: this.toolsLogger
             });
+            if (config.options) {
+                config.options.templatePathOverwrite = (0, templates_1.getTemplatesOverwritePath)();
+            }
             await (0, adp_tooling_1.generate)(this._getProjectPath(), config, this.fs);
         }
         catch (e) {

package/generators/utils/subgenHelpers.js

@@ -27,9 +27,9 @@ const PACKAGE_ADDITIONAL_VALIDATION = {
 function addFlpGen({ projectRootPath, vscode, inbounds, layer }, composeWith, logger, appWizard) {
     try {
         /**
-         * We are using this namespace for now because '@sap-ux/adp-flp-config-sub-generator' is not yet bundled in '@sap/generator-fiori'.
+         * We are using this namespace for now because '@sap/fiori:adp-flp-config' is not yet bundled in '@sap/generator-fiori'.
          */
-        composeWith(require.resolve('@sap-ux/adp-flp-config-sub-generator/generators/app'), {
+        composeWith('@sap/fiori:adp-flp-config', {
             launchAsSubGen: true,
             vscode,
             inbounds,
@@ -37,11 +37,11 @@ function addFlpGen({ projectRootPath, vscode, inbounds, layer }, composeWith, lo
             data: { projectRootPath },
             appWizard
         });
-        logger.info(`'@sap-ux/adp-flp-config-sub-generator' was called.`);
+        logger.info(`'@sap/fiori:adp-flp-config' was called.`);
     }
     catch (e) {
         logger.error(e);
-        throw new Error(`Could not call '@sap-ux/adp-flp-config-sub-generator' sub-generator: ${e.message}`);
+        throw new Error(`Could not call '@sap/fiori:adp-flp-config' sub-generator: ${e.message}`);
     }
 }
 /**

package/generators/utils/templates.d.ts

@@ -0,0 +1,8 @@
+/**
+ * This function is used to get the path to the templates directory when this generator is bundled inside `@sap/generator-fiori`.
+ * It is used to overwrite the templates directory.
+ *
+ * @returns {string | undefined} The path to the templates directory.
+ */
+export declare function getTemplatesOverwritePath(): string | undefined;
+//# sourceMappingURL=templates.d.ts.map

package/generators/utils/templates.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTemplatesOverwritePath = getTemplatesOverwritePath;
+const fs_1 = require("fs");
+const path_1 = require("path");
+/**
+ * This function is used to get the path to the templates directory when this generator is bundled inside `@sap/generator-fiori`.
+ * It is used to overwrite the templates directory.
+ *
+ * @returns {string | undefined} The path to the templates directory.
+ */
+function getTemplatesOverwritePath() {
+    const templatePath = (0, path_1.join)(__dirname, 'templates');
+    if ((0, fs_1.existsSync)(templatePath)) {
+        return templatePath;
+    }
+    return undefined;
+}
+//# sourceMappingURL=templates.js.map

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.65",
+  "version": "0.3.67",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,7 +30,7 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.15.17",
+    "@sap-ux/adp-tooling": "0.15.19",
     "@sap-ux/axios-extension": "1.22.5",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/feature-toggle": "0.3.0",
@@ -41,7 +41,6 @@
     "@sap-ux/system-access": "0.6.12",
     "@sap-ux/project-input-validator": "0.6.17",
     "@sap-ux/fiori-generator-shared": "0.13.9",
-    "@sap-ux/adp-flp-config-sub-generator": "0.1.63",
     "@sap-ux/odata-service-writer": "0.27.17"
   },
   "devDependencies": {
@@ -57,7 +56,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.3.59"
+    "@sap-ux/deploy-config-sub-generator": "0.3.60"
   },
   "engines": {
     "node": ">=20.x"