generator-jhipster 8.3.0 → 8.5.0

package/dist/jdl/exporters/applications/jhipster-application-formatter.js

@@ -20,34 +20,26 @@ import { GENERATOR_NAME } from '../export-utils.js';
 /**
  * Exports JDL applications to JDL files in separate folders (based on application base names).
  * @param applications the applications to exporters (key: application name, value: a JDLApplication).
- * @param {Object} [configuration]
  * @return object[] exported applications in their final form.
  */
-export function formatApplicationsToExport(applications, configuration) {
+export function formatApplicationsToExport(applications) {
     if (!applications) {
         throw new Error('Applications have to be passed to be exported.');
     }
     return Object.values(applications).map(application => {
-        // TODO: This is probably a bug, too many arguments given.
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-        return setUpApplicationStructure(application, configuration);
+        return setUpApplicationStructure(application);
     });
 }
 /**
  * Exports JDL a application to a JDL file in the current directory.
  * @param {Object} application - the JDL application to export.
- * @param {Object} [configuration]
  * @return {Object} the exported application in its final form.
  */
-export function formatApplicationToExport(application, configuration = {}) {
-    // TODO: This is probably a bug, too many arguments given.
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error
-    return setUpApplicationStructure(application, configuration);
+export function formatApplicationToExport(application) {
+    return setUpApplicationStructure(application);
 }
 function setUpApplicationStructure(application) {
-    let applicationToExport = {
+    const applicationToExport = {
         [GENERATOR_NAME]: {},
     };
     applicationToExport[GENERATOR_NAME] = getApplicationConfig(application);
@@ -58,12 +50,12 @@ function setUpApplicationStructure(application) {
     if (application.hasConfigurationOption('creationTimestamp')) {
         applicationToExport[GENERATOR_NAME].creationTimestamp = parseInt(application.getConfigurationOptionValue('creationTimestamp'), 10);
     }
-    applicationToExport = cleanUpOptions(applicationToExport);
-    return applicationToExport;
+    const postProcessedApplicationToExport = cleanUpOptions(applicationToExport);
+    return postProcessedApplicationToExport;
 }
 function getApplicationConfig(application) {
     const result = {};
-    application.forEachConfigurationOption(option => {
+    application.forEachConfigurationOption((option) => {
         result[option.name] = option.getValue();
     });
     return result;
@@ -73,7 +65,7 @@ function getApplicationNamespaceConfig(application) {
         return undefined;
     }
     const result = {};
-    application.forEachNamespaceConfiguration(configurationOption => {
+    application.forEachNamespaceConfiguration((configurationOption) => {
         result[configurationOption.namespace] = result[configurationOption.namespace] ?? {};
         configurationOption.forEachOption(option => {
             result[configurationOption.namespace][option.name] = option.getValue();
@@ -82,19 +74,20 @@ function getApplicationNamespaceConfig(application) {
     return result;
 }
 function cleanUpOptions(application) {
-    if (!application[GENERATOR_NAME].frontEndBuilder) {
-        delete application[GENERATOR_NAME].frontEndBuilder;
+    const res = structuredClone(application);
+    if (res[GENERATOR_NAME].frontEndBuilder) {
+        delete res[GENERATOR_NAME].frontEndBuilder;
     }
-    delete application.entityNames;
+    delete res.entityNames;
     if (application[GENERATOR_NAME].blueprints) {
-        application[GENERATOR_NAME].blueprints = application[GENERATOR_NAME].blueprints.map(blueprintName => ({
+        res[GENERATOR_NAME].blueprints = application[GENERATOR_NAME].blueprints.map(blueprintName => ({
             name: blueprintName,
         }));
     }
     if (application[GENERATOR_NAME].microfrontends) {
-        application[GENERATOR_NAME].microfrontends = application[GENERATOR_NAME].microfrontends.map(baseName => ({
+        res[GENERATOR_NAME].microfrontends = application[GENERATOR_NAME].microfrontends.map(baseName => ({
             baseName,
         }));
     }
-    return application;
+    return res;
 }

package/dist/jdl/exporters/config.js

@@ -1,5 +1,6 @@
 import { GENERATOR_NAME } from './export-utils.js';
 export const mergeYoRcContent = (oldConfig, newConfig) => {
+    // @ts-expect-error partial assignment
     const merged = { [GENERATOR_NAME]: {} };
     for (const ns of new Set([...Object.keys(oldConfig), ...Object.keys(newConfig)])) {
         merged[ns] = { ...oldConfig[ns], ...newConfig[ns] };

package/dist/jdl/exporters/jhipster-deployment-exporter.js

@@ -31,9 +31,9 @@ export default function exportDeployments(deployments) {
     }
     return Object.values(deployments).map(deployment => {
         checkForErrors(deployment);
-        deployment = setUpDeploymentStructure(deployment);
-        writeDeploymentConfigs(deployment);
-        return deployment;
+        const yoRcDeployment = setUpDeploymentStructure(deployment);
+        writeDeploymentConfigs(yoRcDeployment);
+        return yoRcDeployment;
     });
 }
 function checkForErrors(deployment) {
@@ -49,8 +49,8 @@ function setUpDeploymentStructure(deployment) {
     return deploymentToExport;
 }
 function setUpArrayOptions(deployment) {
-    deployment[GENERATOR_NAME].appsFolders = Array.from(deployment[GENERATOR_NAME].appsFolders);
-    deployment[GENERATOR_NAME].clusteredDbApps = Array.from(deployment[GENERATOR_NAME].clusteredDbApps);
+    deployment[GENERATOR_NAME].appsFolders = Array.from(deployment[GENERATOR_NAME]?.appsFolders || []);
+    deployment[GENERATOR_NAME].clusteredDbApps = Array.from(deployment[GENERATOR_NAME]?.clusteredDbApps || []);
     return deployment;
 }
 /**

package/dist/jdl/exporters/jhipster-entity-exporter.js

@@ -55,7 +55,7 @@ function init(passedConfiguration) {
  * @param subFolder the folder (to create) in which the JHipster entity folder will be.
  */
 function updateEntities(subFolder) {
-    return configuration.entities.map(entity => {
+    return configuration.entities.map((entity) => {
         const filePath = path.join(subFolder, toFilePath(entity.name));
         return updateEntityToGenerateWithExistingOne(filePath, entity);
     });

package/dist/jdl/jdl-importer.js

@@ -29,8 +29,10 @@ import exportEntities from './exporters/jhipster-entity-exporter.js';
 import createWithApplicationValidator from './validators/jdl-with-application-validator.js';
 import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js';
 import { applicationOptions } from './jhipster/index.js';
+import { GENERATOR_NAME } from './exporters/export-utils.js';
 const { OptionNames } = applicationOptions;
 const { APPLICATION_TYPE, BASE_NAME } = OptionNames;
+const GENERATOR_JHIPSTER = 'generator-jhipster'; // can't use the one of the generator as it circles
 /**
  * Creates a new JDL importer from files.
  * There are two ways to create an importer:
@@ -99,10 +101,10 @@ function makeJDLImporter(content, configuration) {
                 importState.exportedEntities = importOnlyEntities(jdlObject, configuration);
             }
             else if (jdlObject.getApplicationQuantity() === 1) {
-                importState = importOneApplicationAndEntities(jdlObject, configuration);
+                importState = importOneApplicationAndEntities(jdlObject);
             }
             else {
-                importState = importApplicationsAndEntities(jdlObject, configuration);
+                importState = importApplicationsAndEntities(jdlObject);
             }
             if (jdlObject.getDeploymentQuantity()) {
                 importState.exportedDeployments = importDeployments(jdlObject.deployments);
@@ -119,9 +121,9 @@ function getJDLObject(parsedJDLContent, configuration) {
     let applicationType = configuration.applicationType;
     let databaseType = configuration.databaseType;
     if (configuration.application) {
-        baseName = configuration.application['generator-jhipster'].baseName;
-        applicationType = configuration.application['generator-jhipster'].applicationType;
-        databaseType = configuration.application['generator-jhipster'].databaseType;
+        baseName = configuration.application[GENERATOR_JHIPSTER].baseName;
+        applicationType = configuration.application[GENERATOR_JHIPSTER].applicationType;
+        databaseType = configuration.application[GENERATOR_JHIPSTER].databaseType;
     }
     return ParsedJDLToJDLObjectConverter.parseFromConfigurationObject({
         parsedContent: parsedJDLContent,
@@ -140,15 +142,15 @@ function checkForErrors(jdlObject, configuration, logger = console) {
         let applicationType = configuration.applicationType;
         let databaseType = configuration.databaseType;
         let blueprints = configuration.blueprints;
-        if (application && application['generator-jhipster']) {
+        if (application && application[GENERATOR_JHIPSTER]) {
             if (applicationType === undefined) {
-                applicationType = application['generator-jhipster'].applicationType;
+                applicationType = application[GENERATOR_JHIPSTER].applicationType;
             }
             if (databaseType === undefined) {
-                databaseType = application['generator-jhipster'].databaseType;
+                databaseType = application[GENERATOR_JHIPSTER].databaseType;
             }
             if (blueprints === undefined) {
-                blueprints = application['generator-jhipster'].blueprints;
+                blueprints = application[GENERATOR_JHIPSTER].blueprints;
             }
         }
         validator = createWithoutApplicationValidator(jdlObject, {
@@ -168,15 +170,15 @@ function importOnlyEntities(jdlObject, configuration) {
     if (!configuration.application && doesFileExist('.yo-rc.json')) {
         application = readJSONFile('.yo-rc.json');
     }
-    if (application && application['generator-jhipster']) {
+    if (application && application[GENERATOR_JHIPSTER]) {
         if (applicationType === undefined) {
-            applicationType = application['generator-jhipster'].applicationType;
+            applicationType = application[GENERATOR_JHIPSTER].applicationType;
         }
         if (applicationName === undefined) {
-            applicationName = application['generator-jhipster'].baseName;
+            applicationName = application[GENERATOR_JHIPSTER].baseName;
         }
         if (databaseType === undefined) {
-            databaseType = application['generator-jhipster'].databaseType;
+            databaseType = application[GENERATOR_JHIPSTER].databaseType;
         }
     }
     const entitiesPerApplicationMap = JDLWithoutApplicationToJSONConverter.convert({
@@ -188,14 +190,14 @@ function importOnlyEntities(jdlObject, configuration) {
     const jsonEntities = entitiesPerApplicationMap.get(applicationName);
     return exportJSONEntities(jsonEntities, configuration);
 }
-function importOneApplicationAndEntities(jdlObject, configuration) {
+function importOneApplicationAndEntities(jdlObject) {
     const importState = {
         exportedApplications: [],
         exportedApplicationsWithEntities: {},
         exportedEntities: [],
         exportedDeployments: [],
     };
-    const formattedApplication = formatApplicationToExport(jdlObject.getApplications()[0], configuration);
+    const formattedApplication = formatApplicationToExport(jdlObject.getApplications()[0]);
     importState.exportedApplications.push(formattedApplication);
     const jdlApplication = jdlObject.getApplications()[0];
     const applicationName = jdlApplication.getConfigurationOptionValue(BASE_NAME);
@@ -203,7 +205,7 @@ function importOneApplicationAndEntities(jdlObject, configuration) {
         jdlObject,
     });
     const jsonEntities = entitiesPerApplicationMap.get(applicationName);
-    const { 'generator-jhipster': config, ...remaining } = formattedApplication;
+    const { [GENERATOR_NAME]: config, ...remaining } = formattedApplication;
     importState.exportedApplicationsWithEntities[applicationName] = {
         config,
         ...remaining,
@@ -220,14 +222,14 @@ function importOneApplicationAndEntities(jdlObject, configuration) {
     }
     return importState;
 }
-function importApplicationsAndEntities(jdlObject, configuration) {
+function importApplicationsAndEntities(jdlObject) {
     const importState = {
         exportedApplications: [],
         exportedApplicationsWithEntities: {},
         exportedEntities: [],
         exportedDeployments: [],
     };
-    const formattedApplications = formatApplicationsToExport(jdlObject.applications, configuration);
+    const formattedApplications = formatApplicationsToExport(jdlObject.applications);
     importState.exportedApplications = formattedApplications;
     const entitiesPerApplicationMap = convert({
         jdlObject,
@@ -257,8 +259,8 @@ function exportJSONEntities(entities, configuration) {
     let baseName = configuration.applicationName;
     let applicationType = configuration.applicationType;
     if (configuration.application) {
-        baseName = configuration.application['generator-jhipster'].baseName;
-        applicationType = configuration.application['generator-jhipster'].applicationType;
+        baseName = configuration.application[GENERATOR_JHIPSTER].baseName;
+        applicationType = configuration.application[GENERATOR_JHIPSTER].applicationType;
     }
     return exportEntities({
         entities,

package/dist/jdl/jhipster/binary-options.js

@@ -33,15 +33,19 @@ const Options = {
     CLIENT_ROOT_FOLDER: 'clientRootFolder',
 };
 const optionNames = Object.values(Options);
+const dtoValues = { MAPSTRUCT, NO: NO_MAPPER };
+const serviceValues = { SERVICE_CLASS, SERVICE_IMPL, NO: NO_SERVICE };
+const paginationValues = {
+    PAGINATION: PaginationTypes.PAGINATION,
+    'INFINITE-SCROLL': PaginationTypes.INFINITE_SCROLL,
+    NO: PaginationTypes.NO,
+};
+const searchValues = { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH };
 const Values = {
-    [Options.DTO]: { MAPSTRUCT, NO: NO_MAPPER },
-    [Options.SERVICE]: { SERVICE_CLASS, SERVICE_IMPL, NO: NO_SERVICE },
-    [Options.PAGINATION]: {
-        PAGINATION: PaginationTypes.PAGINATION,
-        'INFINITE-SCROLL': PaginationTypes.INFINITE_SCROLL,
-        NO: PaginationTypes.NO,
-    },
-    [Options.SEARCH]: { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH },
+    dto: dtoValues,
+    service: serviceValues,
+    pagination: paginationValues,
+    search: searchValues,
 };
 const DefaultValues = {
     [Options.DTO]: Values[Options.DTO].NO,

package/dist/jdl/jhipster/json-entity.js

@@ -47,7 +47,7 @@ class JSONEntity {
         const merged = merge(getDefaults(args.entityName), args);
         this.name = merged.name;
         this.fields = merged.fields;
-        this.annotations = merged.annotations;
+        this.annotations = merged.annotations ?? {};
         this.relationships = merged.relationships;
         this.documentation = merged.documentation;
         this.entityTableName = merged.entityTableName;

package/dist/jdl/models/abstract-jdl-option.js

@@ -50,8 +50,8 @@ export default class AbstractJDLOption {
         if (!option) {
             return false;
         }
-        addAll(this.entityNames, option.entityNames);
-        addAll(this.excludedNames, option.excludedNames);
+        addAll(this.entityNames, Array.from(option.entityNames.values()));
+        addAll(this.excludedNames, Array.from(option.excludedNames.values()));
         return true;
     }
     excludeEntityName(entityName) {

package/dist/jdl/models/jdl-application-configuration-factory.js

@@ -79,6 +79,8 @@ function createJDLConfigurationOption(type, name, value) {
             return new BooleanJDLApplicationConfigurationOption(name, value);
         case 'list':
             return new ListJDLApplicationConfigurationOption(name, value);
+        case 'quotedList':
+            return new ListJDLApplicationConfigurationOption(name, value, true);
         /* istanbul ignore next */
         default:
             // It should not happen! This is a developer error.

package/dist/jdl/models/jdl-binary-option.js

@@ -26,7 +26,7 @@ export default class JDLBinaryOption extends AbstractJDLOption {
     value;
     constructor(args) {
         super(args);
-        if (args.value == null) {
+        if (typeof args.value !== 'string') {
             throw new Error('A binary option must have a value.');
         }
         this.value = args.value;
@@ -46,7 +46,7 @@ export default class JDLBinaryOption extends AbstractJDLOption {
             return firstPart;
         }
         const excludedNames = join(this.excludedNames, ', ');
-        excludedNames.slice(1, this.excludedNames.length - 1);
+        excludedNames.slice(1, this.excludedNames.size - 1);
         return `${firstPart} except ${excludedNames}`;
     }
 }

package/dist/jdl/models/jdl-deployment.js

@@ -24,6 +24,17 @@ const { Options } = deploymentOptions;
 const arrayTypes = ['appsFolders', 'clusteredDbApps'];
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 export default class JDLDeployment {
+    deploymentType;
+    appsFolders;
+    directoryPath;
+    gatewayType;
+    kubernetesServiceType;
+    istio;
+    ingressDomain;
+    ingressType;
+    storageType;
+    monitoring;
+    clusteredDbApps;
     constructor(args) {
         if (!args || !args.deploymentType) {
             throw new Error('The deploymentType is mandatory to create a deployment.');

package/dist/jdl/models/jdl-entity.js

@@ -32,7 +32,7 @@ export default class JDLEntity {
         }
         this.name = merged.name;
         this.tableName = merged.tableName;
-        this.fields = merged.fields;
+        this.fields = merged.fields ?? {};
         this.comment = merged.comment;
         this.annotations = merged.annotations ?? {};
     }

package/dist/jdl/models/jdl-enum.js

@@ -29,7 +29,7 @@ export default class JDLEnum {
         }
         this.comment = merged.comment;
         this.name = merged.name;
-        this.values = new Map(merged.values.map(entry => {
+        this.values = new Map(merged.values.map((entry) => {
             return [entry.key, new JDLEnumValue(entry.key, entry.value, entry.comment)];
         }));
     }

package/dist/jdl/models/jdl-enums.js

@@ -1,21 +1,3 @@
-/**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 export default class JDLEnums {
     enums;
     constructor() {

package/dist/jdl/models/jdl-field.js

@@ -32,8 +32,8 @@ export default class JDLField {
         this.name = merged.name;
         this.type = merged.type;
         this.comment = merged.comment;
-        this.validations = merged.validations;
-        this.options = merged.options;
+        this.validations = merged.validations ?? {};
+        this.options = merged.options ?? {};
     }
     addValidation(validation) {
         if (!validation) {

package/dist/jdl/models/jdl-object-wrapper.js

@@ -0,0 +1 @@
+export {};

package/dist/jdl/models/jdl-object.js

@@ -215,60 +215,38 @@ export default class JDLObject {
         return this.options.size();
     }
     toString() {
-        let string = '';
-        if (this.getApplicationQuantity() !== 0) {
-            string += `${applicationsToString(this.applications)}\n`;
-        }
-        if (this.getDeploymentQuantity() !== 0) {
-            string += `${deploymentsToString(this.deployments)}\n`;
-        }
-        if (this.getEntityQuantity() !== 0) {
-            string += `${entitiesToString(this.entities)}\n`;
-        }
-        if (this.getEnumQuantity() !== 0) {
-            string += `${this.enums.toString()}\n`;
-        }
-        if (this.getRelationshipQuantity() !== 0) {
-            string += `${relationshipsToString(this.relationships)}`;
-        }
-        if (this.getOptionQuantity() !== 0) {
-            string += `\n${optionsToString(this.options)}`;
-        }
-        return string;
+        return [
+            applicationsToString(this.applications),
+            deploymentsToString(this.deployments),
+            entitiesToString(this.entities),
+            this.enums.toString(),
+            relationshipsToString(this.relationships),
+            optionsToString(this.options),
+        ]
+            .map(section => section.trim())
+            .filter(Boolean)
+            .join('\n\n')
+            .concat('\n');
     }
 }
 function applicationsToString(applications) {
-    let string = '';
-    Object.keys(applications).forEach(applicationName => {
-        string += `${applications[applicationName].toString()}\n`;
-    });
-    return string;
+    return Object.values(applications)
+        .map(application => application.toString())
+        .join('\n');
 }
 function deploymentsToString(deployments) {
-    let string = '';
-    Object.values(deployments).forEach(deployment => {
-        string += `${deployment.toString()}\n`;
-    });
-    return string;
+    return Object.values(deployments)
+        .map(deployment => deployment.toString())
+        .join('\n');
 }
 function entitiesToString(entities) {
-    let string = '';
-    Object.keys(entities).forEach(entityName => {
-        string += `${entities[entityName].toString()}\n`;
-    });
-    return string.slice(0, string.length - 1);
+    return Object.values(entities)
+        .map(entity => entity.toString())
+        .join('\n');
 }
 function relationshipsToString(relationships) {
-    const string = relationships.toString();
-    if (string === '') {
-        return '';
-    }
-    return `${string}\n`;
+    return relationships.toString();
 }
 function optionsToString(options) {
-    const string = options.toString();
-    if (string === '') {
-        return '';
-    }
-    return `${string}\n`;
+    return options.toString();
 }

package/dist/jdl/models/jdl-options.js

@@ -1,21 +1,3 @@
-/**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 export default class JDLOptions {
     options;
     optionSize;

package/dist/jdl/models/jdl-relationships.js

@@ -91,23 +91,15 @@ export default class JDLRelationships {
         if (this.size() === 0) {
             return '';
         }
-        let string = '';
-        Object.keys(this.relationships).forEach(type => {
-            if (this.relationships[type].size !== 0) {
-                const result = relationshipTypeToString(this.relationships[type], type);
-                string += `${result}\n`;
-            }
-        });
-        return string.slice(0, string.length - 1);
+        return Object.entries(this.relationships)
+            .map(([key, relationships]) => (relationships.size > 0 ? relationshipTypeToString(relationships, key) : undefined))
+            .filter(Boolean)
+            .join('\n');
     }
 }
 function relationshipTypeToString(relationships, type) {
-    let relationship = `relationship ${type} {\n`;
-    relationships.forEach(internalRelationship => {
-        let lines = internalRelationship.toString().split('\n');
-        lines = lines.slice(1, lines.length - 1);
-        relationship += `${lines.join('\n')}\n`;
-    });
-    relationship = `${relationship.slice(0, relationship.length - 1)}\n}`;
-    return relationship;
+    const relationshipsLines = [...relationships.values()].map(relationship => relationship.toString().split('\n').slice(1, -1)).flat();
+    return `relationship ${type} {
+${relationshipsLines.join('\n')}
+}`;
 }

package/dist/jdl/models/jdl-unary-option.js

@@ -33,7 +33,7 @@ export default class JDLUnaryOption extends AbstractJDLOption {
             return firstPart;
         }
         const excludedNames = join(this.excludedNames, ', ');
-        excludedNames.slice(1, this.excludedNames.length - 1);
+        excludedNames.slice(1, this.excludedNames.size - 1);
         return `${firstPart} except ${excludedNames}`;
     }
 }

package/dist/jdl/models/list-jdl-application-configuration-option.js

@@ -19,13 +19,16 @@
 import JDLApplicationConfigurationOption from './jdl-application-configuration-option.js';
 import { join } from '../utils/set-utils.js';
 export default class ListJDLApplicationConfigurationOption extends JDLApplicationConfigurationOption {
-    constructor(name, value) {
+    // TODO for v9, use set everywhere
+    quoted;
+    constructor(name, value, quoted = false) {
         super(name, new Set(value));
+        this.quoted = quoted;
     }
     getValue() {
         return Array.from(this.value);
     }
     toString() {
-        return `${this.name} [${join(this.value, ', ')}]`;
+        return `${this.name} [${join(this.value, ', ', this.quoted)}]`;
     }
 }

package/dist/jdl/parsing/jdl-ast-builder-visitor.js

@@ -472,6 +472,9 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
         if (context.list) {
             return this.visit(context.list);
         }
+        if (context.quotedList) {
+            return this.visit(context.quotedList);
+        }
         if (context.INTEGER) {
             return context.INTEGER[0].image;
         }
@@ -513,6 +516,9 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
         if (context.list) {
             return this.visit(context.list);
         }
+        if (context.quotedList) {
+            return this.visit(context.quotedList);
+        }
         if (context.INTEGER) {
             return context.INTEGER[0].image;
         }
@@ -535,6 +541,12 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
         }
         return context.NAME.map(namePart => namePart.image, this);
     }
+    quotedList(context) {
+        if (!context.STRING) {
+            return [];
+        }
+        return context.STRING.map(namePart => namePart.image.slice(1, -1), this);
+    }
 }
 function getOptionEntityAndExcludedEntityLists(astResult, option) {
     let entityList = astResult.list || [];