feat: Switch Adaptation Project's generator/wizard to use Open Source writers

.changeset/famous-panthers-occur.md

@@ -0,0 +1,6 @@
+---
+'@sap-ux/adp-tooling': minor
+'@sap-ux/preview-middleware': patch
+---
+
+Adds writer functionality for generation of adaptation projects

packages/adp-tooling/src/types.ts

@@ -1,6 +1,6 @@
 import type { UI5FlexLayer } from '@sap-ux/project-access';
 import type { DestinationAbapTarget, UrlAbapTarget } from '@sap-ux/system-access';
-import type { Adp } from '@sap-ux/ui5-config';
+import type { Adp, BspApp } from '@sap-ux/ui5-config';
 import type { Editor } from 'mem-fs-editor';
 
 export interface DescriptorVariant {
@@ -35,21 +35,41 @@ export interface AdpWriterConfig {
     target: AbapTarget;
     ui5?: {
         minVersion?: string;
+        ui5Version?: string;
+        ui5EndpointUrl?: string;
     };
     package?: {
         name?: string;
         description?: string;
     };
+    flp?: {
+        flpTitle?: string;
+        flpSubtitle?: string;
+        inboundId?: string;
+        bspName?: string;
+        languages?: Language[];
+        credentials?: {
+            username: string;
+            password: string;
+        };
+    };
+    customConfig?: AdpCustomConfig;
     /**
      * Optional: configuration for deployment to ABAP
      */
-    deploy?: Adp;
+    deploy?: Adp | BspApp;
     options?: {
         /**
          * Optional: if set to true then the generated project will be recognized by the SAP Fiori tools
          */
         fioriTools?: boolean;
     };
+    appdescr?: ManifestAppdescr;
+}
+
+export interface Language {
+    sap: string;
+    i18n: string;
 }
 
 export interface ManifestAppdescr {
@@ -171,6 +191,7 @@ export type IWriterData<T extends ChangeType> = IWriter<GeneratorData<T>>;
  *
  * @template T - The specific type of data the writer will handle, determined by the associated ChangeType.
  */
+
 export interface IWriter<T> {
     /**
      * Writes the provided data to the project.
@@ -192,6 +213,14 @@ export const enum ChangeType {
     CHANGE_INBOUND = 'appdescr_app_changeInbound'
 }
 
+/**
+ * Enumerates the types of projects that can be made, each representing a specific kind of project structure.
+ */
+export const enum ProjectType {
+    ON_PREM = 'OnPrem',
+    S4 = 'S4',
+}
+
 /**
  * Maps a ChangeType to the corresponding data structure needed for that type of change.
  * This conditional type ensures type safety by linking each change type with its relevant data model.
@@ -340,3 +369,10 @@ export interface AdpProjectData {
     reference: string;
     id: string;
 }
+
+export interface AdpCustomConfig {
+    adp: {
+        safeMode: boolean;
+        environment: ProjectType;
+    };
+}

packages/adp-tooling/src/writer/index.ts

@@ -1,10 +1,14 @@
 import { join } from 'path';
 import { create as createStorage } from 'mem-fs';
-import type { Editor } from 'mem-fs-editor';
-import { create } from 'mem-fs-editor';
+import { create, type Editor } from 'mem-fs-editor';
 import type { AdpWriterConfig } from '../types';
-import { UI5Config } from '@sap-ux/ui5-config';
-import { enhanceUI5Yaml, enhanceUI5DeployYaml, hasDeployConfig } from './options';
+import {
+    writeTemplateToFolder,
+    writeManifestAppdescr,
+    writeUI5Yaml,
+    writeUI5DeployYaml,
+    writeEnvFile
+} from './project-utils';
 
 /**
  * Set default values for optional properties.
@@ -18,7 +22,10 @@ function setDefaults(config: AdpWriterConfig): AdpWriterConfig {
         target: { ...config.target },
         ui5: { ...config.ui5 },
         deploy: config.deploy ? { ...config.deploy } : undefined,
-        options: { ...config.options }
+        options: { ...config.options },
+        flp: config.flp ? { ...config.flp } : undefined,
+        customConfig: config.customConfig ? { ...config.customConfig } : undefined,
+        appdescr: config.appdescr ? { ...config.appdescr } : undefined
     };
     configWithDefaults.app.title ??= `Adaptation of ${config.app.reference}`;
     configWithDefaults.app.layer ??= 'CUSTOMER_BASE';
@@ -42,26 +49,18 @@ export async function generate(basePath: string, config: AdpWriterConfig, fs?: E
     if (!fs) {
         fs = create(createStorage());
     }
+
     const tmplPath = join(__dirname, '../../templates/project');
     const fullConfig = setDefaults(config);
+    const ignoredFiles = fullConfig.appdescr ? ['**/manifest.appdescr_variant'] : [];
 
-    fs.copyTpl(join(tmplPath, '**/*.*'), join(basePath), fullConfig, undefined, {
-        globOptions: { dot: true },
-        processDestinationPath: (filePath: string) => filePath.replace(/gitignore.tmpl/g, '.gitignore')
-    });
-
-    // ui5.yaml
-    const ui5ConfigPath = join(basePath, 'ui5.yaml');
-    const baseUi5ConfigContent = fs.read(ui5ConfigPath);
-    const ui5Config = await UI5Config.newInstance(baseUi5ConfigContent);
-    enhanceUI5Yaml(ui5Config, fullConfig);
-    fs.write(ui5ConfigPath, ui5Config.toString());
-    // ui5-deploy.yaml
-    if (hasDeployConfig(fullConfig)) {
-        const ui5DeployConfig = await UI5Config.newInstance(baseUi5ConfigContent);
-        enhanceUI5DeployYaml(ui5DeployConfig, fullConfig);
-        fs.write(join(basePath, 'ui5-deploy.yaml'), ui5DeployConfig.toString());
+    writeTemplateToFolder(join(tmplPath, '**/*.*'), join(basePath), fullConfig, fs, ignoredFiles);
+    if (fullConfig.appdescr) {
+        writeManifestAppdescr(tmplPath, basePath, fullConfig.appdescr, fs);
     }
+    await writeUI5DeployYaml(basePath, fullConfig, fs);
+    await writeUI5Yaml(basePath, fullConfig, fs);
+    await writeEnvFile(basePath, fullConfig, fs);
 
     return fs;
-}
+}

packages/adp-tooling/src/writer/options.ts

@@ -1,5 +1,5 @@
-import type { CustomMiddleware, UI5Config } from '@sap-ux/ui5-config';
-import type { AdpWriterConfig } from '../types';
+import type { CustomMiddleware, UI5Config, CustomTask, AbapTarget } from '@sap-ux/ui5-config';
+import type { AdpCustomConfig, AdpWriterConfig, Language } from '../types';
 
 /**
  * Generate the configuration for the middlewares required for the ui5.yaml.
@@ -9,9 +9,34 @@ import type { AdpWriterConfig } from '../types';
  */
 export function enhanceUI5Yaml(ui5Config: UI5Config, config: AdpWriterConfig) {
     const middlewares = config.options?.fioriTools ? getFioriToolsMiddlwares(config) : getOpenSourceMiddlewares(config);
+    ui5Config.setConfiguration({ propertiesFileSourceEncoding: 'UTF-8' });
     ui5Config.addCustomMiddleware(middlewares);
 }
 
+/**
+ * Generate the configuration for the custom tasks required for the ui5.yaml.
+ *
+ * @param ui5Config configuration representing the ui5.yaml
+ * @param config full project configuration
+ */
+export function enhanceUI5YamlWithCustomTask(ui5Config: UI5Config, config: AdpWriterConfig) {
+    const tasks = getAdpCloudCustomTasks(config);
+    ui5Config.addCustomTasks(tasks);
+}
+
+/**
+ * Generate custom configuration required for the ui5.yaml.
+ *
+ * @param ui5Config configuration representing the ui5.yaml
+ * @param config full project configuration
+ */
+export function enhanceUI5YamlWithCustomConfig(ui5Config: UI5Config, config?: AdpCustomConfig) {
+    if (config?.adp) {
+        const { safeMode } = config.adp;
+        ui5Config.addCustomConfiguration('adp', { safeMode });
+    }
+}
+
 /**
  * Writer configuration with deploy configuration.
  */
@@ -46,8 +71,17 @@ export function enhanceUI5DeployYaml(ui5Config: UI5Config, config: AdpWriterConf
 function getFioriToolsMiddlwares(config: AdpWriterConfig): CustomMiddleware<unknown>[] {
     return [
         {
-            name: 'fiori-tools-preview',
+            name: 'fiori-tools-appreload',
             afterMiddleware: 'compression',
+            configuration: {
+              port: 35729,
+              path: 'webapp',
+              delay: 300,
+            }
+        },
+        {
+            name: 'fiori-tools-preview',
+            afterMiddleware: 'fiori-tools-appreload',
             configuration: {
                 adp: {
                     target: config.target,
@@ -61,8 +95,9 @@ function getFioriToolsMiddlwares(config: AdpWriterConfig): CustomMiddleware<unkn
             configuration: {
                 ignoreCertErrors: false,
                 ui5: {
+                    version: config?.ui5?.minVersion,
                     path: ['/resources', '/test-resources'],
-                    url: 'https://ui5.sap.com'
+                    url: config?.ui5?.ui5EndpointUrl
                 },
                 backend: [
                     {
@@ -83,6 +118,15 @@ function getFioriToolsMiddlwares(config: AdpWriterConfig): CustomMiddleware<unkn
  */
 function getOpenSourceMiddlewares(config: AdpWriterConfig): CustomMiddleware<object | undefined>[] {
     return [
+        {
+            name: 'reload-middleware',
+            afterMiddleware: 'compression',
+            configuration: {
+              port: 35729,
+              path: 'webapp',
+              delay: 300,
+            }
+        },
         {
             name: 'preview-middleware',
             afterMiddleware: 'compression',
@@ -120,3 +164,36 @@ function getOpenSourceMiddlewares(config: AdpWriterConfig): CustomMiddleware<obj
         }
     ];
 }
+
+/**
+ * Get a list of required custom tasks for S4.
+ *
+ * @param config full project configuration
+ * @returns list of required tasks.
+ */
+function getAdpCloudCustomTasks(config: AdpWriterConfig & { target: AbapTarget }): CustomTask[] {
+    const user = 'env:ABAP_USERNAME';
+    const pass = 'env:ABAP_PASSWORD';
+
+    return [
+        {
+            name: 'app-variant-bundler-build',
+            beforeTask: 'escapeNonAsciiCharacters',
+            configuration: {
+                type: 'abap',
+                destination: config.target?.destination,
+                appName: config?.flp?.bspName,
+                languages: config?.flp?.languages?.map((language: Language) => {
+                    return {
+                        sap: language.sap,
+                        i18n: language.i18n
+                    };
+                }),
+                credentials: {
+                    username: user,
+                    password: pass
+                }
+            }
+        }
+    ];
+}