@sap-ux/adp-tooling 0.7.4 → 0.8.1

package/dist/base/helper.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Checks if the input is a non-empty string.
+ *
+ * @param input - input to check
+ * @returns true if the input is a non-empty string
+ */
+export declare function isNotEmptyString(input: string | undefined): boolean;
+/**
+ * Checks if the input is a valid SAP client.
+ *
+ * @param input - input to check
+ * @returns true if the input is a valid SAP client
+ */
+export declare function isValidSapClient(input: string | undefined): boolean;
+//# sourceMappingURL=helper.d.ts.map

package/dist/base/helper.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidSapClient = exports.isNotEmptyString = void 0;
+/**
+ * Checks if the input is a non-empty string.
+ *
+ * @param input - input to check
+ * @returns true if the input is a non-empty string
+ */
+function isNotEmptyString(input) {
+    return typeof input === 'string' && input.trim().length > 0;
+}
+exports.isNotEmptyString = isNotEmptyString;
+/**
+ * Checks if the input is a valid SAP client.
+ *
+ * @param input - input to check
+ * @returns true if the input is a valid SAP client
+ */
+function isValidSapClient(input) {
+    return !input || (input.length < 4 && !!new RegExp(/^\d*$/).exec(input));
+}
+exports.isValidSapClient = isValidSapClient;
+//# sourceMappingURL=helper.js.map

package/dist/base/prompt.d.ts

@@ -1,12 +1,14 @@
 import type { AdpWriterConfig } from '../types';
