@sap-ux/create 0.5.113 → 0.6.0

package/README.md

@@ -21,6 +21,22 @@ npx sap-ux
 ## add
 Calling `sap-ux add` allows adding a feature to a project.
 
+### html
+Calling `sap-ux add html` will add html files for local preview and testing to the project. It will use the configuration from the `preview-middleware` from the `ui5.yaml` as default but also allows pointing to a different yaml e.g.:
+```sh
+sap-ux change add html ui5-test.yaml
+```
+
+## change
+Calling `sap-ux change` allows changing a feature of a project.
+
+### data-source
+Calling `sap-ux change data-source` allows replacing the OData Source of the base application in an adaptation project.  
+```sh
+sap-ux change data-source /path/to/adaptation-project
+```
+If the project path is not provided, the current working directory will be used.
+
 ## remove
 Calling `sap-ux remove` allows removing a feature to a project.
 
@@ -32,4 +48,4 @@ Calling `sap-ux generate adaptation-project` allows generating a new adaptation
 ```sh
 sap-ux generate adaptation-project --id my.adp --reference the.original.app --url http://my.sapsystem.example
 ```
-Additional options are `--skip-install` to skip running `npm install` after the project generation and `--simulate` to only simulate the files that would be generated instead of writing them to the file system.
+Additional options are `--skip-install` to skip running `npm install` after the project generation and `--simulate` to only simulate the files that would be generated instead of writing them to the file system.

package/dist/cli/add/cards-editor.js

@@ -44,7 +44,7 @@ function addCardsEditorConfig(basePath, simulate, skipInstall) {
         const logger = (0, tracing_1.getLogger)();
         try {
             logger.debug(`Called add cards-editor-config for path '${basePath}', simulate is '${simulate}'`);
-            (0, validation_1.validateBasePath)(basePath);
+            yield (0, validation_1.validateBasePath)(basePath);
             const fs = yield (0, cards_editor_config_writer_1.enableCardsEditor)(basePath);
             if (!simulate) {
                 yield new Promise((resolve) => fs.commit(resolve));

package/dist/cli/add/html.d.ts

@@ -0,0 +1,8 @@
+import type { Command } from 'commander';
+/**
+ * Adds a command to add the virtual html files hosted by the preview middleware to the file system.
+ *
+ * @param cmd - commander command for adding navigation inbounds config command
+ */
+export declare function addLocalHtmlFiles(cmd: Command): void;
+//# sourceMappingURL=html.d.ts.map

package/dist/cli/add/html.js

@@ -0,0 +1,70 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addLocalHtmlFiles = void 0;
+const tracing_1 = require("../../tracing");
+const validation_1 = require("../../validation");
+const preview_middleware_1 = require("@sap-ux/preview-middleware");
+const path_1 = require("path");
+const ui5_config_1 = require("@sap-ux/ui5-config");
+const mem_fs_editor_1 = require("mem-fs-editor");
+const mem_fs_1 = require("mem-fs");
+/**
+ * Adds a command to add the virtual html files hosted by the preview middleware to the file system.
+ *
+ * @param cmd - commander command for adding navigation inbounds config command
+ */
+function addLocalHtmlFiles(cmd) {
+    cmd.command('html [path]')
+        .option('-c, --config <string>', 'Path to project configuration file in YAML format', 'ui5.yaml')
+        .option('-s, --simulate', 'simulate only do not write config; sets also --verbose')
+        .option('-v, --verbose', 'show verbose information')
+        .action((path, options) => __awaiter(this, void 0, void 0, function* () {
+        if (options.verbose === true || options.simulate) {
+            (0, tracing_1.setLogLevelVerbose)();
+        }
+        yield addHtmlFiles(path || process.cwd(), !!options.simulate, options.config);
+    }));
+}
+exports.addLocalHtmlFiles = addLocalHtmlFiles;
+/**
+ * Adds the virtual html files hosted by the preview middleware to the file system.
+ *
+ * @param basePath - path to application root
+ * @param simulate - if true, do not write but just show what would be change; otherwise write
+ * @param yamlPath - path to the ui5*.yaml file
+ */
+function addHtmlFiles(basePath, simulate, yamlPath) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        const logger = (0, tracing_1.getLogger)();
+        try {
+            logger.debug(`Called add html for path '${basePath}', simulate is '${simulate}'`);
+            const ui5ConfigPath = (0, path_1.isAbsolute)(yamlPath) ? yamlPath : (0, path_1.join)(basePath, yamlPath);
+            yield (0, validation_1.validateBasePath)(basePath, ui5ConfigPath);
+            const fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+            const ui5Conf = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5ConfigPath));
+            const preview = (_a = ui5Conf.findCustomMiddleware('fiori-tools-preview')) !== null && _a !== void 0 ? _a : ui5Conf.findCustomMiddleware('preview-middleware');
+            yield (0, preview_middleware_1.generatePreviewFiles)(basePath, (_b = preview === null || preview === void 0 ? void 0 : preview.configuration) !== null && _b !== void 0 ? _b : {}, fs, logger);
+            if (!simulate) {
+                yield new Promise((resolve) => fs.commit(resolve));
+            }
+            else {
+                yield (0, tracing_1.traceChanges)(fs);
+            }
+        }
+        catch (error) {
+            logger.error(`Error while executing add html '${error.message}'`);
+            logger.debug(error);
+        }
+    });
+}
+//# sourceMappingURL=html.js.map

