@sap-ux/fiori-app-sub-generator 0.8.8 → 0.9.1

package/generators/app-headless/transforms.js

@@ -106,7 +106,6 @@ function _setProjectDefaults(project) {
         localUI5Version: project.localUI5Version ?? ui5Version,
         ui5Theme: project.ui5Theme ?? (0, ui5_info_1.getDefaultUI5Theme)(ui5Version),
         skipAnnotations: project.skipAnnotations || types_1.defaultPromptValues[ui5_application_inquirer_1.promptNames.skipAnnotations],
-        enableCodeAssist: project.enableCodeAssist || types_1.defaultPromptValues[ui5_application_inquirer_1.promptNames.enableCodeAssist],
         enableEslint: project.enableEslint || types_1.defaultPromptValues[ui5_application_inquirer_1.promptNames.enableEslint],
         enableTypeScript: project.enableTypeScript || types_1.defaultPromptValues[ui5_application_inquirer_1.promptNames.enableTypeScript],
         sapux: project.sapux || false,

package/generators/fiori-app-generator/fioriAppGenerator.js

@@ -264,7 +264,6 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                 AppGenBusinessHubType: (0, utils_1.getTelemetryBusinessHubType)(service.apiHubConfig?.apiHubType),
                 EnableEslint: project.enableEslint,
                 EnableTypeScript: project.enableTypeScript,
-                EnableCodeAssist: project.enableCodeAssist,
                 EnableVirtualEndpoints: project.enableVirtualEndpoints,
                 ToolsId: appConfig.app.sourceTemplate?.toolsId
             });
