generator-jhipster 8.0.0 → 8.1.0

package/dist/generators/base/command.mjs

@@ -1,4 +1,3 @@
-import { parseCreationTimestamp } from './support/timestamp.mjs';
 const command = {
     options: {
         useVersionPlaceholders: {
@@ -25,16 +24,6 @@ const command = {
             type: Boolean,
             scope: 'generator',
         },
-        skipJhipsterDependencies: {
-            description: "Don't write jhipster dependencies to package.json.",
-            type: Boolean,
-            scope: 'storage',
-        },
-        creationTimestamp: {
-            description: 'Project creation timestamp (used for reproducible builds)',
-            type: parseCreationTimestamp,
-            scope: 'storage',
-        },
         reproducible: {
             description: 'Try to reproduce changelog',
             type: Boolean,

package/dist/generators/base-application/generator.mjs

@@ -21,7 +21,6 @@ import BaseGenerator from '../base/index.mjs';
 import { CUSTOM_PRIORITIES, PRIORITY_NAMES, QUEUES } from './priorities.mjs';
 import { JHIPSTER_CONFIG_DIR } from '../generator-constants.mjs';
 import { getEntitiesFromDir } from './support/index.mjs';
-import command from './command.mjs';
 import { mutateData } from '../base/support/config.mjs';
 const { LOADING, PREPARING, POST_PREPARING, CONFIGURING_EACH_ENTITY, LOADING_ENTITIES, PREPARING_EACH_ENTITY, PREPARING_EACH_ENTITY_FIELD, PREPARING_EACH_ENTITY_RELATIONSHIP, POST_PREPARING_EACH_ENTITY, DEFAULT, WRITING, POST_WRITING, WRITING_ENTITIES, POST_WRITING_ENTITIES, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
 const { CONFIGURING_EACH_ENTITY_QUEUE, LOADING_ENTITIES_QUEUE, PREPARING_EACH_ENTITY_QUEUE, PREPARING_EACH_ENTITY_FIELD_QUEUE, PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE, POST_PREPARING_EACH_ENTITY_QUEUE, WRITING_ENTITIES_QUEUE, POST_WRITING_ENTITIES_QUEUE, } = QUEUES;
@@ -43,7 +42,6 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         if (this.options.help) {
             return;
         }
-        this.parseJHipsterOptions(command.options);
         this.registerPriorities(CUSTOM_PRIORITIES);
         /* Add tasks allowing entities priorities to match normal priorities pattern */
         this.on('queueOwnTasks', () => {
@@ -51,6 +49,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             this.queueEntityTasks();
         });
         if (this.options.applicationWithEntities) {
+            this.log.warn('applicationWithEntities option is deprecated');
             // Write new definitions to memfs
             this.config.set({
                 ...this.config.getAll(),
@@ -95,7 +94,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         return this.createStorage(entityPath);
     }
     /**
-     * get sorted list of entitiy names according to changelog date (i.e. the order in which they were added)
+     * get sorted list of entity names according to changelog date (i.e. the order in which they were added)
      */
     getExistingEntityNames() {
         return this.getExistingEntities().map(entity => entity.name);
@@ -105,7 +104,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
      */
     getExistingEntities() {
         function isBefore(e1, e2) {
-            return e1.definition.changelogDate - e2.definition.changelogDate;
+            return (e1.definition.annotations?.changelogDate ?? 0) - (e2.definition.annotations?.changelogDate ?? 0);
         }
         const configDir = this.getEntitiesConfigPath();
         const entities = [];
@@ -214,7 +213,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
      */
     resetEntitiesFakeData(seed) {
         seed = `${this.sharedData.getApplication().baseName}-${seed}`;
-        this.log.debug(`Reseting entities seed with '${seed}'`);
+        this.log.debug(`Resetting entities seed with '${seed}'`);
         this.sharedData.getEntities().forEach(({ entity }) => {
             entity.resetFakerSeed(seed);
         });
@@ -304,7 +303,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
     /**
      * @private
      * Get entities to load.
-     * This method doesn't filter entities. An filtered config can be changed at thie priority.
+     * This method doesn't filter entities. An filtered config can be changed at this priority.
      * @returns {string[]}
      */
     getEntitiesDataToLoad() {

package/dist/generators/base-application/support/entities.mjs

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { existsSync, mkdirSync, opendirSync } from 'fs';
+import { existsSync, opendirSync } from 'fs';
 import { extname, basename } from 'path';
 // eslint-disable-next-line import/prefer-default-export
 export function getEntitiesFromDir(configDir) {
     if (!existsSync(configDir)) {
-        mkdirSync(configDir);
+        return [];
     }
     const dir = opendirSync(configDir);
     const entityNames = [];

package/dist/generators/base-application/support/index.mjs

@@ -28,3 +28,4 @@ export { default as prepareField } from './prepare-field.mjs';
 export * from './prepare-field.mjs';
 export { default as prepareRelationship } from './prepare-relationship.mjs';
 export * from './relationship.mjs';
+export * from './update-application-entities-transform.mjs';

package/dist/generators/base-application/support/prepare-entity.mjs

@@ -499,7 +499,6 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity) {
     entity.anyPropertyHasValidation =
         entity.anyPropertyHasValidation || relationships.some(({ relationshipValidate }) => relationshipValidate);
     const relationshipsByOtherEntity = relationships
-        .filter(rel => !rel.otherEntity.embedded)
         .map(relationship => [relationship.otherEntity.entityNameCapitalized, relationship])
         .reduce((relationshipsByOtherEntity, [type, relationship]) => {
         if (!relationshipsByOtherEntity[type]) {

package/dist/generators/base-application/support/prepare-relationship.mjs

@@ -57,6 +57,7 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
         // let ownerSide true when type is 'many-to-one' for convenience.
         // means that this side should control the reference.
         ownerSide: ({ ownerSide, relationshipLeftSide, relationshipManyToOne, relationshipOneToMany }) => ownerSide ?? (relationshipManyToOne || (relationshipLeftSide && !relationshipOneToMany)),
+        persistableRelationship: ({ persistableRelationship, ownerSide }) => persistableRelationship ?? ownerSide,
         relationshipUpdateBackReference: ({ relationshipUpdateBackReference, ownerSide, relationshipRightSide }) => relationshipUpdateBackReference ?? (entityWithConfig.databaseType === 'neo4j' ? relationshipRightSide : !ownerSide),
     });
     relationship.otherSideReferenceExists = false;
@@ -78,6 +79,9 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
             entityWithConfig.databaseType !== NEO4J &&
             entityWithConfig.databaseType !== DATABASE_NO &&
             (relationship.relationshipType === 'one-to-many' || relationship.ownerSide === false)) {
+            if (otherEntityData.builtInUser) {
+                throw new Error(`Error at entity ${entityName}: relationships with built-in User cannot have back reference`);
+            }
             throw new Error(`Error at entity ${entityName}: could not find the other side of the relationship ${stringifyApplicationData(relationship)}`);
         }
         else {

package/dist/generators/base-application/support/update-application-entities-transform.mjs

@@ -0,0 +1,52 @@
+import { readdir } from 'fs/promises';
+import { loadFile } from 'mem-fs';
+import { Minimatch } from 'minimatch';
+import { transform } from 'p-transform';
+import { basename, join } from 'path';
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+export const updateApplicationEntitiesTransform = ({ destinationPath, throwOnMissingConfig = true, }) => {
+    let yoRcFileInMemory;
+    const entities = [];
+    const yoRcFilePath = join(destinationPath, '.yo-rc.json');
+    const entitiesMatcher = new Minimatch(`${destinationPath}/.jhipster/*.json`);
+    return transform(file => {
+        if (file.path === yoRcFilePath) {
+            yoRcFileInMemory = file;
+            return undefined;
+        }
+        if (entitiesMatcher.match(file.path)) {
+            entities.push(basename(file.path).replace('.json', ''));
+        }
+        return file;
+    }, async function () {
+        try {
+            entities.push(...(await readdir(join(destinationPath, '.jhipster'))).map(file => file.replace('.json', '')));
+        }
+        catch {
+            // Directory does not exist
+        }
+        if (entities.length > 0) {
+            // The mem-fs instance requires another file instance to emit a change event
+            const yoRcFile = loadFile(yoRcFilePath);
+            // Prefer in-memory file if it exists
+            const yoRcFileContents = yoRcFileInMemory?.contents ?? yoRcFile.contents;
+            if (yoRcFileContents) {
+                const contents = JSON.parse(yoRcFileContents.toString());
+                if (contents[GENERATOR_JHIPSTER]) {
+                    contents[GENERATOR_JHIPSTER].entities = [...new Set([...(contents[GENERATOR_JHIPSTER].entities ?? []), ...entities])];
+                    yoRcFile.contents = Buffer.from(JSON.stringify(contents, null, 2));
+                    yoRcFileInMemory = yoRcFile;
+                }
+                else if (throwOnMissingConfig) {
+                    throw new Error(`File ${yoRcFile.path} is not a valid JHipster configuration file`);
+                }
+            }
+            else if (throwOnMissingConfig) {
+                throw new Error(`File ${yoRcFile.path} has no contents`);
+            }
+        }
+        if (yoRcFileInMemory) {
+            this.push(yoRcFileInMemory);
+        }
+    });
+};

package/dist/generators/base-core/generator.mjs

@@ -116,7 +116,7 @@ export default class CoreGenerator extends YeomanGenerator {
         }
         this.registerPriorities(CUSTOM_PRIORITIES);
         if (this.getFeatures().jhipsterBootstrap ?? true) {
-            // jhipster:bootstrap is always required. Run it once the enviroment starts.
+            // jhipster:bootstrap is always required. Run it once the environment starts.
             this.env.queueTask('environment:run', async () => this.composeWithJHipster(GENERATOR_BOOTSTRAP).then(), {
                 once: 'queueJhipsterBootstrap',
                 startQueue: false,
@@ -141,6 +141,19 @@ export default class CoreGenerator extends YeomanGenerator {
         }
         return this._needleApi;
     }
+    /**
+     * Warn or throws check failure based on current skipChecks option.
+     * @param message
+     */
+    handleCheckFailure(message) {
+        if (this.skipChecks) {
+            this.log.warn(message);
+        }
+        else {
+            throw new Error(`${message}
+You can ignore this error by passing '--skip-checks' to jhipster command.`);
+        }
+    }
     /**
      * Check if the JHipster version used to generate an existing project is less than the passed version argument
      *
@@ -189,7 +202,7 @@ export default class CoreGenerator extends YeomanGenerator {
      */
     getTaskNames() {
         let priorities = super.getTaskNames();
-        if (this.options.skipPriorities) {
+        if (!this.features.disableSkipPriorities && this.options.skipPriorities) {
             // Make sure yeoman-generator will not throw on empty tasks due to filtered priorities.
             this.customLifecycle = priorities.length > 0;
             priorities = priorities.filter(priorityName => !this.options.skipPriorities.includes(priorityName));
@@ -226,7 +239,7 @@ export default class CoreGenerator extends YeomanGenerator {
             if (!optionDesc?.type || !optionDesc.scope || (common && optionDesc.scope === 'generator'))
                 return;
             let optionValue;
-            // Hidden options are test options, which doesn't rely on commoander for options parsing.
+            // Hidden options are test options, which doesn't rely on commander for options parsing.
             // We must parse environment variables manually
             if (this.options[optionDesc.name ?? optionName] === undefined && optionDesc.env && process.env[optionDesc.env]) {
                 optionValue = process.env[optionDesc.env];
@@ -413,7 +426,7 @@ export default class CoreGenerator extends YeomanGenerator {
                 generator = namespace;
             }
             else {
-                // Keep test compatibily were jhipster lookup does not run.
+                // Keep test compatibility were jhipster lookup does not run.
                 const found = ['/index.js', '/index.cjs', '/index.mjs', '/index.ts', '/index.cts', '/index.mts'].find(extension => {
                     const pathToLook = join(__dirname, `../${generator}${extension}`);
                     return existsSync(pathToLook) ? pathToLook : undefined;

package/dist/generators/base-entity-changes/generator.mjs

@@ -64,7 +64,7 @@ export default class GeneratorBaseEntityChanges extends GeneratorBaseApplication
         const { generateBuiltInUserEntity, incrementalChangelog } = this.sharedData.getApplication();
         const entityNames = this.getExistingEntityNames();
         const entitiesByName = Object.fromEntries(entityNames.map(entityName => [entityName, this.sharedData.getEntity(entityName)]));
-        const entitiesWithExistingChangelog = entityNames.filter(entityName => !this.isChangelogNew({ entityName, changelogDate: entitiesByName[entityName].changelogDate }));
+        const entitiesWithExistingChangelog = entityNames.filter(entityName => !this.isChangelogNew({ entityName, changelogDate: entitiesByName[entityName].annotations?.changelogDate }));
         const previousEntitiesByName = Object.fromEntries(entityNames
             .filter(entityName => existsSync(this.getEntityConfigPath(entityName)))
             .map(entityName => [

package/dist/generators/bootstrap/command.mjs

@@ -11,6 +11,12 @@ const command = {
             hide: true,
             scope: 'generator',
         },
+        refreshOnCommit: {
+            description: 'Refresh files on commit',
+            type: Boolean,
+            hide: true,
+            scope: 'generator',
+        },
     },
 };
 export default command;

package/dist/generators/bootstrap/generator.mjs

@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Duplex } from 'stream';
 import { forceYoFiles, createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter';
-import { isFileStateModified } from 'mem-fs-editor/state';
+import { isFileStateModified, isFilePending } from 'mem-fs-editor/state';
 import { createCommitTransform } from 'mem-fs-editor/transform';
 import BaseGenerator from '../base/index.mjs';
 import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFilePath, createSortConfigFilesTransform, createESLintTransform, createRemoveUnusedImportsTransform, } from './support/index.mjs';
@@ -37,8 +38,9 @@ export default class BootstrapGenerator extends BaseGenerator {
     skipPrettier;
     prettierExtensions = PRETTIER_EXTENSIONS.split(',');
     prettierOptions = { plugins: [] };
+    refreshOnCommit = false;
     constructor(args, options, features) {
-        super(args, options, { jhipsterBootstrap: false, uniqueGlobally: true, customCommitTask: () => this.commitSharedFs(), ...features });
+        super(args, options, { jhipsterBootstrap: false, uniqueGlobally: true, customCommitTask: () => this.commitTask(), ...features });
     }
     async beforeQueue() {
         loadStoredAppOptions.call(this);
@@ -55,7 +57,7 @@ export default class BootstrapGenerator extends BaseGenerator {
     get initializing() {
         return this.asInitializingTaskGroup({
             loadOptions() {
-                this.parseJHipsterOptions(command.options);
+                this.parseJHipsterOptions(command.options, command.configs);
             },
             validateBlueprint() {
                 if (this.jhipsterConfig.blueprints && !this.skipChecks) {
@@ -135,16 +137,22 @@ export default class BootstrapGenerator extends BaseGenerator {
     }
     async commitPrettierConfig() {
         await this.commitSharedFs({
-            log: 'prettier configuration files commited to disk',
+            log: 'prettier configuration files committed to disk',
             filter: file => isPrettierConfigFilePath(file.path),
         });
     }
+    async commitTask() {
+        await this.commitSharedFs({ refresh: this.refreshOnCommit }, ...this.env
+            .findFeature('commitTransformFactory')
+            .map(({ feature }) => feature())
+            .flat());
+    }
     /**
      * Commits the MemFs to the disc.
      */
-    async commitSharedFs({ log, ...options } = {}) {
+    async commitSharedFs({ log, ...options } = {}, ...transforms) {
         const skipYoResolveTransforms = [];
-        if (this.options.skipYoResolve) {
+        if (!this.options.skipYoResolve) {
             skipYoResolveTransforms.push(createYoResolveTransform());
         }
         const prettierTransforms = [];
@@ -172,12 +180,22 @@ export default class BootstrapGenerator extends BaseGenerator {
             createConflicterTransform(this.env.adapter, { ...this.env.conflicterOptions }),
             createCommitTransform(),
         ];
-        // Disable progress since it blocks stdin.
         await this.pipeline({
             refresh: false,
+            // Let pending files pass through.
+            pendingFiles: false,
             ...options,
+            // Disable progress since it blocks stdin.
             disabled: true,
-        }, ...transformStreams);
-        this.log.ok(log ?? 'files commited to disk');
+        }, ...transforms, 
+        // Filter out pending files.
+        Duplex.from(async function* (files) {
+            for await (const file of files) {
+                if (isFilePending(file)) {
+                    yield file;
+                }
+            }
+        }), ...transformStreams);
+        this.log.ok(log ?? 'files committed to disk');
     }
 }

package/dist/generators/bootstrap-application/generator.mjs

@@ -22,8 +22,6 @@ import { validations } from '../../jdl/jhipster/index.mjs';
 import { stringifyApplicationData, derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, } from '../base-application/support/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT, GENERATOR_BOOTSTRAP_APPLICATION_SERVER, } from '../generator-list.mjs';
 import { preparePostEntityServerDerivedProperties } from '../server/support/index.mjs';
-import { getDefaultAppName } from '../project-name/support/index.mjs';
-import { packageJson } from '../../lib/index.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
 import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL } from '../generator-constants.mjs';
 const { Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN }, SUPPORTED_VALIDATION_RULES, } = validations;
@@ -44,22 +42,6 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
     }
-    get configuring() {
-        return this.asConfiguringTaskGroup({
-            defaults() {
-                if (!this.options.reproducible) {
-                    this.config.defaults({
-                        jhipsterVersion: packageJson.version,
-                        baseName: getDefaultAppName(this),
-                        creationTimestamp: new Date().getTime(),
-                    });
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.configuring;
-    }
     get preparing() {
         return this.asPreparingTaskGroup({
             preparing({ application, applicationDefaults }) {
@@ -152,7 +134,7 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
                     if (new Set(properties).size !== properties.length) {
                         // Has duplicated properties.
                         const duplicated = [...new Set(properties.filter((v, i, a) => a.indexOf(v) !== i))];
-                        throw new Error(`You have duplicated properties ${duplicated.join(', ')}`);
+                        throw new Error(`You have duplicate properties in entity ${entity.name}: ${duplicated.join(', ')}`);
                     }
                 }
             },

package/dist/generators/bootstrap-application-base/command.mjs

@@ -0,0 +1,30 @@
+import { parseCreationTimestamp } from '../base/support/timestamp.mjs';
+const command = {
+    options: {
+        baseName: {
+            description: 'Application base name',
+            type: String,
+            scope: 'storage',
+        },
+        skipJhipsterDependencies: {
+            description: "Don't write jhipster dependencies to package.json.",
+            type: Boolean,
+            scope: 'storage',
+        },
+        creationTimestamp: {
+            description: 'Project creation timestamp (used for reproducible builds)',
+            type: parseCreationTimestamp,
+            scope: 'storage',
+        },
+    },
+    configs: {
+        jdlStore: {
+            description: 'JDL store',
+            cli: {
+                type: String,
+            },
+            scope: 'storage',
+        },
+    },
+};
+export default command;

package/dist/generators/bootstrap-application-base/generator.mjs

@@ -30,6 +30,8 @@ import { GENERATOR_BOOTSTRAP, GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_CO
 import { packageJson } from '../../lib/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
 import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.mjs';
+import { exportJDLTransform, importJDLTransform } from './support/index.mjs';
+import command from './command.mjs';
 const isWin32 = os.platform() === 'win32';
 const { lowerFirst } = _;
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
@@ -46,7 +48,8 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+        const projectNameGenerator = (await this.dependsOnJHipster(GENERATOR_PROJECT_NAME));
+        projectNameGenerator.javaApplication = true;
         await this.composeWithJHipster(GENERATOR_BOOTSTRAP);
     }
     get initializing() {
@@ -54,6 +57,19 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
             displayLogo() {
                 this.printDestinationInfo();
             },
+            parseOptions() {
+                this.parseJHipsterCommand(command);
+            },
+            async jdlStore() {
+                if (this.jhipsterConfig.jdlStore) {
+                    this.logger.warn('Storing configuration inside a JDL file is experimental');
+                    this.logger.info(`Using JDL store ${this.jhipsterConfig.jdlStore}`);
+                    const destinationPath = this.destinationPath();
+                    const jdlStorePath = this.destinationPath(this.jhipsterConfig.jdlStore);
+                    this.features.commitTransformFactory = () => exportJDLTransform({ destinationPath, jdlStorePath });
+                    await this.pipeline({ refresh: true, pendingFiles: false }, importJDLTransform({ destinationPath, jdlStorePath }));
+                }
+            },
         });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {
@@ -113,9 +129,14 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     get configuringEachEntity() {
         return this.asConfiguringEachEntityTaskGroup({
             configureEntity({ entityStorage, entityConfig }) {
-                entityStorage.defaults({ fields: [], relationships: [] });
-                if (entityConfig.changelogDate === undefined) {
-                    entityConfig.changelogDate = this.dateFormatForLiquibase();
+                entityStorage.defaults({ fields: [], relationships: [], annotations: {} });
+                if (entityConfig.changelogDate) {
+                    entityConfig.annotations.changelogDate = entityConfig.changelogDate;
+                    delete entityConfig.changelogDate;
+                }
+                if (!entityConfig.annotations.changelogDate) {
+                    entityConfig.annotations.changelogDate = this.dateFormatForLiquibase();
+                    entityStorage.save();
                 }
             },
             configureRelationships({ entityName, entityStorage, entityConfig }) {
@@ -172,8 +193,9 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
                         }
                     }
                     else {
-                        const entity = entityStorage.getAll();
+                        let entity = entityStorage.getAll();
                         entity.name = entity.name ?? entityName;
+                        entity = { ...entity, ...entity.annotations };
                         this.sharedData.setEntity(entityName, entity);
                     }
                 }

package/dist/generators/bootstrap-application-base/index.mjs

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.mjs';
+export { default as command } from './command.mjs';

package/dist/generators/bootstrap-application-base/support/export-jdl-transform.mjs

@@ -0,0 +1,61 @@
+import { basename, join } from 'path';
+import { Duplex } from 'stream';
+import { loadFile } from 'mem-fs';
+import { Minimatch } from 'minimatch';
+import { setModifiedFileState } from 'mem-fs-editor/state';
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+import { getJDLObjectFromSingleApplication } from '../../../jdl/converters/json-to-jdl-converter.js';
+export const exportJDLTransform = ({ destinationPath, jdlStorePath, throwOnMissingConfig = true, keepEntitiesConfig, }) => Duplex.from(async function* (files) {
+    const yoRcFilePath = join(destinationPath, '.yo-rc.json');
+    const entitiesMatcher = new Minimatch(`${destinationPath}/.jhipster/*.json`);
+    const entitiesFiles = [];
+    const entitiesMap = new Map();
+    let yoRcFileInMemory;
+    let jdlStoreFileInMemory;
+    for await (const file of files) {
+        if (file.path === yoRcFilePath) {
+            yoRcFileInMemory = file;
+        }
+        else if (file.path === jdlStorePath) {
+            jdlStoreFileInMemory = file;
+        }
+        else if (file.contents && entitiesMatcher.match(file.path)) {
+            entitiesMap.set(basename(file.path).replace('.json', ''), JSON.parse(file.contents.toString()));
+            entitiesFiles.push(file);
+        }
+        else {
+            yield file;
+        }
+    }
+    const yoRcFile = loadFile(yoRcFilePath);
+    const yoRcContents = yoRcFileInMemory?.contents ?? yoRcFile.contents;
+    if (yoRcContents) {
+        const contents = JSON.parse(yoRcContents.toString());
+        if (contents[GENERATOR_JHIPSTER]?.jdlStore) {
+            const { jdlStore, jwtSecretKey, rememberMeKey, jhipsterVersion, creationTimestamp, incrementalChangelog, ...rest } = contents[GENERATOR_JHIPSTER];
+            const jdlObject = getJDLObjectFromSingleApplication({ ...contents, [GENERATOR_JHIPSTER]: { ...rest, incrementalChangelog } }, entitiesMap);
+            const jdlContents = jdlObject.toString();
+            const jdlStoreFile = jdlStoreFileInMemory ?? loadFile(jdlStorePath);
+            jdlStoreFile.contents = Buffer.from(jdlContents);
+            setModifiedFileState(jdlStoreFile);
+            jdlStoreFile.conflicter = 'force';
+            yield jdlStoreFile;
+            yoRcFile.contents = Buffer.from(JSON.stringify({ [GENERATOR_JHIPSTER]: { jdlStore, jwtSecretKey, rememberMeKey, jhipsterVersion, creationTimestamp } }, null, 2));
+            setModifiedFileState(yoRcFile);
+            yoRcFile.conflicter = 'force';
+            yield yoRcFile;
+            // Incremental changelog requires entities files to be kept for incremental change at next run
+            if (keepEntitiesConfig || incrementalChangelog) {
+                for (const file of entitiesFiles) {
+                    yield file;
+                }
+            }
+        }
+        else if (throwOnMissingConfig) {
+            throw new Error(`File ${yoRcFilePath} is not a valid JHipster configuration file`);
+        }
+    }
+    else if (throwOnMissingConfig) {
+        throw new Error(`File ${yoRcFilePath} has no contents`);
+    }
+});

package/dist/generators/bootstrap-application-base/support/import-jdl-transform.mjs

@@ -0,0 +1,64 @@
+import { Duplex } from 'stream';
+import { join } from 'path';
+import { loadFile } from 'mem-fs';
+import { Minimatch } from 'minimatch';
+import { upperFirst } from 'lodash-es';
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+import { createImporterFromContent } from '../../../jdl/jdl-importer.js';
+import { mergeYoRcContent } from '../../../jdl/index.js';
+export const importJDLTransform = ({ destinationPath, jdlStorePath }) => Duplex.from(async function* (files) {
+    const yoRcFilePath = join(destinationPath, '.yo-rc.json');
+    const entitiesFolder = join(destinationPath, '.jhipster');
+    const entitiesMatcher = new Minimatch(`${entitiesFolder}/*.json`);
+    const entityFields = [];
+    let jdlStoreFileInMemory;
+    let yoRcFileInMemory;
+    for await (const file of files) {
+        if (file.path === jdlStorePath) {
+            jdlStoreFileInMemory = file;
+            yield jdlStoreFileInMemory;
+        }
+        else if (file.path === yoRcFilePath) {
+            yoRcFileInMemory = file;
+        }
+        else if (entitiesMatcher.match(file.path)) {
+            entityFields.push(file);
+        }
+        else {
+            yield file;
+        }
+    }
+    const jdlStoreContents = jdlStoreFileInMemory?.contents ?? loadFile(jdlStorePath).contents;
+    if (!jdlStoreContents) {
+        if (yoRcFileInMemory) {
+            yield yoRcFileInMemory;
+        }
+        for (const file of entityFields) {
+            yield file;
+        }
+        return;
+    }
+    if (entityFields.length > 0) {
+        throw new Error('Entities configuration files are not supported by jdlStore');
+    }
+    const importer = createImporterFromContent(jdlStoreContents.toString());
+    const importState = importer.import();
+    const applicationWithEntities = Object.values(importState.exportedApplicationsWithEntities);
+    if (applicationWithEntities.length !== 1) {
+        throw new Error(`JDL stores supports only jdls  with 1 application, found ${applicationWithEntities.length}`);
+    }
+    const { config, namespaceConfigs, entities } = applicationWithEntities[0];
+    const yoRcFile = loadFile(yoRcFilePath);
+    const yoRcContents = yoRcFileInMemory?.contents ?? yoRcFile.contents;
+    yoRcFile.contents = Buffer.from(JSON.stringify(mergeYoRcContent(yoRcContents ? JSON.parse(yoRcContents.toString()) : {}, {
+        ...namespaceConfigs,
+        [GENERATOR_JHIPSTER]: config,
+    }), null, 2));
+    yield yoRcFile;
+    for (const entity of entities) {
+        const configFile = join(entitiesFolder, `${upperFirst(entity.name)}.json`);
+        const file = loadFile(configFile);
+        file.contents = Buffer.from(JSON.stringify(entity, null, 2));
+        yield file;
+    }
+});

package/dist/generators/bootstrap-application-base/support/index.mjs

@@ -0,0 +1,2 @@
+export * from './export-jdl-transform.mjs';
+export * from './import-jdl-transform.mjs';

package/dist/generators/client/command.mjs

@@ -20,6 +20,7 @@ import chalk from 'chalk';
 import * as _ from 'lodash-es';
 import { testFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes } from '../../jdl/index.js';
+import { GENERATOR_COMMON } from '../generator-list.mjs';
 const { CYPRESS } = testFrameworkTypes;
 const { intersection } = _;
 const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
@@ -116,5 +117,6 @@ const command = {
             },
         },
     },
+    import: [GENERATOR_COMMON],
 };
 export default command;