jhipster-core - npm Package Compare versions

Comparing version 7.2.0 to 7.2.1

CHANGELOG.md

@@ -1,3 +0,11 @@
-# Latest: v7.2.0
+# Latest: v7.2.1
 
+## Bug fix:
+  - Fixed bug when parsing a JDL content with no entity     
+    - The failing cases happened when parsing applications without entities, and it failed because we wanted to export no entities.
+
+___
+
+# v7.2.0
+
 ## What's new
@@ -4,0 +12,0 @@ - JDL:

lib/converters/JDLToJSON/jdl_with_applications_to_json_converter.js

@@ -51,3 +51,6 @@ /**
   if (entitiesPerApplication.size === 0) {
-    return new Map();
+    const applicationNames = jdlObject
+      .getApplications()
+      .map(jdlApplication => jdlApplication.getConfigurationOptionValue('baseName'));
+    return new Map(applicationNames.map(applicationName => [applicationName, []]));
   }
@@ -54,0 +57,0 @@ setBasicEntityInformation(args.creationTimestamp);

lib/exporters/jhipster_entity_exporter.js

@@ -92,2 +92,5 @@ /**
   init(passedConfiguration);
+  if (configuration.entities.length === 0) {
+    return configuration.entities;
+  }
   const subFolder = passedConfiguration.application.forSeveralApplications ? configuration.application.name : '';
@@ -94,0 +97,0 @@ configuration.entities = updateEntities(subFolder);

lib/jdl/jdl_importer.js

@@ -221,9 +221,11 @@ /** Copyright 2013-2020 the original author or authors from the JHipster project.
   const jsonEntities = entitiesPerApplicationMap.get(applicationName);
-  const exportedJSONEntities = exportJSONEntities(jsonEntities, {
-    applicationName,
-    applicationType: jdlApplication.getConfigurationOptionValue('applicationType'),
-    forSeveralApplications: false,
-    skipEntityFilesGeneration
-  });
-  importState.exportedEntities = uniqBy([...importState.exportedEntities, ...exportedJSONEntities], 'name');
+  if (jsonEntities.length !== 0) {
+    const exportedJSONEntities = exportJSONEntities(jsonEntities, {
+      applicationName,
+      applicationType: jdlApplication.getConfigurationOptionValue('applicationType'),
+      forSeveralApplications: false,
+      skipEntityFilesGeneration
+    });
+    importState.exportedEntities = uniqBy([...importState.exportedEntities, ...exportedJSONEntities], 'name');
+  }
   return importState;
@@ -230,0 +232,0 @@ }

package.json

 {
   "name": "jhipster-core",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "description": "JHipster's own domain language and core objects",
@@ -5,0 +5,0 @@ "main": "module/index.js",

test/spec/exporters/jhipster_entity_exporter.spec.js

@@ -92,2 +92,21 @@ /**
       });
+      context('when not exporting entities', () => {
+        let returned;
+
+        before(() => {
+          returned = JHipsterEntityExporter.exportEntities({
+            entities: [],
+            application: {
+              name: 'MyApp',
+              type: ApplicationTypes.MONOLITH
+            }
+          });
+        });
+        it('should return an empty list', () => {
+          expect(returned).to.deep.equal([]);
+        });
+        it('should not create a .jhipster folder', () => {
+          expect(FileUtils.doesDirectoryExist('.jhipster')).to.be.false;
+        });
+      });
       context('when exporting the same entity', () => {
@@ -94,0 +113,0 @@ let entities;

test/spec/jdl/jdl_importer.spec.js

@@ -1851,3 +1851,20 @@ /**
     });
+    context('when not exporting entities but only applications', () => {
+      before(() => {
+        const importer = createImporterFromFiles([path.join('test', 'test_files', 'application.jdl')], {
+          creationTimestamp: '2019-01-01'
+        });
+        importer.import();
+      });
+      after(() => {
+        fse.removeSync('.yo-rc.json');
+      });
+      it('should export the .yo-rc.json file', () => {
+        expect(fse.existsSync('.yo-rc.json')).to.be.true;
+      });
+      it('should not create the .jhipster folder', () => {
+        expect(fse.existsSync('.jhipster')).to.be.false;
+      });
+    });
   });
 });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1753095

increased by0.1%

Lines of code

42598

increased by0.11%

No dependency changes