Rework jdl structure

.gitignore

@@ -36,4 +36,4 @@ build/
 nbbuild/
 nbdist/
 .nb-gradle/
-
+generators/**/package-lock.json

.prettierignore

@@ -10,3 +10,4 @@ jdl/**/.jhipster/**
 test/fixtures/**
 dist
 coverage
+BadEntity.json

generators/angular/generator.spec.ts

@@ -5,7 +5,7 @@ import { snakeCase } from 'lodash-es';
 
 import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers, runResult } from '../../testing/index.js';
 import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js';
-import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
 import { GENERATOR_ANGULAR } from '../generator-list.js';
 import Generator from './index.js';

generators/angular/generator.ts

@@ -23,7 +23,7 @@ import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_ANGULAR, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.js';
 import { defaultLanguage } from '../languages/support/index.js';
-import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import {
   generateTypescriptTestEntity as generateTestEntity,
   generateEntityClientEnumImports as getClientEnumImportsFormat,

generators/angular/needle-api/needle-client-angular.ts

@@ -22,7 +22,7 @@ import { startCase } from 'lodash-es';
 import needleClientBase from '../../client/needle-api/needle-client.js';
 import { LINE_LENGTH } from '../../generator-constants.js';
 import { stripMargin, upperFirstCamelCase } from '../../base/support/index.js';
-import { clientFrameworkTypes } from '../../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../../lib/jhipster/index.js';
 import { createNeedleCallback } from '../../base/support/needles.js';
 
 const { ANGULAR } = clientFrameworkTypes;

generators/app/generator.ts

@@ -25,7 +25,7 @@ import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_SERVER } from '../generat
 import { getDefaultAppName } from '../project-name/support/index.js';
 import { packageJson } from '../../lib/index.js';
 
-import { applicationTypes } from '../../jdl/jhipster/index.js';
+import { applicationTypes } from '../../lib/jhipster/index.js';
 import cleanupOldFilesTask from './cleanup.js';
 import { checkNode, loadStoredAppOptions } from './support/index.js';
 

generators/app/support/config.ts

@@ -1,6 +1,6 @@
 import { camelCase, kebabCase, startCase, upperFirst } from 'lodash-es';
 import { NODE_VERSION } from '../../generator-constants.js';
-import { applicationTypes, authenticationTypes, databaseTypes, testFrameworkTypes } from '../../../jdl/jhipster/index.js';
+import { applicationTypes, authenticationTypes, databaseTypes, testFrameworkTypes } from '../../../lib/jhipster/index.js';
 import { getHipster, mutateData, pickFields, upperFirstCamelCase } from '../../base/support/index.js';
 import { getDBTypeFromDBValue } from '../../server/support/index.js';
 import detectLanguage from '../../languages/support/detect-language.js';

generators/base-application/generator.ts

@@ -32,6 +32,7 @@ import {
 import type { TaskTypes as DefaultTaskTypes } from '../../lib/types/application/tasks.js';
 import type { ApplicationType } from '../../lib/types/application/application.js';
 import type { Entity } from '../../lib/types/application/entity.js';
+import type { Entity as BaseEntity } from '../../lib/types/base/entity.js';
 import type { GenericTaskGroup } from '../../lib/types/base/tasks.js';
 import type { ApplicationConfiguration } from '../../lib/types/application/yo-rc.js';
 import { getEntitiesFromDir } from './support/index.js';
@@ -185,16 +186,16 @@ export default class BaseApplicationGenerator<
   /**
    * get sorted list of entities according to changelog date (i.e. the order in which they were added)
    */