-export declare const enum flexLayer {
-    CUSTOMER_BASE = "CUSTOMER_BASE",
-    VENDOR = "VENDOR"
-}
+import type { AbapTarget } from '@sap-ux/system-access';
+import type { Logger } from '@sap-ux/logger';
+import type { UI5FlexLayer } from '@sap-ux/project-access';
+import type { AppIndex } from '@sap-ux/axios-extension';
 export type PromptDefaults = {
     id?: string;
     reference?: string;
     url?: string;
+    client?: string;
+    ignoreCertErrors?: boolean;
     ft?: boolean;
     package?: string;
     transport?: string;
@@ -15,7 +17,20 @@ export type PromptDefaults = {
  * Prompt the user for the required properties for an adaptation project.
  *
  * @param defaults optional default values for the prompts
+ * @param logger optional logger instance
  * @returns a configuration for the adp writer
  */
-export declare function promptGeneratorInput(defaults?: PromptDefaults): Promise<AdpWriterConfig>;
+export declare function promptGeneratorInput(defaults: PromptDefaults | undefined, logger: Logger): Promise<AdpWriterConfig>;
+/**
+ * Prompt the user for the target system.
+ *
+ * @param defaults default values for the prompts
+ * @param logger logger instance
+ * @returns apps, layer, target url and client
+ */
+export declare function promptTarget(defaults: PromptDefaults, logger: Logger): Promise<{
+    apps: AppIndex;
+    layer: UI5FlexLayer;
+    target: AbapTarget;
+}>;
 //# sourceMappingURL=prompt.d.ts.map

package/dist/base/prompt.js

@@ -12,41 +12,51 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptGeneratorInput = void 0;
+exports.promptTarget = exports.promptGeneratorInput = void 0;
 const prompts_1 = __importDefault(require("prompts"));
+const system_access_1 = require("@sap-ux/system-access");
+const helper_1 = require("./helper");
 /**
  * Prompt the user for the required properties for an adaptation project.
  *
  * @param defaults optional default values for the prompts
+ * @param logger optional logger instance
  * @returns a configuration for the adp writer
  */
-function promptGeneratorInput(defaults = {}) {
+function promptGeneratorInput(defaults, logger) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        defaults = defaults !== null && defaults !== void 0 ? defaults : {};
+        const { target, apps, layer } = yield promptTarget(defaults, logger);
         const app = yield (0, prompts_1.default)([
             {
-                type: 'select',
-                choices: [
-                    { title: "CUSTOMER_BASE" /* flexLayer.CUSTOMER_BASE */, value: "CUSTOMER_BASE" /* flexLayer.CUSTOMER_BASE */ },
-                    { title: "VENDOR" /* flexLayer.VENDOR */, value: "VENDOR" /* flexLayer.VENDOR */ }
-                ],
-                name: 'layer',
-                message: 'Flex layer:'
+                type: 'autocomplete',
+                name: 'reference',
+                message: 'Original application:',
+                initial: defaults.reference,
+                choices: apps.map((app) => {
+                    var _a;
+                    return ({
+                        title: `${app['sap.app/title']} (${((_a = app['sap.fiori/registrationIds']) !== null && _a !== void 0 ? _a : []).join(',')})`,
+                        value: app['sap.app/id']
+                    });
+                }),
+                suggest: (input, choices) => Promise.resolve(choices.filter((i) => i.title.includes(input)))
             },
             {
                 type: 'text',
                 name: 'id',
-                message: (_prev, values) => {
-                    if (values.layer === "CUSTOMER_BASE" /* flexLayer.CUSTOMER_BASE */) {
-                        return 'New adaptation id (CUSTOMER_BASE selected, customer prefix will be automatically added to the id):';
+                message: (_prev) => {
+                    if (layer === 'CUSTOMER_BASE') {
+                        return 'New adaptation id (prefix "customer" will be automatically added to the id):';
                     }
                     else {
                         return 'New adaptation id:';
                     }
                 },
                 initial: defaults.id,
-                format: (input, values) => {
-                    if (values.layer === "CUSTOMER_BASE" /* flexLayer.CUSTOMER_BASE */ && !input.startsWith('customer.')) {
+                format: (input) => {
+                    if (layer === 'CUSTOMER_BASE' && !input.startsWith('customer.')) {
                         return `customer.${input}`;
                     }
                     else {
@@ -55,34 +65,12 @@ function promptGeneratorInput(defaults = {}) {
                 },
                 validate: (input) => (input === null || input === void 0 ? void 0 : input.length) > 0
             },
-            {
-                type: 'text',
-                name: 'reference',
-                message: 'Original application id:',
-                initial: defaults.reference,
-                validate: (input) => (input === null || input === void 0 ? void 0 : input.length) > 0
-            },
             {
                 type: 'text',
                 name: 'title',
                 message: 'Application title:'
             }
         ]);
-        const target = yield (0, prompts_1.default)([
-            {
-                type: 'text',
-                name: 'url',
-                message: 'Target system url:',
-                initial: defaults.url,
-                validate: (input) => (input === null || input === void 0 ? void 0 : input.length) > 0
-            },
-            {
-                type: 'text',
-                name: 'client',
-                message: 'Client (optional):',
-                validate: (input) => (input ? input.length < 4 : true)
-            }
-        ]);
         const deploy = yield (0, prompts_1.default)([
             {
                 type: 'text',
@@ -107,8 +95,93 @@ function promptGeneratorInput(defaults = {}) {
                 validate: (input) => (input === null || input === void 0 ? void 0 : input.length) > 0
             }
         ]);
-        return { app, target, options, deploy };
+        return {
+            app: Object.assign(Object.assign({}, app), { layer }),
+            target,
+            options,
+            deploy
+        };
     });
 }
 exports.promptGeneratorInput = promptGeneratorInput;
+/**
+ * Prompt the user for the target system.
+ *
+ * @param defaults default values for the prompts
+ * @param logger logger instance
+ * @returns apps, layer, target url and client
+ */
+function promptTarget(defaults, logger) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let count = 0;
+        let target = { url: defaults.url, client: defaults.client };
+        while (count < 3) {
+            try {
+                count++;
+                target = yield (0, prompts_1.default)([
+                    {
+                        type: 'text',
+                        name: 'url',
+                        message: 'Target system url:',
+                        initial: target.url,
+                        validate: helper_1.isNotEmptyString,
+                        format: (input) => input.trim()
+                    },
+                    {
+                        type: 'text',
+                        name: 'client',
+                        message: 'Client (optional):',
+                        initial: target.client,
+                        validate: helper_1.isValidSapClient
+                    }
+                ]);
+                const systemInfo = yield fetchSystemInformation(target, defaults.ignoreCertErrors, logger);
+                return Object.assign({ target }, systemInfo);
+            }
+            catch (error) {
+                logger.error('Error while fetching system information. Please check your input.');
+                logger.debug(error.message);
+                if (error.code === 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY') {
+                    logger.error('If you are using a self-signed certificate, please use the --ignore-cert-errors flag.');
+                    const confirm = yield (0, prompts_1.default)([
+                        {
+                            type: 'confirm',
+                            name: 'ignoreCertErrors',
+                            message: 'Do you want to ignore certificate errors?'
+                        }
+                    ]);
+                    defaults.ignoreCertErrors = confirm.ignoreCertErrors;
+                }
+            }
+        }
+        throw new Error('Unable to fetch system information.');
+    });
+}
+exports.promptTarget = promptTarget;
+/**
+ * Fetches the system information from the target system.
+ *
+ * @param target target system
+ * @param ignoreCertErrors ignore certificate errors
+ * @param logger logger instance
+ * @returns app index and layer
+ */
+function fetchSystemInformation(target, ignoreCertErrors, logger) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const provider = yield (0, system_access_1.createAbapServiceProvider)(target, {
+            ignoreCertErrors
+        }, true, logger);
+        logger.info('Fetching system information...');
+        const ato = yield provider.getAtoInfo();
+        const layer = ato.tenantType === 'SAP' ? 'VENDOR' : 'CUSTOMER_BASE';
+        logger.info(`Target layer: ${layer}`);
+        logger.info('Fetching list of available applications... (it can take a moment)');
+        const appIndex = provider.getAppIndex();
+        const apps = yield appIndex.search({
+            'sap.ui/technology': 'UI5',
+            'sap.app/type': 'application'
+        }, ['sap.app/id', 'sap.app/title', 'sap.fiori/registrationIds']);
+        return { apps, layer };
+    });
+}
 //# sourceMappingURL=prompt.js.map

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.7.4",
+  "version": "0.8.1",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -29,9 +29,9 @@
     "mem-fs-editor": "9.4.0",
     "prompts": "2.4.2",
     "adm-zip": "0.5.10",
-    "@sap-ux/axios-extension": "1.8.1",
+    "@sap-ux/axios-extension": "1.9.0",
     "@sap-ux/logger": "0.4.0",
-    "@sap-ux/system-access": "0.3.7",
+    "@sap-ux/system-access": "0.3.8",
     "@sap-ux/ui5-config": "0.21.0"
   },
   "devDependencies": {
@@ -46,7 +46,7 @@
     "nock": "13.4.0",
     "rimraf": "5.0.1",
     "supertest": "6.3.3",
-    "@sap-ux/project-access": "1.16.2",
+    "@sap-ux/project-access": "1.17.0",
     "@sap-ux/store": "0.4.0"
   },
   "peerDependencies": {