updated packages

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
                 node-version: '20'
                 registry-url: 'https://registry.npmjs.org'
             - run: npm i -g npm@latest
-            - run: npm i -g @angular/cli@20 zibri-cli @loopback/cli@6 @nestjs/cli@11 create-vite@6 create-storybook@9.1.16
+            - run: npm i -g @angular/cli@20 zibri-cli @loopback/cli@7 @nestjs/cli@11 create-vite@6 create-storybook@9.1.20
             - run: npm i
             - run: npm run build
             - run: npm run test

jest.config.mjs

@@ -5,7 +5,7 @@ const config = {
     testEnvironment: 'node',
     rootDir: 'src',
     transform: {
-        '^.+.tsx?$': ['ts-jest', {}]
+        '^.+.tsx?$': ['ts-jest']
     },
     setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
     bail: false,

package.json

@@ -1,6 +1,6 @@
 {
     "name": "monux-cli",
-    "version": "2.5.6",
+    "version": "2.5.7",
     "license": "MIT",
     "main": "index.js",
     "engines": {
@@ -46,22 +46,22 @@
         "cli-table3": "^0.6.5",
         "death": "^1.1.0",
         "figlet": "^1.8.2",
-        "inquirer": "^10.2.2",
+        "inquirer": "^13.3.2",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3"
     },
     "devDependencies": {
         "@angular/common": "^20.2.1",
         "@faker-js/faker": "^9.0.3",
-        "@jest/globals": "^30.0.5",
-        "@nestjs/common": "^11.1.6",
+        "@jest/globals": "^30.3.0",
+        "@nestjs/common": "^11.1.18",
         "@types/death": "^1.1.5",
         "@types/figlet": "^1.7.0",
         "@types/js-yaml": "^4.0.9",
         "eslint": "^9.34.0",
-        "eslint-config-service-soft": "^2.1.2",
-        "jest": "^30.0.5",
-        "ngx-material-navigation": "^20.0.0",
-        "ts-jest": "^29.4.1"
+        "eslint-config-service-soft": "^2.1.6",
+        "jest": "^30.3.0",
+        "ngx-material-navigation": "^20.2.2",
+        "ts-jest": "^29.4.9"
     }
 }

src/__testing__/mock/fake-add-nav-element-config.function.ts

@@ -7,6 +7,7 @@ export function fakeAddNavElementConfig(addTo: 'navbar' | 'footer' = 'navbar'):
         rowIndex: 0,
         element: {
             type: NavElementTypes.TITLE_WITH_INTERNAL_LINK,
+            id: 'test',
             title: 'Test',
             link: {
                 route: {

src/__testing__/mock/inquire.mock.ts

@@ -1,18 +1,18 @@
 /* eslint-disable jsdoc/require-jsdoc */
-import { BuiltInQuestion } from 'inquirer/dist/cjs/types/types';
+import { Question } from 'inquirer';
 
 // eslint-disable-next-line typescript/no-explicit-any
-export function inquireMock(answers: Record<string, unknown>): (question: BuiltInQuestion) => Promise<any> {
-    return (question: BuiltInQuestion) => {
+export function inquireMock(answers: Record<string, unknown>): (question: Question) => Promise<any> {
+    return (question: Question) => {
         if (typeof question.message !== 'string') {
             throw new Error('Cannot mock questions with messages that are async functions.');
         }
 
-        if (!Object.keys(answers).includes(question.message)) {
-            throw new Error(`No answer for the question "${question.message}" has been provided.`);
+        if (!Object.keys(answers).includes(question.name)) {
+            throw new Error(`No answer for the question "${question.name}" has been provided.`);
         }
 
         // eslint-disable-next-line typescript/no-unsafe-return, typescript/no-explicit-any
-        return answers[question.message] as any;
+        return answers[question.name] as any;
     };
 }

src/angular/angular-utilities.test.ts

@@ -159,6 +159,7 @@ describe('AngularUtilities', () => {
             '        elements: [',
             '            {',
             '                type: NavElementTypes.TITLE_WITH_INTERNAL_LINK,',
+            '                id: \'test\',',
             '                title: \'Test\',',
             '                link: {',
             '                    route: {',
@@ -216,6 +217,7 @@ describe('AngularUtilities', () => {
             '        elements: [',
             '            {',
             '                type: NavElementTypes.TITLE_WITH_INTERNAL_LINK,',
+            '                id: \'test\',',
             '                title: \'Test\',',
             '                link: {',
             '                    route: {',
@@ -227,6 +229,7 @@ describe('AngularUtilities', () => {
             '            },',
             '            {',
             '                type: NavElementTypes.TITLE_WITH_INTERNAL_LINK,',
+            '                id: \'test\',',
             '                title: \'Test\',',
             '                link: {',
             '                    route: {',
@@ -297,6 +300,7 @@ describe('AngularUtilities', () => {
             '        elements: [',
             '            {',
             '                type: NavElementTypes.TITLE_WITH_INTERNAL_LINK,',
+            '                id: \'test\',',
             '                title: \'Test\',',
             '                link: {',
             '                    route: {',

src/angular/content/admins-page-ts.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const adminsPageTsContent: string
-= `import { CommonModule } from '@angular/common';
+export const adminsPageTsContent: string = `import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgxMatEntityTableComponent, TableData } from 'ngx-material-entity';
 import { Admin } from '../../models/admin.model';

src/angular/content/auth-service.content.ts

@@ -1,7 +1,6 @@
 /* eslint-disable stylistic/max-len */
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const authServiceContent: string
-= `import { HttpClient } from '@angular/common/http';
+export const authServiceContent: string = `import { HttpClient } from '@angular/common/http';
 import { Inject, Injectable, NgZone, PLATFORM_ID } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';

src/angular/content/base-entity-model.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const baseEntityModelContent: string
-= `import { string } from 'ngx-material-entity';
+export const baseEntityModelContent: string = `import { string } from 'ngx-material-entity';
 
 export class BaseEntity {
 

src/angular/content/change-set-service.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const changeSetServiceContent: string
-= `import { HttpClient } from '@angular/common/http';
+export const changeSetServiceContent: string = `import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { BaseChangeSetService, ChangeSet } from 'ngx-material-change-sets';
 

src/angular/content/change-sets-component-html.content.ts

@@ -1,4 +1,2 @@
-// eslint-disable-next-line jsdoc/require-jsdoc
-export const changeSetsComponentHtmlContent: string
-// eslint-disable-next-line stylistic/max-len
-= '<ngx-mat-change-sets [entity]="e" [config]="config" [changeSetsApiBaseUrl]="metadata.customMetadata.changeSetsApiBaseUrl"></ngx-mat-change-sets>';
+// eslint-disable-next-line jsdoc/require-jsdoc, stylistic/max-len
+export const changeSetsComponentHtmlContent: string = '<ngx-mat-change-sets [entity]="e" [config]="config" [changeSetsApiBaseUrl]="metadata.customMetadata.changeSetsApiBaseUrl"></ngx-mat-change-sets>';

src/angular/content/change-sets-component-ts.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const changeSetsComponentTsContent: string
-= `import { Component, OnInit } from '@angular/core';
+export const changeSetsComponentTsContent: string = `import { Component, OnInit } from '@angular/core';
 import { ChangeSet, ChangeSetEntity, ChangeSetsComponent, ChangeSetsConfig } from 'ngx-material-change-sets';
 import { DecoratorTypes, NgxMatEntityBaseInputComponent } from 'ngx-material-entity';
 import { LodashUtilities } from '../../utilities/lodash.utilities';

src/angular/content/lodash-utilities.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const lodashUtilitiesContent: string
-= `import { cloneDeep } from 'lodash';
+export const lodashUtilitiesContent: string = `import { cloneDeep } from 'lodash';
 
 export abstract class LodashUtilities {
     static cloneDeep<E>(value: E): E {

src/angular/content/offline-service.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const offlineServiceContent: string
-= `import { HttpClient } from '@angular/common/http';
+export const offlineServiceContent: string = `import { HttpClient } from '@angular/common/http';
 import { Inject, Injectable, NgZone, PLATFORM_ID } from '@angular/core';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { NgxPwaOfflineService } from 'ngx-pwa';

src/commands/add/add-angular-library/add-angular-library.command.ts

@@ -42,8 +42,9 @@ export class AddAngularLibraryCommand extends BaseAddCommand<AddAngularLibraryCo
     protected override configQuestions: QuestionsFor<OmitStrict<AddAngularLibraryConfiguration, keyof AddConfiguration>> = {
         scope: {
             type: 'input',
-            required: true,
+            name: 'scope',
             message: 'scope',
+            validate: (v?: string) => !!v,
             default: async () => {
                 const workspaceConfig: WorkspaceConfig = await WorkspaceUtilities.getConfigOrFail();
                 return `@${workspaceConfig.name}`;

src/commands/add/add-angular-library/button-component-html.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const buttonComponentHtmlContent: string
-= `<button 
+export const buttonComponentHtmlContent: string = `<button 
     class="transition duration-200 ease-in-out rounded-md p-2 px-4 font-semibold"
     [ngClass]="{
         'bg-primary hover:bg-primary-darker text-primary-contrast': color === 'primary',

src/commands/add/add-angular-library/button-component-ts.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const buttonComponentTsContent: string
-= `import { CommonModule } from '@angular/common';
+export const buttonComponentTsContent: string = `import { CommonModule } from '@angular/common';
 import { Component, Input } from '@angular/core';
 
 /**

src/commands/add/add-angular-library/button-stories-ts.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const buttonStoriesTsContent: string
-= `import { componentWrapperDecorator, StoryFn, type Meta } from '@storybook/angular';
+export const buttonStoriesTsContent: string = `import { componentWrapperDecorator, StoryFn, type Meta } from '@storybook/angular';
 
 import { ButtonComponent } from './button.component';
 

src/commands/add/add-angular-library/storybook-main-ts.content.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line jsdoc/require-jsdoc
-export const storybookMainTsContent: string
-= `import { join, dirname } from 'path';
+export const storybookMainTsContent: string = `import { join, dirname } from 'path';
 
 import type { StorybookConfig } from '@storybook/angular';
 

src/commands/add/add-angular-website/add-angular-website-command.test.ts

@@ -12,9 +12,9 @@ describe('AddAngularWebsiteCommand', () => {
         await FileMockUtilities.setup(mockConstants);
         InquirerUtilities['inquire'] = jest.fn(inquireMock({
             port: 4200,
-            'sub domain': undefined,
-            'title suffix (eg. "| My Company")': '| Website',
-            'Add tracking?': false
+            subDomain: undefined,
+            titleSuffix: '| Website',
+            addTracking: false
         }));
     });
 

src/commands/add/add-angular-website/add-angular-website.command.ts

@@ -48,23 +48,26 @@ export class AddAngularWebsiteCommand extends BaseAddCommand<AddAngularWebsiteCo
     protected override configQuestions: QuestionsFor<OmitStrict<AddAngularWebsiteConfiguration, keyof AddConfiguration>> = {
         port: {
             type: 'number',
+            name: 'port',
             message: 'port',
-            required: true,
+            validate: (v?: number) => !!v,
             default: 4200
         },
         subDomain: {
             type: 'input',
-            message: 'sub domain',
-            required: false
+            name: 'subDomain',
+            message: 'sub domain'
         },
         titleSuffix: {
             type: 'input',
+            name: 'titleSuffix',
             message: 'title suffix (eg. "| My Company")',
-            default: `| ${toPascalCase(this.baseConfig.name)}`,
-            required: true
+            validate: (v?: string) => !!v,
+            default: `| ${toPascalCase(this.baseConfig.name)}`
         },
         addTracking: {
             type: 'select',
+            name: 'addTracking',
             message: 'Add tracking?',
             choices: [{ value: true, name: 'Yes' }, { value: false, name: 'No' }],
             default: true
@@ -126,6 +129,7 @@ export class AddAngularWebsiteCommand extends BaseAddCommand<AddAngularWebsiteCo
             rowIndex: 0,
             element: {
                 type: NavElementTypes.TITLE_WITH_INTERNAL_LINK,
+                id: 'home-navbar',
                 title: 'Home',
                 link: {
                     route: {
@@ -142,6 +146,7 @@ export class AddAngularWebsiteCommand extends BaseAddCommand<AddAngularWebsiteCo
             addTo: 'footer',
             rowIndex: 0,
             element: {
+                id: 'imprint-footer',
                 type: NavElementTypes.INTERNAL_LINK,
                 name: 'Imprint',
                 route: {
@@ -158,6 +163,7 @@ export class AddAngularWebsiteCommand extends BaseAddCommand<AddAngularWebsiteCo
             rowIndex: 0,
             element: {
                 type: NavElementTypes.INTERNAL_LINK,
+                id: 'privacy-footer',
                 name: 'Privacy',
                 route: {
                     path: 'privacy',

src/commands/add/add-angular/add-angular-command.test.ts

@@ -12,9 +12,9 @@ describe('AddAngularCommand', () => {
         await FileMockUtilities.setup(mockConstants);
         InquirerUtilities['inquire'] = jest.fn(inquireMock({
             port: 4200,
-            'sub domain': 'admin',
-            'title suffix (eg. "| My Company")': '| Admin',
-            'name of the api to use': 'api'
+            subDomain: 'admin',
+            titleSuffix: '| Admin',
+            apiName: 'api'
         }));
     });
 

src/commands/add/add-angular/add-angular.command.ts

@@ -47,25 +47,28 @@ export class AddAngularCommand extends BaseAddCommand<AddAngularConfiguration> {
     protected override readonly configQuestions: QuestionsFor<OmitStrict<AddAngularConfiguration, keyof AddConfiguration>> = {
         port: {
             type: 'number',
+            name: 'port',
             message: 'port',
-            required: true,
+            validate: (v?: number) => !!v,
             default: 4200
         },
         subDomain: {
             type: 'input',
-            message: 'sub domain',
-            required: false
+            name: 'subDomain',
+            message: 'sub domain'
         },
         titleSuffix: {
             type: 'input',
+            name: 'titleSuffix',
             message: 'title suffix (eg. "| My Company")',
-            required: true,
+            validate: (v?: string) => !!v,
             default: `| ${toPascalCase(this.baseConfig.name)}`
         },
         apiName: {
             type: 'input',
+            name: 'apiName',
             message: 'name of the api to use',
-            required: true,
+            validate: (v?: string) => !!v,
             default: 'api'
         }
     };

src/commands/add/add-loopback/add-loopback-command.test.ts

@@ -14,14 +14,14 @@ describe('AddLoopbackCommand', () => {
         await FileMockUtilities.setup(mockConstants);
         InquirerUtilities['inquire'] = jest.fn(inquireMock({
             port: 3000,
-            'sub domain': 'api',
-            'Email of the default user': 'test@test.com',
-            'Password of the default user': 'stringstring',
-            'Name of the frontend where the reset password ui is implemented': 'admin',
-            'Database compose service': 'NEW',
-            'Compose service name': 'db',
-            'Database name': 'sandbox',
-            'database type': DbType.POSTGRES
+            subDomain: 'api',
+            defaultUserEmail: 'test@test.com',
+            defaultUserPassword: 'stringstring',
+            frontendName: 'admin',
+            dbComposeService: 'NEW',
+            dbComposeServiceName: 'db',
+            databaseName: 'sandbox',
+            dbType: DbType.POSTGRES
         }));
         LoopbackUtilities['createMailService'] = jest.fn(createMailServiceMock);
         LoopbackUtilities['createBiometricCredentialsService'] = jest.fn(async () => {});