package/dist/cli/add/index.js

@@ -7,6 +7,7 @@ const smartlinks_config_1 = require("./smartlinks-config");
 const cds_plugin_ui_1 = require("./cds-plugin-ui");
 const navigation_config_1 = require("./navigation-config");
 const cards_editor_1 = require("./cards-editor");
+const html_1 = require("./html");
 /**
  * Return 'create-fiori add *' commands. Commands include also the handler action.
  *
@@ -24,6 +25,8 @@ function getAddCommands() {
     (0, navigation_config_1.addInboundNavigationConfigCommand)(addCommands);
     // create-fiori add cards-editor
     (0, cards_editor_1.addCardsEditorConfigCommand)(addCommands);
+    // create-fiori add html
+    (0, html_1.addLocalHtmlFiles)(addCommands);
     return addCommands;
 }
 exports.getAddCommands = getAddCommands;

package/dist/cli/add/mockserver-config.js

@@ -49,7 +49,7 @@ function addMockserverConfig(basePath, simulate, skipInstall, interactive) {
         const logger = (0, tracing_1.getLogger)();
         try {
             logger.debug(`Called add mockserver-config for path '${basePath}', simulate is '${simulate}', skip install is '${skipInstall}'`);
-            (0, validation_1.validateBasePath)(basePath);
+            yield (0, validation_1.validateBasePath)(basePath);
             const webappPath = yield (0, project_access_1.getWebappPath)(basePath);
             const config = { webappPath };
             if (interactive) {

package/dist/cli/add/navigation-config.js

@@ -41,7 +41,7 @@ function addInboundNavigationConfig(basePath, simulate) {
         const logger = (0, tracing_1.getLogger)();
         try {
             logger.debug(`Called add inbound navigation-config for path '${basePath}', simulate is '${simulate}'`);
-            (0, validation_1.validateBasePath)(basePath);
+            yield (0, validation_1.validateBasePath)(basePath);
             const { config, fs } = yield (0, app_config_writer_1.promptInboundNavigationConfig)(basePath);
             if (config) {
                 yield (0, app_config_writer_1.generateInboundNavigationConfig)(basePath, config, true, fs);

package/dist/cli/add/smartlinks-config.js

@@ -41,7 +41,7 @@ function addSmartLinksConfig(basePath, simulate) {
         const logger = (0, tracing_1.getLogger)();
         try {
             logger.debug(`Called add smartlinks-config for path '${basePath}', simulate is '${simulate}'`);
-            (0, validation_1.validateBasePath)(basePath);
+            yield (0, validation_1.validateBasePath)(basePath);
             const config = yield (0, app_config_writer_1.getSmartLinksTargetFromPrompt)(basePath, logger);
             const fs = yield (0, app_config_writer_1.generateSmartLinksConfig)(basePath, config, logger);
             yield (0, tracing_1.traceChanges)(fs);

package/dist/cli/change/change-data-source.d.ts

@@ -0,0 +1,8 @@
+import type { Command } from 'commander';
+/**
+ * Add a new sub-command to change the data source of an adaptation project to the given command.
+ *
+ * @param {Command} cmd - The command to add the change data-source sub-command to.
+ */
+export declare function addChangeDataSourceCommand(cmd: Command): void;
+//# sourceMappingURL=change-data-source.d.ts.map