@@ -285,7 +284,6 @@ class FioriAppGenerator extends yeoman_generator_1.default {
             await (0, install_1.installDependencies)({
                 appPackagePath: this.destinationPath(),
                 capService: this.state.service.capService,
-                enableCodeAssist: this.state.project?.enableCodeAssist ?? false,
                 // Assumption that npm workspaces will be enabled if cds ui5 plugin is a depenedency
                 useNpmWorkspaces: !!(this.state.project.enableTypeScript || // If typescript is enabled, it is required that the CAP project will be updated to use NPM workspaces
                     this.state.service.capService?.cdsUi5PluginInfo?.isCdsUi5PluginEnabled ||

package/generators/fiori-app-generator/install.d.ts

@@ -5,7 +5,6 @@ import { type ILogWrapper } from '@sap-ux/fiori-generator-shared';
  */
 export type CapInstallOptions = {
     ui5Version?: string;
-    codeAssist?: boolean;
     rootPath?: string;
     depsInstallPath?: string;
     useWorkspaces?: boolean;
@@ -18,16 +17,14 @@ export type CapInstallOptions = {
  * @param param0
  * @param param0.appPackagePath
  * @param param0.capService
- * @param param0.enableCodeAssist
  * @param param0.useNpmWorkspaces
  * @param param0.ui5Version
  * @param logger The logger to use for output
  * @returns Promise<void>
  */
-export declare function installDependencies({ appPackagePath, capService, enableCodeAssist, useNpmWorkspaces, ui5Version }: {
+export declare function installDependencies({ appPackagePath, capService, useNpmWorkspaces, ui5Version }: {
     appPackagePath: string;
     capService?: CapService;
-    enableCodeAssist: boolean;
     useNpmWorkspaces: boolean;
     ui5Version: string;
 }, logger: ILogWrapper): Promise<void>;

package/generators/fiori-app-generator/install.js

@@ -3,15 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.installDependencies = installDependencies;
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const utils_1 = require("../utils");
-/**
- * The dependencies required for code assist for the root CAP project package.json.
- * These are not written to the `app` package.json by the `@sap-ux/ui5-application-writer`, as is done for non-CAP projects.
- */
-const codeAssistDeps = {
-    eslint: '7.32.0',
-    '@sap/eslint-plugin-ui5-jsdocs': '2.0.5',
-    '@sapui5/ts-types': '1.92.2'
-};
 /**
  * Install the dependencies for the specified project. In the case of CAP projects, the dependencies are installed to the root project
  * if npm workspace option is used, otherwise they are installed to the app project only.
@@ -24,9 +15,6 @@ async function installProjectDependencies(projectPath, log, capOptions) {
     const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     const runner = new utils_1.CommandRunner(log);
     const runArgs = [];
-    if (capOptions?.codeAssist) {
-        runArgs.push(...Object.keys(codeAssistDeps).map((dep) => `${dep}@${codeAssistDeps[dep]}`));
-    }
     runArgs.unshift('install');
     try {
         log?.info((0, utils_1.t)('logMessages.installingDependencies', { path: projectPath }));
@@ -56,18 +44,16 @@ async function installProjectDependencies(projectPath, log, capOptions) {
  * @param param0
  * @param param0.appPackagePath
  * @param param0.capService
- * @param param0.enableCodeAssist
  * @param param0.useNpmWorkspaces
  * @param param0.ui5Version
  * @param logger The logger to use for output
  * @returns Promise<void>
  */
-async function installDependencies({ appPackagePath, capService, enableCodeAssist, useNpmWorkspaces, ui5Version }, logger) {
+async function installDependencies({ appPackagePath, capService, useNpmWorkspaces, ui5Version }, logger) {
     // Install additional libs to root CAP project
     let capInstallOpts;
     if (capService) {
         capInstallOpts = {
-            codeAssist: enableCodeAssist,
             rootPath: capService.projectPath,
             // if NPM workspaces are used, depsInstallPath will be the CAP projectpackage.json. Otherwise the CAP app package.json.
             depsInstallPath: useNpmWorkspaces ? capService.projectPath : appPackagePath,

package/generators/fiori-app-generator/prompting.js

@@ -211,6 +211,9 @@ async function createUI5ApplicationPromptOptions(ui5PromptOptions) {
         [ui5_application_inquirer_1.promptNames.enableTypeScript]: {
             default: types_1.defaultPromptValues[ui5_application_inquirer_1.promptNames.enableTypeScript]
         },
+        [ui5_application_inquirer_1.promptNames.enableCodeAssist]: {
+            hide: true
+        },
         [ui5_application_inquirer_1.promptNames.enableVirtualEndpoints]: {
             hide: service.capService?.capType === 'Java'
         }
@@ -218,7 +221,6 @@ async function createUI5ApplicationPromptOptions(ui5PromptOptions) {
     const promptOptions = (0, merge_1.default)(preMergedPromptOpts, promptSettings);
     // Configure the prompts which should be hidden behind the advanced option switch
     const advancedPrompts = [
-        ui5_application_inquirer_1.promptNames.enableCodeAssist,
         ui5_application_inquirer_1.promptNames.skipAnnotations,
         ui5_application_inquirer_1.promptNames.enableEslint,
         ui5_application_inquirer_1.promptNames.ui5Theme

package/generators/fiori-app-generator/transforms.js

@@ -276,7 +276,6 @@ function getBaseAppConfig({ project, service, floorplan, entityRelatedConfig, vi
             ui5Libs: []
         },
         appOptions: {
-            codeAssist: project.enableCodeAssist,
             eslint: project.enableEslint,
             typescript: project.enableTypeScript,
             sapux: project.sapux,

package/generators/fiori-app-generator/writing.js

@@ -69,7 +69,6 @@ async function writeAppGenInfoFiles({ project, service, floorplan, entityRelated
         appNamespace: project.namespace ?? '',
         ui5Theme: project.ui5Theme,
         ui5Version: appGenInfoCustom?.ui5Version || project.manifestMinUI5Version || project.ui5Version,
-        enableCodeAssist: project.enableCodeAssist,
         enableEslint: project.enableEslint,
         enableTypeScript: project.enableTypeScript,
         showMockDataInfo: !!service.edmx && !service.capService,

package/generators/types/state.d.ts

@@ -22,6 +22,7 @@ export interface Project {
     localUI5Version: string;
     sapux?: boolean;
     skipAnnotations?: boolean;
+    /** @deprecated Code assist prompt is hidden and this property is no longer used */
     enableCodeAssist?: boolean;
     enableEslint?: boolean;
     enableTypeScript?: boolean;

package/generators/types/telemetryEvents.d.ts

@@ -19,7 +19,6 @@ export interface AppGenEventProperties extends TelemetryProperties {
      */
     AppGenSapSystemType: TelemetrySapSystemType;
     EnableEslint: boolean;
-    EnableCodeAssist: boolean;
     AppGenLaunchSource: LaunchSource;
     /**
      * Version of the module which launches the generator

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-app-sub-generator",
   "description": "A yeoman (sub) generator that can generate Fiori applications. Not for standalone use.",
-  "version": "0.8.8",
+  "version": "0.9.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -19,7 +19,7 @@
     "!generators/**/*.map"
   ],
   "dependencies": {
-    "@sap-ux/annotation-converter": "0.10.3",
+    "@sap-ux/annotation-converter": "0.10.8",
     "@sap-ux/edmx-parser": "0.9.1",
     "@sap/service-provider-apis": "2.5.1",
     "i18next": "25.3.0",
@@ -29,23 +29,23 @@
     "mem-fs-editor": "9.4.0",
     "uuid": "11.0.5",
     "yeoman-generator": "5.10.0",
+    "@sap-ux/annotation-generator": "0.3.76",
     "@sap-ux/axios-extension": "1.24.2",
-    "@sap-ux/annotation-generator": "0.3.75",
+    "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/cap-config-writer": "0.12.25",
     "@sap-ux/feature-toggle": "0.3.4",
-    "@sap-ux/btp-utils": "1.1.5",
-    "@sap-ux/fiori-elements-writer": "2.8.4",
+    "@sap-ux/fiori-elements-writer": "2.8.5",
     "@sap-ux/fiori-freestyle-writer": "2.5.2",
     "@sap-ux/fiori-generator-shared": "0.13.34",
     "@sap-ux/fiori-tools-settings": "0.2.2",
-    "@sap-ux/launch-config": "0.10.35",
-    "@sap-ux/project-access": "1.32.9",
-    "@sap-ux/odata-service-inquirer": "2.11.8",
+    "@sap-ux/launch-config": "0.10.36",
+    "@sap-ux/odata-service-inquirer": "2.11.10",
     "@sap-ux/odata-service-writer": "0.27.30",
+    "@sap-ux/project-access": "1.32.9",
     "@sap-ux/store": "1.3.3",
-    "@sap-ux/ui5-application-inquirer": "0.15.35",
-    "@sap-ux/ui5-info": "0.13.2",
-    "@sap-ux/telemetry": "0.6.39"
+    "@sap-ux/telemetry": "0.6.39",
+    "@sap-ux/ui5-application-inquirer": "0.15.37",
+    "@sap-ux/ui5-info": "0.13.3"
   },
   "devDependencies": {
     "@sap-devx/yeoman-ui-types": "1.16.9",
@@ -62,10 +62,10 @@
     "mock-spawn": "0.2.6",
     "rimraf": "6.0.1",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.5",
-    "@sap-ux/flp-config-sub-generator": "0.3.67",
+    "@sap-ux/deploy-config-sub-generator": "0.5.7",
+    "@sap-ux/flp-config-sub-generator": "0.3.69",
+    "@sap-ux/inquirer-common": "0.9.6",
     "@sap-ux/jest-file-matchers": "0.2.6",
-    "@sap-ux/inquirer-common": "0.9.4",
     "@sap-ux/logger": "0.7.1"
   },
   "engines": {