generator-jhipster 7.9.2 → 7.9.3

package/generators/sql-constants.js

@@ -24,6 +24,9 @@ const databaseData = {
   [MSSQL]: {
     protocolSuffix: 'sqlserver://',
     port: ':1433;database=',
+    jdbc: {
+      extraOptions: ';encrypt=false',
+    },
     r2dbc: {
       protocolSuffix: 'mssql://',
       port: ':1433/',
@@ -66,14 +69,14 @@ const databaseData = {
   [H2_DISK]: {
     protocolSuffix: 'h2:file:',
     useDirectory: true,
-    extraOptions: ';DB_CLOSE_DELAY=-1',
+    extraOptions: ';DB_CLOSE_DELAY=-1;MODE=LEGACY',
     r2dbc: {
       protocolSuffix: 'h2:file://',
     },
   },
   [H2_MEMORY]: {
     protocolSuffix: 'h2:mem:',
-    extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE',
+    extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY',
     r2dbc: {
       protocolSuffix: 'h2:mem:///',
     },

package/generators/utils.js

@@ -32,6 +32,8 @@ const FileUtils = require('../jdl/utils/file-utils');
 const LANGUAGES_MAIN_SRC_DIR = `${__dirname}/languages/templates/${constants.CLIENT_MAIN_SRC_DIR}`;
 
 module.exports = {
+  detectCrLf,
+  normalizeLineEndings,
   rewrite,
   rewriteFile,
   replaceContent,
@@ -131,11 +133,49 @@ function escapeRegExp(str) {
  * @param {string} str string
  * @returns {string} string where CRLF is replaced with LF in Windows
  */
-function normalizeLineEndings(str) {
+function normalizeWindowsLineEndings(str) {
   const isWin32 = os.platform() === 'win32';
   return isWin32 ? str.replace(/\r\n/g, '\n') : str;
 }
 
+/**
+ * Replace line endings with the specified one.
+ *
+ * @param {string} str
+ * @param {string} lineEnding
+ * @returns {string} normalized line ending string
+ */
+function normalizeLineEndings(str, lineEnding) {
+  return str.replace(/\r\n|\r|\n/g, lineEnding);
+}
+
+/**
+ * Detect the file first line endings
+ *
+ * @param {string} filePath
+ * @returns {boolean|undefined} true in case of crlf, false in case of lf, undefined for a single line file
+ */
+function detectCrLf(filePath) {
+  return new Promise((resolve, reject) => {
+    let isCrlf;
+    const rs = fs.createReadStream(filePath, { encoding: 'utf8' });
+    rs.on('data', function (chunk) {
+      const n = chunk.indexOf('\n');
+      const r = chunk.indexOf('\r');
+      if (n !== -1 || r !== -1) {
+        isCrlf = n === -1 || (r !== -1 && r < n);
+        rs.close();
+      }
+    })
+      .on('close', function () {
+        resolve(isCrlf);
+      })
+      .on('error', function (err) {
+        reject(err);
+      });
+  });
+}
+
 /**
  * Change spaces sequences and '>' to allow any number of spaces or new line prefix
  *
@@ -167,7 +207,7 @@ function rewrite(args) {
       re = escapeRegExp(re);
     }
   } else {
-    re = args.splicable.map(line => `\\s*${escapeRegExp(normalizeLineEndings(line))}`).join('\n');
+    re = args.splicable.map(line => `\\s*${escapeRegExp(normalizeWindowsLineEndings(line))}`).join('\n');
   }
   if (!re.test) {
     if (args.prettierAware) {
@@ -176,7 +216,7 @@ function rewrite(args) {
     re = new RegExp(re);
   }
 
-  if (re.test(normalizeLineEndings(args.haystack))) {
+  if (re.test(normalizeWindowsLineEndings(args.haystack))) {
     return args.haystack;
   }
 

package/generators/workspaces/index.js

@@ -238,7 +238,8 @@ module.exports = class extends BaseBlueprintGenerator {
   _getOtherScripts() {
     if (this.dockerCompose) {
       return {
-        'ci:e2e:prepare': 'docker-compose -f docker-compose/docker-compose.yml up -d',
+        'docker-compose': 'docker-compose -f docker-compose/docker-compose.yml up -d',
+        'ci:e2e:prepare': 'npm run docker-compose',
         'ci:e2e:teardown': 'docker-compose -f docker-compose/docker-compose.yml down -v',
       };
     }

package/jdl/exporters/jdl-exporter.js

@@ -27,10 +27,15 @@ module.exports = {
  * Writes down the given JDL to a file.
  * @param jdl the JDL to write.
  * @param path the path where the file will be written.
+ * @returns {string} file contents
  */
 function exportToJDL(jdl, path = 'app.jdl') {
   if (!jdl) {
     throw new Error('A JDLObject has to be passed to be exported.');
   }
-  fs.writeFileSync(path, jdl.toString());
+  const fileContents = jdl.toString();
+  if (path) {
+    fs.writeFileSync(path, fileContents);
+  }
+  return fileContents;
 }

package/jdl/jhipster/application-options.js

@@ -45,7 +45,7 @@ const cacheTypes = require('./cache-types');
 const NO_CACHE_PROVIDER = cacheTypes.NO;
 
 const { PROTRACTOR, CYPRESS, CUCUMBER, GATLING } = require('./test-framework-types');
-const { ANGULAR_X, ANGULAR, REACT, VUE, SVELTE } = require('./client-framework-types');
+const { ANGULAR_X, ANGULAR, REACT, VUE, SVELTE, NO } = require('./client-framework-types');
 const { ELASTICSEARCH } = require('./search-engine-types');
 const searchEngines = require('./search-engine-types');
 
@@ -161,6 +161,7 @@ const optionValues = {
     [REACT]: REACT,
     [VUE]: VUE,
     [SVELTE]: SVELTE,
+    [NO]: NO,
   },
   [optionNames.CLIENT_PACKAGE_MANAGER]: {
     npm: 'npm',

package/jdl/jhipster/binary-options.js

@@ -27,7 +27,7 @@ const NO_SERVICE = ServiceTypes.NO;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const NO_PAGINATION = PaginationTypes.NO;
 
-const { ELASTICSEARCH, COUCHBASE } = SearchTypes;
+const { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH } = SearchTypes;
 
 const Options = {
   DTO: 'dto',
@@ -49,7 +49,7 @@ const Values = {
     'INFINITE-SCROLL': INFINITE_SCROLL,
     NO: NO_PAGINATION,
   },
-  [Options.SEARCH]: { ELASTICSEARCH, COUCHBASE },
+  [Options.SEARCH]: { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH },
 };
 
 const DefaultValues = {

package/jdl/jhipster/default-application-options.js

@@ -35,7 +35,7 @@ const serviceDiscoveryTypes = require('./service-discovery-types');
 
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 
-const { ANGULAR, ANGULAR_X } = require('./client-framework-types');
+const { ANGULAR, ANGULAR_X, NO: NO_CLIENT_FRAMEWORK } = require('./client-framework-types');
 
 const { MAVEN } = require('./build-tool-types');
 
@@ -118,7 +118,9 @@ function getConfigForMonolithApplication(customOptions = {}) {
   if (options[AUTHENTICATION_TYPE] === OAUTH2) {
     options[SKIP_USER_MANAGEMENT] = true;
   }
-
+  if (options[SKIP_CLIENT]) {
+    options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
+  }
   return {
     ...options,
     [APPLICATION_TYPE]: MONOLITH,
@@ -169,12 +171,11 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
     [SKIP_USER_MANAGEMENT]: true,
     ...customOptions,
   };
-  let skipClient = options[SKIP_CLIENT];
-  if (skipClient === undefined) {
-    skipClient = options[CLIENT_FRAMEWORK] === undefined;
+  if (options[SKIP_CLIENT] === undefined) {
+    options[SKIP_CLIENT] = options[CLIENT_FRAMEWORK] === undefined || options[CLIENT_FRAMEWORK] === NO_CLIENT_FRAMEWORK;
   }
-  if (skipClient) {
-    delete options[CLIENT_FRAMEWORK];
+  if (options[SKIP_CLIENT]) {
+    options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
     delete options[SKIP_SERVER];
   }
   delete options[CLIENT_THEME];
@@ -192,7 +193,6 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
   return {
     ...options,
     [APPLICATION_TYPE]: MICROSERVICE,
-    [SKIP_CLIENT]: skipClient,
   };
 }
 
@@ -227,6 +227,9 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
   if (!options[PACKAGE_FOLDER] && options[PACKAGE_NAME]) {
     options[PACKAGE_FOLDER] = options[PACKAGE_NAME].replace(/\./g, '/');
   }
+  if (options[SKIP_CLIENT]) {
+    options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
+  }
   if (options[CLIENT_FRAMEWORK] === ANGULAR) {
     options[CLIENT_FRAMEWORK] = ANGULAR_X;
   }

package/jdl/jhipster/entity-options.js

@@ -36,6 +36,7 @@ const PaginationTypes = {
 const SearchTypes = {
   ELASTICSEARCH: 'elasticsearch',
   COUCHBASE: 'couchbase',
+  NO: 'no',
 };
 
 const FilteringTypes = {

package/jdl/jhipster/search-engine-types.js

@@ -20,6 +20,7 @@
 const Types = {
   ELASTICSEARCH: 'elasticsearch',
   COUCHBASE: 'couchbase',
+  NO: 'no',
   FALSE: false,
 };
 

package/lib/constants/priorities.cjs

@@ -101,6 +101,10 @@ const POST_WRITING_ENTITIES = 'postWritingEntities';
 const POST_WRITING_ENTITIES_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING_ENTITIES}`;
 const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`;
 
+const POST_INSTALL = 'postInstall';
+const POST_INSTALL_PRIORITY = `${PRIORITY_PREFIX}${POST_INSTALL}`;
+const POST_INSTALL_QUEUE = `${QUEUE_PREFIX}${POST_INSTALL}`;
+
 /** @private */
 const PRE_CONFLICTS = 'preConflicts';
 /** @private */
@@ -168,6 +172,12 @@ const CUSTOM_PRIORITIES = [
     args: generator => generator.getArgsForPriority(INSTALL),
     edit: true,
   },
+  {
+    priorityName: POST_INSTALL,
+    queueName: POST_INSTALL_QUEUE,
+    before: END,
+    args: generator => generator.getArgsForPriority(POST_INSTALL),
+  },
   {
     priorityName: END,
     args: generator => generator.getArgsForPriority(END),
@@ -200,6 +210,7 @@ const compat = {
   POST_WRITING_ENTITIES_PRIORITY: POST_WRITING_ENTITIES,
   PRE_CONFLICTS_PRIORITY: PRE_CONFLICTS,
   INSTALL_PRIORITY: INSTALL,
+  POST_INSTALL_PRIORITY: POST_INSTALL,
   END_PRIORITY: END,
 };
 
@@ -227,6 +238,7 @@ const PRIORITY_NAMES = {
   POST_WRITING_ENTITIES,
   PRE_CONFLICTS,
   INSTALL,
+  POST_INSTALL,
   END,
 };
 
@@ -241,6 +253,7 @@ const BASE_PRIORITY_NAMES = [
   WRITING,
   POST_WRITING,
   INSTALL,
+  POST_INSTALL,
   END,
 ];
 
@@ -318,6 +331,7 @@ const QUEUES = {
   POST_WRITING_ENTITIES_QUEUE,
   PRE_CONFLICTS_QUEUE,
   INSTALL_QUEUE: INSTALL,
+  POST_INSTALL_QUEUE,
   END_QUEUE: END,
 };
 
@@ -334,6 +348,7 @@ const ENTITY_PRIORITY_NAMES = [
   WRITING,
   POST_WRITING,
   INSTALL,
+  POST_INSTALL,
   END,
 ];
 
@@ -382,5 +397,6 @@ module.exports = {
   POST_WRITING_ENTITIES_PRIORITY,
   PRE_CONFLICTS_PRIORITY,
   INSTALL_PRIORITY,
+  POST_INSTALL_PRIORITY,
   END_PRIORITY,
 };

package/lib/constants/priorities.mjs

@@ -43,5 +43,6 @@ export {
   POST_WRITING_ENTITIES_PRIORITY,
   PRE_CONFLICTS_PRIORITY,
   INSTALL_PRIORITY,
+  POST_INSTALL_PRIORITY,
   END_PRIORITY,
 } from './priorities.cjs';

package/lib/index.js

@@ -2,6 +2,7 @@ const constants = require('../generators/generator-constants');
 
 const GeneratorBase = require('../generators/generator-base');
 const GeneratorBaseBlueprint = require('../generators/generator-base-blueprint');
+const GeneratorBaseEntities = require('../generators/generator-base-entities.cjs');
 
 const AppGenerator = require('../generators/app');
 const ClientGenerator = require('../generators/client');
@@ -23,6 +24,7 @@ module.exports = {
 
   GeneratorBase,
   GeneratorBaseBlueprint,
+  GeneratorBaseEntities,
 
   AppGenerator,
   ClientGenerator,

package/lib/support/base.cjs

@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 const { platform } = require('os');
+const { normalizeLineEndings } = require('../../generators/utils');
 
 const isWin32 = platform() === 'win32';
 
@@ -29,7 +30,7 @@ const isWin32 = platform() === 'win32';
 const joinCallbacks = (...callbacks) => {
   return function (content, filePath) {
     if (isWin32 && content.match(/\r\n/)) {
-      callbacks = [ct => ct.replace(/\r\n/g, '\n')].concat(callbacks).concat(ct => ct.replace(/\n/g, '\r\n'));
+      callbacks = [ct => normalizeLineEndings(ct, '\n')].concat(callbacks).concat(ct => normalizeLineEndings(ct, '\r\n'));
     }
     for (const callback of callbacks) {
       content = callback.call(this, content, filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.9.2",
+  "version": "7.9.3",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -84,10 +84,10 @@
   },
   "dependencies": {
     "@faker-js/faker": "5.5.3",
-    "aws-sdk": "2.1185.0",
+    "aws-sdk": "2.1204.0",
     "axios": "0.27.2",
     "chalk": "4.1.2",
-    "chevrotain": "10.1.2",
+    "chevrotain": "10.3.0",
     "commander": "9.4.0",
     "conf": "10.2.0",
     "debug": "4.3.4",
@@ -96,9 +96,10 @@
     "escape-string-regexp": "4.0.0",
     "glob": "8.0.3",
     "insight": "0.11.1",
+    "isbinaryfile": "4.0.10",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "mem-fs-editor": "9.4.0",
+    "mem-fs-editor": "9.5.0",
     "minimatch": "5.1.0",
     "normalize-path": "3.0.0",
     "os-locale": "5.0.0",
@@ -113,7 +114,7 @@
     "randexp": "0.5.3",
     "semver": "7.3.7",
     "shelljs": "0.8.5",
-    "simple-git": "3.11.0",
+    "simple-git": "3.13.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
     "winston": "3.8.1",
@@ -123,7 +124,7 @@
   "devDependencies": {
     "chai": "4.3.6",
     "ejs-lint": "1.2.2",
-    "eslint": "8.21.0",
+    "eslint": "8.23.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-chai-friendly": "0.7.2",

package/utils/blueprint.js

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const YeomanNamespace = require('yeoman-environment/lib/util/namespace');
 
 module.exports = {
   mergeBlueprints,
@@ -134,6 +135,15 @@ function parseBlueprintInfo(blueprint) {
  * @returns {string} the normalized blueprint name
  */
 function normalizeBlueprintName(blueprint) {
+  try {
+    const parsed = YeomanNamespace.parse(blueprint);
+    if (parsed.unscoped.startsWith('generator-jhipster-')) {
+      return blueprint;
+    }
+    const namespace = new YeomanNamespace(parsed);
+    return namespace.with({ unscoped: `generator-jhipster-${namespace.unscoped}` }).toString();
+    // eslint-disable-next-line no-empty
+  } catch (e) {}
   if (blueprint && blueprint.startsWith('@')) {
     return blueprint;
   }

package/utils/field.js

@@ -326,7 +326,9 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
   }
 
   field.fieldValidate = Array.isArray(field.fieldValidateRules) && field.fieldValidateRules.length >= 1;
-  field.nullable = !(field.fieldValidate === true && field.fieldValidateRules.includes(REQUIRED));
+  _.defaults(field, {
+    nullable: !(field.fieldValidate === true && field.fieldValidateRules.includes(REQUIRED)),
+  });
   field.unique = field.fieldValidate === true && field.fieldValidateRules.includes(UNIQUE);
   if (field.unique) {
     field.uniqueConstraintName = generator.getUXConstraintName(

package/generators/client/templates/react/src/main/webapp/app/config/translation-middleware.ts.ejs

@@ -1,58 +0,0 @@
-<%#
- Copyright 2013-2022 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.
--%>
-import { createListenerMiddleware } from '@reduxjs/toolkit';
-import { updateLocale, addTranslationSourcePrefix, loadLocale, loaded } from 'app/shared/reducers/locale';
-import getStore from './store';
-
-const listenerMiddleware = createListenerMiddleware();
-
-listenerMiddleware.startListening({
-  actionCreator: updateLocale,
-  async effect(action) {
-    const store = getStore();
-    const { sourcePrefixes, loadedKeys } = store.getState().locale;
-    const keys = (
-      await Promise.all(
-        [''].concat(sourcePrefixes).map(async sourcePrefix => {
-          const key = `${sourcePrefix}${action.payload}`;
-          if (loadedKeys.includes(key)) return;
-          await loadLocale(action.payload, sourcePrefix);
-          return key;
-        })
-      )
-    ).filter(Boolean);
-    store.dispatch(loaded(keys));
-  },
-});
-
-listenerMiddleware.startListening({
-  actionCreator: addTranslationSourcePrefix,
-  async effect(action) {
-    const store = getStore();
-    const { currentLocale, loadedKeys } = store.getState().locale;
-    const key = `${action.payload}${currentLocale}`;
-
-    if (!loadedKeys.includes(key)) {
-      await loadLocale(currentLocale, action.payload);
-    }
-    store.dispatch(loaded(key));
-  },
-});
-
-export default listenerMiddleware.middleware;

package/generators/server/templates/.npmrc.ejs

@@ -1 +0,0 @@
-script-shell=bash