-  getExistingEntities(): { name: string; definition: Record<string, any> }[] {
+  getExistingEntities(): { name: string; definition: BaseEntity }[] {
     function isBefore(e1, e2) {
       return (e1.definition.annotations?.changelogDate ?? 0) - (e2.definition.annotations?.changelogDate ?? 0);
     }
 
     const configDir = this.getEntitiesConfigPath();
 
-    const entities: { name: string; definition: Record<string, any> }[] = [];
+    const entities: { name: string; definition: BaseEntity }[] = [];
     for (const entityName of [...new Set(((this.jhipsterConfig.entities as string[]) || []).concat(getEntitiesFromDir(configDir)))]) {
-      const definition = this.getEntityConfig(entityName)?.getAll();
+      const definition: BaseEntity = this.getEntityConfig(entityName)?.getAll() as BaseEntity;
       if (definition) {
         entities.push({ name: entityName, definition });
       }

generators/base-application/support/entity.ts

@@ -18,7 +18,7 @@
  */
 
 import { upperFirst } from 'lodash-es';
-import type { JSONEntity } from '../../../jdl/converters/types.js';
+import type { Entity } from '../../../lib/types/application/entity.js';
 
-export const findEntityInEntities = (entityName: string, entities: JSONEntity[]) =>
+export const findEntityInEntities = (entityName: string, entities: Entity[]): Entity | undefined =>
   entities.find(entity => upperFirst(entity.name) === upperFirst(entityName));

generators/base-application/support/field-utils.ts

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { fieldTypes } from '../../../jdl/jhipster/index.js';
+import { fieldTypes } from '../../../lib/jhipster/index.js';
 
 const { CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { BYTES, BYTE_BUFFER } = RelationalOnlyDBTypes;

generators/base-application/support/prepare-entity.spec.ts

@@ -21,7 +21,7 @@ import { beforeEach, describe, it } from 'esmocha';
 import { expect } from 'chai';
 import { formatDateForChangelog } from '../../base/support/index.js';
 import BaseGenerator from '../../base/index.js';
-import { getConfigWithDefaults } from '../../../jdl/jhipster/index.js';
+import { getConfigWithDefaults } from '../../../lib/jhipster/index.js';
 import { entityDefaultConfig, prepareEntityPrimaryKeyForTemplates } from './prepare-entity.js';
 
 describe('generator - base-application - support - prepareEntity', () => {

generators/base-application/support/prepare-entity.ts

@@ -30,8 +30,8 @@ import {
   upperFirstCamelCase,
 } from '../../base/support/index.js';
 import { getEntityParentPathAddition, getTypescriptKeyType } from '../../client/support/index.js';
-import { applicationTypes, databaseTypes, entityOptions, fieldTypes, searchEngineTypes } from '../../../jdl/jhipster/index.js';
-import { binaryOptions } from '../../../jdl/built-in-options/index.js';
+import { applicationTypes, databaseTypes, entityOptions, fieldTypes, searchEngineTypes } from '../../../lib/jhipster/index.js';
+import { binaryOptions } from '../../../lib/jdl/core/built-in-options/index.js';
 
 import type { Entity } from '../../../lib/types/application/index.js';
 import type CoreGenerator from '../../base-core/generator.js';

generators/base-application/support/prepare-field.spec.ts

@@ -21,7 +21,7 @@ import { beforeEach, describe, it } from 'esmocha';
 import { expect } from 'chai';
 import { formatDateForChangelog } from '../../base/support/index.js';
 import BaseGenerator from '../../base/index.js';
-import { getConfigWithDefaults } from '../../../jdl/jhipster/index.js';
+import { getConfigWithDefaults } from '../../../lib/jhipster/index.js';
 import prepareFieldForTemplates, { getEnumValuesWithCustomValues } from './prepare-field.js';
 import prepareEntityForTemplates, { loadRequiredConfigIntoEntity } from './prepare-entity.js';
 

generators/base-application/support/prepare-field.ts

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { defaults, kebabCase, snakeCase, startCase, upperFirst } from 'lodash-es';
-import { fieldTypes, validations } from '../../../jdl/jhipster/index.js';
+import { fieldTypes, validations } from '../../../lib/jhipster/index.js';
 import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.js';
 import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.js';
 import { mutateData } from '../../../lib/utils/object.js';

generators/base-application/support/prepare-relationship.ts

@@ -20,7 +20,7 @@
 import { lowerFirst, startCase, upperFirst } from 'lodash-es';
 import pluralize from 'pluralize';
 
-import { checkAndReturnRelationshipOnValue, databaseTypes, entityOptions, validations } from '../../../jdl/jhipster/index.js';
+import { checkAndReturnRelationshipOnValue, databaseTypes, entityOptions, validations } from '../../../lib/jhipster/index.js';
 import { getJoinTableName, hibernateSnakeCase } from '../../server/support/index.js';
 import { mutateData } from '../../../lib/utils/object.js';
 import type CoreGenerator from '../../base-core/generator.js';

generators/base-application/support/relationship.ts

@@ -19,18 +19,16 @@
 
 import { lowerFirst, upperFirst } from 'lodash-es';
 
-import type { JSONEntity, JSONRelationship } from '../../../jdl/converters/types.js';
+import type { JSONEntity } from '../../../lib/jdl/core/types/json-config.js';
 import type { ValidationResult } from '../../base/api.js';
-import { stringifyApplicationData } from './debug.js';
+import type { Entity } from '../../../lib/types/application/entity.js';
+import type { Relationship } from '../../../lib/types/application/relationship.js';
 import { findEntityInEntities } from './entity.js';
+import { stringifyApplicationData } from './debug.js';
 
 export const otherRelationshipType = relationshipType => relationshipType.split('-').reverse().join('-');
 
-export const findOtherRelationshipInRelationships = (
-  entityName: string,
-  relationship: JSONRelationship,
-  inRelationships: JSONRelationship[],
-) => {
+export const findOtherRelationshipInRelationships = (entityName: string, relationship: Relationship, inRelationships: Relationship[]) => {
   return inRelationships.find(otherRelationship => {
     if (upperFirst(otherRelationship.otherEntityName) !== entityName) {
       return false;
@@ -47,7 +45,7 @@ export const findOtherRelationshipInRelationships = (
   });
 };
 
-export const loadEntitiesAnnotations = (entities: JSONEntity[]) => {
+export const loadEntitiesAnnotations = (entities: Entity[]) => {
   for (const entity of entities) {
     // Load field annotations
     for (const field of entity.fields ?? []) {
@@ -65,7 +63,7 @@ export const loadEntitiesAnnotations = (entities: JSONEntity[]) => {
   }
 };
 
-export const loadEntitiesOtherSide = (entities: JSONEntity[], { application }: { application?: any } = {}): ValidationResult => {
+export const loadEntitiesOtherSide = (entities: Entity[], { application }: { application?: any } = {}): ValidationResult => {
   const result: { warning: string[] } = { warning: [] };
   for (const entity of entities) {
     for (const relationship of entity.relationships ?? []) {
@@ -89,7 +87,7 @@ export const loadEntitiesOtherSide = (entities: JSONEntity[], { application }: {
       relationship.otherEntity = otherEntity;
       const otherRelationship = findOtherRelationshipInRelationships(entity.name, relationship, otherEntity.relationships ?? []);
       if (otherRelationship) {
-        relationship.otherRelationship = otherRelationship;
+        relationship.otherRelationship = otherRelationship as Relationship;
         otherRelationship.otherEntityRelationshipName = otherRelationship.otherEntityRelationshipName ?? relationship.relationshipName;
         relationship.otherEntityRelationshipName = relationship.otherEntityRelationshipName ?? otherRelationship.relationshipName;
         if (
@@ -115,17 +113,17 @@ export const loadEntitiesOtherSide = (entities: JSONEntity[], { application }: {
   return result;
 };
 
-export const addOtherRelationship = (entity: JSONEntity, otherEntity: JSONEntity, relationship: JSONRelationship) => {
+export const addOtherRelationship = (entity: JSONEntity, otherEntity: JSONEntity, relationship: Relationship): Relationship => {
   relationship.otherEntityRelationshipName = relationship.otherEntityRelationshipName ?? lowerFirst(entity.name);
-  const otherRelationship: JSONRelationship = {
-    otherEntity: entity,
+  const otherRelationship = {
     otherEntityName: lowerFirst(entity.name),
-    ownerSide: !relationship.ownerSide,
     otherEntityRelationshipName: relationship.relationshipName,
     relationshipName: relationship.otherEntityRelationshipName as string,
     relationshipType: otherRelationshipType(relationship.relationshipType),
+    otherEntity: entity,
+    ownerSide: !relationship.ownerSide,
     otherRelationship: relationship,
-  };
+  } as Relationship;
   otherEntity.relationships = otherEntity.relationships ?? [];
   otherEntity.relationships.push(otherRelationship);
   return otherRelationship;

generators/base-core/generator.ts

@@ -64,7 +64,7 @@ import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
 import { loadConfig } from '../../lib/internal/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
 import { dockerPlaceholderGenerator } from '../docker/utils.js';
-import { getConfigWithDefaults } from '../../jdl/jhipster/index.js';
+import { getConfigWithDefaults } from '../../lib/jhipster/index.js';
 import { extractArgumentsFromConfigs } from '../../lib/command/index.js';
 import type { Entity } from '../../lib/types/base/entity.js';
 import type BaseApplicationGenerator from '../base-application/generator.js';

generators/base-workspaces/internal/deployments.ts

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { defaults } from 'lodash-es';
-import { applicationOptions, deploymentOptions } from '../../../jdl/jhipster/index.js';
+import { applicationOptions, deploymentOptions } from '../../../lib/jhipster/index.js';
 import { loadDerivedPlatformConfig, loadDerivedServerAndPlatformProperties, loadPlatformConfig } from '../../server/support/index.js';
 import type { GeneratorBaseCore } from '../../index.js';
 

generators/base-workspaces/internal/docker-base.ts

@@ -21,7 +21,7 @@ import { existsSync } from 'fs';
 import chalk from 'chalk';
 
 import { convertSecretToBase64, createBase64Secret, removeFieldsWithNullishValues } from '../../base/support/index.js';
-import { applicationTypes, buildToolTypes, getConfigWithDefaults } from '../../../jdl/jhipster/index.js';
+import { applicationTypes, buildToolTypes, getConfigWithDefaults } from '../../../lib/jhipster/index.js';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
 import { loadDeploymentConfig } from '../../base-workspaces/internal/index.js';
 import { loadDerivedAppConfig } from '../../app/support/index.js';

generators/base-workspaces/internal/docker-prompts.ts

@@ -21,7 +21,7 @@
 import { readFileSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import chalk from 'chalk';
-import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../../jdl/jhipster/index.js';
+import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../../lib/jhipster/index.js';
 import { convertSecretToBase64 } from '../../base/support/index.js';
 import { loadConfigs } from './docker-base.js';
 

generators/base/support/jhipster7-context.ts

@@ -2,7 +2,7 @@
 import chalk from 'chalk';
 import { camelCase } from 'lodash-es';
 
-import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js';
+import { isReservedTableName } from '../../../lib/jhipster/reserved-keywords.js';
 import {
   getJavaValueGeneratorForType,
   getJoinTableName,
@@ -12,7 +12,7 @@ import {
 } from '../../server/support/index.js';
 import { getDBCExtraOption } from '../../spring-data-relational/support/database-data.js';
 import { getJdbcUrl, getR2dbcUrl } from '../../spring-data-relational/support/database-url.js';
-import { fieldTypes } from '../../../jdl/jhipster/index.js';
+import { fieldTypes } from '../../../lib/jhipster/index.js';
 import { upperFirstCamelCase } from '../../../lib/utils/string.js';
 
 const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;

generators/bootstrap-application-base/support/export-jdl-transform.ts

@@ -5,10 +5,10 @@ import type { MemFsEditorFile } from 'mem-fs-editor';
 import { Minimatch } from 'minimatch';
 import { setModifiedFileState } from 'mem-fs-editor/state';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
-import { getJDLObjectFromSingleApplication } from '../../../jdl/converters/json-to-jdl-converter.js';
-import type { JSONEntity } from '../../../jdl/converters/types.js';
-import { createRuntime } from '../../../jdl/runtime.js';
-import type { JDLApplicationConfig } from '../../../jdl/types/types.js';
+import { getJDLObjectFromSingleApplication } from '../../../lib/jdl/converters/json-to-jdl-converter.js';
+import { createRuntime } from '../../../lib/jdl/core/runtime.js';
+import type { JDLApplicationConfig } from '../../../lib/jdl/core/types/parsing.js';
+import type { Entity } from '../../../lib/types/base/entity.js';
 
 export const exportJDLTransform = ({
   destinationPath,
@@ -27,7 +27,7 @@ export const exportJDLTransform = ({
     const yoRcFilePath = join(destinationPath, '.yo-rc.json');
     const entitiesMatcher = new Minimatch(`${destinationPath}/.jhipster/*.json`);
     const entitiesFiles: MemFsEditorFile[] = [];
-    const entitiesMap = new Map<string, JSONEntity>();
+    const entitiesMap = new Map<string, Entity>();
 
     let yoRcFileInMemory: MemFsEditorFile | undefined;
     let jdlStoreFileInMemory: MemFsEditorFile | undefined;

generators/bootstrap-application-base/support/import-jdl-transform.ts

@@ -5,9 +5,9 @@ import type { MemFsEditorFile } from 'mem-fs-editor';
 import { Minimatch } from 'minimatch';
 import { upperFirst } from 'lodash-es';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
-import { createImporterFromContent } from '../../../jdl/jdl-importer.js';
+import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js';
 import { mergeYoRcContent } from '../../../lib/utils/yo-rc.js';
-import type { JDLApplicationConfig } from '../../../jdl/types/types.js';
+import type { JDLApplicationConfig } from '../../../lib/jdl/core/types/parsing.js';
 
 export const importJDLTransform = ({
   destinationPath,

generators/bootstrap-application-base/utils.ts

@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 import { defaults } from 'lodash-es';
-import { Validations, authenticationTypes, databaseTypes, fieldTypes } from '../../jdl/jhipster/index.js';
+import { Validations, authenticationTypes, databaseTypes, fieldTypes } from '../../lib/jhipster/index.js';
 import { loadRequiredConfigIntoEntity } from '../base-application/support/index.js';
-import { PaginationTypes } from '../../jdl/jhipster/entity-options.js';
+import { PaginationTypes } from '../../lib/jhipster/entity-options.js';
 import { LOGIN_REGEX, LOGIN_REGEX_JS } from '../generator-constants.js';
 import { getDatabaseTypeData } from '../server/support/database.js';
 import type BaseApplicationGenerator from '../base-application/generator.js';

generators/bootstrap-application/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
 import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js';
-import { fieldTypes } from '../../jdl/jhipster/index.js';
+import { fieldTypes } from '../../lib/jhipster/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import Generator from './index.js';
 

generators/bootstrap-application/generator.ts

@@ -19,7 +19,7 @@
 import assert from 'assert';
 
 import BaseApplicationGenerator from '../base-application/index.js';
-import { validations } from '../../jdl/jhipster/index.js';
+import { validations } from '../../lib/jhipster/index.js';
 import {
   derivedPrimaryKeyProperties,
   preparePostEntitiesCommonDerivedProperties,

generators/ci-cd/generator.ts

@@ -21,7 +21,7 @@
 import chalk from 'chalk';
 
 import BaseApplicationGenerator from '../base-application/index.js';
-import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import { createPomStorage } from '../maven/support/pom-store.js';
 import { loadConfig, loadDerivedConfig } from '../../lib/internal/config-def.js';
 import command from './command.js';

generators/client/command.ts

@@ -23,7 +23,7 @@ import {
   APPLICATION_TYPE_MICROSERVICE,
   clientFrameworkTypes,
   testFrameworkTypes,
-} from '../../jdl/jhipster/index.js';
+} from '../../lib/jhipster/index.js';
 import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
 import { GENERATOR_COMMON } from '../generator-list.js';
 

generators/client/generator-needles.spec.ts

@@ -1,7 +1,7 @@
 import { before, describe, it } from 'esmocha';
 import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js';
 import { CLIENT_WEBPACK_DIR } from '../generator-constants.js';
-import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import ClientGenerator from './index.js';
 
 const { ANGULAR, REACT } = clientFrameworkTypes;