package/dist/cli/change/change-data-source.js

@@ -0,0 +1,117 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addChangeDataSourceCommand = void 0;
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const tracing_1 = require("../../tracing");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const ui5_config_1 = require("@sap-ux/ui5-config");
+const common_1 = require("../../common");
+const project_access_1 = require("@sap-ux/project-access");
+let loginAttempts = 3;
+/**
+ * Add a new sub-command to change the data source of an adaptation project to the given command.
+ *
+ * @param {Command} cmd - The command to add the change data-source sub-command to.
+ */
+function addChangeDataSourceCommand(cmd) {
+    cmd.command('data-source [path]')
+        .option('-s, --simulate', 'simulate only do not write or install')
+        .option('-c, --config <string>', 'Path to project configuration file in YAML format', 'ui5.yaml')
+        .action((path, options) => __awaiter(this, void 0, void 0, function* () {
+        yield changeDataSource(path, Object.assign({}, options), !!options.simulate, options.config);
+    }));
+}
+exports.addChangeDataSourceCommand = addChangeDataSourceCommand;
+/**
+ * Changes the data source of an adaptation project.
+ *
+ * @param {string} basePath - The path to the adaptation project.
+ * @param {PromptDefaults} defaults - The default values for the prompts.
+ * @param {boolean} simulate - If set to true, then no files will be written to the filesystem.
+ * @param {string} yamlPath - The path to the project configuration file in YAML format.
+ */
+function changeDataSource(basePath, defaults, simulate, yamlPath) {
+    var _a, _b, _c;
+    return __awaiter(this, void 0, void 0, function* () {
+        const logger = (0, tracing_1.getLogger)();
+        try {
+            if (!basePath) {
+                basePath = process.cwd();
+            }
+            if ((yield (0, project_access_1.getAppType)(basePath)) !== 'Fiori Adaptation') {
+                throw new Error('This command can only be used for an Adaptation Project');
+            }
+            checkEnvironment(basePath);
+            const variant = getVariant(basePath);
+            const ui5ConfigPath = (0, path_1.isAbsolute)(yamlPath) ? yamlPath : (0, path_1.join)(basePath, yamlPath);
+            const ui5Conf = yield ui5_config_1.UI5Config.newInstance((0, fs_1.readFileSync)(ui5ConfigPath, 'utf-8'));
+            const customMiddlerware = (_a = ui5Conf.findCustomMiddleware('fiori-tools-preview')) !== null && _a !== void 0 ? _a : ui5Conf.findCustomMiddleware('preview-middleware');
+            const adp = (_b = customMiddlerware === null || customMiddlerware === void 0 ? void 0 : customMiddlerware.configuration) === null || _b === void 0 ? void 0 : _b.adp;
+            if (!adp) {
+                throw new Error('No system configuration found in ui5.yaml');
+            }
+            const manifest = yield (0, adp_tooling_1.getManifest)(variant.reference, adp, logger);
+            const dataSources = manifest['sap.app'].dataSources;
+            if (!dataSources) {
+                throw new Error('No data sources found in the manifest');
+            }
+            const answers = yield (0, common_1.promptYUIQuestions)((0, adp_tooling_1.getPromptsForChangeDataSource)(dataSources), false);
+            const fs = yield (0, adp_tooling_1.generateChange)(basePath, "appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */, {
+                variant,
+                dataSources,
+                answers
+            });
+            if (!simulate) {
+                yield new Promise((resolve) => fs.commit(resolve));
+            }
+            else {
+                yield (0, tracing_1.traceChanges)(fs);
+            }
+        }
+        catch (error) {
+            logger.error(error.message);
+            if (((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) === 401 && loginAttempts) {
+                loginAttempts--;
+                logger.error(`Authentication failed. Please check your credentials. Login attempts left: ${loginAttempts}`);
+                yield changeDataSource(basePath, defaults, simulate, yamlPath);
+                return;
+            }
+            logger.debug(error);
+        }
+    });
+}
+/**
+ * Get the app descriptor variant.
+ *
+ * @param {string} basePath - The path to the adaptation project.
+ * @returns {DescriptorVariant} The app descriptor variant.
+ */
+function getVariant(basePath) {
+    return JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(basePath, 'webapp', 'manifest.appdescr_variant'), 'utf-8'));
+}
+/**
+ * Check if the project is a CF project.
+ *
+ * @param {string} basePath - The path to the adaptation project.
+ * @throws {Error} If the project is a CF project.
+ */
+function checkEnvironment(basePath) {
+    const configJsonPath = (0, path_1.join)(basePath, '.adp', 'config.json');
+    if ((0, fs_1.existsSync)(configJsonPath)) {
+        const config = JSON.parse((0, fs_1.readFileSync)(configJsonPath, 'utf-8'));
+        if (config.environment === 'CF') {
+            throw new Error('Changing data source is not supported for CF projects.');
+        }
+    }
+}
+//# sourceMappingURL=change-data-source.js.map

