jhipster-core - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

lib/core/jdl_entity.js

@@ -60,4 +60,3 @@ 'use strict';
   return {
-    fields: {},
-    comment: null
+    fields: {}
   };
@@ -64,0 +63,0 @@ }

lib/core/jdl_field.js

@@ -67,5 +67,4 @@ 'use strict';
   return {
-    comment: '',
     validations: {}
   };
 }

lib/export/json_exporter.js

@@ -11,3 +11,4 @@ 'use strict';
 module.exports = {
-  exportToJSON: exportToJSON
+  exportToJSON: exportToJSON,
+  createJHipsterJSONFolder: createJHipsterJSONFolder
 };
@@ -21,5 +22,3 @@
   }
-  if (!fs.statSync('./.jhipster').isFile()) {
-    fs.mkdirSync('.jhipster');
-  }
+  createJHipsterJSONFolder();
   let filteredEntities = filterOutUnchangedEntities(entities);
@@ -32,7 +31,18 @@ for (let i = 0, entityNames = Object.keys(filteredEntities); i < entityNames.length; i++) {
 
+function createJHipsterJSONFolder() {
+  try {
+    if (!fs.statSync('./.jhipster').isDirectory()) {
+      fs.mkdirSync('.jhipster');
+    }
+  } catch (error) {
+    fs.mkdirSync('.jhipster');
+  }
+}
+
 function filterOutUnchangedEntities(entities) {
   var filtered = {};
   for (let i = 0, entityNames = Object.keys(entities); i < entityNames.length; i++) {
-    if (!areJHipsterEntitiesEqual(readEntityJSON(toFilePath(entityNames[i])), entities[entityNames[i]])) {
-      filtered[entityNames[i]].push(entities[entityNames[i]]);
+    let filePath = toFilePath(entityNames[i]);
+    if (!(fs.existsSync(filePath) && areJHipsterEntitiesEqual(readEntityJSON(filePath), entities[entityNames[i]]))) {
+      filtered[entityNames[i]] = (entities[entityNames[i]]);
     }
@@ -39,0 +49,0 @@ }

lib/parser/entity_parser.js

@@ -137,2 +137,3 @@ 'use strict';
     if (jdlObject.enums[jdlField.type]) {
+      fieldData.fieldType = jdlField.type;
       fieldData.fieldValues = jdlObject.enums[jdlField.type].values.join(',');
@@ -139,0 +140,0 @@ }

lib/utils/format_utils.js

@@ -15,3 +15,3 @@ 'use strict';
   if (!comment) {
-    return comment;
+    return undefined;
   }
@@ -58,2 +58,2 @@ var parts = comment.trim().split('\n');
   return `${year}${month}${day}${hour}${minute}${second}`;
-}
+}

lib/utils/object_utils.js

@@ -71,3 +71,5 @@ 'use strict';
     return Object.keys(field).every(function(key) {
-      return field[key] === secondEntityField[key];
+      if (field[key].constructor === Array)
+        return field[key].toString() === secondEntityField[key].toString();
+      else return field[key] === secondEntityField[key];
     });
@@ -74,0 +76,0 @@ });

module/index.js

@@ -22,2 +22,5 @@ 'use strict';
     exportToJSON = require('../lib/export/json_exporter').exportToJSON,
+    createJHipsterJSONFolder = require('../lib/export/json_exporter').createJHipsterJSONFolder,
+    toFilePath = require('../lib/reader/json_file_reader').toFilePath,
+    readEntityJSON = require('../lib/reader/json_file_reader').readEntityJSON,
     ObjectUtils = require('../lib/utils/object_utils'),
@@ -56,4 +59,7 @@ Set = require('../lib/utils/objects/set');
   ObjectUtils: ObjectUtils,
+  createJHipsterJSONFolder: createJHipsterJSONFolder,
+  readEntityJSON: readEntityJSON,
+  toFilePath: toFilePath,
   /* Objects */
   Set: Set
 };

package.json

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

test/spec/parser/jdl_parser_test.js

@@ -80,3 +80,4 @@ 'use strict';
               startDate: new JDLField({name: 'startDate', type: FieldTypes.ZONED_DATE_TIME}),
-              endDate: new JDLField({name: 'endDate', type: FieldTypes.ZONED_DATE_TIME})
+              endDate: new JDLField({name: 'endDate', type: FieldTypes.ZONED_DATE_TIME}),
+              language: new JDLField({name: 'language', type: 'Language'})
             },
@@ -83,0 +84,0 @@ comment: 'JobHistory comment.'

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

380921

increased by0.69%

Number of package files

75

increased by1.35%

Lines of code

10443

increased by0.55%

Worsened metrics

Number of low supply chain risk alerts

7

increased by16.67%

No dependency changes