@sap-ux/abap-deploy-config-sub-generator 0.1.4 → 0.1.5

package/generators/app/index.d.ts

@@ -46,5 +46,6 @@ export default class extends DeploymentGenerator {
 export { AbapDeployConfigQuestion, AbapDeployConfigAnswersInternal };
 export { getAbapQuestions } from './questions';
 export { indexHtmlExists } from '../utils';
-export { AbapDeployConfigOptions, DeployProjectType, AbapDeployConfigPromptOptions } from './types';
+export { AbapDeployConfigOptions, DeployProjectType } from './types';
+export { AbapDeployConfigPromptOptions } from '@sap-ux/abap-deploy-config-inquirer';
 //# sourceMappingURL=index.d.ts.map

package/generators/app/index.js

@@ -134,16 +134,21 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         if (!this.launchDeployConfigAsSubGenerator) {
             const appType = await (0, project_access_1.getAppType)(this.destinationPath());
             const isAdp = appType === 'Fiori Adaptation';
+            const packageAdditionalValidation = {
+                shouldValidatePackageForStartingPrefix: isAdp,
+                shouldValidatePackageType: isAdp,
+                shouldValidateFormatAndSpecialCharacters: isAdp
+            };
             const promptOptions = {
                 ui5AbapRepo: { hideIfOnPremise: isAdp },
                 transportInputChoice: { hideIfOnPremise: isAdp },
                 packageAutocomplete: {
-                    shouldValidatePackageForStartingPrefix: isAdp,
-                    shouldValidatePackageType: isAdp,
-                    shouldValidateFormatAndSpecialCharacters: isAdp
+                    additionalValidation: packageAdditionalValidation
+                },
+                packageManual: {
+                    additionalValidation: packageAdditionalValidation
                 },
-                packageManual: { shouldValidatePackageForStartingPrefix: isAdp, shouldValidatePackageType: isAdp },
-                targetSystem: { shouldRestrictDifferentSystemType: isAdp }
+                targetSystem: { additionalValidation: { shouldRestrictDifferentSystemType: isAdp } }
             };
             const indexGenerationAllowed = this.indexGenerationAllowed && !isAdp;
             const { prompts: abapDeployConfigPrompts, answers: abapAnswers = {} } = await (0, questions_1.getAbapQuestions)({

package/generators/app/questions.d.ts

@@ -1,8 +1,8 @@
+import { DeployProjectType } from './types';
 import type { ILogWrapper } from '@sap-ux/fiori-generator-shared';
-import type { AbapDeployConfigAnswersInternal, AbapDeployConfigQuestion } from '@sap-ux/abap-deploy-config-inquirer';
+import type { AbapDeployConfigAnswersInternal, AbapDeployConfigPromptOptions, AbapDeployConfigQuestion } from '@sap-ux/abap-deploy-config-inquirer';
 import type { FioriToolsProxyConfigBackend } from '@sap-ux/ui5-config';
 import type { ConnectedSystem } from '@sap-ux/deploy-config-generator-shared';
-import { DeployProjectType, type AbapDeployConfigPromptOptions } from './types';
 /**
  * Retrieves the ABAP prompt questions from the inquirer.
  *

package/generators/app/questions.js

@@ -92,34 +92,22 @@ async function getAbapQuestions({ appRootPath, connectedSystem, backendConfig, c
         },
         ui5AbapRepo: {
             default: deployAppConfig?.name,
-            hideIfOnPremise: promptOptions?.ui5AbapRepo?.hideIfOnPremise ?? false
+            ...promptOptions?.ui5AbapRepo
         },
         description: { default: deployAppConfig?.description },
         packageManual: {
-            default: deployAppConfig?.package,
-            additionalValidation: {
-                shouldValidatePackageType: promptOptions?.packageAutocomplete?.shouldValidatePackageType ?? false,
-                shouldValidatePackageForStartingPrefix: promptOptions?.packageAutocomplete?.shouldValidatePackageForStartingPrefix ?? false,
-                shouldValidateFormatAndSpecialCharacters: promptOptions?.packageAutocomplete?.shouldValidateFormatAndSpecialCharacters ?? false
-            }
+            default: deployAppConfig?.package ?? promptOptions?.packageManual?.default,
+            ...promptOptions?.packageManual
         },
         transportManual: { default: deployAppConfig?.transport },
         index: { indexGenerationAllowed },
         packageAutocomplete: {
             useAutocomplete: true,
-            additionalValidation: {
-                shouldValidatePackageType: promptOptions?.packageAutocomplete?.shouldValidatePackageType ?? false,
-                shouldValidatePackageForStartingPrefix: promptOptions?.packageAutocomplete?.shouldValidatePackageForStartingPrefix ?? false,
-                shouldValidateFormatAndSpecialCharacters: promptOptions?.packageAutocomplete?.shouldValidateFormatAndSpecialCharacters ?? false
-            }
+            ...promptOptions?.packageAutocomplete
         },
         overwrite: { hide: !showOverwriteQuestion },
         transportInputChoice: { hideIfOnPremise: promptOptions?.transportInputChoice?.hideIfOnPremise ?? false },
-        targetSystem: {
-            additionalValidation: {
-                shouldRestrictDifferentSystemType: promptOptions?.targetSystem?.shouldRestrictDifferentSystemType ?? false
-            }
-        }
+        targetSystem: promptOptions?.targetSystem
     }, logger, (0, fiori_generator_shared_1.getHostEnvironment)() !== fiori_generator_shared_1.hostEnvironment.cli);
 }
 //# sourceMappingURL=questions.js.map

package/generators/app/types.d.ts

@@ -1,4 +1,4 @@
-import type { AbapDeployConfigAnswersInternal } from '@sap-ux/abap-deploy-config-inquirer';
+import type { AbapDeployConfigAnswersInternal, AbapDeployConfigPromptOptions } from '@sap-ux/abap-deploy-config-inquirer';
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { ConnectedSystem } from '@sap-ux/deploy-config-generator-shared';
 import type { TelemetryData } from '@sap-ux/fiori-generator-shared';
@@ -47,32 +47,13 @@ export interface AbapDeployConfigOptions extends AbapDeployConfigAnswersInternal
      * Telemetry data to be send after deployment configuration has been added
      */
     telemetryData?: TelemetryData;
+    /**
+     * Prompts options for the ABAP deploy config inquirer
+     */
+    promptOptions?: AbapDeployConfigPromptOptions;
 }
 export declare enum DeployProjectType {
     Application = "application",
     Library = "library"
 }
-/**
- * Enum defining prompt names for ABAP deployment configuration.
- */
-declare enum promptNames {
-    ui5AbapRepo = "ui5AbapRepo",
-    packageManual = "packageManual",
-    packageAutocomplete = "packageAutocomplete",
-    transportInputChoice = "transportInputChoice",
-    targetSystem = "targetSystem"
-}
-type HideIfOnPremisePromptOption = {
-    hideIfOnPremise?: boolean;
-};
-type TargetSystemPromptOptions = {
-    shouldRestrictDifferentSystemType: boolean;
-};
-type PackageAdditionalValidationPrompOptions = {
-    shouldValidatePackageType?: boolean;
-    shouldValidatePackageForStartingPrefix?: boolean;
-    shouldValidateFormatAndSpecialCharacters?: boolean;
-};
-export type AbapDeployConfigPromptOptions = Partial<Record<promptNames.ui5AbapRepo, HideIfOnPremisePromptOption> & Record<promptNames.transportInputChoice, HideIfOnPremisePromptOption> & Record<promptNames.packageManual, PackageAdditionalValidationPrompOptions> & Record<promptNames.packageAutocomplete, PackageAdditionalValidationPrompOptions> & Record<promptNames.targetSystem, TargetSystemPromptOptions>>;
-export {};
 //# sourceMappingURL=types.d.ts.map

package/generators/app/types.js

@@ -6,15 +6,4 @@ var DeployProjectType;
     DeployProjectType["Application"] = "application";
     DeployProjectType["Library"] = "library";
 })(DeployProjectType || (exports.DeployProjectType = DeployProjectType = {}));
-/**
- * Enum defining prompt names for ABAP deployment configuration.
- */
-var promptNames;
-(function (promptNames) {
-    promptNames["ui5AbapRepo"] = "ui5AbapRepo";
-    promptNames["packageManual"] = "packageManual";
-    promptNames["packageAutocomplete"] = "packageAutocomplete";
-    promptNames["transportInputChoice"] = "transportInputChoice";
-    promptNames["targetSystem"] = "targetSystem";
-})(promptNames || (promptNames = {}));
 //# sourceMappingURL=types.js.map

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/SAP/open-ux-tools.git",
     "directory": "packages/abap-deploy-config-sub-generator"
   },
-  "version": "0.1.4",
+  "version": "0.1.5",
   "license": "Apache-2.0",
   "main": "generators/app/index.js",
   "files": [
@@ -21,7 +21,7 @@
   "dependencies": {
     "i18next": "23.5.1",
     "@sap-devx/yeoman-ui-types": "1.14.4",
-    "@sap-ux/abap-deploy-config-inquirer": "1.4.4",
+    "@sap-ux/abap-deploy-config-inquirer": "1.4.5",
     "@sap-ux/abap-deploy-config-writer": "0.1.2",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/deploy-config-generator-shared": "0.1.2",