package/dist/cli/change/index.d.ts

@@ -0,0 +1,8 @@
+import { Command } from 'commander';
+/**
+ * Return 'create-fiori change *' commands. Commands include also the handler action.
+ *
+ * @returns - commander command containing change <feature> commands
+ */
+export declare function getChangeCommands(): Command;
+//# sourceMappingURL=index.d.ts.map

package/dist/cli/change/index.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChangeCommands = void 0;
+const commander_1 = require("commander");
+const change_data_source_1 = require("./change-data-source");
+/**
+ * Return 'create-fiori change *' commands. Commands include also the handler action.
+ *
+ * @returns - commander command containing change <feature> commands
+ */
+function getChangeCommands() {
+    const addCommands = new commander_1.Command('change');
+    // create-fiori change data-source
+    (0, change_data_source_1.addChangeDataSourceCommand)(addCommands);
+    return addCommands;
+}
+exports.getChangeCommands = getChangeCommands;
+//# sourceMappingURL=index.js.map

package/dist/cli/index.js

@@ -8,6 +8,7 @@ const tracing_1 = require("../tracing");
 const add_1 = require("./add");
 const remove_1 = require("./remove");
 const generate_1 = require("./generate");
+const change_1 = require("./change");
 /*
  * We've chosen 'commander' over 'minimist' and 'yargs' for this CLI implementation. Reasons:
  * (if it still up: https://npmtrends.com/commander-vs-minimist-vs-yargs)
@@ -51,6 +52,8 @@ function getCommanderProgram() {
     program.addCommand((0, add_1.getAddCommands)());
     // Handler for create-fiori remove <feature> ..
     program.addCommand((0, remove_1.getRemoveCommands)());
+    // Handler for create-fiori change <feature> ..
+    program.addCommand((0, change_1.getChangeCommands)());
     // Override exit so calling this command without arguments does not result in an exit code 1, which causes an error message when running from npm init
     program.exitOverride();
     return program;

package/dist/cli/remove/mockserver-config.js

@@ -45,7 +45,7 @@ function removeMockserverConfiguration(basePath, force) {
         const logger = (0, tracing_1.getLogger)();
         try {
             logger.debug(`Called remove mockserver-config for path '${basePath}', force is '${force}'`);
-            (0, validation_1.validateBasePath)(basePath);
+            yield (0, validation_1.validateBasePath)(basePath);
             const fs = (0, mockserver_config_writer_1.removeMockserverConfig)(basePath);
             yield (0, tracing_1.traceChanges)(fs);
             const hasDeletions = (0, validation_1.hasFileDeletes)(fs);

package/dist/common/prompts.js

@@ -50,6 +50,24 @@ function enhanceListQuestion(listQuestion, prompt, answers) {
             : mapppedChoices.findIndex((choice) => choice.value === initialValue);
     });
 }
+/**
+ * Indicates if the question is optional.
+ *
+ * @param question question to be checked
+ * @param answers rpeviously given answers
+ * @returns message of the question
+ */
+function extractMessage(question, answers) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const message = isFunction(question.message) ? yield question.message(answers) : question.message;
+        if (question.guiOptions && !question.guiOptions.mandatory) {
+            return `${message} (optional)`;
+        }
+        else {
+            return message;
+        }
+    });
+}
 /**
  * Converts a YUI question to a simple prompts question.
  *
@@ -63,7 +81,7 @@ function convertQuestion(question, answers) {
         const prompt = {
             type: (_b = QUESTION_TYPE_MAP[(_a = question.type) !== null && _a !== void 0 ? _a : 'input']) !== null && _b !== void 0 ? _b : question.type,
             name: question.name,
-            message: isFunction(question.message) ? yield question.message(answers) : yield question.message,
+            message: yield extractMessage(question, answers),
             validate: (value) => __awaiter(this, void 0, void 0, function* () { var _c; return isFunction(question.validate) ? yield question.validate(value, answers) : (_c = question.validate) !== null && _c !== void 0 ? _c : true; }),
             initial: () => (isFunction(question.default) ? question.default(answers) : question.default)
         };

package/dist/validation/validation.d.ts

@@ -3,8 +3,9 @@ import type { Editor } from 'mem-fs-editor';
  * Validate base path of app, throw error if file is missing.
  *
  * @param basePath - base path of the app, where package.json and ui5.yaml resides
+ * @param ui5YamlPath - optional path to ui5.yaml file
  */
-export declare function validateBasePath(basePath: string): void;
+export declare function validateBasePath(basePath: string, ui5YamlPath?: string): Promise<void>;
 /**
  * Return if an instance of mem-fs editor recorded any deletion.
  *

package/dist/validation/validation.js

@@ -1,23 +1,36 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasFileDeletes = exports.validateBasePath = void 0;
+const project_access_1 = require("@sap-ux/project-access");
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**
  * Validate base path of app, throw error if file is missing.
  *
  * @param basePath - base path of the app, where package.json and ui5.yaml resides
+ * @param ui5YamlPath - optional path to ui5.yaml file
  */
-function validateBasePath(basePath) {
-    const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
-    if (!(0, fs_1.existsSync)(packageJsonPath)) {
-        throw Error(`Required file '${packageJsonPath}' does not exist.`);
-    }
-    const ui5YamlPath = (0, path_1.join)(basePath, 'ui5.yaml');
-    const webappPath = (0, path_1.join)(basePath, 'webapp');
-    if (!(0, fs_1.existsSync)(ui5YamlPath) && !(0, fs_1.existsSync)(webappPath)) {
-        throw Error(`There must be either a folder '${webappPath}' or a config file '${ui5YamlPath}'`);
-    }
+function validateBasePath(basePath, ui5YamlPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
+        if (!(0, fs_1.existsSync)(packageJsonPath)) {
+            throw Error(`Required file '${packageJsonPath}' does not exist.`);
+        }
+        ui5YamlPath !== null && ui5YamlPath !== void 0 ? ui5YamlPath : (ui5YamlPath = (0, path_1.join)(basePath, 'ui5.yaml'));
+        const webappPath = yield (0, project_access_1.getWebappPath)(basePath);
+        if (!(0, fs_1.existsSync)(ui5YamlPath) && !(0, fs_1.existsSync)(webappPath)) {
+            throw Error(`There must be either a folder '${webappPath}' or a config file '${ui5YamlPath}'`);
+        }
+    });
 }
 exports.validateBasePath = validateBasePath;
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/create",
   "description": "SAP Fiori tools module to add or remove features",
-  "version": "0.5.113",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,14 +27,20 @@
     "chalk": "4.1.2",
     "commander": "9.4.0",
     "diff": "5.1.0",
+    "mem-fs": "2.1.0",
+    "mem-fs-editor": "9.4.0",
     "prompts": "2.4.2",
-    "@sap-ux/adp-tooling": "0.11.6",
-    "@sap-ux/app-config-writer": "0.3.80",
-    "@sap-ux/cap-config-writer": "0.5.3",
+    "@sap-ux/adp-tooling": "0.11.7",
+    "@sap-ux/app-config-writer": "0.3.81",
+    "@sap-ux/cap-config-writer": "0.5.4",
     "@sap-ux/cards-editor-config-writer": "0.3.9",
+    "@sap-ux/inquirer-common": "0.3.1",
     "@sap-ux/logger": "0.5.1",
     "@sap-ux/mockserver-config-writer": "0.5.8",
-    "@sap-ux/project-access": "1.22.3"
+    "@sap-ux/preview-middleware": "0.14.0",
+    "@sap-ux/project-access": "1.22.3",
+    "@sap-ux/ui5-config": "0.22.10",
+    "@sap-ux/system-access": "0.4.5"
   },
   "devDependencies": {
     "@types/diff": "5.0.9",
@@ -42,7 +48,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/prompts": "2.4.4",
-    "@sap-ux/inquirer-common": "0.3.0",
+    "@sap-ux/inquirer-common": "0.3.1",
     "@sap-ux/store": "0.6.0"
   },
   "scripts": {