From 0de9be0f8d8f08213360d8791a5db5fb8f99d6b6 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 7 Sep 2024 22:31:04 -0300 Subject: [PATCH 01/21] move jdl to lib/jdl --- generators/angular/generator.spec.ts | 2 +- generators/angular/generator.ts | 2 +- .../needle-api/needle-client-angular.ts | 2 +- generators/app/generator.ts | 2 +- generators/app/support/config.ts | 2 +- generators/base-application/support/entity.ts | 2 +- .../base-application/support/field-utils.ts | 2 +- .../support/prepare-entity.spec.ts | 2 +- .../support/prepare-entity.ts | 4 ++-- .../support/prepare-field.spec.ts | 2 +- .../base-application/support/prepare-field.ts | 2 +- .../support/prepare-relationship.ts | 2 +- .../base-application/support/relationship.ts | 2 +- generators/base-core/generator.ts | 2 +- .../base-workspaces/internal/deployments.ts | 2 +- .../base-workspaces/internal/docker-base.ts | 2 +- .../internal/docker-prompts.ts | 2 +- generators/base/support/jhipster7-context.ts | 4 ++-- .../support/export-jdl-transform.ts | 8 +++---- .../support/import-jdl-transform.ts | 4 ++-- .../bootstrap-application-base/utils.ts | 4 ++-- .../bootstrap-application/generator.spec.ts | 2 +- generators/bootstrap-application/generator.ts | 2 +- generators/ci-cd/generator.ts | 2 +- generators/client/command.ts | 2 +- generators/client/generator-needles.spec.ts | 2 +- generators/client/generator.spec.ts | 2 +- generators/client/generator.ts | 2 +- generators/client/prompts.spec.ts | 2 +- .../client/support/entity-definition.ts | 2 +- .../client/support/template-utils.spec.ts | 2 +- generators/client/support/template-utils.ts | 2 +- generators/client/support/types-utils.spec.ts | 2 +- generators/client/support/types-utils.ts | 2 +- generators/common/generator.ts | 2 +- generators/cypress/generator.spec.ts | 2 +- generators/cypress/generator.ts | 2 +- .../docker-compose/docker-compose.spec.ts | 4 ++-- generators/docker-compose/files.ts | 2 +- generators/docker-compose/generator.ts | 2 +- generators/docker/generator.spec.ts | 2 +- generators/entity/generator.ts | 2 +- generators/entity/prompts.ts | 2 +- generators/export-jdl/generator.ts | 4 ++-- generators/info/generator.ts | 6 ++--- .../java/generators/build-tool/command.ts | 2 +- .../java/generators/build-tool/generator.ts | 2 +- generators/jdl/generator.ts | 4 ++-- generators/jdl/internal/application.ts | 2 +- generators/kubernetes-helm/files.ts | 2 +- generators/kubernetes-helm/generator.ts | 2 +- generators/kubernetes-knative/files.ts | 2 +- generators/kubernetes-knative/generator.ts | 2 +- generators/kubernetes-knative/prompts.ts | 2 +- generators/kubernetes/files.ts | 2 +- generators/kubernetes/generator.ts | 2 +- generators/kubernetes/kubernetes-base.ts | 2 +- generators/kubernetes/kubernetes-constants.ts | 2 +- generators/kubernetes/prompts.ts | 2 +- generators/languages/generator.ts | 2 +- generators/liquibase/generator.ts | 2 +- .../liquibase/incremental-liquibase.spec.ts | 2 +- .../liquibase/support/post-prepare-entity.ts | 2 +- generators/liquibase/support/prepare-field.ts | 2 +- generators/react/generator.spec.ts | 2 +- generators/react/generator.ts | 2 +- generators/server/__test-support/index.ts | 2 +- generators/server/command.ts | 2 +- generators/server/generator.ts | 4 ++-- .../server/jdl/application-definition.ts | 2 +- .../server/options/database-migration.spec.ts | 4 ++-- .../server/options/database-migration.ts | 2 +- .../server/options/message-broker.spec.ts | 4 ++-- generators/server/options/message-broker.ts | 2 +- .../server/options/sync-user-with-idp.spec.ts | 4 ++-- .../server/options/sync-user-with-idp.ts | 2 +- .../support/build-specification-mapper.ts | 2 +- generators/server/support/config.ts | 2 +- generators/server/support/database.spec.ts | 2 +- generators/server/support/database.ts | 2 +- generators/server/support/prepare-entity.ts | 4 ++-- generators/server/support/prepare-field.ts | 2 +- generators/server/support/relationship.ts | 4 ++-- .../server/support/templates/field-values.ts | 2 +- generators/spring-boot/command.ts | 2 +- generators/spring-boot/entity-files.ts | 2 +- generators/spring-boot/generator.ts | 2 +- .../spring-boot/options/feign-client.spec.ts | 4 ++-- generators/spring-boot/prompts.ts | 2 +- generators/spring-cache/generator.spec.ts | 2 +- .../generator-pulsar.spec.ts | 2 +- .../spring-cloud-stream/generator.spec.ts | 2 +- .../gateway/jdl/jdl-routes-option.spec.ts | 6 ++--- .../gateway/jdl/jdl-routes-option.ts | 2 +- .../spring-data-cassandra/generator.spec.ts | 2 +- generators/spring-data-cassandra/generator.ts | 2 +- .../spring-data-couchbase/generator.spec.ts | 2 +- .../generator.spec.ts | 2 +- .../spring-data-mongodb/generator.spec.ts | 2 +- .../spring-data-neo4j/generator.spec.ts | 2 +- .../spring-data-relational/generator.spec.ts | 2 +- .../spring-data-relational/generator.ts | 4 ++-- .../sql-entities.spec.ts | 2 +- .../support/application-properties.ts | 2 +- .../support/database-data.ts | 2 +- .../support/database-url.spec.ts | 2 +- .../support/database-url.ts | 2 +- generators/vue/generator.spec.ts | 2 +- generators/vue/generator.ts | 2 +- .../__snapshots__/jdl-importer.spec.ts.snap | 0 {jdl => lib/jdl}/__test-files__/MyEntity.json | 0 .../jdl}/__test-files__/annotations.jdl | 0 .../annotations_and_options.jdl | 0 .../jdl}/__test-files__/application.jdl | 0 .../application_with_blueprints.jdl | 0 .../application_with_entities.jdl | 0 .../application_with_entity_dto_suffixes.jdl | 0 .../application_wrong_basename.jdl | 0 .../jdl}/__test-files__/applications.jdl | 0 .../jdl}/__test-files__/applications2.jdl | 0 .../jdl}/__test-files__/applications3.jdl | 0 ...applications_with_and_without_entities.jdl | 0 .../authority_entity_to_relationship.jdl | 0 .../jdl}/__test-files__/big_sample.jdl | 0 {jdl => lib/jdl}/__test-files__/blob_jdl.jdl | 0 .../capitalized_annotations.jdl | 0 .../jdl}/__test-files__/cassandra_jdl.jdl | 0 .../cassandra_with_relationships.jdl | 0 .../__test-files__/client_root_folder.jdl | 0 .../client_root_folder_no_microservice.jdl | 0 .../jdl}/__test-files__/complex_jdl.jdl | 0 .../jdl}/__test-files__/complex_jdl_2.jdl | 0 {jdl => lib/jdl}/__test-files__/constants.jdl | 0 .../jdl}/__test-files__/couchbase_jdl.jdl | 0 .../jdl}/__test-files__/deployments.jdl | 0 .../different_relationship_types.jdl | 0 {jdl => lib/jdl}/__test-files__/enum.jdl | 0 .../jdl}/__test-files__/enum_with_values.jdl | 0 .../jdl}/__test-files__/field_comments.jdl | 0 .../__test-files__/filtering_with_service.jdl | 0 .../filtering_without_service.jdl | 0 .../jdl}/__test-files__/fluent_methods.jdl | 0 .../jdl}/__test-files__/fluent_methods2.jdl | 0 .../__test-files__/following_comments.jdl | 0 {jdl => lib/jdl}/__test-files__/id_field.jdl | 0 .../jdl}/__test-files__/integration/file1.jdl | 0 .../jdl}/__test-files__/integration/file2.jdl | 0 .../__test-files__/invalid_field_type.jdl | 0 .../jdl}/__test-files__/invalid_file.txt | 0 {jdl => lib/jdl}/__test-files__/invalid_file2 | 0 .../jdl}/__test-files__/invalid_option.jdl | 0 .../jhipster_app/.jhipster/BadEntity.json | 0 .../.jhipster/CassBankAccount.json | 0 .../jhipster_app/.jhipster/Country.json | 0 .../jhipster_app/.jhipster/Department.json | 0 .../jhipster_app/.jhipster/Employee.json | 0 .../.jhipster/InvalidBlobType.json | 0 .../jhipster_app/.jhipster/Job.json | 0 .../jhipster_app/.jhipster/JobHistory.json | 0 .../jhipster_app/.jhipster/Location.json | 0 .../jhipster_app/.jhipster/NoEntity.txt | 0 .../jhipster_app/.jhipster/Region.json | 0 .../jhipster_app/.jhipster/Task.json | 0 .../__test-files__/jhipster_app/.yo-rc.json | 0 .../app_with_entities/.jhipster/Country.json | 0 .../.jhipster/Department.json | 0 .../app_with_entities/.jhipster/Employee.json | 0 .../app_with_entities/.jhipster/Job.json | 0 .../.jhipster/JobHistory.json | 0 .../app_with_entities/.jhipster/Location.json | 0 .../app_with_entities/.jhipster/Region.json | 0 .../app_with_entities/.jhipster/Task.json | 0 .../app_with_entities/.yo-rc.json | 0 .../multi_apps/app1/.jhipster/Region.json | 0 .../multi_apps/app1/.yo-rc.json | 0 .../multi_apps/app2/.jhipster/Country.json | 0 .../multi_apps/app2/.jhipster/Location.json | 0 .../multi_apps/app2/.yo-rc.json | 0 .../multi_apps/app3/.yo-rc.json | 0 .../with_authority/.jhipster/TestEntity.json | 0 .../with_authority/.yo-rc.json | 0 .../with_user/.jhipster/TestEntity.json | 0 .../with_user/.yo-rc.json | 0 .../lint/duplicate_entities.jdl | 0 .../__test-files__/lint/duplicate_enums.jdl | 0 .../__test-files__/lint/duplicate_fields.jdl | 0 .../lint/ungrouped_relationships.jdl | 0 .../jdl}/__test-files__/lint/unused_enums.jdl | 0 .../lint/useless_commas_fields.jdl | 0 .../lint/useless_entity_curly_braces.jdl | 0 .../lint/useless_table_names.jdl | 0 {jdl => lib/jdl}/__test-files__/mongo_jdl.jdl | 0 .../__test-files__/multiple_jdl_comments.jdl | 0 .../jdl}/__test-files__/no_injected_field.jdl | 0 .../jdl}/__test-files__/no_microservice.jdl | 0 .../non_existent_validation.jdl | 0 .../pattern_validation_with_quote.jdl | 0 .../jdl}/__test-files__/realistic_sample.jdl | 0 .../jdl}/__test-files__/regex_validation.jdl | 0 .../relationship_built_in_entity.jdl | 0 .../__test-files__/required_relationships.jdl | 0 {jdl => lib/jdl}/__test-files__/simple.jdl | 0 .../simple_microservice_setup.jdl | 0 .../jdl}/__test-files__/two_microservices.jdl | 0 .../underscore_application_name.jdl | 0 .../unexistent_entities_for_relationship.jdl | 0 {jdl => lib/jdl}/__test-files__/unique.jdl | 0 .../user_entity_from_relationship.jdl | 0 .../user_entity_to_relationship.jdl | 0 {jdl => lib/jdl}/__test-files__/valid_jdl.jdl | 0 .../jdl}/__test-files__/valid_jdl2.jdl | 0 {jdl => lib/jdl}/basic-types/index.ts | 0 .../jdl}/basic-types/json-entity.spec.ts | 0 {jdl => lib/jdl}/basic-types/json-entity.ts | 0 .../basic-types/relationship-types.spec.ts | 0 .../jdl}/basic-types/relationship-types.ts | 0 {jdl => lib/jdl}/basic-types/relationships.ts | 0 .../built-in-options/binary-options.spec.ts | 0 .../jdl}/built-in-options/binary-options.ts | 0 {jdl => lib/jdl}/built-in-options/index.ts | 0 .../jdl-application-definition.spec.ts | 0 .../jdl-application-definition.ts | 0 .../relationship-options.spec.ts | 0 .../built-in-options/relationship-options.ts | 0 .../built-in-options/unary-options.spec.ts | 0 .../jdl}/built-in-options/unary-options.ts | 0 .../built-in-options/validation-patterns.ts | 0 .../jdl}/built-in-options/validations.spec.ts | 0 .../jdl}/built-in-options/validations.ts | 0 .../jdl-to-json-basic-entity-converter.ts | 0 ...basic-entity-information-converter.spec.ts | 0 .../jdl-to-json-field-converter.spec.ts | 0 .../jdl-to-json-field-converter.ts | 0 .../jdl-to-json-option-converter.spec.ts | 0 .../jdl-to-json-option-converter.ts | 0 ...jdl-to-json-relationship-converter.spec.ts | 0 .../jdl-to-json-relationship-converter.ts | 0 ...ith-applications-to-json-converter.spec.ts | 2 +- ...jdl-with-applications-to-json-converter.ts | 0 ...hout-application-to-json-converter.spec.ts | 0 ...l-without-application-to-json-converter.ts | 0 .../json-to-jdl-application-converter.spec.ts | 2 +- .../json-to-jdl-application-converter.ts | 0 .../converters/json-to-jdl-converter.spec.ts | 2 +- .../jdl}/converters/json-to-jdl-converter.ts | 4 ++-- .../json-to-jdl-entity-converter.spec.ts | 0 .../json-to-jdl-entity-converter.ts | 0 .../json-to-jdl-option-converter.spec.ts | 0 .../json-to-jdl-option-converter.ts | 0 .../option-converter.spec.ts.snap | 0 .../application-converter.spec.ts | 2 +- .../application-converter.ts | 0 .../deployment-converter.spec.ts | 0 .../deployment-converter.ts | 0 .../entity-converter.spec.ts | 0 .../entity-converter.ts | 0 .../enum-converter.spec.ts | 0 .../enum-converter.ts | 0 .../field-converter.spec.ts | 0 .../field-converter.ts | 0 .../option-converter.spec.ts | 0 .../option-converter.ts | 0 ...parsed-jdl-to-jdl-object-converter.spec.ts | 2 +- .../parsed-jdl-to-jdl-object-converter.ts | 0 .../relationship-converter.spec.ts | 0 .../relationship-converter.ts | 0 .../parsed-jdl-to-jdl-object/types.ts | 0 .../validation-converter.spec.ts | 0 .../validation-converter.ts | 0 {jdl => lib/jdl}/converters/types.d.ts | 2 +- .../jhipster-application-formatter.ts | 0 .../jdl}/exporters/export-utils.spec.ts | 2 +- {jdl => lib/jdl}/exporters/export-utils.ts | 2 +- .../jdl}/exporters/jdl-exporter.spec.ts | 2 +- {jdl => lib/jdl}/exporters/jdl-exporter.ts | 0 .../jhipster-deployment-exporter.spec.ts | 2 +- .../exporters/jhipster-deployment-exporter.ts | 0 .../jhipster-entity-exporter.spec.ts | 2 +- .../exporters/jhipster-entity-exporter.ts | 0 {jdl => lib/jdl}/exporters/types.d.ts | 0 {jdl => lib/jdl}/index.ts | 2 +- {jdl => lib/jdl}/integration-test.spec.ts | 4 ++-- {jdl => lib/jdl}/jdl-importer.spec.ts | 2 +- {jdl => lib/jdl}/jdl-importer.ts | 0 .../jdl}/jhipster/application-options.ts | 0 .../jdl}/jhipster/application-types.ts | 0 .../jdl}/jhipster/authentication-types.ts | 0 {jdl => lib/jdl}/jhipster/build-tool-types.ts | 0 {jdl => lib/jdl}/jhipster/cache-types.ts | 0 .../jdl}/jhipster/client-framework-types.ts | 0 .../jdl}/jhipster/database-types.spec.ts | 0 {jdl => lib/jdl}/jhipster/database-types.ts | 0 .../default-application-options.spec.ts | 0 .../jhipster/default-application-options.ts | 2 +- .../jdl}/jhipster/deployment-options.spec.ts | 0 .../jdl}/jhipster/deployment-options.ts | 0 {jdl => lib/jdl}/jhipster/entity-options.ts | 0 {jdl => lib/jdl}/jhipster/field-types.spec.ts | 0 {jdl => lib/jdl}/jhipster/field-types.ts | 0 {jdl => lib/jdl}/jhipster/index.ts | 0 .../jdl}/jhipster/jdl-validator-definition.ts | 0 .../jhipster/kubernetes-platform-types.ts | 0 .../jdl}/jhipster/message-broker-types.ts | 0 {jdl => lib/jdl}/jhipster/monitoring-types.ts | 0 {jdl => lib/jdl}/jhipster/openapi-options.ts | 0 .../jdl}/jhipster/openshift-platform-types.ts | 0 .../relationship-on-handler-options.ts | 0 .../jdl}/jhipster/reserved-keywords.spec.ts | 0 .../jdl}/jhipster/reserved-keywords.ts | 20 ++++++++-------- .../jhipster/reserved-keywords/jhipster.ts | 0 .../jdl}/jhipster/reserved-keywords/paging.ts | 0 .../jdl}/jhipster/search-engine-types.ts | 0 .../jdl}/jhipster/service-discovery-types.ts | 0 .../jdl}/jhipster/test-framework-types.ts | 0 {jdl => lib/jdl}/jhipster/websocket-types.ts | 0 {jdl => lib/jdl}/linters/entity-linter.ts | 0 {jdl => lib/jdl}/linters/enum-linter.ts | 0 {jdl => lib/jdl}/linters/field-linter.ts | 0 .../jdl}/linters/issues/abstract-issue.ts | 0 .../jdl}/linters/issues/entity-issue.spec.ts | 0 .../jdl}/linters/issues/entity-issue.ts | 0 .../jdl}/linters/issues/enum-issue.spec.ts | 0 {jdl => lib/jdl}/linters/issues/enum-issue.ts | 0 .../jdl}/linters/issues/field-issue.spec.ts | 0 .../jdl}/linters/issues/field-issue.ts | 0 .../jdl}/linters/issues/issues.spec.ts | 0 {jdl => lib/jdl}/linters/issues/issues.ts | 0 .../linters/issues/relationship-issue.spec.ts | 0 .../jdl}/linters/issues/relationship-issue.ts | 0 {jdl => lib/jdl}/linters/jdl-linter.spec.ts | 4 ++-- {jdl => lib/jdl}/linters/jdl-linter.ts | 0 .../jdl}/linters/relationship-linter.ts | 0 {jdl => lib/jdl}/linters/rule-levels.ts | 0 {jdl => lib/jdl}/linters/rule.spec.ts | 0 {jdl => lib/jdl}/linters/rule.ts | 0 {jdl => lib/jdl}/linters/rules.spec.ts | 0 {jdl => lib/jdl}/linters/rules.ts | 0 {jdl => lib/jdl}/matchers/entity-matcher.ts | 0 {jdl => lib/jdl}/matchers/field-matcher.ts | 0 .../jdl}/models/abstract-jdl-option.spec.ts | 0 .../jdl}/models/abstract-jdl-option.ts | 0 ...an-jdl-application-configuration-option.ts | 0 {jdl => lib/jdl}/models/index.ts | 0 ...er-jdl-application-configuration-option.ts | 0 ...-application-configuration-factory.spec.ts | 0 .../jdl-application-configuration-factory.ts | 0 .../jdl-application-configuration-option.ts | 0 .../jdl-application-configuration.spec.ts | 0 .../models/jdl-application-configuration.ts | 0 .../models/jdl-application-entities.spec.ts | 0 .../jdl}/models/jdl-application-entities.ts | 0 .../models/jdl-application-factory.spec.ts | 0 .../jdl}/models/jdl-application-factory.ts | 0 .../jdl}/models/jdl-application.spec.ts | 0 {jdl => lib/jdl}/models/jdl-application.ts | 0 .../jdl}/models/jdl-binary-option.spec.ts | 0 {jdl => lib/jdl}/models/jdl-binary-option.ts | 0 .../jdl}/models/jdl-deployment.spec.ts | 0 {jdl => lib/jdl}/models/jdl-deployment.ts | 0 {jdl => lib/jdl}/models/jdl-entity.spec.ts | 0 {jdl => lib/jdl}/models/jdl-entity.ts | 0 .../jdl}/models/jdl-enum-value.spec.ts | 0 {jdl => lib/jdl}/models/jdl-enum-value.ts | 0 {jdl => lib/jdl}/models/jdl-enum.spec.ts | 0 {jdl => lib/jdl}/models/jdl-enum.ts | 0 {jdl => lib/jdl}/models/jdl-enums.spec.ts | 0 {jdl => lib/jdl}/models/jdl-enums.ts | 0 {jdl => lib/jdl}/models/jdl-field.spec.ts | 0 {jdl => lib/jdl}/models/jdl-field.ts | 0 .../jdl}/models/jdl-object-merger.spec.ts | 2 +- {jdl => lib/jdl}/models/jdl-object-merger.ts | 0 {jdl => lib/jdl}/models/jdl-object-wrapper.ts | 0 {jdl => lib/jdl}/models/jdl-object.spec.ts | 2 +- {jdl => lib/jdl}/models/jdl-object.ts | 0 {jdl => lib/jdl}/models/jdl-options.spec.ts | 0 {jdl => lib/jdl}/models/jdl-options.ts | 0 .../jdl}/models/jdl-relationship.spec.ts | 0 {jdl => lib/jdl}/models/jdl-relationship.ts | 0 .../jdl}/models/jdl-relationships.spec.ts | 0 {jdl => lib/jdl}/models/jdl-relationships.ts | 0 .../jdl}/models/jdl-unary-option.spec.ts | 0 {jdl => lib/jdl}/models/jdl-unary-option.ts | 0 .../jdl}/models/jdl-validation.spec.ts | 0 {jdl => lib/jdl}/models/jdl-validation.ts | 0 ...st-jdl-application-configuration-option.ts | 0 ...ng-jdl-application-configuration-option.ts | 0 {jdl => lib/jdl}/parsing/api.ts | 0 {jdl => lib/jdl}/parsing/dsl-api.spec.ts | 0 .../generated/generated-serialized-grammar.js | 0 .../jdl}/parsing/generated/grammar.html | 0 {jdl => lib/jdl}/parsing/grammar.spec.ts | 0 .../jdl}/parsing/jdl-ast-builder-visitor.ts | 0 {jdl => lib/jdl}/parsing/jdl-parser.ts | 0 .../jdl}/parsing/jdl-parsing-types.d.ts | 0 .../jdl}/parsing/jdl-post-parsing-tasks.ts | 0 .../jdl}/parsing/lexer/application-tokens.ts | 0 .../jdl}/parsing/lexer/deployment-tokens.ts | 0 {jdl => lib/jdl}/parsing/lexer/lexer.spec.ts | 0 {jdl => lib/jdl}/parsing/lexer/lexer.ts | 0 .../jdl}/parsing/lexer/minmax-tokens.ts | 0 .../jdl}/parsing/lexer/option-tokens.ts | 0 .../parsing/lexer/relationship-type-tokens.ts | 0 .../jdl}/parsing/lexer/shared-tokens.ts | 0 .../jdl}/parsing/lexer/token-creator.spec.ts | 0 .../jdl}/parsing/lexer/token-creator.ts | 0 .../jdl}/parsing/lexer/validation-tokens.ts | 0 .../self-checks/parsing-system-checker.ts | 0 .../self-checks/token-collector-visitor.ts | 0 {jdl => lib/jdl}/parsing/validator.spec.ts | 0 {jdl => lib/jdl}/parsing/validator.ts | 0 {jdl => lib/jdl}/readers/file-reader.spec.ts | 2 +- {jdl => lib/jdl}/readers/file-reader.ts | 0 {jdl => lib/jdl}/readers/jdl-reader.spec.ts | 4 ++-- {jdl => lib/jdl}/readers/jdl-reader.ts | 0 .../jdl}/readers/json-file-reader.spec.ts | 0 {jdl => lib/jdl}/readers/json-file-reader.ts | 0 {jdl => lib/jdl}/readers/json-reader.spec.ts | 0 {jdl => lib/jdl}/readers/json-reader.ts | 0 {jdl => lib/jdl}/runtime.ts | 2 +- {jdl => lib/jdl}/types/runtime.d.ts | 0 {jdl => lib/jdl}/types/types.d.ts | 0 {jdl => lib/jdl}/utils/array-utils.spec.ts | 0 {jdl => lib/jdl}/utils/array-utils.ts | 0 {jdl => lib/jdl}/utils/deprecation-utils.ts | 0 .../utils/entity-table-name-creator.spec.ts | 0 .../jdl}/utils/entity-table-name-creator.ts | 2 +- {jdl => lib/jdl}/utils/file-utils.ts | 0 {jdl => lib/jdl}/utils/files-utils.spec.ts | 2 +- {jdl => lib/jdl}/utils/format-utils.spec.ts | 0 {jdl => lib/jdl}/utils/format-utils.ts | 0 {jdl => lib/jdl}/utils/object-utils.spec.ts | 0 {jdl => lib/jdl}/utils/object-utils.ts | 0 {jdl => lib/jdl}/utils/objects/logger.ts | 2 +- {jdl => lib/jdl}/utils/set-utils.spec.ts | 0 {jdl => lib/jdl}/utils/set-utils.ts | 0 {jdl => lib/jdl}/utils/string-utils.ts | 0 {jdl => lib/jdl}/utils/string_utils.spec.ts | 0 .../binary-option-validator.spec.ts | 0 .../validators/binary-option-validator.ts | 0 .../validators/deployment-validator.spec.ts | 0 .../jdl}/validators/deployment-validator.ts | 0 .../jdl}/validators/entity-validator.spec.ts | 0 .../jdl}/validators/entity-validator.ts | 0 .../jdl}/validators/enum-validator.spec.ts | 0 {jdl => lib/jdl}/validators/enum-validator.ts | 0 .../jdl}/validators/field-validator.spec.ts | 0 .../jdl}/validators/field-validator.ts | 0 .../jdl-with-application-validator.spec.ts | 0 .../jdl-with-application-validator.ts | 0 .../jdl-without-application-validator.spec.ts | 0 .../jdl-without-application-validator.ts | 0 .../jdl}/validators/option-validator.ts | 0 .../validators/relationship-validator.spec.ts | 0 .../jdl}/validators/relationship-validator.ts | 0 .../validators/unary-option-validator.spec.ts | 0 .../jdl}/validators/unary-option-validator.ts | 0 .../validators/validation-validator.spec.ts | 0 .../jdl}/validators/validation-validator.ts | 0 {jdl => lib/jdl}/validators/validator.ts | 0 package.json | 14 +++++------ test/integration-test.spec.ts | 2 +- test/needle-api/needle-client-angular.spec.ts | 2 +- .../needle-client-react-generator.spec.ts | 2 +- test/needle-api/needle-client-react.spec.ts | 2 +- .../needle-client-vue-generator.spec.ts | 2 +- test/needle-api/needle-client-vue.spec.ts | 2 +- test/support/jdl/index.ts | 23 +++++++++++-------- testing/support/application-samples.ts | 2 +- testing/support/entity-samples.ts | 2 +- 469 files changed, 198 insertions(+), 195 deletions(-) rename {jdl => lib/jdl}/__snapshots__/jdl-importer.spec.ts.snap (100%) rename {jdl => lib/jdl}/__test-files__/MyEntity.json (100%) rename {jdl => lib/jdl}/__test-files__/annotations.jdl (100%) rename {jdl => lib/jdl}/__test-files__/annotations_and_options.jdl (100%) rename {jdl => lib/jdl}/__test-files__/application.jdl (100%) rename {jdl => lib/jdl}/__test-files__/application_with_blueprints.jdl (100%) rename {jdl => lib/jdl}/__test-files__/application_with_entities.jdl (100%) rename {jdl => lib/jdl}/__test-files__/application_with_entity_dto_suffixes.jdl (100%) rename {jdl => lib/jdl}/__test-files__/application_wrong_basename.jdl (100%) rename {jdl => lib/jdl}/__test-files__/applications.jdl (100%) rename {jdl => lib/jdl}/__test-files__/applications2.jdl (100%) rename {jdl => lib/jdl}/__test-files__/applications3.jdl (100%) rename {jdl => lib/jdl}/__test-files__/applications_with_and_without_entities.jdl (100%) rename {jdl => lib/jdl}/__test-files__/authority_entity_to_relationship.jdl (100%) rename {jdl => lib/jdl}/__test-files__/big_sample.jdl (100%) rename {jdl => lib/jdl}/__test-files__/blob_jdl.jdl (100%) rename {jdl => lib/jdl}/__test-files__/capitalized_annotations.jdl (100%) rename {jdl => lib/jdl}/__test-files__/cassandra_jdl.jdl (100%) rename {jdl => lib/jdl}/__test-files__/cassandra_with_relationships.jdl (100%) rename {jdl => lib/jdl}/__test-files__/client_root_folder.jdl (100%) rename {jdl => lib/jdl}/__test-files__/client_root_folder_no_microservice.jdl (100%) rename {jdl => lib/jdl}/__test-files__/complex_jdl.jdl (100%) rename {jdl => lib/jdl}/__test-files__/complex_jdl_2.jdl (100%) rename {jdl => lib/jdl}/__test-files__/constants.jdl (100%) rename {jdl => lib/jdl}/__test-files__/couchbase_jdl.jdl (100%) rename {jdl => lib/jdl}/__test-files__/deployments.jdl (100%) rename {jdl => lib/jdl}/__test-files__/different_relationship_types.jdl (100%) rename {jdl => lib/jdl}/__test-files__/enum.jdl (100%) rename {jdl => lib/jdl}/__test-files__/enum_with_values.jdl (100%) rename {jdl => lib/jdl}/__test-files__/field_comments.jdl (100%) rename {jdl => lib/jdl}/__test-files__/filtering_with_service.jdl (100%) rename {jdl => lib/jdl}/__test-files__/filtering_without_service.jdl (100%) rename {jdl => lib/jdl}/__test-files__/fluent_methods.jdl (100%) rename {jdl => lib/jdl}/__test-files__/fluent_methods2.jdl (100%) rename {jdl => lib/jdl}/__test-files__/following_comments.jdl (100%) rename {jdl => lib/jdl}/__test-files__/id_field.jdl (100%) rename {jdl => lib/jdl}/__test-files__/integration/file1.jdl (100%) rename {jdl => lib/jdl}/__test-files__/integration/file2.jdl (100%) rename {jdl => lib/jdl}/__test-files__/invalid_field_type.jdl (100%) rename {jdl => lib/jdl}/__test-files__/invalid_file.txt (100%) rename {jdl => lib/jdl}/__test-files__/invalid_file2 (100%) rename {jdl => lib/jdl}/__test-files__/invalid_option.jdl (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/BadEntity.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/CassBankAccount.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Country.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Department.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Employee.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Job.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/JobHistory.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Location.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/NoEntity.txt (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Region.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.jhipster/Task.json (100%) rename {jdl => lib/jdl}/__test-files__/jhipster_app/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json (100%) rename {jdl => lib/jdl}/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json (100%) rename {jdl => lib/jdl}/__test-files__/lint/duplicate_entities.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/duplicate_enums.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/duplicate_fields.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/ungrouped_relationships.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/unused_enums.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/useless_commas_fields.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/useless_entity_curly_braces.jdl (100%) rename {jdl => lib/jdl}/__test-files__/lint/useless_table_names.jdl (100%) rename {jdl => lib/jdl}/__test-files__/mongo_jdl.jdl (100%) rename {jdl => lib/jdl}/__test-files__/multiple_jdl_comments.jdl (100%) rename {jdl => lib/jdl}/__test-files__/no_injected_field.jdl (100%) rename {jdl => lib/jdl}/__test-files__/no_microservice.jdl (100%) rename {jdl => lib/jdl}/__test-files__/non_existent_validation.jdl (100%) rename {jdl => lib/jdl}/__test-files__/pattern_validation_with_quote.jdl (100%) rename {jdl => lib/jdl}/__test-files__/realistic_sample.jdl (100%) rename {jdl => lib/jdl}/__test-files__/regex_validation.jdl (100%) rename {jdl => lib/jdl}/__test-files__/relationship_built_in_entity.jdl (100%) rename {jdl => lib/jdl}/__test-files__/required_relationships.jdl (100%) rename {jdl => lib/jdl}/__test-files__/simple.jdl (100%) rename {jdl => lib/jdl}/__test-files__/simple_microservice_setup.jdl (100%) rename {jdl => lib/jdl}/__test-files__/two_microservices.jdl (100%) rename {jdl => lib/jdl}/__test-files__/underscore_application_name.jdl (100%) rename {jdl => lib/jdl}/__test-files__/unexistent_entities_for_relationship.jdl (100%) rename {jdl => lib/jdl}/__test-files__/unique.jdl (100%) rename {jdl => lib/jdl}/__test-files__/user_entity_from_relationship.jdl (100%) rename {jdl => lib/jdl}/__test-files__/user_entity_to_relationship.jdl (100%) rename {jdl => lib/jdl}/__test-files__/valid_jdl.jdl (100%) rename {jdl => lib/jdl}/__test-files__/valid_jdl2.jdl (100%) rename {jdl => lib/jdl}/basic-types/index.ts (100%) rename {jdl => lib/jdl}/basic-types/json-entity.spec.ts (100%) rename {jdl => lib/jdl}/basic-types/json-entity.ts (100%) rename {jdl => lib/jdl}/basic-types/relationship-types.spec.ts (100%) rename {jdl => lib/jdl}/basic-types/relationship-types.ts (100%) rename {jdl => lib/jdl}/basic-types/relationships.ts (100%) rename {jdl => lib/jdl}/built-in-options/binary-options.spec.ts (100%) rename {jdl => lib/jdl}/built-in-options/binary-options.ts (100%) rename {jdl => lib/jdl}/built-in-options/index.ts (100%) rename {jdl => lib/jdl}/built-in-options/jdl-application-definition.spec.ts (100%) rename {jdl => lib/jdl}/built-in-options/jdl-application-definition.ts (100%) rename {jdl => lib/jdl}/built-in-options/relationship-options.spec.ts (100%) rename {jdl => lib/jdl}/built-in-options/relationship-options.ts (100%) rename {jdl => lib/jdl}/built-in-options/unary-options.spec.ts (100%) rename {jdl => lib/jdl}/built-in-options/unary-options.ts (100%) rename {jdl => lib/jdl}/built-in-options/validation-patterns.ts (100%) rename {jdl => lib/jdl}/built-in-options/validations.spec.ts (100%) rename {jdl => lib/jdl}/built-in-options/validations.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-field-converter.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-option-converter.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-to-json-relationship-converter.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts (99%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/jdl-to-json/jdl-without-application-to-json-converter.ts (100%) rename {jdl => lib/jdl}/converters/json-to-jdl-application-converter.spec.ts (97%) rename {jdl => lib/jdl}/converters/json-to-jdl-application-converter.ts (100%) rename {jdl => lib/jdl}/converters/json-to-jdl-converter.spec.ts (99%) rename {jdl => lib/jdl}/converters/json-to-jdl-converter.ts (97%) rename {jdl => lib/jdl}/converters/json-to-jdl-entity-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/json-to-jdl-entity-converter.ts (100%) rename {jdl => lib/jdl}/converters/json-to-jdl-option-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/json-to-jdl-option-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts (99%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/application-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/deployment-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/entity-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/enum-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/field-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/option-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts (99%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/relationship-converter.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/types.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts (100%) rename {jdl => lib/jdl}/converters/parsed-jdl-to-jdl-object/validation-converter.ts (100%) rename {jdl => lib/jdl}/converters/types.d.ts (97%) rename {jdl => lib/jdl}/exporters/applications/jhipster-application-formatter.ts (100%) rename {jdl => lib/jdl}/exporters/export-utils.spec.ts (98%) rename {jdl => lib/jdl}/exporters/export-utils.ts (96%) rename {jdl => lib/jdl}/exporters/jdl-exporter.spec.ts (98%) rename {jdl => lib/jdl}/exporters/jdl-exporter.ts (100%) rename {jdl => lib/jdl}/exporters/jhipster-deployment-exporter.spec.ts (98%) rename {jdl => lib/jdl}/exporters/jhipster-deployment-exporter.ts (100%) rename {jdl => lib/jdl}/exporters/jhipster-entity-exporter.spec.ts (99%) rename {jdl => lib/jdl}/exporters/jhipster-entity-exporter.ts (100%) rename {jdl => lib/jdl}/exporters/types.d.ts (100%) rename {jdl => lib/jdl}/index.ts (73%) rename {jdl => lib/jdl}/integration-test.spec.ts (98%) rename {jdl => lib/jdl}/jdl-importer.spec.ts (99%) rename {jdl => lib/jdl}/jdl-importer.ts (100%) rename {jdl => lib/jdl}/jhipster/application-options.ts (100%) rename {jdl => lib/jdl}/jhipster/application-types.ts (100%) rename {jdl => lib/jdl}/jhipster/authentication-types.ts (100%) rename {jdl => lib/jdl}/jhipster/build-tool-types.ts (100%) rename {jdl => lib/jdl}/jhipster/cache-types.ts (100%) rename {jdl => lib/jdl}/jhipster/client-framework-types.ts (100%) rename {jdl => lib/jdl}/jhipster/database-types.spec.ts (100%) rename {jdl => lib/jdl}/jhipster/database-types.ts (100%) rename {jdl => lib/jdl}/jhipster/default-application-options.spec.ts (100%) rename {jdl => lib/jdl}/jhipster/default-application-options.ts (98%) rename {jdl => lib/jdl}/jhipster/deployment-options.spec.ts (100%) rename {jdl => lib/jdl}/jhipster/deployment-options.ts (100%) rename {jdl => lib/jdl}/jhipster/entity-options.ts (100%) rename {jdl => lib/jdl}/jhipster/field-types.spec.ts (100%) rename {jdl => lib/jdl}/jhipster/field-types.ts (100%) rename {jdl => lib/jdl}/jhipster/index.ts (100%) rename {jdl => lib/jdl}/jhipster/jdl-validator-definition.ts (100%) rename {jdl => lib/jdl}/jhipster/kubernetes-platform-types.ts (100%) rename {jdl => lib/jdl}/jhipster/message-broker-types.ts (100%) rename {jdl => lib/jdl}/jhipster/monitoring-types.ts (100%) rename {jdl => lib/jdl}/jhipster/openapi-options.ts (100%) rename {jdl => lib/jdl}/jhipster/openshift-platform-types.ts (100%) rename {jdl => lib/jdl}/jhipster/relationship-on-handler-options.ts (100%) rename {jdl => lib/jdl}/jhipster/reserved-keywords.spec.ts (100%) rename {jdl => lib/jdl}/jhipster/reserved-keywords.ts (77%) rename {jdl => lib/jdl}/jhipster/reserved-keywords/jhipster.ts (100%) rename {jdl => lib/jdl}/jhipster/reserved-keywords/paging.ts (100%) rename {jdl => lib/jdl}/jhipster/search-engine-types.ts (100%) rename {jdl => lib/jdl}/jhipster/service-discovery-types.ts (100%) rename {jdl => lib/jdl}/jhipster/test-framework-types.ts (100%) rename {jdl => lib/jdl}/jhipster/websocket-types.ts (100%) rename {jdl => lib/jdl}/linters/entity-linter.ts (100%) rename {jdl => lib/jdl}/linters/enum-linter.ts (100%) rename {jdl => lib/jdl}/linters/field-linter.ts (100%) rename {jdl => lib/jdl}/linters/issues/abstract-issue.ts (100%) rename {jdl => lib/jdl}/linters/issues/entity-issue.spec.ts (100%) rename {jdl => lib/jdl}/linters/issues/entity-issue.ts (100%) rename {jdl => lib/jdl}/linters/issues/enum-issue.spec.ts (100%) rename {jdl => lib/jdl}/linters/issues/enum-issue.ts (100%) rename {jdl => lib/jdl}/linters/issues/field-issue.spec.ts (100%) rename {jdl => lib/jdl}/linters/issues/field-issue.ts (100%) rename {jdl => lib/jdl}/linters/issues/issues.spec.ts (100%) rename {jdl => lib/jdl}/linters/issues/issues.ts (100%) rename {jdl => lib/jdl}/linters/issues/relationship-issue.spec.ts (100%) rename {jdl => lib/jdl}/linters/issues/relationship-issue.ts (100%) rename {jdl => lib/jdl}/linters/jdl-linter.spec.ts (98%) rename {jdl => lib/jdl}/linters/jdl-linter.ts (100%) rename {jdl => lib/jdl}/linters/relationship-linter.ts (100%) rename {jdl => lib/jdl}/linters/rule-levels.ts (100%) rename {jdl => lib/jdl}/linters/rule.spec.ts (100%) rename {jdl => lib/jdl}/linters/rule.ts (100%) rename {jdl => lib/jdl}/linters/rules.spec.ts (100%) rename {jdl => lib/jdl}/linters/rules.ts (100%) rename {jdl => lib/jdl}/matchers/entity-matcher.ts (100%) rename {jdl => lib/jdl}/matchers/field-matcher.ts (100%) rename {jdl => lib/jdl}/models/abstract-jdl-option.spec.ts (100%) rename {jdl => lib/jdl}/models/abstract-jdl-option.ts (100%) rename {jdl => lib/jdl}/models/boolean-jdl-application-configuration-option.ts (100%) rename {jdl => lib/jdl}/models/index.ts (100%) rename {jdl => lib/jdl}/models/integer-jdl-application-configuration-option.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-configuration-factory.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-configuration-factory.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-configuration-option.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-configuration.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-configuration.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-entities.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-entities.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-factory.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-application-factory.ts (100%) rename {jdl => lib/jdl}/models/jdl-application.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-application.ts (100%) rename {jdl => lib/jdl}/models/jdl-binary-option.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-binary-option.ts (100%) rename {jdl => lib/jdl}/models/jdl-deployment.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-deployment.ts (100%) rename {jdl => lib/jdl}/models/jdl-entity.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-entity.ts (100%) rename {jdl => lib/jdl}/models/jdl-enum-value.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-enum-value.ts (100%) rename {jdl => lib/jdl}/models/jdl-enum.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-enum.ts (100%) rename {jdl => lib/jdl}/models/jdl-enums.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-enums.ts (100%) rename {jdl => lib/jdl}/models/jdl-field.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-field.ts (100%) rename {jdl => lib/jdl}/models/jdl-object-merger.spec.ts (98%) rename {jdl => lib/jdl}/models/jdl-object-merger.ts (100%) rename {jdl => lib/jdl}/models/jdl-object-wrapper.ts (100%) rename {jdl => lib/jdl}/models/jdl-object.spec.ts (99%) rename {jdl => lib/jdl}/models/jdl-object.ts (100%) rename {jdl => lib/jdl}/models/jdl-options.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-options.ts (100%) rename {jdl => lib/jdl}/models/jdl-relationship.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-relationship.ts (100%) rename {jdl => lib/jdl}/models/jdl-relationships.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-relationships.ts (100%) rename {jdl => lib/jdl}/models/jdl-unary-option.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-unary-option.ts (100%) rename {jdl => lib/jdl}/models/jdl-validation.spec.ts (100%) rename {jdl => lib/jdl}/models/jdl-validation.ts (100%) rename {jdl => lib/jdl}/models/list-jdl-application-configuration-option.ts (100%) rename {jdl => lib/jdl}/models/string-jdl-application-configuration-option.ts (100%) rename {jdl => lib/jdl}/parsing/api.ts (100%) rename {jdl => lib/jdl}/parsing/dsl-api.spec.ts (100%) rename {jdl => lib/jdl}/parsing/generated/generated-serialized-grammar.js (100%) rename {jdl => lib/jdl}/parsing/generated/grammar.html (100%) rename {jdl => lib/jdl}/parsing/grammar.spec.ts (100%) rename {jdl => lib/jdl}/parsing/jdl-ast-builder-visitor.ts (100%) rename {jdl => lib/jdl}/parsing/jdl-parser.ts (100%) rename {jdl => lib/jdl}/parsing/jdl-parsing-types.d.ts (100%) rename {jdl => lib/jdl}/parsing/jdl-post-parsing-tasks.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/application-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/deployment-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/lexer.spec.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/lexer.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/minmax-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/option-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/relationship-type-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/shared-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/token-creator.spec.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/token-creator.ts (100%) rename {jdl => lib/jdl}/parsing/lexer/validation-tokens.ts (100%) rename {jdl => lib/jdl}/parsing/self-checks/parsing-system-checker.ts (100%) rename {jdl => lib/jdl}/parsing/self-checks/token-collector-visitor.ts (100%) rename {jdl => lib/jdl}/parsing/validator.spec.ts (100%) rename {jdl => lib/jdl}/parsing/validator.ts (100%) rename {jdl => lib/jdl}/readers/file-reader.spec.ts (97%) rename {jdl => lib/jdl}/readers/file-reader.ts (100%) rename {jdl => lib/jdl}/readers/jdl-reader.spec.ts (97%) rename {jdl => lib/jdl}/readers/jdl-reader.ts (100%) rename {jdl => lib/jdl}/readers/json-file-reader.spec.ts (100%) rename {jdl => lib/jdl}/readers/json-file-reader.ts (100%) rename {jdl => lib/jdl}/readers/json-reader.spec.ts (100%) rename {jdl => lib/jdl}/readers/json-reader.ts (100%) rename {jdl => lib/jdl}/runtime.ts (97%) rename {jdl => lib/jdl}/types/runtime.d.ts (100%) rename {jdl => lib/jdl}/types/types.d.ts (100%) rename {jdl => lib/jdl}/utils/array-utils.spec.ts (100%) rename {jdl => lib/jdl}/utils/array-utils.ts (100%) rename {jdl => lib/jdl}/utils/deprecation-utils.ts (100%) rename {jdl => lib/jdl}/utils/entity-table-name-creator.spec.ts (100%) rename {jdl => lib/jdl}/utils/entity-table-name-creator.ts (96%) rename {jdl => lib/jdl}/utils/file-utils.ts (100%) rename {jdl => lib/jdl}/utils/files-utils.spec.ts (99%) rename {jdl => lib/jdl}/utils/format-utils.spec.ts (100%) rename {jdl => lib/jdl}/utils/format-utils.ts (100%) rename {jdl => lib/jdl}/utils/object-utils.spec.ts (100%) rename {jdl => lib/jdl}/utils/object-utils.ts (100%) rename {jdl => lib/jdl}/utils/objects/logger.ts (93%) rename {jdl => lib/jdl}/utils/set-utils.spec.ts (100%) rename {jdl => lib/jdl}/utils/set-utils.ts (100%) rename {jdl => lib/jdl}/utils/string-utils.ts (100%) rename {jdl => lib/jdl}/utils/string_utils.spec.ts (100%) rename {jdl => lib/jdl}/validators/binary-option-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/binary-option-validator.ts (100%) rename {jdl => lib/jdl}/validators/deployment-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/deployment-validator.ts (100%) rename {jdl => lib/jdl}/validators/entity-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/entity-validator.ts (100%) rename {jdl => lib/jdl}/validators/enum-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/enum-validator.ts (100%) rename {jdl => lib/jdl}/validators/field-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/field-validator.ts (100%) rename {jdl => lib/jdl}/validators/jdl-with-application-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/jdl-with-application-validator.ts (100%) rename {jdl => lib/jdl}/validators/jdl-without-application-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/jdl-without-application-validator.ts (100%) rename {jdl => lib/jdl}/validators/option-validator.ts (100%) rename {jdl => lib/jdl}/validators/relationship-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/relationship-validator.ts (100%) rename {jdl => lib/jdl}/validators/unary-option-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/unary-option-validator.ts (100%) rename {jdl => lib/jdl}/validators/validation-validator.spec.ts (100%) rename {jdl => lib/jdl}/validators/validation-validator.ts (100%) rename {jdl => lib/jdl}/validators/validator.ts (100%) diff --git a/generators/angular/generator.spec.ts b/generators/angular/generator.spec.ts index b58aea760383..bc18931ab5ba 100644 --- a/generators/angular/generator.spec.ts +++ b/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/jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { GENERATOR_ANGULAR } from '../generator-list.js'; import Generator from './index.js'; diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts index 5299c340cd5b..b2c16a06224f 100644 --- a/generators/angular/generator.ts +++ b/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/jdl/jhipster/index.js'; import { generateTypescriptTestEntity as generateTestEntity, generateEntityClientEnumImports as getClientEnumImportsFormat, diff --git a/generators/angular/needle-api/needle-client-angular.ts b/generators/angular/needle-api/needle-client-angular.ts index 5dc4ed777e66..4fd1d7fbf824 100644 --- a/generators/angular/needle-api/needle-client-angular.ts +++ b/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/jdl/jhipster/index.js'; import { createNeedleCallback } from '../../base/support/needles.js'; const { ANGULAR } = clientFrameworkTypes; diff --git a/generators/app/generator.ts b/generators/app/generator.ts index 38e5c33a54d2..9c72719d739d 100644 --- a/generators/app/generator.ts +++ b/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/jdl/jhipster/index.js'; import cleanupOldFilesTask from './cleanup.js'; import { checkNode, loadStoredAppOptions } from './support/index.js'; diff --git a/generators/app/support/config.ts b/generators/app/support/config.ts index 5d276676d1ae..5120d56c23bb 100644 --- a/generators/app/support/config.ts +++ b/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/jdl/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'; diff --git a/generators/base-application/support/entity.ts b/generators/base-application/support/entity.ts index 50d32de92756..e0967f18f8fd 100644 --- a/generators/base-application/support/entity.ts +++ b/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 { JSONEntity } from '../../../lib/jdl/converters/types.js'; export const findEntityInEntities = (entityName: string, entities: JSONEntity[]) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName)); diff --git a/generators/base-application/support/field-utils.ts b/generators/base-application/support/field-utils.ts index d597ec031d99..c6ee706f6cd0 100644 --- a/generators/base-application/support/field-utils.ts +++ b/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/jdl/jhipster/index.js'; const { CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes; const { BYTES, BYTE_BUFFER } = RelationalOnlyDBTypes; diff --git a/generators/base-application/support/prepare-entity.spec.ts b/generators/base-application/support/prepare-entity.spec.ts index 5fbf8c7858b0..1aabcacdf8b1 100644 --- a/generators/base-application/support/prepare-entity.spec.ts +++ b/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/jdl/jhipster/index.js'; import { entityDefaultConfig, prepareEntityPrimaryKeyForTemplates } from './prepare-entity.js'; describe('generator - base-application - support - prepareEntity', () => { diff --git a/generators/base-application/support/prepare-entity.ts b/generators/base-application/support/prepare-entity.ts index f690005071c0..3fab0c72c007 100644 --- a/generators/base-application/support/prepare-entity.ts +++ b/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/jdl/jhipster/index.js'; +import { binaryOptions } from '../../../lib/jdl/built-in-options/index.js'; import type { Entity } from '../../../lib/types/application/index.js'; import type CoreGenerator from '../../base-core/generator.js'; diff --git a/generators/base-application/support/prepare-field.spec.ts b/generators/base-application/support/prepare-field.spec.ts index a4f0b52a08d9..ee1cb3a335ad 100644 --- a/generators/base-application/support/prepare-field.spec.ts +++ b/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/jdl/jhipster/index.js'; import prepareFieldForTemplates, { getEnumValuesWithCustomValues } from './prepare-field.js'; import prepareEntityForTemplates, { loadRequiredConfigIntoEntity } from './prepare-entity.js'; diff --git a/generators/base-application/support/prepare-field.ts b/generators/base-application/support/prepare-field.ts index 09ac74bc1bc3..95879ef205eb 100644 --- a/generators/base-application/support/prepare-field.ts +++ b/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/jdl/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'; diff --git a/generators/base-application/support/prepare-relationship.ts b/generators/base-application/support/prepare-relationship.ts index ee260b29591e..4f487e276f09 100644 --- a/generators/base-application/support/prepare-relationship.ts +++ b/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/jdl/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'; diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts index ee2a465b48c7..8ab225569d7f 100644 --- a/generators/base-application/support/relationship.ts +++ b/generators/base-application/support/relationship.ts @@ -19,7 +19,7 @@ import { lowerFirst, upperFirst } from 'lodash-es'; -import type { JSONEntity, JSONRelationship } from '../../../jdl/converters/types.js'; +import type { JSONEntity, JSONRelationship } from '../../../lib/jdl/converters/types.js'; import type { ValidationResult } from '../../base/api.js'; import { stringifyApplicationData } from './debug.js'; import { findEntityInEntities } from './entity.js'; diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index ca7b61f42db7..1b14c85255fa 100644 --- a/generators/base-core/generator.ts +++ b/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/jdl/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'; diff --git a/generators/base-workspaces/internal/deployments.ts b/generators/base-workspaces/internal/deployments.ts index d0e999cc1fb1..7c4060283f3f 100644 --- a/generators/base-workspaces/internal/deployments.ts +++ b/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/jdl/jhipster/index.js'; import { loadDerivedPlatformConfig, loadDerivedServerAndPlatformProperties, loadPlatformConfig } from '../../server/support/index.js'; import type { GeneratorBaseCore } from '../../index.js'; diff --git a/generators/base-workspaces/internal/docker-base.ts b/generators/base-workspaces/internal/docker-base.ts index b9a76de8e0a0..65668a504ba3 100644 --- a/generators/base-workspaces/internal/docker-base.ts +++ b/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/jdl/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'; diff --git a/generators/base-workspaces/internal/docker-prompts.ts b/generators/base-workspaces/internal/docker-prompts.ts index 15d06e572458..107c6cca7fb5 100644 --- a/generators/base-workspaces/internal/docker-prompts.ts +++ b/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/jdl/jhipster/index.js'; import { convertSecretToBase64 } from '../../base/support/index.js'; import { loadConfigs } from './docker-base.js'; diff --git a/generators/base/support/jhipster7-context.ts b/generators/base/support/jhipster7-context.ts index 48b720acd4cd..b4481bc8cd69 100644 --- a/generators/base/support/jhipster7-context.ts +++ b/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/jdl/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/jdl/jhipster/index.js'; import { upperFirstCamelCase } from '../../../lib/utils/string.js'; const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes; diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index 83959afadee6..e9f8ba959d81 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/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 type { JSONEntity } from '../../../lib/jdl/converters/types.js'; +import { createRuntime } from '../../../lib/jdl/runtime.js'; +import type { JDLApplicationConfig } from '../../../lib/jdl/types/types.js'; export const exportJDLTransform = ({ destinationPath, diff --git a/generators/bootstrap-application-base/support/import-jdl-transform.ts b/generators/bootstrap-application-base/support/import-jdl-transform.ts index cf7aec24b5b9..26d4b939b496 100644 --- a/generators/bootstrap-application-base/support/import-jdl-transform.ts +++ b/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/types/types.js'; export const importJDLTransform = ({ destinationPath, diff --git a/generators/bootstrap-application-base/utils.ts b/generators/bootstrap-application-base/utils.ts index 35b428923650..947045b34b59 100644 --- a/generators/bootstrap-application-base/utils.ts +++ b/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/jdl/jhipster/index.js'; import { loadRequiredConfigIntoEntity } from '../base-application/support/index.js'; -import { PaginationTypes } from '../../jdl/jhipster/entity-options.js'; +import { PaginationTypes } from '../../lib/jdl/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'; diff --git a/generators/bootstrap-application/generator.spec.ts b/generators/bootstrap-application/generator.spec.ts index 463a3df159fe..a9ea99c50dc2 100644 --- a/generators/bootstrap-application/generator.spec.ts +++ b/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/jdl/jhipster/index.js'; import { shouldSupportFeatures } from '../../test/support/tests.js'; import Generator from './index.js'; diff --git a/generators/bootstrap-application/generator.ts b/generators/bootstrap-application/generator.ts index 852a9d44470c..979e41850b73 100644 --- a/generators/bootstrap-application/generator.ts +++ b/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/jdl/jhipster/index.js'; import { derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, diff --git a/generators/ci-cd/generator.ts b/generators/ci-cd/generator.ts index b19d39fdf27b..5932e4196159 100644 --- a/generators/ci-cd/generator.ts +++ b/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/jdl/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'; diff --git a/generators/client/command.ts b/generators/client/command.ts index 3e6ea73ddd40..0b89600cf992 100644 --- a/generators/client/command.ts +++ b/generators/client/command.ts @@ -23,7 +23,7 @@ import { APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes, testFrameworkTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; import type { JHipsterCommandDefinition } from '../../lib/command/index.js'; import { GENERATOR_COMMON } from '../generator-list.js'; diff --git a/generators/client/generator-needles.spec.ts b/generators/client/generator-needles.spec.ts index eacdd5496f04..235129646be0 100644 --- a/generators/client/generator-needles.spec.ts +++ b/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/jdl/jhipster/index.js'; import ClientGenerator from './index.js'; const { ANGULAR, REACT } = clientFrameworkTypes; diff --git a/generators/client/generator.spec.ts b/generators/client/generator.spec.ts index bde54c4f4a4f..b7f52ada7f46 100644 --- a/generators/client/generator.spec.ts +++ b/generators/client/generator.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { before, describe, expect, it } from 'esmocha'; import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { defaultHelpers as helpers, result } from '../../testing/index.js'; -import { testFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { testFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_CLIENT } from '../generator-list.js'; import Generator from './index.js'; diff --git a/generators/client/generator.ts b/generators/client/generator.ts index 31986e71a51d..241a80b54632 100644 --- a/generators/client/generator.ts +++ b/generators/client/generator.ts @@ -23,7 +23,7 @@ import BaseApplicationGenerator from '../base-application/index.js'; import { LOGIN_REGEX_JS } from '../generator-constants.js'; import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS } from '../generator-list.js'; -import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; import { createNeedleCallback } from '../base/support/index.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { addEnumerationFiles } from './entity-files.js'; diff --git a/generators/client/prompts.spec.ts b/generators/client/prompts.spec.ts index 4bb60fdaffd2..e8b29c644c69 100644 --- a/generators/client/prompts.spec.ts +++ b/generators/client/prompts.spec.ts @@ -8,7 +8,7 @@ import { clientFrameworkTypes, databaseTypes, testFrameworkTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_APP } from '../generator-list.js'; const { MONOLITH } = applicationTypes; diff --git a/generators/client/support/entity-definition.ts b/generators/client/support/entity-definition.ts index 466c6e6421eb..e3c13d7bac6a 100644 --- a/generators/client/support/entity-definition.ts +++ b/generators/client/support/entity-definition.ts @@ -18,7 +18,7 @@ * limitations under the License. */ -import { clientFrameworkTypes, fieldTypes, validations } from '../../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes, validations } from '../../../lib/jdl/jhipster/index.js'; import getTypescriptKeyType from './types-utils.js'; import { filterRelevantRelationships } from './template-utils.js'; diff --git a/generators/client/support/template-utils.spec.ts b/generators/client/support/template-utils.spec.ts index 53739cdeef51..7c95e56fc37b 100644 --- a/generators/client/support/template-utils.spec.ts +++ b/generators/client/support/template-utils.spec.ts @@ -1,7 +1,7 @@ import path from 'path'; import { expect } from 'chai'; import { describe, it } from 'esmocha'; -import { entityOptions } from '../../../jdl/jhipster/index.js'; +import { entityOptions } from '../../../lib/jdl/jhipster/index.js'; import { generateEntityClientImports, generateTestEntityId, getEntityParentPathAddition } from './template-utils.js'; diff --git a/generators/client/support/template-utils.ts b/generators/client/support/template-utils.ts index fd7a006b35a3..463128a6d670 100644 --- a/generators/client/support/template-utils.ts +++ b/generators/client/support/template-utils.ts @@ -18,7 +18,7 @@ */ import path from 'path'; -import { clientFrameworkTypes, fieldTypes } from '../../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../../lib/jdl/jhipster/index.js'; import type { PrimaryKey } from '../../../lib/types/application/entity.js'; import { getEntryIfTypeOrTypeAttribute } from './types-utils.js'; diff --git a/generators/client/support/types-utils.spec.ts b/generators/client/support/types-utils.spec.ts index 890b3f2adc1f..bd87e0cf512c 100644 --- a/generators/client/support/types-utils.spec.ts +++ b/generators/client/support/types-utils.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'esmocha'; -import { fieldTypes } from '../../../jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jdl/jhipster/index.js'; import { getTypescriptType } from './types-utils.js'; diff --git a/generators/client/support/types-utils.ts b/generators/client/support/types-utils.ts index 072361f554ff..09a7d9686a83 100644 --- a/generators/client/support/types-utils.ts +++ b/generators/client/support/types-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/jdl/jhipster/index.js'; import type { PrimaryKey } from '../../../lib/types/application/entity.js'; import { fieldIsEnum } from '../../base-application/support/index.js'; diff --git a/generators/common/generator.ts b/generators/common/generator.ts index 70f8f78fc5d2..3fbb3abb9d9f 100644 --- a/generators/common/generator.ts +++ b/generators/common/generator.ts @@ -28,7 +28,7 @@ import { SERVER_MAIN_RES_DIR, TEST_DIR, } from '../generator-constants.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_COMMON, GENERATOR_GIT } from '../generator-list.js'; import { createPrettierTransform } from '../bootstrap/support/prettier-support.js'; import { loadStoredAppOptions } from '../app/support/index.js'; diff --git a/generators/cypress/generator.spec.ts b/generators/cypress/generator.spec.ts index c2cdb11c41c8..6cd0c0a2e071 100644 --- a/generators/cypress/generator.spec.ts +++ b/generators/cypress/generator.spec.ts @@ -20,7 +20,7 @@ import path, { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; import { after, before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; -import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; import { AuthenticationTypeMatrix, extendMatrix, fromMatrix, defaultHelpers as helpers } from '../../testing/index.js'; import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { GENERATOR_CYPRESS } from '../generator-list.js'; diff --git a/generators/cypress/generator.ts b/generators/cypress/generator.ts index d5880787d0f0..2ef4fdb2b088 100644 --- a/generators/cypress/generator.ts +++ b/generators/cypress/generator.ts @@ -19,7 +19,7 @@ import { createFaker, stringHashCode } from '../base/support/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { generateTestEntity as entityWithFakeValues } from '../client/support/index.js'; diff --git a/generators/docker-compose/docker-compose.spec.ts b/generators/docker-compose/docker-compose.spec.ts index 5754fbb49f26..dac9712e61c5 100644 --- a/generators/docker-compose/docker-compose.spec.ts +++ b/generators/docker-compose/docker-compose.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import monitoringTypes from '../../jdl/jhipster/monitoring-types.js'; -import applicationTypes from '../../jdl/jhipster/application-types.js'; +import monitoringTypes from '../../lib/jdl/jhipster/monitoring-types.js'; +import applicationTypes from '../../lib/jdl/jhipster/application-types.js'; import { GENERATOR_DOCKER_COMPOSE } from '../generator-list.js'; import { getGenerator, defaultHelpers as helpers, runResult } from '../../testing/index.js'; diff --git a/generators/docker-compose/files.ts b/generators/docker-compose/files.ts index 3ac1638c79f3..ff0c04e0f8d1 100644 --- a/generators/docker-compose/files.ts +++ b/generators/docker-compose/files.ts @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { applicationTypes, authenticationTypes, monitoringTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes, monitoringTypes } from '../../lib/jdl/jhipster/index.js'; const { PROMETHEUS } = monitoringTypes; const { MICROSERVICE } = applicationTypes; diff --git a/generators/docker-compose/generator.ts b/generators/docker-compose/generator.ts index 43b8cd43f274..1da8c865dc6d 100644 --- a/generators/docker-compose/generator.ts +++ b/generators/docker-compose/generator.ts @@ -26,7 +26,7 @@ import { defaults } from 'lodash-es'; import BaseWorkspacesGenerator from '../base-workspaces/index.js'; -import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js'; +import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js'; import { convertSecretToBase64, createBase64Secret, createFaker, stringHashCode } from '../base/support/index.js'; import { checkDocker } from '../base-workspaces/internal/docker-base.js'; diff --git a/generators/docker/generator.spec.ts b/generators/docker/generator.spec.ts index 0148cb1566a2..c26069754f7f 100644 --- a/generators/docker/generator.spec.ts +++ b/generators/docker/generator.spec.ts @@ -31,7 +31,7 @@ import { } from '../../testing/index.js'; import { matchElasticSearchDocker } from '../spring-data-elasticsearch/__test-support/elastic-search-matcher.js'; -import { cacheTypes, databaseTypes, searchEngineTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes, searchEngineTypes, serviceDiscoveryTypes } from '../../lib/jdl/jhipster/index.js'; import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../server/options/message-broker.js'; import { shouldSupportFeatures } from '../../test/support/tests.js'; import { matchConsul, matchEureka } from './__test-support/service-discovery-matcher.js'; diff --git a/generators/entity/generator.ts b/generators/entity/generator.ts index 27a4153f20e0..48a5b7ce769f 100644 --- a/generators/entity/generator.ts +++ b/generators/entity/generator.ts @@ -26,7 +26,7 @@ import { upperFirst } from 'lodash-es'; import type { Storage } from 'yeoman-generator'; import BaseApplicationGenerator from '../base-application/index.js'; import { JHIPSTER_CONFIG_DIR } from '../generator-constants.js'; -import { applicationTypes, reservedKeywords } from '../../jdl/jhipster/index.js'; +import { applicationTypes, reservedKeywords } from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_ENTITIES } from '../generator-list.js'; import { getDBTypeFromDBValue, hibernateSnakeCase } from '../server/support/index.js'; import type { Entity } from '../../lib/types/application/entity.js'; diff --git a/generators/entity/prompts.ts b/generators/entity/prompts.ts index b4d19a2b8774..151202a6c9ef 100644 --- a/generators/entity/prompts.ts +++ b/generators/entity/prompts.ts @@ -28,7 +28,7 @@ import { fieldTypes, reservedKeywords, validations, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; import { inputIsNumber, inputIsSignedDecimalNumber, inputIsSignedNumber } from './support/index.js'; import type EntityGenerator from './generator.js'; diff --git a/generators/export-jdl/generator.ts b/generators/export-jdl/generator.ts index c86808da9271..349adeb4fd7d 100644 --- a/generators/export-jdl/generator.ts +++ b/generators/export-jdl/generator.ts @@ -20,8 +20,8 @@ import chalk from 'chalk'; import BaseGenerator from '../base/index.js'; -import { applicationOptions } from '../../jdl/jhipster/index.js'; -import { convertToJDL } from '../../jdl/converters/json-to-jdl-converter.js'; +import { applicationOptions } from '../../lib/jdl/jhipster/index.js'; +import { convertToJDL } from '../../lib/jdl/converters/json-to-jdl-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import jdlDefinition from '../app/jdl/index.js'; diff --git a/generators/info/generator.ts b/generators/info/generator.ts index 20970a5b3ae0..34b39f4c657e 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -22,11 +22,11 @@ import chalk from 'chalk'; import BaseApplicationGenerator from '../base-application/index.js'; -import JSONToJDLEntityConverter from '../../jdl/converters/json-to-jdl-entity-converter.js'; -import JSONToJDLOptionConverter from '../../jdl/converters/json-to-jdl-option-converter.js'; +import JSONToJDLEntityConverter from '../../lib/jdl/converters/json-to-jdl-entity-converter.js'; +import JSONToJDLOptionConverter from '../../lib/jdl/converters/json-to-jdl-option-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import { YO_RC_FILE } from '../generator-constants.js'; -import type { JSONEntity } from '../../jdl/converters/types.js'; +import type { JSONEntity } from '../../lib/jdl/converters/types.js'; import { applicationsLookup } from '../workspaces/support/applications-lookup.js'; import { replaceSensitiveConfig } from './support/utils.js'; diff --git a/generators/java/generators/build-tool/command.ts b/generators/java/generators/build-tool/command.ts index ac92e272a348..caa2a616c92f 100644 --- a/generators/java/generators/build-tool/command.ts +++ b/generators/java/generators/build-tool/command.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { buildToolTypes } from '../../../../jdl/jhipster/index.js'; +import { buildToolTypes } from '../../../../lib/jdl/jhipster/index.js'; import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js'; import { asCommand } from '../../../type-utils.js'; diff --git a/generators/java/generators/build-tool/generator.ts b/generators/java/generators/build-tool/generator.ts index 76f0a7008ffa..6a6377b9ffe6 100644 --- a/generators/java/generators/build-tool/generator.ts +++ b/generators/java/generators/build-tool/generator.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { buildToolTypes } from '../../../../jdl/jhipster/index.js'; +import { buildToolTypes } from '../../../../lib/jdl/jhipster/index.js'; import BaseApplicationGenerator from '../../../base-application/index.js'; import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js'; import type { MavenDependency } from '../../../maven/types.js'; diff --git a/generators/jdl/generator.ts b/generators/jdl/generator.ts index 83896ff5b7a2..426576cae2f3 100644 --- a/generators/jdl/generator.ts +++ b/generators/jdl/generator.ts @@ -27,8 +27,8 @@ import { downloadJdlFile } from '../../cli/download.mjs'; import EnvironmentBuilder from '../../cli/environment-builder.mjs'; import { CLI_NAME } from '../../cli/utils.mjs'; import { GENERATOR_APP, GENERATOR_ENTITIES, GENERATOR_WORKSPACES } from '../generator-list.js'; -import type { ApplicationWithEntities } from '../../jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../jdl/jdl-importer.js'; +import type { ApplicationWithEntities } from '../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../lib/jdl/jdl-importer.js'; import { GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR } from '../generator-constants.js'; import { mergeYoRcContent } from '../../lib/utils/yo-rc.js'; import { normalizeBlueprintName } from '../base/internal/blueprint.js'; diff --git a/generators/jdl/internal/application.ts b/generators/jdl/internal/application.ts index 2ba0c7766115..da281ccf9e38 100644 --- a/generators/jdl/internal/application.ts +++ b/generators/jdl/internal/application.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { ApplicationWithEntities } from '../../../jdl/jdl-importer.js'; +import type { ApplicationWithEntities } from '../../../lib/jdl/jdl-importer.js'; export const addApplicationIndex = (applicationsWithEntities: ApplicationWithEntities[]) => { applicationsWithEntities.forEach((applicationWithEntities, applicationIndex) => { diff --git a/generators/kubernetes-helm/files.ts b/generators/kubernetes-helm/files.ts index 479636ac40ac..ca1617ff9747 100644 --- a/generators/kubernetes-helm/files.ts +++ b/generators/kubernetes-helm/files.ts @@ -24,7 +24,7 @@ import { monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; const { GATEWAY, MONOLITH } = applicationTypes; diff --git a/generators/kubernetes-helm/generator.ts b/generators/kubernetes-helm/generator.ts index 9f8ca0184ff5..4cf9c4ee0c02 100644 --- a/generators/kubernetes-helm/generator.ts +++ b/generators/kubernetes-helm/generator.ts @@ -33,7 +33,7 @@ import { setupHelmConstants, setupKubernetesConstants, } from '../kubernetes/kubernetes-base.js'; -import { messageBrokerTypes } from '../../jdl/jhipster/index.js'; +import { messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { checkDocker } from '../docker/support/index.js'; diff --git a/generators/kubernetes-knative/files.ts b/generators/kubernetes-knative/files.ts index ccd39f56e6f1..2799baab01a0 100644 --- a/generators/kubernetes-knative/files.ts +++ b/generators/kubernetes-knative/files.ts @@ -25,7 +25,7 @@ import { monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; const { GATEWAY, MONOLITH } = applicationTypes; diff --git a/generators/kubernetes-knative/generator.ts b/generators/kubernetes-knative/generator.ts index 3a43a4e1ed92..9eba5dbf2d92 100644 --- a/generators/kubernetes-knative/generator.ts +++ b/generators/kubernetes-knative/generator.ts @@ -32,7 +32,7 @@ import { setupHelmConstants, setupKubernetesConstants, } from '../kubernetes/kubernetes-base.js'; -import { buildToolTypes, kubernetesPlatformTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js'; +import { buildToolTypes, kubernetesPlatformTypes, messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; import { getJdbcUrl } from '../spring-data-relational/support/index.js'; import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { checkDocker } from '../docker/support/index.js'; diff --git a/generators/kubernetes-knative/prompts.ts b/generators/kubernetes-knative/prompts.ts index 2c81f23356dd..57a7742e941b 100644 --- a/generators/kubernetes-knative/prompts.ts +++ b/generators/kubernetes-knative/prompts.ts @@ -18,7 +18,7 @@ * limitations under the License. */ import k8sPrompts from '../kubernetes/prompts.js'; -import { kubernetesPlatformTypes } from '../../jdl/jhipster/index.js'; +import { kubernetesPlatformTypes } from '../../lib/jdl/jhipster/index.js'; import { generatorDefaultConfig } from '../kubernetes/kubernetes-constants.js'; const { GeneratorTypes } = kubernetesPlatformTypes; diff --git a/generators/kubernetes/files.ts b/generators/kubernetes/files.ts index 8787932297f1..a87d2c0f4298 100644 --- a/generators/kubernetes/files.ts +++ b/generators/kubernetes/files.ts @@ -27,7 +27,7 @@ import { monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; const { GATEWAY, MONOLITH } = applicationTypes; diff --git a/generators/kubernetes/generator.ts b/generators/kubernetes/generator.ts index 83ecbf127c43..127f5c6d5d71 100644 --- a/generators/kubernetes/generator.ts +++ b/generators/kubernetes/generator.ts @@ -23,7 +23,7 @@ import chalk from 'chalk'; import BaseWorkspacesGenerator from '../base-workspaces/index.js'; -import { buildToolTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js'; +import { buildToolTypes, messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; import { checkImages, configureImageNames, generateJwtSecret, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; diff --git a/generators/kubernetes/kubernetes-base.ts b/generators/kubernetes/kubernetes-base.ts index b5aadf4be824..ac700fd30d09 100644 --- a/generators/kubernetes/kubernetes-base.ts +++ b/generators/kubernetes/kubernetes-base.ts @@ -39,7 +39,7 @@ import { KUBERNETES_RBAC_API_VERSION, KUBERNETES_STATEFULSET_API_VERSION, } from '../generator-constants.js'; -import { applicationTypes, kubernetesPlatformTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, kubernetesPlatformTypes } from '../../lib/jdl/jhipster/index.js'; import { defaultKubernetesConfig } from './kubernetes-constants.js'; const { MICROSERVICE } = applicationTypes; diff --git a/generators/kubernetes/kubernetes-constants.ts b/generators/kubernetes/kubernetes-constants.ts index c51b6681bc40..227fc59d088c 100644 --- a/generators/kubernetes/kubernetes-constants.ts +++ b/generators/kubernetes/kubernetes-constants.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { kubernetesPlatformTypes, monitoringTypes } from '../../jdl/jhipster/index.js'; +import { kubernetesPlatformTypes, monitoringTypes } from '../../lib/jdl/jhipster/index.js'; const { NO } = monitoringTypes; const { ServiceTypes, IngressTypes, GeneratorTypes } = kubernetesPlatformTypes; diff --git a/generators/kubernetes/prompts.ts b/generators/kubernetes/prompts.ts index d36fd19541aa..c3679dbe8c34 100644 --- a/generators/kubernetes/prompts.ts +++ b/generators/kubernetes/prompts.ts @@ -18,7 +18,7 @@ * limitations under the License. */ import dockerPrompts from '../base-workspaces/internal/docker-prompts.js'; -import { applicationTypes, databaseTypes, kubernetesPlatformTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, databaseTypes, kubernetesPlatformTypes } from '../../lib/jdl/jhipster/index.js'; import { defaultKubernetesConfig, ingressDefaultConfig } from './kubernetes-constants.js'; const { MONOLITH } = applicationTypes; diff --git a/generators/languages/generator.ts b/generators/languages/generator.ts index 42ea39fb4ae2..fe0f3ac10f90 100644 --- a/generators/languages/generator.ts +++ b/generators/languages/generator.ts @@ -29,7 +29,7 @@ import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/ import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js'; import { QUEUES } from '../base-application/priorities.js'; import { PRIORITY_NAMES } from '../base/priorities.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; import { findLanguageForTag, supportedLanguages } from './support/languages.js'; import TranslationData, { createTranslationsFileFilter, createTranslationsFilter } from './translation-data.js'; import { writeEntityFiles } from './entity-files.js'; diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index 9c82663bb602..c7684bd6aa8a 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -29,7 +29,7 @@ import { prepareRelationship, } from '../base-application/support/index.js'; import { prepareSqlApplicationProperties } from '../spring-data-relational/support/index.js'; -import { fieldTypes } from '../../jdl/jhipster/index.js'; +import { fieldTypes } from '../../lib/jdl/jhipster/index.js'; import type { MavenProperty } from '../maven/types.js'; import { liquibaseFiles } from './files.js'; import { diff --git a/generators/liquibase/incremental-liquibase.spec.ts b/generators/liquibase/incremental-liquibase.spec.ts index 3f9557ec6001..fbe22800ff15 100644 --- a/generators/liquibase/incremental-liquibase.spec.ts +++ b/generators/liquibase/incremental-liquibase.spec.ts @@ -4,7 +4,7 @@ import { fileURLToPath } from 'url'; import { after, before, describe, expect, it } from 'esmocha'; import { skipPrettierHelpers as helpers, runResult } from '../../testing/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; -import { createImporterFromContent } from '../../jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../lib/jdl/jdl-importer.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); diff --git a/generators/liquibase/support/post-prepare-entity.ts b/generators/liquibase/support/post-prepare-entity.ts index e1e4f72a195f..ac3f2f2c952c 100644 --- a/generators/liquibase/support/post-prepare-entity.ts +++ b/generators/liquibase/support/post-prepare-entity.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/jdl/jhipster/index.js'; import type { LiquibaseEntity } from '../types.js'; import { asPostPreparingEachEntityTask } from '../../base-application/support/task-type-inference.js'; diff --git a/generators/liquibase/support/prepare-field.ts b/generators/liquibase/support/prepare-field.ts index e081cc00b52f..0e10a93dcd92 100644 --- a/generators/liquibase/support/prepare-field.ts +++ b/generators/liquibase/support/prepare-field.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { databaseTypes, fieldTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../lib/jdl/jhipster/index.js'; import { mutateData } from '../../base/support/index.js'; const { MYSQL, MARIADB } = databaseTypes; diff --git a/generators/react/generator.spec.ts b/generators/react/generator.spec.ts index f8fec51ed5c6..fa349d2ec53f 100644 --- a/generators/react/generator.spec.ts +++ b/generators/react/generator.spec.ts @@ -6,7 +6,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/jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_REACT } from '../generator-list.js'; diff --git a/generators/react/generator.ts b/generators/react/generator.ts index 2a8cc8a56951..1683699bb22c 100644 --- a/generators/react/generator.ts +++ b/generators/react/generator.ts @@ -22,7 +22,7 @@ import { camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_REACT } from '../generator-list.js'; -import { clientFrameworkTypes, fieldTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../lib/jdl/jhipster/index.js'; import { generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, diff --git a/generators/server/__test-support/index.ts b/generators/server/__test-support/index.ts index cfbc9768e270..bb9aacdb7143 100644 --- a/generators/server/__test-support/index.ts +++ b/generators/server/__test-support/index.ts @@ -1,6 +1,6 @@ import assert from 'assert'; -import { databaseTypes, messageBrokerTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes, messageBrokerTypes } from '../../../lib/jdl/jhipster/index.js'; import { GENERATOR_BOOTSTRAP, GENERATOR_JAVA, diff --git a/generators/server/command.ts b/generators/server/command.ts index 9eded5ec7575..1adb85be3c38 100644 --- a/generators/server/command.ts +++ b/generators/server/command.ts @@ -19,7 +19,7 @@ import chalk from 'chalk'; import type { JHipsterCommandDefinition } from '../../lib/command/index.js'; import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js'; -import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../jdl/jhipster/index.js'; +import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../lib/jdl/jhipster/index.js'; const command: JHipsterCommandDefinition = { options: { diff --git a/generators/server/generator.ts b/generators/server/generator.ts index df2d80098a54..18094e40a794 100644 --- a/generators/server/generator.ts +++ b/generators/server/generator.ts @@ -48,10 +48,10 @@ import { reservedKeywords, searchEngineTypes, validations, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; import { stringifyApplicationData } from '../base-application/support/index.js'; import { createNeedleCallback, mutateData } from '../base/support/index.js'; -import { isReservedPaginationWords } from '../../jdl/jhipster/reserved-keywords.js'; +import { isReservedPaginationWords } from '../../lib/jdl/jhipster/reserved-keywords.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { isReservedH2Keyword } from '../spring-data-relational/support/h2-reserved-keywords.js'; import { diff --git a/generators/server/jdl/application-definition.ts b/generators/server/jdl/application-definition.ts index 67813c1aaf16..a273ed0432e3 100644 --- a/generators/server/jdl/application-definition.ts +++ b/generators/server/jdl/application-definition.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { snakeCase, upperCase } from 'lodash-es'; -import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../jdl/types/types.js'; +import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; import databaseMigrationOption from '../options/database-migration.js'; import messageBrokerOption from '../options/message-broker.js'; import { syncUserWithIdpDefinition } from '../options/index.js'; diff --git a/generators/server/options/database-migration.spec.ts b/generators/server/options/database-migration.spec.ts index 047c888c8080..331e45af7278 100644 --- a/generators/server/options/database-migration.spec.ts +++ b/generators/server/options/database-migration.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import optionDefinition from './database-migration.js'; import { DATABASE_MIGRATION as optionName } from './index.js'; diff --git a/generators/server/options/database-migration.ts b/generators/server/options/database-migration.ts index 3238a9f71379..9ee824c4ecd2 100644 --- a/generators/server/options/database-migration.ts +++ b/generators/server/options/database-migration.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; export const DATABASE_MIGRATION = 'databaseMigration'; export const DATABASE_MIGRATION_LIQUIBASE = 'liquibase'; diff --git a/generators/server/options/message-broker.spec.ts b/generators/server/options/message-broker.spec.ts index 42a0cdaf4d35..4c6fed21d676 100644 --- a/generators/server/options/message-broker.spec.ts +++ b/generators/server/options/message-broker.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import optionDefinition from './message-broker.js'; import { MESSAGE_BROKER } from './index.js'; diff --git a/generators/server/options/message-broker.ts b/generators/server/options/message-broker.ts index 22122ba8d6a8..aef31bbfee02 100644 --- a/generators/server/options/message-broker.ts +++ b/generators/server/options/message-broker.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; import type { OptionWithDerivedProperties } from '../../base-application/application-options.js'; export const MESSAGE_BROKER = 'messageBroker'; diff --git a/generators/server/options/sync-user-with-idp.spec.ts b/generators/server/options/sync-user-with-idp.spec.ts index 89ae75c3a756..4bb808a56168 100644 --- a/generators/server/options/sync-user-with-idp.spec.ts +++ b/generators/server/options/sync-user-with-idp.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import { SYNC_USER_WITH_IDP as optionName } from './sync-user-with-idp.js'; diff --git a/generators/server/options/sync-user-with-idp.ts b/generators/server/options/sync-user-with-idp.ts index ace4e1d44505..77162e2084d3 100644 --- a/generators/server/options/sync-user-with-idp.ts +++ b/generators/server/options/sync-user-with-idp.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; export const SYNC_USER_WITH_IDP = 'syncUserWithIdp'; diff --git a/generators/server/support/build-specification-mapper.ts b/generators/server/support/build-specification-mapper.ts index 931d27d23359..6f92f103e04a 100644 --- a/generators/server/support/build-specification-mapper.ts +++ b/generators/server/support/build-specification-mapper.ts @@ -1,4 +1,4 @@ -import { fieldTypes } from '../../../jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jdl/jhipster/index.js'; const { STRING: TYPE_STRING, diff --git a/generators/server/support/config.ts b/generators/server/support/config.ts index c8a3a9e5a29d..91e1b554b9dd 100644 --- a/generators/server/support/config.ts +++ b/generators/server/support/config.ts @@ -9,7 +9,7 @@ import { searchEngineTypes, serviceDiscoveryTypes, websocketTypes, -} from '../../../jdl/jhipster/index.js'; +} from '../../../lib/jdl/jhipster/index.js'; import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.js'; import { CLIENT_DIST_DIR, diff --git a/generators/server/support/database.spec.ts b/generators/server/support/database.spec.ts index 140fb6e76bb4..338589717788 100644 --- a/generators/server/support/database.spec.ts +++ b/generators/server/support/database.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'esmocha'; -import { databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; import { getDBTypeFromDBValue, getFKConstraintName, getJoinTableName, getUXConstraintName } from './database.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/database.ts b/generators/server/support/database.ts index 0db4afad9c73..37a31c91c963 100644 --- a/generators/server/support/database.ts +++ b/generators/server/support/database.ts @@ -18,7 +18,7 @@ */ import crypto from 'crypto'; -import { databaseTypes, fieldTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../lib/jdl/jhipster/index.js'; import { databaseData } from '../../spring-data-relational/support/index.js'; import type { ValidationResult } from '../../base/api.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/prepare-entity.ts b/generators/server/support/prepare-entity.ts index c46049a326f1..0a2ade3b6284 100644 --- a/generators/server/support/prepare-entity.ts +++ b/generators/server/support/prepare-entity.ts @@ -18,9 +18,9 @@ */ import path from 'path'; -import { databaseTypes, searchEngineTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes, searchEngineTypes } from '../../../lib/jdl/jhipster/index.js'; -import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js'; +import { isReservedTableName } from '../../../lib/jdl/jhipster/reserved-keywords.js'; import { mutateData, normalizePathEnd } from '../../base/support/index.js'; import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/prepare-field.ts b/generators/server/support/prepare-field.ts index 8cef367901f5..1549d4715e5b 100644 --- a/generators/server/support/prepare-field.ts +++ b/generators/server/support/prepare-field.ts @@ -19,7 +19,7 @@ import assert from 'assert'; import { snakeCase, upperFirst } from 'lodash-es'; -import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.js'; +import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../lib/jdl/jhipster/index.js'; import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js'; import { mutateData } from '../../../lib/utils/object.js'; import { getUXConstraintName } from './database.js'; diff --git a/generators/server/support/relationship.ts b/generators/server/support/relationship.ts index 16373b0cdc28..cbcb0ed9d17a 100644 --- a/generators/server/support/relationship.ts +++ b/generators/server/support/relationship.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import type { JSONEntity } from '../../../jdl/converters/types.js'; +import type { JSONEntity } from '../../../lib/jdl/converters/types.js'; import { addOtherRelationship } from '../../base-application/support/index.js'; import type { ValidationResult } from '../../base/api.js'; -import { databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; const { NO: NO_DATABASE, SQL, NEO4J } = databaseTypes; diff --git a/generators/server/support/templates/field-values.ts b/generators/server/support/templates/field-values.ts index 5b3df8cfea6c..b836fa554e0a 100644 --- a/generators/server/support/templates/field-values.ts +++ b/generators/server/support/templates/field-values.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { databaseTypes, fieldTypes } from '../../../../jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../../lib/jdl/jhipster/index.js'; const dbTypes = fieldTypes; const { STRING, UUID, LONG, INTEGER } = dbTypes.CommonDBTypes; diff --git a/generators/spring-boot/command.ts b/generators/spring-boot/command.ts index bb7e28157e74..28b436549fbf 100644 --- a/generators/spring-boot/command.ts +++ b/generators/spring-boot/command.ts @@ -20,7 +20,7 @@ import chalk from 'chalk'; import type { JHipsterCommandDefinition } from '../../lib/command/index.js'; import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js'; import { createBase64Secret, createSecret } from '../base/support/secret.js'; -import { applicationTypes, authenticationTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../../lib/jdl/jhipster/index.js'; const { OAUTH2, SESSION, JWT } = authenticationTypes; const { GATEWAY, MICROSERVICE } = applicationTypes; diff --git a/generators/spring-boot/entity-files.ts b/generators/spring-boot/entity-files.ts index a76c32c90bc9..433caecd8f24 100644 --- a/generators/spring-boot/entity-files.ts +++ b/generators/spring-boot/entity-files.ts @@ -21,7 +21,7 @@ import * as _ from 'lodash-es'; import chalk from 'chalk'; import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock, moveToJavaPackageSrcDir } from '../java/support/index.js'; import { SERVER_TEST_SRC_DIR } from '../generator-constants.js'; -import { databaseTypes, entityOptions } from '../../jdl/jhipster/index.js'; +import { databaseTypes, entityOptions } from '../../lib/jdl/jhipster/index.js'; import { asWritingEntitiesTask } from '../base-application/support/task-type-inference.js'; import { cleanupOldFiles } from './entity-cleanup.js'; diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index 46d23dad67df..71b3b307b373 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -58,7 +58,7 @@ import { searchEngineTypes, testFrameworkTypes, websocketTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js'; import { writeFiles as writeEntityFiles } from './entity-files.js'; import cleanupTask from './cleanup.js'; diff --git a/generators/spring-boot/options/feign-client.spec.ts b/generators/spring-boot/options/feign-client.spec.ts index db4c9142109c..013be7af896b 100644 --- a/generators/spring-boot/options/feign-client.spec.ts +++ b/generators/spring-boot/options/feign-client.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; const optionName = 'feignClient'; diff --git a/generators/spring-boot/prompts.ts b/generators/spring-boot/prompts.ts index 652ed810786d..4469f49c0bfe 100644 --- a/generators/spring-boot/prompts.ts +++ b/generators/spring-boot/prompts.ts @@ -27,7 +27,7 @@ import { cacheTypes, databaseTypes, testFrameworkTypes, -} from '../../jdl/jhipster/index.js'; +} from '../../lib/jdl/jhipster/index.js'; import { MESSAGE_BROKER } from '../server/options/index.js'; import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js'; import type CoreGenerator from '../base-core/generator.js'; diff --git a/generators/spring-cache/generator.spec.ts b/generators/spring-cache/generator.spec.ts index 6d66d994c8d2..dbad9efc1bb8 100644 --- a/generators/spring-cache/generator.spec.ts +++ b/generators/spring-cache/generator.spec.ts @@ -7,7 +7,7 @@ import { fromMatrix, defaultHelpers as helpers, result } from '../../testing/ind import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { GENERATOR_SPRING_CACHE } from '../generator-list.js'; -import { buildToolTypes, cacheTypes } from '../../jdl/jhipster/index.js'; +import { buildToolTypes, cacheTypes } from '../../lib/jdl/jhipster/index.js'; import Generator from './index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/generators/spring-cloud-stream/generator-pulsar.spec.ts b/generators/spring-cloud-stream/generator-pulsar.spec.ts index 1aeda383bb91..315e389a84fc 100644 --- a/generators/spring-cloud-stream/generator-pulsar.spec.ts +++ b/generators/spring-cloud-stream/generator-pulsar.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { buildSamplesFromMatrix, buildServerMatrix, defaultHelpers as helpers } from '../../testing/index.js'; -import { messageBrokerTypes } from '../../jdl/jhipster/index.js'; +import { messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; import Generator from './index.js'; const { PULSAR } = messageBrokerTypes; diff --git a/generators/spring-cloud-stream/generator.spec.ts b/generators/spring-cloud-stream/generator.spec.ts index 596828f26dcb..85663802bda1 100644 --- a/generators/spring-cloud-stream/generator.spec.ts +++ b/generators/spring-cloud-stream/generator.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { buildSamplesFromMatrix, buildServerMatrix, defaultHelpers as helpers } from '../../testing/index.js'; -import { messageBrokerTypes } from '../../jdl/jhipster/index.js'; +import { messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; import Generator from './index.js'; const { KAFKA } = messageBrokerTypes; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts index fef34b3f8a7b..66cfd95278ad 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts @@ -1,7 +1,7 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../../../jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../../../jdl/jdl-importer.js'; -import { convertSingleContentToJDL } from '../../../../../jdl/converters/json-to-jdl-converter.js'; +import type { ImportState } from '../../../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../../../lib/jdl/jdl-importer.js'; +import { convertSingleContentToJDL } from '../../../../../lib/jdl/converters/json-to-jdl-converter.js'; const optionName = 'routes'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts index c8b7fe256016..df1f8bdf213b 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../../../../../jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/types/types.js'; export const jdlRoutesOptions: JHipsterOptionDefinition = { name: 'routes', diff --git a/generators/spring-data-cassandra/generator.spec.ts b/generators/spring-data-cassandra/generator.spec.ts index 6bed360a6ba3..fabcf5601915 100644 --- a/generators/spring-data-cassandra/generator.spec.ts +++ b/generators/spring-data-cassandra/generator.spec.ts @@ -25,7 +25,7 @@ import { buildServerSamples, entitiesSimple as entities, defaultHelpers as helpe import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes } from '../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-cassandra/generator.ts b/generators/spring-data-cassandra/generator.ts index 30f300bd23a5..1bdbda7d23c4 100644 --- a/generators/spring-data-cassandra/generator.ts +++ b/generators/spring-data-cassandra/generator.ts @@ -18,7 +18,7 @@ */ import BaseApplicationGenerator from '../base-application/index.js'; -import { PaginationTypes } from '../../jdl/jhipster/entity-options.js'; +import { PaginationTypes } from '../../lib/jdl/jhipster/entity-options.js'; import writeCassandraFilesTask from './files.js'; import cleanupCassandraFilesTask from './cleanup.js'; import writeCassandraEntityFilesTask, { cleanupCassandraEntityFilesTask } from './entity-files.js'; diff --git a/generators/spring-data-couchbase/generator.spec.ts b/generators/spring-data-couchbase/generator.spec.ts index 484373577460..0c026f37de69 100644 --- a/generators/spring-data-couchbase/generator.spec.ts +++ b/generators/spring-data-couchbase/generator.spec.ts @@ -31,7 +31,7 @@ import { } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; -import { databaseTypes } from '../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-elasticsearch/generator.spec.ts b/generators/spring-data-elasticsearch/generator.spec.ts index 9597961cfa8f..39c9b494dcdc 100644 --- a/generators/spring-data-elasticsearch/generator.spec.ts +++ b/generators/spring-data-elasticsearch/generator.spec.ts @@ -30,7 +30,7 @@ import { runResult, } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; -import { applicationTypes, authenticationTypes, databaseTypes, searchEngineTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes, databaseTypes, searchEngineTypes } from '../../lib/jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithSpringCloudStream } from '../server/__test-support/index.js'; import Generator from './generator.js'; import { matchElasticSearch, matchElasticSearchUser } from './__test-support/elastic-search-matcher.js'; diff --git a/generators/spring-data-mongodb/generator.spec.ts b/generators/spring-data-mongodb/generator.spec.ts index 4812b7bed174..38d6d74e07ca 100644 --- a/generators/spring-data-mongodb/generator.spec.ts +++ b/generators/spring-data-mongodb/generator.spec.ts @@ -31,7 +31,7 @@ import { import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes } from '../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-neo4j/generator.spec.ts b/generators/spring-data-neo4j/generator.spec.ts index 4c7911a7b716..c85cc0eebfad 100644 --- a/generators/spring-data-neo4j/generator.spec.ts +++ b/generators/spring-data-neo4j/generator.spec.ts @@ -11,7 +11,7 @@ import { import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes } from '../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-relational/generator.spec.ts b/generators/spring-data-relational/generator.spec.ts index 6d61d2820638..32bba2f8850e 100644 --- a/generators/spring-data-relational/generator.spec.ts +++ b/generators/spring-data-relational/generator.spec.ts @@ -14,7 +14,7 @@ import { import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { cacheTypes, databaseTypes } from '../../jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes } from '../../lib/jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-relational/generator.ts b/generators/spring-data-relational/generator.ts index 759b005dbf14..0a40c78f76dd 100644 --- a/generators/spring-data-relational/generator.ts +++ b/generators/spring-data-relational/generator.ts @@ -20,8 +20,8 @@ import assert from 'assert'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_LIQUIBASE } from '../generator-list.js'; -import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js'; -import { databaseTypes } from '../../jdl/jhipster/index.js'; +import { isReservedTableName } from '../../lib/jdl/jhipster/reserved-keywords.js'; +import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; import writeTask from './files.js'; import cleanupTask from './cleanup.js'; import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js'; diff --git a/generators/spring-data-relational/sql-entities.spec.ts b/generators/spring-data-relational/sql-entities.spec.ts index 1f24bfe4feed..007c09e82d74 100644 --- a/generators/spring-data-relational/sql-entities.spec.ts +++ b/generators/spring-data-relational/sql-entities.spec.ts @@ -10,7 +10,7 @@ import { } from '../../testing/index.js'; import { filterBasicServerGenerators } from '../server/__test-support/index.js'; -import { cacheTypes, databaseTypes } from '../../jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes } from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_SERVER } from '../generator-list.js'; const { SQL: databaseType, H2_DISK, H2_MEMORY, POSTGRESQL, MARIADB, MYSQL, MSSQL, ORACLE } = databaseTypes; diff --git a/generators/spring-data-relational/support/application-properties.ts b/generators/spring-data-relational/support/application-properties.ts index 232c4ad10b07..5912441ee597 100644 --- a/generators/spring-data-relational/support/application-properties.ts +++ b/generators/spring-data-relational/support/application-properties.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; import { getDatabaseData } from './database-data.js'; import { getJdbcUrl, getR2dbcUrl } from './database-url.js'; diff --git a/generators/spring-data-relational/support/database-data.ts b/generators/spring-data-relational/support/database-data.ts index 66ca34e665bd..9e969147cc09 100644 --- a/generators/spring-data-relational/support/database-data.ts +++ b/generators/spring-data-relational/support/database-data.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; export type DatabaseData = { name: string; diff --git a/generators/spring-data-relational/support/database-url.spec.ts b/generators/spring-data-relational/support/database-url.spec.ts index ea0c4162a6e0..62a3bc45eff8 100644 --- a/generators/spring-data-relational/support/database-url.spec.ts +++ b/generators/spring-data-relational/support/database-url.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'esmocha'; -import { databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; import { getJdbcUrl, getR2dbcUrl } from './database-url.js'; const { H2_MEMORY, H2_DISK, MARIADB, MSSQL, MYSQL, ORACLE, POSTGRESQL } = databaseTypes; diff --git a/generators/spring-data-relational/support/database-url.ts b/generators/spring-data-relational/support/database-url.ts index acb997f6f8a0..dd73bad04161 100644 --- a/generators/spring-data-relational/support/database-url.ts +++ b/generators/spring-data-relational/support/database-url.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; import databaseData, { type getData } from './database-data.js'; const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, H2_DISK, H2_MEMORY } = databaseTypes; diff --git a/generators/vue/generator.spec.ts b/generators/vue/generator.spec.ts index 2a7c6ed376c9..3f075276516a 100644 --- a/generators/vue/generator.spec.ts +++ b/generators/vue/generator.spec.ts @@ -6,7 +6,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/jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { GENERATOR_VUE } from '../generator-list.js'; import Generator from './index.js'; diff --git a/generators/vue/generator.ts b/generators/vue/generator.ts index 2ce14d7dedf1..dc8edf11e83a 100644 --- a/generators/vue/generator.ts +++ b/generators/vue/generator.ts @@ -22,7 +22,7 @@ import { isFileStateModified } from 'mem-fs-editor/state'; import { camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; -import { clientFrameworkTypes, fieldTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../lib/jdl/jhipster/index.js'; import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_VUE } from '../generator-list.js'; import { generateEntityClientImports as formatEntityClientImports, diff --git a/jdl/__snapshots__/jdl-importer.spec.ts.snap b/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap similarity index 100% rename from jdl/__snapshots__/jdl-importer.spec.ts.snap rename to lib/jdl/__snapshots__/jdl-importer.spec.ts.snap diff --git a/jdl/__test-files__/MyEntity.json b/lib/jdl/__test-files__/MyEntity.json similarity index 100% rename from jdl/__test-files__/MyEntity.json rename to lib/jdl/__test-files__/MyEntity.json diff --git a/jdl/__test-files__/annotations.jdl b/lib/jdl/__test-files__/annotations.jdl similarity index 100% rename from jdl/__test-files__/annotations.jdl rename to lib/jdl/__test-files__/annotations.jdl diff --git a/jdl/__test-files__/annotations_and_options.jdl b/lib/jdl/__test-files__/annotations_and_options.jdl similarity index 100% rename from jdl/__test-files__/annotations_and_options.jdl rename to lib/jdl/__test-files__/annotations_and_options.jdl diff --git a/jdl/__test-files__/application.jdl b/lib/jdl/__test-files__/application.jdl similarity index 100% rename from jdl/__test-files__/application.jdl rename to lib/jdl/__test-files__/application.jdl diff --git a/jdl/__test-files__/application_with_blueprints.jdl b/lib/jdl/__test-files__/application_with_blueprints.jdl similarity index 100% rename from jdl/__test-files__/application_with_blueprints.jdl rename to lib/jdl/__test-files__/application_with_blueprints.jdl diff --git a/jdl/__test-files__/application_with_entities.jdl b/lib/jdl/__test-files__/application_with_entities.jdl similarity index 100% rename from jdl/__test-files__/application_with_entities.jdl rename to lib/jdl/__test-files__/application_with_entities.jdl diff --git a/jdl/__test-files__/application_with_entity_dto_suffixes.jdl b/lib/jdl/__test-files__/application_with_entity_dto_suffixes.jdl similarity index 100% rename from jdl/__test-files__/application_with_entity_dto_suffixes.jdl rename to lib/jdl/__test-files__/application_with_entity_dto_suffixes.jdl diff --git a/jdl/__test-files__/application_wrong_basename.jdl b/lib/jdl/__test-files__/application_wrong_basename.jdl similarity index 100% rename from jdl/__test-files__/application_wrong_basename.jdl rename to lib/jdl/__test-files__/application_wrong_basename.jdl diff --git a/jdl/__test-files__/applications.jdl b/lib/jdl/__test-files__/applications.jdl similarity index 100% rename from jdl/__test-files__/applications.jdl rename to lib/jdl/__test-files__/applications.jdl diff --git a/jdl/__test-files__/applications2.jdl b/lib/jdl/__test-files__/applications2.jdl similarity index 100% rename from jdl/__test-files__/applications2.jdl rename to lib/jdl/__test-files__/applications2.jdl diff --git a/jdl/__test-files__/applications3.jdl b/lib/jdl/__test-files__/applications3.jdl similarity index 100% rename from jdl/__test-files__/applications3.jdl rename to lib/jdl/__test-files__/applications3.jdl diff --git a/jdl/__test-files__/applications_with_and_without_entities.jdl b/lib/jdl/__test-files__/applications_with_and_without_entities.jdl similarity index 100% rename from jdl/__test-files__/applications_with_and_without_entities.jdl rename to lib/jdl/__test-files__/applications_with_and_without_entities.jdl diff --git a/jdl/__test-files__/authority_entity_to_relationship.jdl b/lib/jdl/__test-files__/authority_entity_to_relationship.jdl similarity index 100% rename from jdl/__test-files__/authority_entity_to_relationship.jdl rename to lib/jdl/__test-files__/authority_entity_to_relationship.jdl diff --git a/jdl/__test-files__/big_sample.jdl b/lib/jdl/__test-files__/big_sample.jdl similarity index 100% rename from jdl/__test-files__/big_sample.jdl rename to lib/jdl/__test-files__/big_sample.jdl diff --git a/jdl/__test-files__/blob_jdl.jdl b/lib/jdl/__test-files__/blob_jdl.jdl similarity index 100% rename from jdl/__test-files__/blob_jdl.jdl rename to lib/jdl/__test-files__/blob_jdl.jdl diff --git a/jdl/__test-files__/capitalized_annotations.jdl b/lib/jdl/__test-files__/capitalized_annotations.jdl similarity index 100% rename from jdl/__test-files__/capitalized_annotations.jdl rename to lib/jdl/__test-files__/capitalized_annotations.jdl diff --git a/jdl/__test-files__/cassandra_jdl.jdl b/lib/jdl/__test-files__/cassandra_jdl.jdl similarity index 100% rename from jdl/__test-files__/cassandra_jdl.jdl rename to lib/jdl/__test-files__/cassandra_jdl.jdl diff --git a/jdl/__test-files__/cassandra_with_relationships.jdl b/lib/jdl/__test-files__/cassandra_with_relationships.jdl similarity index 100% rename from jdl/__test-files__/cassandra_with_relationships.jdl rename to lib/jdl/__test-files__/cassandra_with_relationships.jdl diff --git a/jdl/__test-files__/client_root_folder.jdl b/lib/jdl/__test-files__/client_root_folder.jdl similarity index 100% rename from jdl/__test-files__/client_root_folder.jdl rename to lib/jdl/__test-files__/client_root_folder.jdl diff --git a/jdl/__test-files__/client_root_folder_no_microservice.jdl b/lib/jdl/__test-files__/client_root_folder_no_microservice.jdl similarity index 100% rename from jdl/__test-files__/client_root_folder_no_microservice.jdl rename to lib/jdl/__test-files__/client_root_folder_no_microservice.jdl diff --git a/jdl/__test-files__/complex_jdl.jdl b/lib/jdl/__test-files__/complex_jdl.jdl similarity index 100% rename from jdl/__test-files__/complex_jdl.jdl rename to lib/jdl/__test-files__/complex_jdl.jdl diff --git a/jdl/__test-files__/complex_jdl_2.jdl b/lib/jdl/__test-files__/complex_jdl_2.jdl similarity index 100% rename from jdl/__test-files__/complex_jdl_2.jdl rename to lib/jdl/__test-files__/complex_jdl_2.jdl diff --git a/jdl/__test-files__/constants.jdl b/lib/jdl/__test-files__/constants.jdl similarity index 100% rename from jdl/__test-files__/constants.jdl rename to lib/jdl/__test-files__/constants.jdl diff --git a/jdl/__test-files__/couchbase_jdl.jdl b/lib/jdl/__test-files__/couchbase_jdl.jdl similarity index 100% rename from jdl/__test-files__/couchbase_jdl.jdl rename to lib/jdl/__test-files__/couchbase_jdl.jdl diff --git a/jdl/__test-files__/deployments.jdl b/lib/jdl/__test-files__/deployments.jdl similarity index 100% rename from jdl/__test-files__/deployments.jdl rename to lib/jdl/__test-files__/deployments.jdl diff --git a/jdl/__test-files__/different_relationship_types.jdl b/lib/jdl/__test-files__/different_relationship_types.jdl similarity index 100% rename from jdl/__test-files__/different_relationship_types.jdl rename to lib/jdl/__test-files__/different_relationship_types.jdl diff --git a/jdl/__test-files__/enum.jdl b/lib/jdl/__test-files__/enum.jdl similarity index 100% rename from jdl/__test-files__/enum.jdl rename to lib/jdl/__test-files__/enum.jdl diff --git a/jdl/__test-files__/enum_with_values.jdl b/lib/jdl/__test-files__/enum_with_values.jdl similarity index 100% rename from jdl/__test-files__/enum_with_values.jdl rename to lib/jdl/__test-files__/enum_with_values.jdl diff --git a/jdl/__test-files__/field_comments.jdl b/lib/jdl/__test-files__/field_comments.jdl similarity index 100% rename from jdl/__test-files__/field_comments.jdl rename to lib/jdl/__test-files__/field_comments.jdl diff --git a/jdl/__test-files__/filtering_with_service.jdl b/lib/jdl/__test-files__/filtering_with_service.jdl similarity index 100% rename from jdl/__test-files__/filtering_with_service.jdl rename to lib/jdl/__test-files__/filtering_with_service.jdl diff --git a/jdl/__test-files__/filtering_without_service.jdl b/lib/jdl/__test-files__/filtering_without_service.jdl similarity index 100% rename from jdl/__test-files__/filtering_without_service.jdl rename to lib/jdl/__test-files__/filtering_without_service.jdl diff --git a/jdl/__test-files__/fluent_methods.jdl b/lib/jdl/__test-files__/fluent_methods.jdl similarity index 100% rename from jdl/__test-files__/fluent_methods.jdl rename to lib/jdl/__test-files__/fluent_methods.jdl diff --git a/jdl/__test-files__/fluent_methods2.jdl b/lib/jdl/__test-files__/fluent_methods2.jdl similarity index 100% rename from jdl/__test-files__/fluent_methods2.jdl rename to lib/jdl/__test-files__/fluent_methods2.jdl diff --git a/jdl/__test-files__/following_comments.jdl b/lib/jdl/__test-files__/following_comments.jdl similarity index 100% rename from jdl/__test-files__/following_comments.jdl rename to lib/jdl/__test-files__/following_comments.jdl diff --git a/jdl/__test-files__/id_field.jdl b/lib/jdl/__test-files__/id_field.jdl similarity index 100% rename from jdl/__test-files__/id_field.jdl rename to lib/jdl/__test-files__/id_field.jdl diff --git a/jdl/__test-files__/integration/file1.jdl b/lib/jdl/__test-files__/integration/file1.jdl similarity index 100% rename from jdl/__test-files__/integration/file1.jdl rename to lib/jdl/__test-files__/integration/file1.jdl diff --git a/jdl/__test-files__/integration/file2.jdl b/lib/jdl/__test-files__/integration/file2.jdl similarity index 100% rename from jdl/__test-files__/integration/file2.jdl rename to lib/jdl/__test-files__/integration/file2.jdl diff --git a/jdl/__test-files__/invalid_field_type.jdl b/lib/jdl/__test-files__/invalid_field_type.jdl similarity index 100% rename from jdl/__test-files__/invalid_field_type.jdl rename to lib/jdl/__test-files__/invalid_field_type.jdl diff --git a/jdl/__test-files__/invalid_file.txt b/lib/jdl/__test-files__/invalid_file.txt similarity index 100% rename from jdl/__test-files__/invalid_file.txt rename to lib/jdl/__test-files__/invalid_file.txt diff --git a/jdl/__test-files__/invalid_file2 b/lib/jdl/__test-files__/invalid_file2 similarity index 100% rename from jdl/__test-files__/invalid_file2 rename to lib/jdl/__test-files__/invalid_file2 diff --git a/jdl/__test-files__/invalid_option.jdl b/lib/jdl/__test-files__/invalid_option.jdl similarity index 100% rename from jdl/__test-files__/invalid_option.jdl rename to lib/jdl/__test-files__/invalid_option.jdl diff --git a/jdl/__test-files__/jhipster_app/.jhipster/BadEntity.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/BadEntity.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/BadEntity.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/BadEntity.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/CassBankAccount.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/CassBankAccount.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/CassBankAccount.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/CassBankAccount.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Country.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Country.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Country.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Country.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Department.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Department.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Department.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Department.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Employee.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Employee.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Employee.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Employee.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Job.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Job.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Job.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Job.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/JobHistory.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/JobHistory.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/JobHistory.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/JobHistory.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Location.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Location.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Location.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Location.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/NoEntity.txt b/lib/jdl/__test-files__/jhipster_app/.jhipster/NoEntity.txt similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/NoEntity.txt rename to lib/jdl/__test-files__/jhipster_app/.jhipster/NoEntity.txt diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Region.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Region.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Region.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Region.json diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Task.json b/lib/jdl/__test-files__/jhipster_app/.jhipster/Task.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.jhipster/Task.json rename to lib/jdl/__test-files__/jhipster_app/.jhipster/Task.json diff --git a/jdl/__test-files__/jhipster_app/.yo-rc.json b/lib/jdl/__test-files__/jhipster_app/.yo-rc.json similarity index 100% rename from jdl/__test-files__/jhipster_app/.yo-rc.json rename to lib/jdl/__test-files__/jhipster_app/.yo-rc.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json b/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json rename to lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json b/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json rename to lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json b/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json rename to lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json b/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json rename to lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json b/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json rename to lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json b/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json rename to lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json b/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json rename to lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json diff --git a/jdl/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json b/lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json rename to lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json diff --git a/jdl/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json b/lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json rename to lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json diff --git a/jdl/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json b/lib/jdl/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json rename to lib/jdl/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json diff --git a/jdl/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json b/lib/jdl/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json similarity index 100% rename from jdl/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json rename to lib/jdl/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json diff --git a/jdl/__test-files__/lint/duplicate_entities.jdl b/lib/jdl/__test-files__/lint/duplicate_entities.jdl similarity index 100% rename from jdl/__test-files__/lint/duplicate_entities.jdl rename to lib/jdl/__test-files__/lint/duplicate_entities.jdl diff --git a/jdl/__test-files__/lint/duplicate_enums.jdl b/lib/jdl/__test-files__/lint/duplicate_enums.jdl similarity index 100% rename from jdl/__test-files__/lint/duplicate_enums.jdl rename to lib/jdl/__test-files__/lint/duplicate_enums.jdl diff --git a/jdl/__test-files__/lint/duplicate_fields.jdl b/lib/jdl/__test-files__/lint/duplicate_fields.jdl similarity index 100% rename from jdl/__test-files__/lint/duplicate_fields.jdl rename to lib/jdl/__test-files__/lint/duplicate_fields.jdl diff --git a/jdl/__test-files__/lint/ungrouped_relationships.jdl b/lib/jdl/__test-files__/lint/ungrouped_relationships.jdl similarity index 100% rename from jdl/__test-files__/lint/ungrouped_relationships.jdl rename to lib/jdl/__test-files__/lint/ungrouped_relationships.jdl diff --git a/jdl/__test-files__/lint/unused_enums.jdl b/lib/jdl/__test-files__/lint/unused_enums.jdl similarity index 100% rename from jdl/__test-files__/lint/unused_enums.jdl rename to lib/jdl/__test-files__/lint/unused_enums.jdl diff --git a/jdl/__test-files__/lint/useless_commas_fields.jdl b/lib/jdl/__test-files__/lint/useless_commas_fields.jdl similarity index 100% rename from jdl/__test-files__/lint/useless_commas_fields.jdl rename to lib/jdl/__test-files__/lint/useless_commas_fields.jdl diff --git a/jdl/__test-files__/lint/useless_entity_curly_braces.jdl b/lib/jdl/__test-files__/lint/useless_entity_curly_braces.jdl similarity index 100% rename from jdl/__test-files__/lint/useless_entity_curly_braces.jdl rename to lib/jdl/__test-files__/lint/useless_entity_curly_braces.jdl diff --git a/jdl/__test-files__/lint/useless_table_names.jdl b/lib/jdl/__test-files__/lint/useless_table_names.jdl similarity index 100% rename from jdl/__test-files__/lint/useless_table_names.jdl rename to lib/jdl/__test-files__/lint/useless_table_names.jdl diff --git a/jdl/__test-files__/mongo_jdl.jdl b/lib/jdl/__test-files__/mongo_jdl.jdl similarity index 100% rename from jdl/__test-files__/mongo_jdl.jdl rename to lib/jdl/__test-files__/mongo_jdl.jdl diff --git a/jdl/__test-files__/multiple_jdl_comments.jdl b/lib/jdl/__test-files__/multiple_jdl_comments.jdl similarity index 100% rename from jdl/__test-files__/multiple_jdl_comments.jdl rename to lib/jdl/__test-files__/multiple_jdl_comments.jdl diff --git a/jdl/__test-files__/no_injected_field.jdl b/lib/jdl/__test-files__/no_injected_field.jdl similarity index 100% rename from jdl/__test-files__/no_injected_field.jdl rename to lib/jdl/__test-files__/no_injected_field.jdl diff --git a/jdl/__test-files__/no_microservice.jdl b/lib/jdl/__test-files__/no_microservice.jdl similarity index 100% rename from jdl/__test-files__/no_microservice.jdl rename to lib/jdl/__test-files__/no_microservice.jdl diff --git a/jdl/__test-files__/non_existent_validation.jdl b/lib/jdl/__test-files__/non_existent_validation.jdl similarity index 100% rename from jdl/__test-files__/non_existent_validation.jdl rename to lib/jdl/__test-files__/non_existent_validation.jdl diff --git a/jdl/__test-files__/pattern_validation_with_quote.jdl b/lib/jdl/__test-files__/pattern_validation_with_quote.jdl similarity index 100% rename from jdl/__test-files__/pattern_validation_with_quote.jdl rename to lib/jdl/__test-files__/pattern_validation_with_quote.jdl diff --git a/jdl/__test-files__/realistic_sample.jdl b/lib/jdl/__test-files__/realistic_sample.jdl similarity index 100% rename from jdl/__test-files__/realistic_sample.jdl rename to lib/jdl/__test-files__/realistic_sample.jdl diff --git a/jdl/__test-files__/regex_validation.jdl b/lib/jdl/__test-files__/regex_validation.jdl similarity index 100% rename from jdl/__test-files__/regex_validation.jdl rename to lib/jdl/__test-files__/regex_validation.jdl diff --git a/jdl/__test-files__/relationship_built_in_entity.jdl b/lib/jdl/__test-files__/relationship_built_in_entity.jdl similarity index 100% rename from jdl/__test-files__/relationship_built_in_entity.jdl rename to lib/jdl/__test-files__/relationship_built_in_entity.jdl diff --git a/jdl/__test-files__/required_relationships.jdl b/lib/jdl/__test-files__/required_relationships.jdl similarity index 100% rename from jdl/__test-files__/required_relationships.jdl rename to lib/jdl/__test-files__/required_relationships.jdl diff --git a/jdl/__test-files__/simple.jdl b/lib/jdl/__test-files__/simple.jdl similarity index 100% rename from jdl/__test-files__/simple.jdl rename to lib/jdl/__test-files__/simple.jdl diff --git a/jdl/__test-files__/simple_microservice_setup.jdl b/lib/jdl/__test-files__/simple_microservice_setup.jdl similarity index 100% rename from jdl/__test-files__/simple_microservice_setup.jdl rename to lib/jdl/__test-files__/simple_microservice_setup.jdl diff --git a/jdl/__test-files__/two_microservices.jdl b/lib/jdl/__test-files__/two_microservices.jdl similarity index 100% rename from jdl/__test-files__/two_microservices.jdl rename to lib/jdl/__test-files__/two_microservices.jdl diff --git a/jdl/__test-files__/underscore_application_name.jdl b/lib/jdl/__test-files__/underscore_application_name.jdl similarity index 100% rename from jdl/__test-files__/underscore_application_name.jdl rename to lib/jdl/__test-files__/underscore_application_name.jdl diff --git a/jdl/__test-files__/unexistent_entities_for_relationship.jdl b/lib/jdl/__test-files__/unexistent_entities_for_relationship.jdl similarity index 100% rename from jdl/__test-files__/unexistent_entities_for_relationship.jdl rename to lib/jdl/__test-files__/unexistent_entities_for_relationship.jdl diff --git a/jdl/__test-files__/unique.jdl b/lib/jdl/__test-files__/unique.jdl similarity index 100% rename from jdl/__test-files__/unique.jdl rename to lib/jdl/__test-files__/unique.jdl diff --git a/jdl/__test-files__/user_entity_from_relationship.jdl b/lib/jdl/__test-files__/user_entity_from_relationship.jdl similarity index 100% rename from jdl/__test-files__/user_entity_from_relationship.jdl rename to lib/jdl/__test-files__/user_entity_from_relationship.jdl diff --git a/jdl/__test-files__/user_entity_to_relationship.jdl b/lib/jdl/__test-files__/user_entity_to_relationship.jdl similarity index 100% rename from jdl/__test-files__/user_entity_to_relationship.jdl rename to lib/jdl/__test-files__/user_entity_to_relationship.jdl diff --git a/jdl/__test-files__/valid_jdl.jdl b/lib/jdl/__test-files__/valid_jdl.jdl similarity index 100% rename from jdl/__test-files__/valid_jdl.jdl rename to lib/jdl/__test-files__/valid_jdl.jdl diff --git a/jdl/__test-files__/valid_jdl2.jdl b/lib/jdl/__test-files__/valid_jdl2.jdl similarity index 100% rename from jdl/__test-files__/valid_jdl2.jdl rename to lib/jdl/__test-files__/valid_jdl2.jdl diff --git a/jdl/basic-types/index.ts b/lib/jdl/basic-types/index.ts similarity index 100% rename from jdl/basic-types/index.ts rename to lib/jdl/basic-types/index.ts diff --git a/jdl/basic-types/json-entity.spec.ts b/lib/jdl/basic-types/json-entity.spec.ts similarity index 100% rename from jdl/basic-types/json-entity.spec.ts rename to lib/jdl/basic-types/json-entity.spec.ts diff --git a/jdl/basic-types/json-entity.ts b/lib/jdl/basic-types/json-entity.ts similarity index 100% rename from jdl/basic-types/json-entity.ts rename to lib/jdl/basic-types/json-entity.ts diff --git a/jdl/basic-types/relationship-types.spec.ts b/lib/jdl/basic-types/relationship-types.spec.ts similarity index 100% rename from jdl/basic-types/relationship-types.spec.ts rename to lib/jdl/basic-types/relationship-types.spec.ts diff --git a/jdl/basic-types/relationship-types.ts b/lib/jdl/basic-types/relationship-types.ts similarity index 100% rename from jdl/basic-types/relationship-types.ts rename to lib/jdl/basic-types/relationship-types.ts diff --git a/jdl/basic-types/relationships.ts b/lib/jdl/basic-types/relationships.ts similarity index 100% rename from jdl/basic-types/relationships.ts rename to lib/jdl/basic-types/relationships.ts diff --git a/jdl/built-in-options/binary-options.spec.ts b/lib/jdl/built-in-options/binary-options.spec.ts similarity index 100% rename from jdl/built-in-options/binary-options.spec.ts rename to lib/jdl/built-in-options/binary-options.spec.ts diff --git a/jdl/built-in-options/binary-options.ts b/lib/jdl/built-in-options/binary-options.ts similarity index 100% rename from jdl/built-in-options/binary-options.ts rename to lib/jdl/built-in-options/binary-options.ts diff --git a/jdl/built-in-options/index.ts b/lib/jdl/built-in-options/index.ts similarity index 100% rename from jdl/built-in-options/index.ts rename to lib/jdl/built-in-options/index.ts diff --git a/jdl/built-in-options/jdl-application-definition.spec.ts b/lib/jdl/built-in-options/jdl-application-definition.spec.ts similarity index 100% rename from jdl/built-in-options/jdl-application-definition.spec.ts rename to lib/jdl/built-in-options/jdl-application-definition.spec.ts diff --git a/jdl/built-in-options/jdl-application-definition.ts b/lib/jdl/built-in-options/jdl-application-definition.ts similarity index 100% rename from jdl/built-in-options/jdl-application-definition.ts rename to lib/jdl/built-in-options/jdl-application-definition.ts diff --git a/jdl/built-in-options/relationship-options.spec.ts b/lib/jdl/built-in-options/relationship-options.spec.ts similarity index 100% rename from jdl/built-in-options/relationship-options.spec.ts rename to lib/jdl/built-in-options/relationship-options.spec.ts diff --git a/jdl/built-in-options/relationship-options.ts b/lib/jdl/built-in-options/relationship-options.ts similarity index 100% rename from jdl/built-in-options/relationship-options.ts rename to lib/jdl/built-in-options/relationship-options.ts diff --git a/jdl/built-in-options/unary-options.spec.ts b/lib/jdl/built-in-options/unary-options.spec.ts similarity index 100% rename from jdl/built-in-options/unary-options.spec.ts rename to lib/jdl/built-in-options/unary-options.spec.ts diff --git a/jdl/built-in-options/unary-options.ts b/lib/jdl/built-in-options/unary-options.ts similarity index 100% rename from jdl/built-in-options/unary-options.ts rename to lib/jdl/built-in-options/unary-options.ts diff --git a/jdl/built-in-options/validation-patterns.ts b/lib/jdl/built-in-options/validation-patterns.ts similarity index 100% rename from jdl/built-in-options/validation-patterns.ts rename to lib/jdl/built-in-options/validation-patterns.ts diff --git a/jdl/built-in-options/validations.spec.ts b/lib/jdl/built-in-options/validations.spec.ts similarity index 100% rename from jdl/built-in-options/validations.spec.ts rename to lib/jdl/built-in-options/validations.spec.ts diff --git a/jdl/built-in-options/validations.ts b/lib/jdl/built-in-options/validations.ts similarity index 100% rename from jdl/built-in-options/validations.ts rename to lib/jdl/built-in-options/validations.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts diff --git a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts similarity index 99% rename from jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts index 0c72096d724b..1985603f2254 100644 --- a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts @@ -43,7 +43,7 @@ import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; import logger from '../../utils/objects/logger.js'; -import { createJDLApplication } from '../../../test/support/jdl/index.js'; +import { createJDLApplication } from '../../../../test/support/jdl/index.js'; import { convert } from './jdl-with-applications-to-json-converter.js'; const { diff --git a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts diff --git a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts diff --git a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts similarity index 100% rename from jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts diff --git a/jdl/converters/json-to-jdl-application-converter.spec.ts b/lib/jdl/converters/json-to-jdl-application-converter.spec.ts similarity index 97% rename from jdl/converters/json-to-jdl-application-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-application-converter.spec.ts index baad6acab0af..33b35aa5fe9a 100644 --- a/jdl/converters/json-to-jdl-application-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-application-converter.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; import { createJDLApplication } from '../models/jdl-application-factory.js'; import JDLObject from '../models/jdl-object.js'; import { applicationTypes } from '../built-in-options/index.js'; -import { convertApplicationsToJDL } from '../../test/support/jdl/index.js'; +import { convertApplicationsToJDL } from '../../../test/support/jdl/index.js'; const { MONOLITH } = applicationTypes; diff --git a/jdl/converters/json-to-jdl-application-converter.ts b/lib/jdl/converters/json-to-jdl-application-converter.ts similarity index 100% rename from jdl/converters/json-to-jdl-application-converter.ts rename to lib/jdl/converters/json-to-jdl-application-converter.ts diff --git a/jdl/converters/json-to-jdl-converter.spec.ts b/lib/jdl/converters/json-to-jdl-converter.spec.ts similarity index 99% rename from jdl/converters/json-to-jdl-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-converter.spec.ts index 058e7e498280..0373243d75d5 100644 --- a/jdl/converters/json-to-jdl-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-converter.spec.ts @@ -23,7 +23,7 @@ import { fileURLToPath } from 'url'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { convertSingleContentToJDL, convertToJDL } from '../converters/json-to-jdl-converter.js'; -import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../testing/index.js'; +import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts similarity index 97% rename from jdl/converters/json-to-jdl-converter.ts rename to lib/jdl/converters/json-to-jdl-converter.ts index 3c469c796cfe..3d9c3796ce0c 100644 --- a/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -24,11 +24,11 @@ import mergeJDLObjects from '../models/jdl-object-merger.js'; import { doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; import { readJSONFile } from '../readers/json-file-reader.js'; import exportJDLObject from '../exporters/jdl-exporter.js'; -import { removeFieldsWithNullishValues } from '../../lib/utils/object.js'; +import { removeFieldsWithNullishValues } from '../../utils/object.js'; import type JDLApplication from '../models/jdl-application.js'; import type { JDLRuntime } from '../types/runtime.js'; import { createRuntime, getDefaultRuntime } from '../runtime.js'; -import { YO_RC_CONFIG_KEY } from '../../lib/utils/yo-rc.js'; +import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; import type { JDLApplicationConfig } from '../types/types.js'; import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from './types.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; diff --git a/jdl/converters/json-to-jdl-entity-converter.spec.ts b/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts similarity index 100% rename from jdl/converters/json-to-jdl-entity-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-entity-converter.spec.ts diff --git a/jdl/converters/json-to-jdl-entity-converter.ts b/lib/jdl/converters/json-to-jdl-entity-converter.ts similarity index 100% rename from jdl/converters/json-to-jdl-entity-converter.ts rename to lib/jdl/converters/json-to-jdl-entity-converter.ts diff --git a/jdl/converters/json-to-jdl-option-converter.spec.ts b/lib/jdl/converters/json-to-jdl-option-converter.spec.ts similarity index 100% rename from jdl/converters/json-to-jdl-option-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-option-converter.spec.ts diff --git a/jdl/converters/json-to-jdl-option-converter.ts b/lib/jdl/converters/json-to-jdl-option-converter.ts similarity index 100% rename from jdl/converters/json-to-jdl-option-converter.ts rename to lib/jdl/converters/json-to-jdl-option-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap b/lib/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap rename to lib/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap diff --git a/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts similarity index 99% rename from jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts index 5b172296f985..78c4fb932190 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts @@ -20,7 +20,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes } from '../../built-in-options/index.js'; -import { convertApplications, createJDLApplication } from '../../../test/support/jdl/index.js'; +import { convertApplications, createJDLApplication } from '../../../../test/support/jdl/index.js'; const { MONOLITH } = applicationTypes; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts similarity index 99% rename from jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index 9232a9b7b8b1..4d66de1d378a 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -36,7 +36,7 @@ import { unaryOptions, validations, } from '../../built-in-options/index.js'; -import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../../test/support/jdl/index.js'; +import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../../../test/support/jdl/index.js'; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; const { OptionNames } = applicationOptions; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/types.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/types.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/types.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/types.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts diff --git a/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts similarity index 100% rename from jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts diff --git a/jdl/converters/types.d.ts b/lib/jdl/converters/types.d.ts similarity index 97% rename from jdl/converters/types.d.ts rename to lib/jdl/converters/types.d.ts index 4789d138962a..5a0be1d75457 100644 --- a/jdl/converters/types.d.ts +++ b/lib/jdl/converters/types.d.ts @@ -1,4 +1,4 @@ -import type { YO_RC_CONFIG_KEY } from '../../lib/utils/yo-rc.ts'; +import type { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.ts'; import type { RelationshipSide, RelationshipType } from '../basic-types/relationships.js'; export type JSONField = { diff --git a/jdl/exporters/applications/jhipster-application-formatter.ts b/lib/jdl/exporters/applications/jhipster-application-formatter.ts similarity index 100% rename from jdl/exporters/applications/jhipster-application-formatter.ts rename to lib/jdl/exporters/applications/jhipster-application-formatter.ts diff --git a/jdl/exporters/export-utils.spec.ts b/lib/jdl/exporters/export-utils.spec.ts similarity index 98% rename from jdl/exporters/export-utils.spec.ts rename to lib/jdl/exporters/export-utils.spec.ts index 0390c7947aff..2ec24059043b 100644 --- a/jdl/exporters/export-utils.spec.ts +++ b/lib/jdl/exporters/export-utils.spec.ts @@ -22,7 +22,7 @@ import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { beforeEach, describe, expect, it } from 'esmocha'; import { writeConfigFile } from '../exporters/export-utils.js'; -import { basicHelpers as helpers } from '../../testing/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/jdl/exporters/export-utils.ts b/lib/jdl/exporters/export-utils.ts similarity index 96% rename from jdl/exporters/export-utils.ts rename to lib/jdl/exporters/export-utils.ts index 7e04f60092a2..6182eba9a129 100644 --- a/jdl/exporters/export-utils.ts +++ b/lib/jdl/exporters/export-utils.ts @@ -20,7 +20,7 @@ import fs from 'fs'; import { doesFileExist } from '../utils/file-utils.js'; import type { JHipsterYoRcContent } from '../converters/types.js'; -import { mergeYoRcContent } from '../../lib/utils/yo-rc.js'; +import { mergeYoRcContent } from '../../utils/yo-rc.js'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/jdl/exporters/jdl-exporter.spec.ts b/lib/jdl/exporters/jdl-exporter.spec.ts similarity index 98% rename from jdl/exporters/jdl-exporter.spec.ts rename to lib/jdl/exporters/jdl-exporter.spec.ts index d01fe6d7b429..a5abb90bbc3e 100644 --- a/jdl/exporters/jdl-exporter.spec.ts +++ b/lib/jdl/exporters/jdl-exporter.spec.ts @@ -26,7 +26,7 @@ import exportToJDL from '../exporters/jdl-exporter.js'; import JDLApplication from '../models/jdl-application.js'; import type { JDLJSONApplicationConfiguration } from '../parsing/jdl-parsing-types.js'; import { applicationOptions } from '../built-in-options/index.js'; -import { basicHelpers as helpers } from '../../testing/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; import { getDefaultRuntime } from '../runtime.js'; const { diff --git a/jdl/exporters/jdl-exporter.ts b/lib/jdl/exporters/jdl-exporter.ts similarity index 100% rename from jdl/exporters/jdl-exporter.ts rename to lib/jdl/exporters/jdl-exporter.ts diff --git a/jdl/exporters/jhipster-deployment-exporter.spec.ts b/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts similarity index 98% rename from jdl/exporters/jhipster-deployment-exporter.spec.ts rename to lib/jdl/exporters/jhipster-deployment-exporter.spec.ts index 79b1a10748dd..3a1c8473d893 100644 --- a/jdl/exporters/jhipster-deployment-exporter.spec.ts +++ b/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts @@ -24,7 +24,7 @@ import { expect } from 'chai'; import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; import JDLDeployment from '../models/jdl-deployment.js'; import { deploymentOptions } from '../built-in-options/index.js'; -import { basicHelpers as helpers } from '../../testing/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; const { DeploymentTypes: { DOCKERCOMPOSE, KUBERNETES }, diff --git a/jdl/exporters/jhipster-deployment-exporter.ts b/lib/jdl/exporters/jhipster-deployment-exporter.ts similarity index 100% rename from jdl/exporters/jhipster-deployment-exporter.ts rename to lib/jdl/exporters/jhipster-deployment-exporter.ts diff --git a/jdl/exporters/jhipster-entity-exporter.spec.ts b/lib/jdl/exporters/jhipster-entity-exporter.spec.ts similarity index 99% rename from jdl/exporters/jhipster-entity-exporter.spec.ts rename to lib/jdl/exporters/jhipster-entity-exporter.spec.ts index 8f4bb0568b54..563539ce2987 100644 --- a/jdl/exporters/jhipster-entity-exporter.spec.ts +++ b/lib/jdl/exporters/jhipster-entity-exporter.spec.ts @@ -23,7 +23,7 @@ import exportEntities from '../exporters/jhipster-entity-exporter.js'; import { applicationTypes, entityOptions } from '../built-in-options/index.js'; import { doesDirectoryExist } from '../utils/file-utils.js'; -import { basicHelpers as helpers } from '../../testing/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; const { MapperTypes, PaginationTypes, ServiceTypes } = entityOptions; const { MONOLITH, MICROSERVICE } = applicationTypes; diff --git a/jdl/exporters/jhipster-entity-exporter.ts b/lib/jdl/exporters/jhipster-entity-exporter.ts similarity index 100% rename from jdl/exporters/jhipster-entity-exporter.ts rename to lib/jdl/exporters/jhipster-entity-exporter.ts diff --git a/jdl/exporters/types.d.ts b/lib/jdl/exporters/types.d.ts similarity index 100% rename from jdl/exporters/types.d.ts rename to lib/jdl/exporters/types.d.ts diff --git a/jdl/index.ts b/lib/jdl/index.ts similarity index 73% rename from jdl/index.ts rename to lib/jdl/index.ts index 0be130459f17..3a7f5c31f723 100644 --- a/jdl/index.ts +++ b/lib/jdl/index.ts @@ -1,4 +1,4 @@ export * from './jdl-importer.js'; export * from './parsing/api.js'; export * from './jhipster/index.js'; -export * from '../lib/utils/yo-rc.js'; +export * from '../utils/yo-rc.js'; diff --git a/jdl/integration-test.spec.ts b/lib/jdl/integration-test.spec.ts similarity index 98% rename from jdl/integration-test.spec.ts rename to lib/jdl/integration-test.spec.ts index 1bcc261b2b44..3ef9981728b3 100644 --- a/jdl/integration-test.spec.ts +++ b/lib/jdl/integration-test.spec.ts @@ -21,8 +21,8 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import { basicHelpers as helpers } from '../testing/index.js'; -import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../test/support/jdl/index.js'; +import { basicHelpers as helpers } from '../../testing/index.js'; +import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../test/support/jdl/index.js'; import { applicationTypes } from './jhipster/index.js'; import exportToJDL from './exporters/jdl-exporter.js'; import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; diff --git a/jdl/jdl-importer.spec.ts b/lib/jdl/jdl-importer.spec.ts similarity index 99% rename from jdl/jdl-importer.spec.ts rename to lib/jdl/jdl-importer.spec.ts index cbd714a6e5a4..08321f4f1502 100644 --- a/jdl/jdl-importer.spec.ts +++ b/lib/jdl/jdl-importer.spec.ts @@ -23,7 +23,7 @@ import { readFileSync, rmSync } from 'fs'; import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { createImporterFromContent, createImporterFromFiles } from '../test/support/jdl/index.js'; +import { createImporterFromContent, createImporterFromFiles } from '../../test/support/jdl/index.js'; import { applicationTypes, clientFrameworkTypes, databaseTypes } from './jhipster/index.js'; const { MONOLITH } = applicationTypes; diff --git a/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts similarity index 100% rename from jdl/jdl-importer.ts rename to lib/jdl/jdl-importer.ts diff --git a/jdl/jhipster/application-options.ts b/lib/jdl/jhipster/application-options.ts similarity index 100% rename from jdl/jhipster/application-options.ts rename to lib/jdl/jhipster/application-options.ts diff --git a/jdl/jhipster/application-types.ts b/lib/jdl/jhipster/application-types.ts similarity index 100% rename from jdl/jhipster/application-types.ts rename to lib/jdl/jhipster/application-types.ts diff --git a/jdl/jhipster/authentication-types.ts b/lib/jdl/jhipster/authentication-types.ts similarity index 100% rename from jdl/jhipster/authentication-types.ts rename to lib/jdl/jhipster/authentication-types.ts diff --git a/jdl/jhipster/build-tool-types.ts b/lib/jdl/jhipster/build-tool-types.ts similarity index 100% rename from jdl/jhipster/build-tool-types.ts rename to lib/jdl/jhipster/build-tool-types.ts diff --git a/jdl/jhipster/cache-types.ts b/lib/jdl/jhipster/cache-types.ts similarity index 100% rename from jdl/jhipster/cache-types.ts rename to lib/jdl/jhipster/cache-types.ts diff --git a/jdl/jhipster/client-framework-types.ts b/lib/jdl/jhipster/client-framework-types.ts similarity index 100% rename from jdl/jhipster/client-framework-types.ts rename to lib/jdl/jhipster/client-framework-types.ts diff --git a/jdl/jhipster/database-types.spec.ts b/lib/jdl/jhipster/database-types.spec.ts similarity index 100% rename from jdl/jhipster/database-types.spec.ts rename to lib/jdl/jhipster/database-types.spec.ts diff --git a/jdl/jhipster/database-types.ts b/lib/jdl/jhipster/database-types.ts similarity index 100% rename from jdl/jhipster/database-types.ts rename to lib/jdl/jhipster/database-types.ts diff --git a/jdl/jhipster/default-application-options.spec.ts b/lib/jdl/jhipster/default-application-options.spec.ts similarity index 100% rename from jdl/jhipster/default-application-options.spec.ts rename to lib/jdl/jhipster/default-application-options.spec.ts diff --git a/jdl/jhipster/default-application-options.ts b/lib/jdl/jhipster/default-application-options.ts similarity index 98% rename from jdl/jhipster/default-application-options.ts rename to lib/jdl/jhipster/default-application-options.ts index 046949ec2de6..e7e1b6f67853 100644 --- a/jdl/jhipster/default-application-options.ts +++ b/lib/jdl/jhipster/default-application-options.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { MESSAGE_BROKER, MESSAGE_BROKER_NO } from '../../generators/server/options/message-broker.js'; +import { MESSAGE_BROKER, MESSAGE_BROKER_NO } from '../../../generators/server/options/message-broker.js'; import applicationTypes from './application-types.js'; import authenticationTypes from './authentication-types.js'; import databaseTypes from './database-types.js'; diff --git a/jdl/jhipster/deployment-options.spec.ts b/lib/jdl/jhipster/deployment-options.spec.ts similarity index 100% rename from jdl/jhipster/deployment-options.spec.ts rename to lib/jdl/jhipster/deployment-options.spec.ts diff --git a/jdl/jhipster/deployment-options.ts b/lib/jdl/jhipster/deployment-options.ts similarity index 100% rename from jdl/jhipster/deployment-options.ts rename to lib/jdl/jhipster/deployment-options.ts diff --git a/jdl/jhipster/entity-options.ts b/lib/jdl/jhipster/entity-options.ts similarity index 100% rename from jdl/jhipster/entity-options.ts rename to lib/jdl/jhipster/entity-options.ts diff --git a/jdl/jhipster/field-types.spec.ts b/lib/jdl/jhipster/field-types.spec.ts similarity index 100% rename from jdl/jhipster/field-types.spec.ts rename to lib/jdl/jhipster/field-types.spec.ts diff --git a/jdl/jhipster/field-types.ts b/lib/jdl/jhipster/field-types.ts similarity index 100% rename from jdl/jhipster/field-types.ts rename to lib/jdl/jhipster/field-types.ts diff --git a/jdl/jhipster/index.ts b/lib/jdl/jhipster/index.ts similarity index 100% rename from jdl/jhipster/index.ts rename to lib/jdl/jhipster/index.ts diff --git a/jdl/jhipster/jdl-validator-definition.ts b/lib/jdl/jhipster/jdl-validator-definition.ts similarity index 100% rename from jdl/jhipster/jdl-validator-definition.ts rename to lib/jdl/jhipster/jdl-validator-definition.ts diff --git a/jdl/jhipster/kubernetes-platform-types.ts b/lib/jdl/jhipster/kubernetes-platform-types.ts similarity index 100% rename from jdl/jhipster/kubernetes-platform-types.ts rename to lib/jdl/jhipster/kubernetes-platform-types.ts diff --git a/jdl/jhipster/message-broker-types.ts b/lib/jdl/jhipster/message-broker-types.ts similarity index 100% rename from jdl/jhipster/message-broker-types.ts rename to lib/jdl/jhipster/message-broker-types.ts diff --git a/jdl/jhipster/monitoring-types.ts b/lib/jdl/jhipster/monitoring-types.ts similarity index 100% rename from jdl/jhipster/monitoring-types.ts rename to lib/jdl/jhipster/monitoring-types.ts diff --git a/jdl/jhipster/openapi-options.ts b/lib/jdl/jhipster/openapi-options.ts similarity index 100% rename from jdl/jhipster/openapi-options.ts rename to lib/jdl/jhipster/openapi-options.ts diff --git a/jdl/jhipster/openshift-platform-types.ts b/lib/jdl/jhipster/openshift-platform-types.ts similarity index 100% rename from jdl/jhipster/openshift-platform-types.ts rename to lib/jdl/jhipster/openshift-platform-types.ts diff --git a/jdl/jhipster/relationship-on-handler-options.ts b/lib/jdl/jhipster/relationship-on-handler-options.ts similarity index 100% rename from jdl/jhipster/relationship-on-handler-options.ts rename to lib/jdl/jhipster/relationship-on-handler-options.ts diff --git a/jdl/jhipster/reserved-keywords.spec.ts b/lib/jdl/jhipster/reserved-keywords.spec.ts similarity index 100% rename from jdl/jhipster/reserved-keywords.spec.ts rename to lib/jdl/jhipster/reserved-keywords.spec.ts diff --git a/jdl/jhipster/reserved-keywords.ts b/lib/jdl/jhipster/reserved-keywords.ts similarity index 77% rename from jdl/jhipster/reserved-keywords.ts rename to lib/jdl/jhipster/reserved-keywords.ts index 408c222bca51..035b539c14c4 100644 --- a/jdl/jhipster/reserved-keywords.ts +++ b/lib/jdl/jhipster/reserved-keywords.ts @@ -17,16 +17,16 @@ * limitations under the License. */ -import { angularReservedKeywords } from '../../generators/angular/support/reserved-keywords.js'; -import { mysqlReservedKeywords } from '../../generators/spring-data-relational/support/mysql-reserved-keywords.js'; -import { javaReservedKeywords } from '../../generators/java/support/reserved-keywords.js'; -import { typescriptReservedKeywords } from '../../generators/client/support/typescript.js'; -import { postgresqlReservedKeywords } from '../../generators/spring-data-relational/support/postgresql-reserved-keywords.js'; -import { cassandraReservedKeywords } from '../../generators/spring-data-cassandra/support/reserved-keywords.js'; -import { couchbaseReservedKeywords } from '../../generators/spring-data-couchbase/support/reserved-keywords.js'; -import { oracleReservedKeywords } from '../../generators/spring-data-relational/support/oracle-reserved-keywords.js'; -import { mssqlReservedKeywords } from '../../generators/spring-data-relational/support/mssql-reserved-keywords.js'; -import { neo4jReservedKeywords } from '../../generators/spring-data-neo4j/support/reserved-keywords.js'; +import { angularReservedKeywords } from '../../../generators/angular/support/reserved-keywords.js'; +import { mysqlReservedKeywords } from '../../../generators/spring-data-relational/support/mysql-reserved-keywords.js'; +import { javaReservedKeywords } from '../../../generators/java/support/reserved-keywords.js'; +import { typescriptReservedKeywords } from '../../../generators/client/support/typescript.js'; +import { postgresqlReservedKeywords } from '../../../generators/spring-data-relational/support/postgresql-reserved-keywords.js'; +import { cassandraReservedKeywords } from '../../../generators/spring-data-cassandra/support/reserved-keywords.js'; +import { couchbaseReservedKeywords } from '../../../generators/spring-data-couchbase/support/reserved-keywords.js'; +import { oracleReservedKeywords } from '../../../generators/spring-data-relational/support/oracle-reserved-keywords.js'; +import { mssqlReservedKeywords } from '../../../generators/spring-data-relational/support/mssql-reserved-keywords.js'; +import { neo4jReservedKeywords } from '../../../generators/spring-data-neo4j/support/reserved-keywords.js'; import PagingReservedKeywords from './reserved-keywords/paging.js'; import JHipsterReservedKeywords from './reserved-keywords/jhipster.js'; import applicationOptions from './application-options.js'; diff --git a/jdl/jhipster/reserved-keywords/jhipster.ts b/lib/jdl/jhipster/reserved-keywords/jhipster.ts similarity index 100% rename from jdl/jhipster/reserved-keywords/jhipster.ts rename to lib/jdl/jhipster/reserved-keywords/jhipster.ts diff --git a/jdl/jhipster/reserved-keywords/paging.ts b/lib/jdl/jhipster/reserved-keywords/paging.ts similarity index 100% rename from jdl/jhipster/reserved-keywords/paging.ts rename to lib/jdl/jhipster/reserved-keywords/paging.ts diff --git a/jdl/jhipster/search-engine-types.ts b/lib/jdl/jhipster/search-engine-types.ts similarity index 100% rename from jdl/jhipster/search-engine-types.ts rename to lib/jdl/jhipster/search-engine-types.ts diff --git a/jdl/jhipster/service-discovery-types.ts b/lib/jdl/jhipster/service-discovery-types.ts similarity index 100% rename from jdl/jhipster/service-discovery-types.ts rename to lib/jdl/jhipster/service-discovery-types.ts diff --git a/jdl/jhipster/test-framework-types.ts b/lib/jdl/jhipster/test-framework-types.ts similarity index 100% rename from jdl/jhipster/test-framework-types.ts rename to lib/jdl/jhipster/test-framework-types.ts diff --git a/jdl/jhipster/websocket-types.ts b/lib/jdl/jhipster/websocket-types.ts similarity index 100% rename from jdl/jhipster/websocket-types.ts rename to lib/jdl/jhipster/websocket-types.ts diff --git a/jdl/linters/entity-linter.ts b/lib/jdl/linters/entity-linter.ts similarity index 100% rename from jdl/linters/entity-linter.ts rename to lib/jdl/linters/entity-linter.ts diff --git a/jdl/linters/enum-linter.ts b/lib/jdl/linters/enum-linter.ts similarity index 100% rename from jdl/linters/enum-linter.ts rename to lib/jdl/linters/enum-linter.ts diff --git a/jdl/linters/field-linter.ts b/lib/jdl/linters/field-linter.ts similarity index 100% rename from jdl/linters/field-linter.ts rename to lib/jdl/linters/field-linter.ts diff --git a/jdl/linters/issues/abstract-issue.ts b/lib/jdl/linters/issues/abstract-issue.ts similarity index 100% rename from jdl/linters/issues/abstract-issue.ts rename to lib/jdl/linters/issues/abstract-issue.ts diff --git a/jdl/linters/issues/entity-issue.spec.ts b/lib/jdl/linters/issues/entity-issue.spec.ts similarity index 100% rename from jdl/linters/issues/entity-issue.spec.ts rename to lib/jdl/linters/issues/entity-issue.spec.ts diff --git a/jdl/linters/issues/entity-issue.ts b/lib/jdl/linters/issues/entity-issue.ts similarity index 100% rename from jdl/linters/issues/entity-issue.ts rename to lib/jdl/linters/issues/entity-issue.ts diff --git a/jdl/linters/issues/enum-issue.spec.ts b/lib/jdl/linters/issues/enum-issue.spec.ts similarity index 100% rename from jdl/linters/issues/enum-issue.spec.ts rename to lib/jdl/linters/issues/enum-issue.spec.ts diff --git a/jdl/linters/issues/enum-issue.ts b/lib/jdl/linters/issues/enum-issue.ts similarity index 100% rename from jdl/linters/issues/enum-issue.ts rename to lib/jdl/linters/issues/enum-issue.ts diff --git a/jdl/linters/issues/field-issue.spec.ts b/lib/jdl/linters/issues/field-issue.spec.ts similarity index 100% rename from jdl/linters/issues/field-issue.spec.ts rename to lib/jdl/linters/issues/field-issue.spec.ts diff --git a/jdl/linters/issues/field-issue.ts b/lib/jdl/linters/issues/field-issue.ts similarity index 100% rename from jdl/linters/issues/field-issue.ts rename to lib/jdl/linters/issues/field-issue.ts diff --git a/jdl/linters/issues/issues.spec.ts b/lib/jdl/linters/issues/issues.spec.ts similarity index 100% rename from jdl/linters/issues/issues.spec.ts rename to lib/jdl/linters/issues/issues.spec.ts diff --git a/jdl/linters/issues/issues.ts b/lib/jdl/linters/issues/issues.ts similarity index 100% rename from jdl/linters/issues/issues.ts rename to lib/jdl/linters/issues/issues.ts diff --git a/jdl/linters/issues/relationship-issue.spec.ts b/lib/jdl/linters/issues/relationship-issue.spec.ts similarity index 100% rename from jdl/linters/issues/relationship-issue.spec.ts rename to lib/jdl/linters/issues/relationship-issue.spec.ts diff --git a/jdl/linters/issues/relationship-issue.ts b/lib/jdl/linters/issues/relationship-issue.ts similarity index 100% rename from jdl/linters/issues/relationship-issue.ts rename to lib/jdl/linters/issues/relationship-issue.ts diff --git a/jdl/linters/jdl-linter.spec.ts b/lib/jdl/linters/jdl-linter.spec.ts similarity index 98% rename from jdl/linters/jdl-linter.spec.ts rename to lib/jdl/linters/jdl-linter.spec.ts index dee8feaead7c..92998455c274 100644 --- a/jdl/linters/jdl-linter.spec.ts +++ b/lib/jdl/linters/jdl-linter.spec.ts @@ -22,8 +22,8 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import { basicHelpers as helpers } from '../../testing/index.js'; -import { createJDLLinterFromContent, createJDLLinterFromFile } from '../../test/support/jdl/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; +import { createJDLLinterFromContent, createJDLLinterFromFile } from '../../../test/support/jdl/index.js'; import type { JDLLinter } from './jdl-linter.js'; import type Issues from './issues/issues.js'; import type EnumIssue from './issues/enum-issue.js'; diff --git a/jdl/linters/jdl-linter.ts b/lib/jdl/linters/jdl-linter.ts similarity index 100% rename from jdl/linters/jdl-linter.ts rename to lib/jdl/linters/jdl-linter.ts diff --git a/jdl/linters/relationship-linter.ts b/lib/jdl/linters/relationship-linter.ts similarity index 100% rename from jdl/linters/relationship-linter.ts rename to lib/jdl/linters/relationship-linter.ts diff --git a/jdl/linters/rule-levels.ts b/lib/jdl/linters/rule-levels.ts similarity index 100% rename from jdl/linters/rule-levels.ts rename to lib/jdl/linters/rule-levels.ts diff --git a/jdl/linters/rule.spec.ts b/lib/jdl/linters/rule.spec.ts similarity index 100% rename from jdl/linters/rule.spec.ts rename to lib/jdl/linters/rule.spec.ts diff --git a/jdl/linters/rule.ts b/lib/jdl/linters/rule.ts similarity index 100% rename from jdl/linters/rule.ts rename to lib/jdl/linters/rule.ts diff --git a/jdl/linters/rules.spec.ts b/lib/jdl/linters/rules.spec.ts similarity index 100% rename from jdl/linters/rules.spec.ts rename to lib/jdl/linters/rules.spec.ts diff --git a/jdl/linters/rules.ts b/lib/jdl/linters/rules.ts similarity index 100% rename from jdl/linters/rules.ts rename to lib/jdl/linters/rules.ts diff --git a/jdl/matchers/entity-matcher.ts b/lib/jdl/matchers/entity-matcher.ts similarity index 100% rename from jdl/matchers/entity-matcher.ts rename to lib/jdl/matchers/entity-matcher.ts diff --git a/jdl/matchers/field-matcher.ts b/lib/jdl/matchers/field-matcher.ts similarity index 100% rename from jdl/matchers/field-matcher.ts rename to lib/jdl/matchers/field-matcher.ts diff --git a/jdl/models/abstract-jdl-option.spec.ts b/lib/jdl/models/abstract-jdl-option.spec.ts similarity index 100% rename from jdl/models/abstract-jdl-option.spec.ts rename to lib/jdl/models/abstract-jdl-option.spec.ts diff --git a/jdl/models/abstract-jdl-option.ts b/lib/jdl/models/abstract-jdl-option.ts similarity index 100% rename from jdl/models/abstract-jdl-option.ts rename to lib/jdl/models/abstract-jdl-option.ts diff --git a/jdl/models/boolean-jdl-application-configuration-option.ts b/lib/jdl/models/boolean-jdl-application-configuration-option.ts similarity index 100% rename from jdl/models/boolean-jdl-application-configuration-option.ts rename to lib/jdl/models/boolean-jdl-application-configuration-option.ts diff --git a/jdl/models/index.ts b/lib/jdl/models/index.ts similarity index 100% rename from jdl/models/index.ts rename to lib/jdl/models/index.ts diff --git a/jdl/models/integer-jdl-application-configuration-option.ts b/lib/jdl/models/integer-jdl-application-configuration-option.ts similarity index 100% rename from jdl/models/integer-jdl-application-configuration-option.ts rename to lib/jdl/models/integer-jdl-application-configuration-option.ts diff --git a/jdl/models/jdl-application-configuration-factory.spec.ts b/lib/jdl/models/jdl-application-configuration-factory.spec.ts similarity index 100% rename from jdl/models/jdl-application-configuration-factory.spec.ts rename to lib/jdl/models/jdl-application-configuration-factory.spec.ts diff --git a/jdl/models/jdl-application-configuration-factory.ts b/lib/jdl/models/jdl-application-configuration-factory.ts similarity index 100% rename from jdl/models/jdl-application-configuration-factory.ts rename to lib/jdl/models/jdl-application-configuration-factory.ts diff --git a/jdl/models/jdl-application-configuration-option.ts b/lib/jdl/models/jdl-application-configuration-option.ts similarity index 100% rename from jdl/models/jdl-application-configuration-option.ts rename to lib/jdl/models/jdl-application-configuration-option.ts diff --git a/jdl/models/jdl-application-configuration.spec.ts b/lib/jdl/models/jdl-application-configuration.spec.ts similarity index 100% rename from jdl/models/jdl-application-configuration.spec.ts rename to lib/jdl/models/jdl-application-configuration.spec.ts diff --git a/jdl/models/jdl-application-configuration.ts b/lib/jdl/models/jdl-application-configuration.ts similarity index 100% rename from jdl/models/jdl-application-configuration.ts rename to lib/jdl/models/jdl-application-configuration.ts diff --git a/jdl/models/jdl-application-entities.spec.ts b/lib/jdl/models/jdl-application-entities.spec.ts similarity index 100% rename from jdl/models/jdl-application-entities.spec.ts rename to lib/jdl/models/jdl-application-entities.spec.ts diff --git a/jdl/models/jdl-application-entities.ts b/lib/jdl/models/jdl-application-entities.ts similarity index 100% rename from jdl/models/jdl-application-entities.ts rename to lib/jdl/models/jdl-application-entities.ts diff --git a/jdl/models/jdl-application-factory.spec.ts b/lib/jdl/models/jdl-application-factory.spec.ts similarity index 100% rename from jdl/models/jdl-application-factory.spec.ts rename to lib/jdl/models/jdl-application-factory.spec.ts diff --git a/jdl/models/jdl-application-factory.ts b/lib/jdl/models/jdl-application-factory.ts similarity index 100% rename from jdl/models/jdl-application-factory.ts rename to lib/jdl/models/jdl-application-factory.ts diff --git a/jdl/models/jdl-application.spec.ts b/lib/jdl/models/jdl-application.spec.ts similarity index 100% rename from jdl/models/jdl-application.spec.ts rename to lib/jdl/models/jdl-application.spec.ts diff --git a/jdl/models/jdl-application.ts b/lib/jdl/models/jdl-application.ts similarity index 100% rename from jdl/models/jdl-application.ts rename to lib/jdl/models/jdl-application.ts diff --git a/jdl/models/jdl-binary-option.spec.ts b/lib/jdl/models/jdl-binary-option.spec.ts similarity index 100% rename from jdl/models/jdl-binary-option.spec.ts rename to lib/jdl/models/jdl-binary-option.spec.ts diff --git a/jdl/models/jdl-binary-option.ts b/lib/jdl/models/jdl-binary-option.ts similarity index 100% rename from jdl/models/jdl-binary-option.ts rename to lib/jdl/models/jdl-binary-option.ts diff --git a/jdl/models/jdl-deployment.spec.ts b/lib/jdl/models/jdl-deployment.spec.ts similarity index 100% rename from jdl/models/jdl-deployment.spec.ts rename to lib/jdl/models/jdl-deployment.spec.ts diff --git a/jdl/models/jdl-deployment.ts b/lib/jdl/models/jdl-deployment.ts similarity index 100% rename from jdl/models/jdl-deployment.ts rename to lib/jdl/models/jdl-deployment.ts diff --git a/jdl/models/jdl-entity.spec.ts b/lib/jdl/models/jdl-entity.spec.ts similarity index 100% rename from jdl/models/jdl-entity.spec.ts rename to lib/jdl/models/jdl-entity.spec.ts diff --git a/jdl/models/jdl-entity.ts b/lib/jdl/models/jdl-entity.ts similarity index 100% rename from jdl/models/jdl-entity.ts rename to lib/jdl/models/jdl-entity.ts diff --git a/jdl/models/jdl-enum-value.spec.ts b/lib/jdl/models/jdl-enum-value.spec.ts similarity index 100% rename from jdl/models/jdl-enum-value.spec.ts rename to lib/jdl/models/jdl-enum-value.spec.ts diff --git a/jdl/models/jdl-enum-value.ts b/lib/jdl/models/jdl-enum-value.ts similarity index 100% rename from jdl/models/jdl-enum-value.ts rename to lib/jdl/models/jdl-enum-value.ts diff --git a/jdl/models/jdl-enum.spec.ts b/lib/jdl/models/jdl-enum.spec.ts similarity index 100% rename from jdl/models/jdl-enum.spec.ts rename to lib/jdl/models/jdl-enum.spec.ts diff --git a/jdl/models/jdl-enum.ts b/lib/jdl/models/jdl-enum.ts similarity index 100% rename from jdl/models/jdl-enum.ts rename to lib/jdl/models/jdl-enum.ts diff --git a/jdl/models/jdl-enums.spec.ts b/lib/jdl/models/jdl-enums.spec.ts similarity index 100% rename from jdl/models/jdl-enums.spec.ts rename to lib/jdl/models/jdl-enums.spec.ts diff --git a/jdl/models/jdl-enums.ts b/lib/jdl/models/jdl-enums.ts similarity index 100% rename from jdl/models/jdl-enums.ts rename to lib/jdl/models/jdl-enums.ts diff --git a/jdl/models/jdl-field.spec.ts b/lib/jdl/models/jdl-field.spec.ts similarity index 100% rename from jdl/models/jdl-field.spec.ts rename to lib/jdl/models/jdl-field.spec.ts diff --git a/jdl/models/jdl-field.ts b/lib/jdl/models/jdl-field.ts similarity index 100% rename from jdl/models/jdl-field.ts rename to lib/jdl/models/jdl-field.ts diff --git a/jdl/models/jdl-object-merger.spec.ts b/lib/jdl/models/jdl-object-merger.spec.ts similarity index 98% rename from jdl/models/jdl-object-merger.spec.ts rename to lib/jdl/models/jdl-object-merger.spec.ts index 3aff9053f58d..91bf2a3e178d 100644 --- a/jdl/models/jdl-object-merger.spec.ts +++ b/lib/jdl/models/jdl-object-merger.spec.ts @@ -27,7 +27,7 @@ import JDLField from '../models/jdl-field.js'; import JDLRelationship from '../models/jdl-relationship.js'; import JDLUnaryOption from '../models/jdl-unary-option.js'; import mergeJDLObjects from '../models/jdl-object-merger.js'; -import { createJDLApplication } from '../../test/support/jdl/index.js'; +import { createJDLApplication } from '../../../test/support/jdl/index.js'; const { MONOLITH } = applicationTypes; diff --git a/jdl/models/jdl-object-merger.ts b/lib/jdl/models/jdl-object-merger.ts similarity index 100% rename from jdl/models/jdl-object-merger.ts rename to lib/jdl/models/jdl-object-merger.ts diff --git a/jdl/models/jdl-object-wrapper.ts b/lib/jdl/models/jdl-object-wrapper.ts similarity index 100% rename from jdl/models/jdl-object-wrapper.ts rename to lib/jdl/models/jdl-object-wrapper.ts diff --git a/jdl/models/jdl-object.spec.ts b/lib/jdl/models/jdl-object.spec.ts similarity index 99% rename from jdl/models/jdl-object.spec.ts rename to lib/jdl/models/jdl-object.spec.ts index c67b5fec954f..fd99c1421e43 100644 --- a/jdl/models/jdl-object.spec.ts +++ b/lib/jdl/models/jdl-object.spec.ts @@ -23,7 +23,7 @@ import { relationshipTypes } from '../basic-types/index.js'; import { applicationTypes, binaryOptions, unaryOptions } from '../built-in-options/index.js'; import JDLObject from '../models/jdl-object.js'; -import { createJDLApplication } from '../../test/support/jdl/index.js'; +import { createJDLApplication } from '../../../test/support/jdl/index.js'; import JDLDeployment from '../models/jdl-deployment.js'; import { JDLEntity, JDLEnum } from '../models/index.js'; import JDLField from '../models/jdl-field.js'; diff --git a/jdl/models/jdl-object.ts b/lib/jdl/models/jdl-object.ts similarity index 100% rename from jdl/models/jdl-object.ts rename to lib/jdl/models/jdl-object.ts diff --git a/jdl/models/jdl-options.spec.ts b/lib/jdl/models/jdl-options.spec.ts similarity index 100% rename from jdl/models/jdl-options.spec.ts rename to lib/jdl/models/jdl-options.spec.ts diff --git a/jdl/models/jdl-options.ts b/lib/jdl/models/jdl-options.ts similarity index 100% rename from jdl/models/jdl-options.ts rename to lib/jdl/models/jdl-options.ts diff --git a/jdl/models/jdl-relationship.spec.ts b/lib/jdl/models/jdl-relationship.spec.ts similarity index 100% rename from jdl/models/jdl-relationship.spec.ts rename to lib/jdl/models/jdl-relationship.spec.ts diff --git a/jdl/models/jdl-relationship.ts b/lib/jdl/models/jdl-relationship.ts similarity index 100% rename from jdl/models/jdl-relationship.ts rename to lib/jdl/models/jdl-relationship.ts diff --git a/jdl/models/jdl-relationships.spec.ts b/lib/jdl/models/jdl-relationships.spec.ts similarity index 100% rename from jdl/models/jdl-relationships.spec.ts rename to lib/jdl/models/jdl-relationships.spec.ts diff --git a/jdl/models/jdl-relationships.ts b/lib/jdl/models/jdl-relationships.ts similarity index 100% rename from jdl/models/jdl-relationships.ts rename to lib/jdl/models/jdl-relationships.ts diff --git a/jdl/models/jdl-unary-option.spec.ts b/lib/jdl/models/jdl-unary-option.spec.ts similarity index 100% rename from jdl/models/jdl-unary-option.spec.ts rename to lib/jdl/models/jdl-unary-option.spec.ts diff --git a/jdl/models/jdl-unary-option.ts b/lib/jdl/models/jdl-unary-option.ts similarity index 100% rename from jdl/models/jdl-unary-option.ts rename to lib/jdl/models/jdl-unary-option.ts diff --git a/jdl/models/jdl-validation.spec.ts b/lib/jdl/models/jdl-validation.spec.ts similarity index 100% rename from jdl/models/jdl-validation.spec.ts rename to lib/jdl/models/jdl-validation.spec.ts diff --git a/jdl/models/jdl-validation.ts b/lib/jdl/models/jdl-validation.ts similarity index 100% rename from jdl/models/jdl-validation.ts rename to lib/jdl/models/jdl-validation.ts diff --git a/jdl/models/list-jdl-application-configuration-option.ts b/lib/jdl/models/list-jdl-application-configuration-option.ts similarity index 100% rename from jdl/models/list-jdl-application-configuration-option.ts rename to lib/jdl/models/list-jdl-application-configuration-option.ts diff --git a/jdl/models/string-jdl-application-configuration-option.ts b/lib/jdl/models/string-jdl-application-configuration-option.ts similarity index 100% rename from jdl/models/string-jdl-application-configuration-option.ts rename to lib/jdl/models/string-jdl-application-configuration-option.ts diff --git a/jdl/parsing/api.ts b/lib/jdl/parsing/api.ts similarity index 100% rename from jdl/parsing/api.ts rename to lib/jdl/parsing/api.ts diff --git a/jdl/parsing/dsl-api.spec.ts b/lib/jdl/parsing/dsl-api.spec.ts similarity index 100% rename from jdl/parsing/dsl-api.spec.ts rename to lib/jdl/parsing/dsl-api.spec.ts diff --git a/jdl/parsing/generated/generated-serialized-grammar.js b/lib/jdl/parsing/generated/generated-serialized-grammar.js similarity index 100% rename from jdl/parsing/generated/generated-serialized-grammar.js rename to lib/jdl/parsing/generated/generated-serialized-grammar.js diff --git a/jdl/parsing/generated/grammar.html b/lib/jdl/parsing/generated/grammar.html similarity index 100% rename from jdl/parsing/generated/grammar.html rename to lib/jdl/parsing/generated/grammar.html diff --git a/jdl/parsing/grammar.spec.ts b/lib/jdl/parsing/grammar.spec.ts similarity index 100% rename from jdl/parsing/grammar.spec.ts rename to lib/jdl/parsing/grammar.spec.ts diff --git a/jdl/parsing/jdl-ast-builder-visitor.ts b/lib/jdl/parsing/jdl-ast-builder-visitor.ts similarity index 100% rename from jdl/parsing/jdl-ast-builder-visitor.ts rename to lib/jdl/parsing/jdl-ast-builder-visitor.ts diff --git a/jdl/parsing/jdl-parser.ts b/lib/jdl/parsing/jdl-parser.ts similarity index 100% rename from jdl/parsing/jdl-parser.ts rename to lib/jdl/parsing/jdl-parser.ts diff --git a/jdl/parsing/jdl-parsing-types.d.ts b/lib/jdl/parsing/jdl-parsing-types.d.ts similarity index 100% rename from jdl/parsing/jdl-parsing-types.d.ts rename to lib/jdl/parsing/jdl-parsing-types.d.ts diff --git a/jdl/parsing/jdl-post-parsing-tasks.ts b/lib/jdl/parsing/jdl-post-parsing-tasks.ts similarity index 100% rename from jdl/parsing/jdl-post-parsing-tasks.ts rename to lib/jdl/parsing/jdl-post-parsing-tasks.ts diff --git a/jdl/parsing/lexer/application-tokens.ts b/lib/jdl/parsing/lexer/application-tokens.ts similarity index 100% rename from jdl/parsing/lexer/application-tokens.ts rename to lib/jdl/parsing/lexer/application-tokens.ts diff --git a/jdl/parsing/lexer/deployment-tokens.ts b/lib/jdl/parsing/lexer/deployment-tokens.ts similarity index 100% rename from jdl/parsing/lexer/deployment-tokens.ts rename to lib/jdl/parsing/lexer/deployment-tokens.ts diff --git a/jdl/parsing/lexer/lexer.spec.ts b/lib/jdl/parsing/lexer/lexer.spec.ts similarity index 100% rename from jdl/parsing/lexer/lexer.spec.ts rename to lib/jdl/parsing/lexer/lexer.spec.ts diff --git a/jdl/parsing/lexer/lexer.ts b/lib/jdl/parsing/lexer/lexer.ts similarity index 100% rename from jdl/parsing/lexer/lexer.ts rename to lib/jdl/parsing/lexer/lexer.ts diff --git a/jdl/parsing/lexer/minmax-tokens.ts b/lib/jdl/parsing/lexer/minmax-tokens.ts similarity index 100% rename from jdl/parsing/lexer/minmax-tokens.ts rename to lib/jdl/parsing/lexer/minmax-tokens.ts diff --git a/jdl/parsing/lexer/option-tokens.ts b/lib/jdl/parsing/lexer/option-tokens.ts similarity index 100% rename from jdl/parsing/lexer/option-tokens.ts rename to lib/jdl/parsing/lexer/option-tokens.ts diff --git a/jdl/parsing/lexer/relationship-type-tokens.ts b/lib/jdl/parsing/lexer/relationship-type-tokens.ts similarity index 100% rename from jdl/parsing/lexer/relationship-type-tokens.ts rename to lib/jdl/parsing/lexer/relationship-type-tokens.ts diff --git a/jdl/parsing/lexer/shared-tokens.ts b/lib/jdl/parsing/lexer/shared-tokens.ts similarity index 100% rename from jdl/parsing/lexer/shared-tokens.ts rename to lib/jdl/parsing/lexer/shared-tokens.ts diff --git a/jdl/parsing/lexer/token-creator.spec.ts b/lib/jdl/parsing/lexer/token-creator.spec.ts similarity index 100% rename from jdl/parsing/lexer/token-creator.spec.ts rename to lib/jdl/parsing/lexer/token-creator.spec.ts diff --git a/jdl/parsing/lexer/token-creator.ts b/lib/jdl/parsing/lexer/token-creator.ts similarity index 100% rename from jdl/parsing/lexer/token-creator.ts rename to lib/jdl/parsing/lexer/token-creator.ts diff --git a/jdl/parsing/lexer/validation-tokens.ts b/lib/jdl/parsing/lexer/validation-tokens.ts similarity index 100% rename from jdl/parsing/lexer/validation-tokens.ts rename to lib/jdl/parsing/lexer/validation-tokens.ts diff --git a/jdl/parsing/self-checks/parsing-system-checker.ts b/lib/jdl/parsing/self-checks/parsing-system-checker.ts similarity index 100% rename from jdl/parsing/self-checks/parsing-system-checker.ts rename to lib/jdl/parsing/self-checks/parsing-system-checker.ts diff --git a/jdl/parsing/self-checks/token-collector-visitor.ts b/lib/jdl/parsing/self-checks/token-collector-visitor.ts similarity index 100% rename from jdl/parsing/self-checks/token-collector-visitor.ts rename to lib/jdl/parsing/self-checks/token-collector-visitor.ts diff --git a/jdl/parsing/validator.spec.ts b/lib/jdl/parsing/validator.spec.ts similarity index 100% rename from jdl/parsing/validator.spec.ts rename to lib/jdl/parsing/validator.spec.ts diff --git a/jdl/parsing/validator.ts b/lib/jdl/parsing/validator.ts similarity index 100% rename from jdl/parsing/validator.ts rename to lib/jdl/parsing/validator.ts diff --git a/jdl/readers/file-reader.spec.ts b/lib/jdl/readers/file-reader.spec.ts similarity index 97% rename from jdl/readers/file-reader.spec.ts rename to lib/jdl/readers/file-reader.spec.ts index b2452809c131..cdfba4690a47 100644 --- a/jdl/readers/file-reader.spec.ts +++ b/lib/jdl/readers/file-reader.spec.ts @@ -21,7 +21,7 @@ import fs from 'fs'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { readFile, readFiles } from '../readers/file-reader.js'; -import { basicHelpers as helpers } from '../../testing/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; describe('jdl - FileReader', () => { beforeEach(async () => { diff --git a/jdl/readers/file-reader.ts b/lib/jdl/readers/file-reader.ts similarity index 100% rename from jdl/readers/file-reader.ts rename to lib/jdl/readers/file-reader.ts diff --git a/jdl/readers/jdl-reader.spec.ts b/lib/jdl/readers/jdl-reader.spec.ts similarity index 97% rename from jdl/readers/jdl-reader.spec.ts rename to lib/jdl/readers/jdl-reader.spec.ts index e0c6e821b764..a6031d13b31f 100644 --- a/jdl/readers/jdl-reader.spec.ts +++ b/lib/jdl/readers/jdl-reader.spec.ts @@ -23,8 +23,8 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { after, beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { basicHelpers as helpers } from '../../testing/index.js'; -import { parseFromContent, parseFromFiles } from '../../test/support/jdl/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; +import { parseFromContent, parseFromFiles } from '../../../test/support/jdl/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/jdl/readers/jdl-reader.ts b/lib/jdl/readers/jdl-reader.ts similarity index 100% rename from jdl/readers/jdl-reader.ts rename to lib/jdl/readers/jdl-reader.ts diff --git a/jdl/readers/json-file-reader.spec.ts b/lib/jdl/readers/json-file-reader.spec.ts similarity index 100% rename from jdl/readers/json-file-reader.spec.ts rename to lib/jdl/readers/json-file-reader.spec.ts diff --git a/jdl/readers/json-file-reader.ts b/lib/jdl/readers/json-file-reader.ts similarity index 100% rename from jdl/readers/json-file-reader.ts rename to lib/jdl/readers/json-file-reader.ts diff --git a/jdl/readers/json-reader.spec.ts b/lib/jdl/readers/json-reader.spec.ts similarity index 100% rename from jdl/readers/json-reader.spec.ts rename to lib/jdl/readers/json-reader.spec.ts diff --git a/jdl/readers/json-reader.ts b/lib/jdl/readers/json-reader.ts similarity index 100% rename from jdl/readers/json-reader.ts rename to lib/jdl/readers/json-reader.ts diff --git a/jdl/runtime.ts b/lib/jdl/runtime.ts similarity index 97% rename from jdl/runtime.ts rename to lib/jdl/runtime.ts index 47c151e79ca6..a5c79a869276 100644 --- a/jdl/runtime.ts +++ b/lib/jdl/runtime.ts @@ -1,5 +1,5 @@ import type { Lexer, TokenType } from 'chevrotain'; -import jhipsterDefinition from '../generators/app/jdl/index.js'; +import jhipsterDefinition from '../../generators/app/jdl/index.js'; import { buildTokens, createJDLLexer } from './parsing/lexer/lexer.js'; import JDLParser from './parsing/jdl-parser.js'; import { checkConfigKeys, checkTokens } from './parsing/self-checks/parsing-system-checker.js'; diff --git a/jdl/types/runtime.d.ts b/lib/jdl/types/runtime.d.ts similarity index 100% rename from jdl/types/runtime.d.ts rename to lib/jdl/types/runtime.d.ts diff --git a/jdl/types/types.d.ts b/lib/jdl/types/types.d.ts similarity index 100% rename from jdl/types/types.d.ts rename to lib/jdl/types/types.d.ts diff --git a/jdl/utils/array-utils.spec.ts b/lib/jdl/utils/array-utils.spec.ts similarity index 100% rename from jdl/utils/array-utils.spec.ts rename to lib/jdl/utils/array-utils.spec.ts diff --git a/jdl/utils/array-utils.ts b/lib/jdl/utils/array-utils.ts similarity index 100% rename from jdl/utils/array-utils.ts rename to lib/jdl/utils/array-utils.ts diff --git a/jdl/utils/deprecation-utils.ts b/lib/jdl/utils/deprecation-utils.ts similarity index 100% rename from jdl/utils/deprecation-utils.ts rename to lib/jdl/utils/deprecation-utils.ts diff --git a/jdl/utils/entity-table-name-creator.spec.ts b/lib/jdl/utils/entity-table-name-creator.spec.ts similarity index 100% rename from jdl/utils/entity-table-name-creator.spec.ts rename to lib/jdl/utils/entity-table-name-creator.spec.ts diff --git a/jdl/utils/entity-table-name-creator.ts b/lib/jdl/utils/entity-table-name-creator.ts similarity index 96% rename from jdl/utils/entity-table-name-creator.ts rename to lib/jdl/utils/entity-table-name-creator.ts index f5cf79aca1ae..062bf5439bbd 100644 --- a/jdl/utils/entity-table-name-creator.ts +++ b/lib/jdl/utils/entity-table-name-creator.ts @@ -18,7 +18,7 @@ */ import { snakeCase } from 'lodash-es'; -import { hibernateSnakeCase } from '../../generators/server/support/string.js'; +import { hibernateSnakeCase } from '../../../generators/server/support/string.js'; /** * @deprecated TODO v9 drop this function and don't calculate entityTableName. diff --git a/jdl/utils/file-utils.ts b/lib/jdl/utils/file-utils.ts similarity index 100% rename from jdl/utils/file-utils.ts rename to lib/jdl/utils/file-utils.ts diff --git a/jdl/utils/files-utils.spec.ts b/lib/jdl/utils/files-utils.spec.ts similarity index 99% rename from jdl/utils/files-utils.spec.ts rename to lib/jdl/utils/files-utils.spec.ts index daded5d5079e..5e9ede7d01d3 100644 --- a/jdl/utils/files-utils.spec.ts +++ b/lib/jdl/utils/files-utils.spec.ts @@ -93,7 +93,7 @@ describe('jdl - FileUtils', () => { describe('when passing a file that exists', () => { it('should fail', () => { expect(() => { - createFolderIfItDoesNotExist(path.join(__dirname, '..', '..', 'package.json')); + createFolderIfItDoesNotExist(path.join(__dirname, '..', '..', '..', 'package.json')); }).to.throw(/^The directory to create '.*?package\.json' is a file\.$/); }); }); diff --git a/jdl/utils/format-utils.spec.ts b/lib/jdl/utils/format-utils.spec.ts similarity index 100% rename from jdl/utils/format-utils.spec.ts rename to lib/jdl/utils/format-utils.spec.ts diff --git a/jdl/utils/format-utils.ts b/lib/jdl/utils/format-utils.ts similarity index 100% rename from jdl/utils/format-utils.ts rename to lib/jdl/utils/format-utils.ts diff --git a/jdl/utils/object-utils.spec.ts b/lib/jdl/utils/object-utils.spec.ts similarity index 100% rename from jdl/utils/object-utils.spec.ts rename to lib/jdl/utils/object-utils.spec.ts diff --git a/jdl/utils/object-utils.ts b/lib/jdl/utils/object-utils.ts similarity index 100% rename from jdl/utils/object-utils.ts rename to lib/jdl/utils/object-utils.ts diff --git a/jdl/utils/objects/logger.ts b/lib/jdl/utils/objects/logger.ts similarity index 93% rename from jdl/utils/objects/logger.ts rename to lib/jdl/utils/objects/logger.ts index af175b6b6ceb..9fbc869b2c6e 100644 --- a/jdl/utils/objects/logger.ts +++ b/lib/jdl/utils/objects/logger.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { createJHipsterLogger } from '../../../lib/utils/logger.js'; +import { createJHipsterLogger } from '../../../utils/logger.js'; const logger = createJHipsterLogger({ namespace: 'jhipster:jdl' }); diff --git a/jdl/utils/set-utils.spec.ts b/lib/jdl/utils/set-utils.spec.ts similarity index 100% rename from jdl/utils/set-utils.spec.ts rename to lib/jdl/utils/set-utils.spec.ts diff --git a/jdl/utils/set-utils.ts b/lib/jdl/utils/set-utils.ts similarity index 100% rename from jdl/utils/set-utils.ts rename to lib/jdl/utils/set-utils.ts diff --git a/jdl/utils/string-utils.ts b/lib/jdl/utils/string-utils.ts similarity index 100% rename from jdl/utils/string-utils.ts rename to lib/jdl/utils/string-utils.ts diff --git a/jdl/utils/string_utils.spec.ts b/lib/jdl/utils/string_utils.spec.ts similarity index 100% rename from jdl/utils/string_utils.spec.ts rename to lib/jdl/utils/string_utils.spec.ts diff --git a/jdl/validators/binary-option-validator.spec.ts b/lib/jdl/validators/binary-option-validator.spec.ts similarity index 100% rename from jdl/validators/binary-option-validator.spec.ts rename to lib/jdl/validators/binary-option-validator.spec.ts diff --git a/jdl/validators/binary-option-validator.ts b/lib/jdl/validators/binary-option-validator.ts similarity index 100% rename from jdl/validators/binary-option-validator.ts rename to lib/jdl/validators/binary-option-validator.ts diff --git a/jdl/validators/deployment-validator.spec.ts b/lib/jdl/validators/deployment-validator.spec.ts similarity index 100% rename from jdl/validators/deployment-validator.spec.ts rename to lib/jdl/validators/deployment-validator.spec.ts diff --git a/jdl/validators/deployment-validator.ts b/lib/jdl/validators/deployment-validator.ts similarity index 100% rename from jdl/validators/deployment-validator.ts rename to lib/jdl/validators/deployment-validator.ts diff --git a/jdl/validators/entity-validator.spec.ts b/lib/jdl/validators/entity-validator.spec.ts similarity index 100% rename from jdl/validators/entity-validator.spec.ts rename to lib/jdl/validators/entity-validator.spec.ts diff --git a/jdl/validators/entity-validator.ts b/lib/jdl/validators/entity-validator.ts similarity index 100% rename from jdl/validators/entity-validator.ts rename to lib/jdl/validators/entity-validator.ts diff --git a/jdl/validators/enum-validator.spec.ts b/lib/jdl/validators/enum-validator.spec.ts similarity index 100% rename from jdl/validators/enum-validator.spec.ts rename to lib/jdl/validators/enum-validator.spec.ts diff --git a/jdl/validators/enum-validator.ts b/lib/jdl/validators/enum-validator.ts similarity index 100% rename from jdl/validators/enum-validator.ts rename to lib/jdl/validators/enum-validator.ts diff --git a/jdl/validators/field-validator.spec.ts b/lib/jdl/validators/field-validator.spec.ts similarity index 100% rename from jdl/validators/field-validator.spec.ts rename to lib/jdl/validators/field-validator.spec.ts diff --git a/jdl/validators/field-validator.ts b/lib/jdl/validators/field-validator.ts similarity index 100% rename from jdl/validators/field-validator.ts rename to lib/jdl/validators/field-validator.ts diff --git a/jdl/validators/jdl-with-application-validator.spec.ts b/lib/jdl/validators/jdl-with-application-validator.spec.ts similarity index 100% rename from jdl/validators/jdl-with-application-validator.spec.ts rename to lib/jdl/validators/jdl-with-application-validator.spec.ts diff --git a/jdl/validators/jdl-with-application-validator.ts b/lib/jdl/validators/jdl-with-application-validator.ts similarity index 100% rename from jdl/validators/jdl-with-application-validator.ts rename to lib/jdl/validators/jdl-with-application-validator.ts diff --git a/jdl/validators/jdl-without-application-validator.spec.ts b/lib/jdl/validators/jdl-without-application-validator.spec.ts similarity index 100% rename from jdl/validators/jdl-without-application-validator.spec.ts rename to lib/jdl/validators/jdl-without-application-validator.spec.ts diff --git a/jdl/validators/jdl-without-application-validator.ts b/lib/jdl/validators/jdl-without-application-validator.ts similarity index 100% rename from jdl/validators/jdl-without-application-validator.ts rename to lib/jdl/validators/jdl-without-application-validator.ts diff --git a/jdl/validators/option-validator.ts b/lib/jdl/validators/option-validator.ts similarity index 100% rename from jdl/validators/option-validator.ts rename to lib/jdl/validators/option-validator.ts diff --git a/jdl/validators/relationship-validator.spec.ts b/lib/jdl/validators/relationship-validator.spec.ts similarity index 100% rename from jdl/validators/relationship-validator.spec.ts rename to lib/jdl/validators/relationship-validator.spec.ts diff --git a/jdl/validators/relationship-validator.ts b/lib/jdl/validators/relationship-validator.ts similarity index 100% rename from jdl/validators/relationship-validator.ts rename to lib/jdl/validators/relationship-validator.ts diff --git a/jdl/validators/unary-option-validator.spec.ts b/lib/jdl/validators/unary-option-validator.spec.ts similarity index 100% rename from jdl/validators/unary-option-validator.spec.ts rename to lib/jdl/validators/unary-option-validator.spec.ts diff --git a/jdl/validators/unary-option-validator.ts b/lib/jdl/validators/unary-option-validator.ts similarity index 100% rename from jdl/validators/unary-option-validator.ts rename to lib/jdl/validators/unary-option-validator.ts diff --git a/jdl/validators/validation-validator.spec.ts b/lib/jdl/validators/validation-validator.spec.ts similarity index 100% rename from jdl/validators/validation-validator.spec.ts rename to lib/jdl/validators/validation-validator.spec.ts diff --git a/jdl/validators/validation-validator.ts b/lib/jdl/validators/validation-validator.ts similarity index 100% rename from jdl/validators/validation-validator.ts rename to lib/jdl/validators/validation-validator.ts diff --git a/jdl/validators/validator.ts b/lib/jdl/validators/validator.ts similarity index 100% rename from jdl/validators/validator.ts rename to lib/jdl/validators/validator.ts diff --git a/package.json b/package.json index 1bec73f10dc8..91952a9c86d7 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "default": "./dist/generators/*/generators/*/support/index.js" }, "./jdl": { - "types": "./dist/jdl/index.d.ts", - "default": "./dist/jdl/index.js" + "types": "./dist/lib/jdl/index.d.ts", + "default": "./dist/lib/jdl/index.js" }, "./testing": { "types": "./dist/testing/index.d.ts", @@ -97,23 +97,23 @@ "clean": "rimraf dist", "compile": "tsc", "completion": "tabtab install --name jhipster --auto", - "copy-files": "cpy \"jdl/*.json\" \"dist/jdl\" && cpy \"generators/**\" \"!**/*.(js|cjs|mjs|ts|cts|mts|snap)\" \"!**/__*/*\" dist/generators", - "copy-types": "cpy \"generators/**/*.d.(|c|m)ts\" dist/generators && cpy \"jdl/**/*.d.(|c|m)ts\" dist/jdl && cpy \"lib/**/*.d.(|c|m)ts\" dist/lib", + "copy-files": "cpy \"lib/jdl/*.json\" \"dist/lib/jdl\" && cpy \"generators/**\" \"!**/*.(js|cjs|mjs|ts|cts|mts|snap)\" \"!**/__*/*\" dist/generators", + "copy-types": "cpy \"generators/**/*.d.(|c|m)ts\" dist/generators && cpy \"lib/**/*.d.(|c|m)ts\" dist/lib", "ejslint": "ejslint generators/**/*.ejs", "eslint": "eslint . --max-warnings 5", - "jdl:test": "esmocha jdl --no-insight --forbid-only -p", + "jdl:test": "esmocha lib/jdl --no-insight --forbid-only -p", "jdl:test-watch": "npm run jdl:test -- --watch", "jsdoc": "jsdoc --configure jsdoc-conf.json", "lint": "npm run eslint && npm run ejslint", "lint-fix": "npm run eslint -- --fix && npm run prettier:format", - "mocha-test": "esmocha jdl --no-insight --forbid-only --parallel --max-old-space-size=4096", + "mocha-test": "esmocha lib/jdl --no-insight --forbid-only --parallel --max-old-space-size=4096", "prepare": "npm run build", "prettier:check": "prettier --check \"{,**/}*.{js,ts,cjs,mjs,cts,mts,json,md,yml,java}\"", "prettier:format": "prettier --write \"{,**/}*.{js,ts,cjs,mjs,cts,mts,json,md,yml,java}\"", "pretest": "npm run lint && npm run check-types", "test": "npm run mocha-test test generators cli", "update-snapshot": "esmocha --no-insight --no-parallel --update-snapshot --", - "update-snapshots": "esmocha jdl generators cli --update-snapshot --no-insight --forbid-only" + "update-snapshots": "esmocha lib/jdl generators cli --update-snapshot --no-insight --forbid-only" }, "dependencies": { "@eslint/js": "9.9.1", diff --git a/test/integration-test.spec.ts b/test/integration-test.spec.ts index 94584cd59fe5..082519399f5c 100644 --- a/test/integration-test.spec.ts +++ b/test/integration-test.spec.ts @@ -23,7 +23,7 @@ import { fileURLToPath } from 'url'; import { before, describe, it } from 'esmocha'; import sortKeys from 'sort-keys'; -import { applicationTypes, authenticationTypes } from '../jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../lib/jdl//jhipster/index.js'; import { formatDateForChangelog } from '../generators/base/support/index.js'; const writeJsonSync = (file, content) => writeFileSync(file, JSON.stringify(content, null, 2)); diff --git a/test/needle-api/needle-client-angular.spec.ts b/test/needle-api/needle-client-angular.spec.ts index 3201fedf8c8b..39519fdb2ec5 100644 --- a/test/needle-api/needle-client-angular.spec.ts +++ b/test/needle-api/needle-client-angular.spec.ts @@ -1,6 +1,6 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-react-generator.spec.ts b/test/needle-api/needle-client-react-generator.spec.ts index 5f4df3d61c97..6c7cfe7b3db4 100644 --- a/test/needle-api/needle-client-react-generator.spec.ts +++ b/test/needle-api/needle-client-react-generator.spec.ts @@ -1,7 +1,7 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; import ReactGenerator from '../../generators/react/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-react.spec.ts b/test/needle-api/needle-client-react.spec.ts index 0f16516a45fc..c71cb3ab5c28 100644 --- a/test/needle-api/needle-client-react.spec.ts +++ b/test/needle-api/needle-client-react.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_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; import ReactGenerator from '../../generators/react/index.js'; diff --git a/test/needle-api/needle-client-vue-generator.spec.ts b/test/needle-api/needle-client-vue-generator.spec.ts index f54e517c4b68..51ce85441cf0 100644 --- a/test/needle-api/needle-client-vue-generator.spec.ts +++ b/test/needle-api/needle-client-vue-generator.spec.ts @@ -2,7 +2,7 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; import VueGenerator from '../../generators/vue/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-vue.spec.ts b/test/needle-api/needle-client-vue.spec.ts index 8b34fa487f2b..9b51f740202e 100644 --- a/test/needle-api/needle-client-vue.spec.ts +++ b/test/needle-api/needle-client-vue.spec.ts @@ -2,7 +2,7 @@ import { before, describe } from 'esmocha'; import { getGenerator, basicHelpers as helpers } from '../../testing/index.js'; import ClientGenerator from '../../generators/client/index.js'; -import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; const { VUE } = clientFrameworkTypes; diff --git a/test/support/jdl/index.ts b/test/support/jdl/index.ts index 8300fd657d77..750208d59ee6 100644 --- a/test/support/jdl/index.ts +++ b/test/support/jdl/index.ts @@ -1,20 +1,23 @@ -import { getDefaultRuntime } from '../../../jdl/runtime.js'; -import { parseFromContent as originalParseFromContent, parseFromFiles as originalParseFromFiles } from '../../../jdl/readers/jdl-reader.js'; -import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../../../jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; +import { getDefaultRuntime } from '../../../lib/jdl//runtime.js'; +import { + parseFromContent as originalParseFromContent, + parseFromFiles as originalParseFromFiles, +} from '../../../lib/jdl//readers/jdl-reader.js'; +import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../../../lib/jdl//converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import { createImporterFromContent as originalCreateImporterFromContent, createImporterFromFiles as originalCreateImporterFromFiles, -} from '../../../jdl/jdl-importer.js'; -import type { ParsedJDLApplication, ParsedJDLRoot } from '../../../jdl/converters/parsed-jdl-to-jdl-object/types.js'; +} from '../../../lib/jdl//jdl-importer.js'; +import type { ParsedJDLApplication, ParsedJDLRoot } from '../../../lib/jdl//converters/parsed-jdl-to-jdl-object/types.js'; import definition from '../../../generators/app/jdl/index.js'; import { createJDLLinterFromContent as originalCreateJDLLinterFromContent, createJDLLinterFromFile as originalCreateJDLLinterFromFile, -} from '../../../jdl/linters/jdl-linter.js'; -import { convertApplications as originalConvertApplications } from '../../../jdl/converters/parsed-jdl-to-jdl-object/application-converter.js'; -import { createJDLApplication as originalCreateJDLApplication } from '../../../jdl/models/jdl-application-factory.js'; -import type { JHipsterYoRcContentAndJDLWrapper } from '../../../jdl/converters/json-to-jdl-application-converter.js'; -import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../../../jdl/converters/json-to-jdl-application-converter.js'; +} from '../../../lib/jdl//linters/jdl-linter.js'; +import { convertApplications as originalConvertApplications } from '../../../lib/jdl//converters/parsed-jdl-to-jdl-object/application-converter.js'; +import { createJDLApplication as originalCreateJDLApplication } from '../../../lib/jdl//models/jdl-application-factory.js'; +import type { JHipsterYoRcContentAndJDLWrapper } from '../../../lib/jdl//converters/json-to-jdl-application-converter.js'; +import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../../../lib/jdl//converters/json-to-jdl-application-converter.js'; const runtime = getDefaultRuntime(); diff --git a/testing/support/application-samples.ts b/testing/support/application-samples.ts index 56081d69234a..44fd6040eda7 100644 --- a/testing/support/application-samples.ts +++ b/testing/support/application-samples.ts @@ -1,4 +1,4 @@ -import { applicationTypes, authenticationTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../../lib/jdl/jhipster/index.js'; const { JWT, OAUTH2, SESSION } = authenticationTypes; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; diff --git a/testing/support/entity-samples.ts b/testing/support/entity-samples.ts index 2fea276495ac..16b984eba745 100644 --- a/testing/support/entity-samples.ts +++ b/testing/support/entity-samples.ts @@ -1,4 +1,4 @@ -import { fieldTypes } from '../../jdl/jhipster/index.js'; +import { fieldTypes } from '../../lib/jdl/jhipster/index.js'; const { CommonDBTypes: { UUID }, From 0a6fa9683a754182d2b2076761bef388bddb120a Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 7 Sep 2024 23:13:02 -0300 Subject: [PATCH 02/21] move jdl/hipster to lib/jhipster --- generators/angular/generator.spec.ts | 2 +- generators/angular/generator.ts | 2 +- .../needle-api/needle-client-angular.ts | 2 +- generators/app/generator.ts | 2 +- generators/app/support/config.ts | 2 +- .../base-application/support/field-utils.ts | 2 +- .../support/prepare-entity.spec.ts | 2 +- .../support/prepare-entity.ts | 2 +- .../support/prepare-field.spec.ts | 2 +- .../base-application/support/prepare-field.ts | 2 +- .../support/prepare-relationship.ts | 2 +- generators/base-core/generator.ts | 2 +- .../base-workspaces/internal/deployments.ts | 2 +- .../base-workspaces/internal/docker-base.ts | 2 +- .../internal/docker-prompts.ts | 2 +- generators/base/support/jhipster7-context.ts | 4 ++-- .../bootstrap-application-base/utils.ts | 4 ++-- .../bootstrap-application/generator.spec.ts | 2 +- generators/bootstrap-application/generator.ts | 2 +- generators/ci-cd/generator.ts | 2 +- generators/client/command.ts | 2 +- generators/client/generator-needles.spec.ts | 2 +- generators/client/generator.spec.ts | 2 +- generators/client/generator.ts | 2 +- generators/client/prompts.spec.ts | 2 +- .../client/support/entity-definition.ts | 2 +- .../client/support/template-utils.spec.ts | 2 +- generators/client/support/template-utils.ts | 2 +- generators/client/support/types-utils.spec.ts | 2 +- generators/client/support/types-utils.ts | 2 +- generators/common/generator.ts | 2 +- generators/cypress/generator.spec.ts | 2 +- generators/cypress/generator.ts | 2 +- .../docker-compose/docker-compose.spec.ts | 4 ++-- generators/docker-compose/files.ts | 2 +- generators/docker-compose/generator.ts | 2 +- generators/docker/generator.spec.ts | 2 +- generators/entity/generator.ts | 2 +- generators/entity/prompts.ts | 2 +- generators/export-jdl/generator.ts | 2 +- .../java/generators/build-tool/command.ts | 2 +- .../java/generators/build-tool/generator.ts | 2 +- generators/kubernetes-helm/files.ts | 2 +- generators/kubernetes-helm/generator.ts | 2 +- generators/kubernetes-knative/files.ts | 2 +- generators/kubernetes-knative/generator.ts | 2 +- generators/kubernetes-knative/prompts.ts | 2 +- generators/kubernetes/files.ts | 2 +- generators/kubernetes/generator.ts | 2 +- generators/kubernetes/kubernetes-base.ts | 2 +- generators/kubernetes/kubernetes-constants.ts | 2 +- generators/kubernetes/prompts.ts | 2 +- generators/languages/generator.ts | 2 +- generators/liquibase/generator.ts | 2 +- .../liquibase/support/post-prepare-entity.ts | 2 +- generators/liquibase/support/prepare-field.ts | 2 +- generators/react/generator.spec.ts | 2 +- generators/react/generator.ts | 2 +- generators/server/__test-support/index.ts | 2 +- generators/server/command.ts | 2 +- generators/server/generator.ts | 4 ++-- .../support/build-specification-mapper.ts | 2 +- generators/server/support/config.ts | 2 +- generators/server/support/database.spec.ts | 2 +- generators/server/support/database.ts | 2 +- generators/server/support/prepare-entity.ts | 4 ++-- generators/server/support/prepare-field.ts | 2 +- generators/server/support/relationship.ts | 2 +- .../server/support/templates/field-values.ts | 2 +- generators/spring-boot/command.ts | 2 +- generators/spring-boot/entity-files.ts | 2 +- generators/spring-boot/generator.ts | 2 +- generators/spring-boot/prompts.ts | 2 +- generators/spring-cache/generator.spec.ts | 2 +- .../generator-pulsar.spec.ts | 2 +- .../spring-cloud-stream/generator.spec.ts | 2 +- .../spring-data-cassandra/generator.spec.ts | 2 +- generators/spring-data-cassandra/generator.ts | 2 +- .../spring-data-couchbase/generator.spec.ts | 2 +- .../generator.spec.ts | 2 +- .../spring-data-mongodb/generator.spec.ts | 2 +- .../spring-data-neo4j/generator.spec.ts | 2 +- .../spring-data-relational/generator.spec.ts | 2 +- .../spring-data-relational/generator.ts | 4 ++-- .../sql-entities.spec.ts | 2 +- .../support/application-properties.ts | 2 +- .../support/database-data.ts | 2 +- .../support/database-url.spec.ts | 2 +- .../support/database-url.ts | 2 +- generators/vue/generator.spec.ts | 2 +- generators/vue/generator.ts | 2 +- lib/jdl/built-in-options/binary-options.ts | 2 +- lib/jdl/built-in-options/index.ts | 2 +- .../jdl-application-definition.spec.ts | 2 +- lib/jdl/index.ts | 2 +- lib/jdl/integration-test.spec.ts | 2 +- lib/jdl/jdl-importer.spec.ts | 2 +- lib/jdl/jdl-importer.ts | 2 +- lib/jdl/runtime.ts | 2 +- lib/{jdl => }/jhipster/application-options.ts | 2 +- lib/{jdl => }/jhipster/application-types.ts | 0 .../jhipster/authentication-types.ts | 0 lib/{jdl => }/jhipster/build-tool-types.ts | 0 lib/{jdl => }/jhipster/cache-types.ts | 0 .../jhipster/client-framework-types.ts | 0 lib/{jdl => }/jhipster/database-types.spec.ts | 0 lib/{jdl => }/jhipster/database-types.ts | 0 .../default-application-options.spec.ts | 0 .../jhipster/default-application-options.ts | 2 +- .../jhipster/deployment-options.spec.ts | 0 lib/{jdl => }/jhipster/deployment-options.ts | 0 lib/{jdl => }/jhipster/entity-options.ts | 0 lib/{jdl => }/jhipster/field-types.spec.ts | 2 +- lib/{jdl => }/jhipster/field-types.ts | 4 ++-- lib/{jdl => }/jhipster/index.ts | 4 ++-- .../jhipster/jdl-validator-definition.ts | 4 ++-- .../jhipster/kubernetes-platform-types.ts | 0 .../jhipster/message-broker-types.ts | 0 lib/{jdl => }/jhipster/monitoring-types.ts | 0 lib/{jdl => }/jhipster/openapi-options.ts | 0 .../jhipster/openshift-platform-types.ts | 0 .../relationship-on-handler-options.ts | 0 .../jhipster/reserved-keywords.spec.ts | 0 lib/{jdl => }/jhipster/reserved-keywords.ts | 20 +++++++++---------- .../jhipster/reserved-keywords/jhipster.ts | 0 .../jhipster/reserved-keywords/paging.ts | 0 lib/{jdl => }/jhipster/search-engine-types.ts | 0 .../jhipster/service-discovery-types.ts | 0 .../jhipster/test-framework-types.ts | 0 lib/{jdl => }/jhipster/websocket-types.ts | 0 testing/support/application-samples.ts | 2 +- testing/support/entity-samples.ts | 2 +- 132 files changed, 126 insertions(+), 126 deletions(-) rename lib/{jdl => }/jhipster/application-options.ts (99%) rename lib/{jdl => }/jhipster/application-types.ts (100%) rename lib/{jdl => }/jhipster/authentication-types.ts (100%) rename lib/{jdl => }/jhipster/build-tool-types.ts (100%) rename lib/{jdl => }/jhipster/cache-types.ts (100%) rename lib/{jdl => }/jhipster/client-framework-types.ts (100%) rename lib/{jdl => }/jhipster/database-types.spec.ts (100%) rename lib/{jdl => }/jhipster/database-types.ts (100%) rename lib/{jdl => }/jhipster/default-application-options.spec.ts (100%) rename lib/{jdl => }/jhipster/default-application-options.ts (98%) rename lib/{jdl => }/jhipster/deployment-options.spec.ts (100%) rename lib/{jdl => }/jhipster/deployment-options.ts (100%) rename lib/{jdl => }/jhipster/entity-options.ts (100%) rename lib/{jdl => }/jhipster/field-types.spec.ts (99%) rename lib/{jdl => }/jhipster/field-types.ts (97%) rename lib/{jdl => }/jhipster/index.ts (92%) rename lib/{jdl => }/jhipster/jdl-validator-definition.ts (97%) rename lib/{jdl => }/jhipster/kubernetes-platform-types.ts (100%) rename lib/{jdl => }/jhipster/message-broker-types.ts (100%) rename lib/{jdl => }/jhipster/monitoring-types.ts (100%) rename lib/{jdl => }/jhipster/openapi-options.ts (100%) rename lib/{jdl => }/jhipster/openshift-platform-types.ts (100%) rename lib/{jdl => }/jhipster/relationship-on-handler-options.ts (100%) rename lib/{jdl => }/jhipster/reserved-keywords.spec.ts (100%) rename lib/{jdl => }/jhipster/reserved-keywords.ts (77%) rename lib/{jdl => }/jhipster/reserved-keywords/jhipster.ts (100%) rename lib/{jdl => }/jhipster/reserved-keywords/paging.ts (100%) rename lib/{jdl => }/jhipster/search-engine-types.ts (100%) rename lib/{jdl => }/jhipster/service-discovery-types.ts (100%) rename lib/{jdl => }/jhipster/test-framework-types.ts (100%) rename lib/{jdl => }/jhipster/websocket-types.ts (100%) diff --git a/generators/angular/generator.spec.ts b/generators/angular/generator.spec.ts index bc18931ab5ba..58aa9977e360 100644 --- a/generators/angular/generator.spec.ts +++ b/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 '../../lib/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'; diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts index b2c16a06224f..df7d1ca91242 100644 --- a/generators/angular/generator.ts +++ b/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 '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { generateTypescriptTestEntity as generateTestEntity, generateEntityClientEnumImports as getClientEnumImportsFormat, diff --git a/generators/angular/needle-api/needle-client-angular.ts b/generators/angular/needle-api/needle-client-angular.ts index 4fd1d7fbf824..fce521111abb 100644 --- a/generators/angular/needle-api/needle-client-angular.ts +++ b/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 '../../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../../lib/jhipster/index.js'; import { createNeedleCallback } from '../../base/support/needles.js'; const { ANGULAR } = clientFrameworkTypes; diff --git a/generators/app/generator.ts b/generators/app/generator.ts index 9c72719d739d..2ddd2fd5072d 100644 --- a/generators/app/generator.ts +++ b/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 '../../lib/jdl/jhipster/index.js'; +import { applicationTypes } from '../../lib/jhipster/index.js'; import cleanupOldFilesTask from './cleanup.js'; import { checkNode, loadStoredAppOptions } from './support/index.js'; diff --git a/generators/app/support/config.ts b/generators/app/support/config.ts index 5120d56c23bb..df7346769c41 100644 --- a/generators/app/support/config.ts +++ b/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 '../../../lib/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'; diff --git a/generators/base-application/support/field-utils.ts b/generators/base-application/support/field-utils.ts index c6ee706f6cd0..aced4dcc6aa9 100644 --- a/generators/base-application/support/field-utils.ts +++ b/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 '../../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jhipster/index.js'; const { CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes; const { BYTES, BYTE_BUFFER } = RelationalOnlyDBTypes; diff --git a/generators/base-application/support/prepare-entity.spec.ts b/generators/base-application/support/prepare-entity.spec.ts index 1aabcacdf8b1..f7d632fecebf 100644 --- a/generators/base-application/support/prepare-entity.spec.ts +++ b/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 '../../../lib/jdl/jhipster/index.js'; +import { getConfigWithDefaults } from '../../../lib/jhipster/index.js'; import { entityDefaultConfig, prepareEntityPrimaryKeyForTemplates } from './prepare-entity.js'; describe('generator - base-application - support - prepareEntity', () => { diff --git a/generators/base-application/support/prepare-entity.ts b/generators/base-application/support/prepare-entity.ts index 3fab0c72c007..3ecb36e244a4 100644 --- a/generators/base-application/support/prepare-entity.ts +++ b/generators/base-application/support/prepare-entity.ts @@ -30,7 +30,7 @@ import { upperFirstCamelCase, } from '../../base/support/index.js'; import { getEntityParentPathAddition, getTypescriptKeyType } from '../../client/support/index.js'; -import { applicationTypes, databaseTypes, entityOptions, fieldTypes, searchEngineTypes } from '../../../lib/jdl/jhipster/index.js'; +import { applicationTypes, databaseTypes, entityOptions, fieldTypes, searchEngineTypes } from '../../../lib/jhipster/index.js'; import { binaryOptions } from '../../../lib/jdl/built-in-options/index.js'; import type { Entity } from '../../../lib/types/application/index.js'; diff --git a/generators/base-application/support/prepare-field.spec.ts b/generators/base-application/support/prepare-field.spec.ts index ee1cb3a335ad..7864113b8d1b 100644 --- a/generators/base-application/support/prepare-field.spec.ts +++ b/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 '../../../lib/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'; diff --git a/generators/base-application/support/prepare-field.ts b/generators/base-application/support/prepare-field.ts index 95879ef205eb..7789e116628a 100644 --- a/generators/base-application/support/prepare-field.ts +++ b/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 '../../../lib/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'; diff --git a/generators/base-application/support/prepare-relationship.ts b/generators/base-application/support/prepare-relationship.ts index 4f487e276f09..d7d4ade6304a 100644 --- a/generators/base-application/support/prepare-relationship.ts +++ b/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 '../../../lib/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'; diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index 1b14c85255fa..a282c82a5a08 100644 --- a/generators/base-core/generator.ts +++ b/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 '../../lib/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'; diff --git a/generators/base-workspaces/internal/deployments.ts b/generators/base-workspaces/internal/deployments.ts index 7c4060283f3f..7f573bac1e74 100644 --- a/generators/base-workspaces/internal/deployments.ts +++ b/generators/base-workspaces/internal/deployments.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { defaults } from 'lodash-es'; -import { applicationOptions, deploymentOptions } from '../../../lib/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'; diff --git a/generators/base-workspaces/internal/docker-base.ts b/generators/base-workspaces/internal/docker-base.ts index 65668a504ba3..8eedd02eba8c 100644 --- a/generators/base-workspaces/internal/docker-base.ts +++ b/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 '../../../lib/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'; diff --git a/generators/base-workspaces/internal/docker-prompts.ts b/generators/base-workspaces/internal/docker-prompts.ts index 107c6cca7fb5..3fb235265565 100644 --- a/generators/base-workspaces/internal/docker-prompts.ts +++ b/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 '../../../lib/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'; diff --git a/generators/base/support/jhipster7-context.ts b/generators/base/support/jhipster7-context.ts index b4481bc8cd69..4d19376ad963 100644 --- a/generators/base/support/jhipster7-context.ts +++ b/generators/base/support/jhipster7-context.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import { camelCase } from 'lodash-es'; -import { isReservedTableName } from '../../../lib/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 '../../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jhipster/index.js'; import { upperFirstCamelCase } from '../../../lib/utils/string.js'; const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes; diff --git a/generators/bootstrap-application-base/utils.ts b/generators/bootstrap-application-base/utils.ts index 947045b34b59..e7ec3afc6f49 100644 --- a/generators/bootstrap-application-base/utils.ts +++ b/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 '../../lib/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 '../../lib/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'; diff --git a/generators/bootstrap-application/generator.spec.ts b/generators/bootstrap-application/generator.spec.ts index a9ea99c50dc2..ff97849fb75c 100644 --- a/generators/bootstrap-application/generator.spec.ts +++ b/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 '../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../lib/jhipster/index.js'; import { shouldSupportFeatures } from '../../test/support/tests.js'; import Generator from './index.js'; diff --git a/generators/bootstrap-application/generator.ts b/generators/bootstrap-application/generator.ts index 979e41850b73..b4b408170119 100644 --- a/generators/bootstrap-application/generator.ts +++ b/generators/bootstrap-application/generator.ts @@ -19,7 +19,7 @@ import assert from 'assert'; import BaseApplicationGenerator from '../base-application/index.js'; -import { validations } from '../../lib/jdl/jhipster/index.js'; +import { validations } from '../../lib/jhipster/index.js'; import { derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, diff --git a/generators/ci-cd/generator.ts b/generators/ci-cd/generator.ts index 5932e4196159..057bb1957086 100644 --- a/generators/ci-cd/generator.ts +++ b/generators/ci-cd/generator.ts @@ -21,7 +21,7 @@ import chalk from 'chalk'; import BaseApplicationGenerator from '../base-application/index.js'; -import { clientFrameworkTypes } from '../../lib/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'; diff --git a/generators/client/command.ts b/generators/client/command.ts index 0b89600cf992..3a4faf786dcb 100644 --- a/generators/client/command.ts +++ b/generators/client/command.ts @@ -23,7 +23,7 @@ import { APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes, testFrameworkTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; import type { JHipsterCommandDefinition } from '../../lib/command/index.js'; import { GENERATOR_COMMON } from '../generator-list.js'; diff --git a/generators/client/generator-needles.spec.ts b/generators/client/generator-needles.spec.ts index 235129646be0..28272e1d15cc 100644 --- a/generators/client/generator-needles.spec.ts +++ b/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 '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import ClientGenerator from './index.js'; const { ANGULAR, REACT } = clientFrameworkTypes; diff --git a/generators/client/generator.spec.ts b/generators/client/generator.spec.ts index b7f52ada7f46..d480576dd4ed 100644 --- a/generators/client/generator.spec.ts +++ b/generators/client/generator.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { before, describe, expect, it } from 'esmocha'; import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { defaultHelpers as helpers, result } from '../../testing/index.js'; -import { testFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; +import { testFrameworkTypes } from '../../lib/jhipster/index.js'; import { GENERATOR_CLIENT } from '../generator-list.js'; import Generator from './index.js'; diff --git a/generators/client/generator.ts b/generators/client/generator.ts index 241a80b54632..e42da8e2b3d9 100644 --- a/generators/client/generator.ts +++ b/generators/client/generator.ts @@ -23,7 +23,7 @@ import BaseApplicationGenerator from '../base-application/index.js'; import { LOGIN_REGEX_JS } from '../generator-constants.js'; import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS } from '../generator-list.js'; -import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jhipster/index.js'; import { createNeedleCallback } from '../base/support/index.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { addEnumerationFiles } from './entity-files.js'; diff --git a/generators/client/prompts.spec.ts b/generators/client/prompts.spec.ts index e8b29c644c69..46101b54e3eb 100644 --- a/generators/client/prompts.spec.ts +++ b/generators/client/prompts.spec.ts @@ -8,7 +8,7 @@ import { clientFrameworkTypes, databaseTypes, testFrameworkTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; import { GENERATOR_APP } from '../generator-list.js'; const { MONOLITH } = applicationTypes; diff --git a/generators/client/support/entity-definition.ts b/generators/client/support/entity-definition.ts index e3c13d7bac6a..2ed424ac0976 100644 --- a/generators/client/support/entity-definition.ts +++ b/generators/client/support/entity-definition.ts @@ -18,7 +18,7 @@ * limitations under the License. */ -import { clientFrameworkTypes, fieldTypes, validations } from '../../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes, validations } from '../../../lib/jhipster/index.js'; import getTypescriptKeyType from './types-utils.js'; import { filterRelevantRelationships } from './template-utils.js'; diff --git a/generators/client/support/template-utils.spec.ts b/generators/client/support/template-utils.spec.ts index 7c95e56fc37b..18065082763c 100644 --- a/generators/client/support/template-utils.spec.ts +++ b/generators/client/support/template-utils.spec.ts @@ -1,7 +1,7 @@ import path from 'path'; import { expect } from 'chai'; import { describe, it } from 'esmocha'; -import { entityOptions } from '../../../lib/jdl/jhipster/index.js'; +import { entityOptions } from '../../../lib/jhipster/index.js'; import { generateEntityClientImports, generateTestEntityId, getEntityParentPathAddition } from './template-utils.js'; diff --git a/generators/client/support/template-utils.ts b/generators/client/support/template-utils.ts index 463128a6d670..8dd72e90beb5 100644 --- a/generators/client/support/template-utils.ts +++ b/generators/client/support/template-utils.ts @@ -18,7 +18,7 @@ */ import path from 'path'; -import { clientFrameworkTypes, fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../../lib/jhipster/index.js'; import type { PrimaryKey } from '../../../lib/types/application/entity.js'; import { getEntryIfTypeOrTypeAttribute } from './types-utils.js'; diff --git a/generators/client/support/types-utils.spec.ts b/generators/client/support/types-utils.spec.ts index bd87e0cf512c..49f904ac8f76 100644 --- a/generators/client/support/types-utils.spec.ts +++ b/generators/client/support/types-utils.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'esmocha'; -import { fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jhipster/index.js'; import { getTypescriptType } from './types-utils.js'; diff --git a/generators/client/support/types-utils.ts b/generators/client/support/types-utils.ts index 09a7d9686a83..82102d3f48a3 100644 --- a/generators/client/support/types-utils.ts +++ b/generators/client/support/types-utils.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jhipster/index.js'; import type { PrimaryKey } from '../../../lib/types/application/entity.js'; import { fieldIsEnum } from '../../base-application/support/index.js'; diff --git a/generators/common/generator.ts b/generators/common/generator.ts index 3fbb3abb9d9f..32c10acbed31 100644 --- a/generators/common/generator.ts +++ b/generators/common/generator.ts @@ -28,7 +28,7 @@ import { SERVER_MAIN_RES_DIR, TEST_DIR, } from '../generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { GENERATOR_COMMON, GENERATOR_GIT } from '../generator-list.js'; import { createPrettierTransform } from '../bootstrap/support/prettier-support.js'; import { loadStoredAppOptions } from '../app/support/index.js'; diff --git a/generators/cypress/generator.spec.ts b/generators/cypress/generator.spec.ts index 6cd0c0a2e071..02309b37c74d 100644 --- a/generators/cypress/generator.spec.ts +++ b/generators/cypress/generator.spec.ts @@ -20,7 +20,7 @@ import path, { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; import { after, before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; -import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jhipster/index.js'; import { AuthenticationTypeMatrix, extendMatrix, fromMatrix, defaultHelpers as helpers } from '../../testing/index.js'; import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { GENERATOR_CYPRESS } from '../generator-list.js'; diff --git a/generators/cypress/generator.ts b/generators/cypress/generator.ts index 2ef4fdb2b088..e12cbbef710f 100644 --- a/generators/cypress/generator.ts +++ b/generators/cypress/generator.ts @@ -19,7 +19,7 @@ import { createFaker, stringHashCode } from '../base/support/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; -import { clientFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { generateTestEntity as entityWithFakeValues } from '../client/support/index.js'; diff --git a/generators/docker-compose/docker-compose.spec.ts b/generators/docker-compose/docker-compose.spec.ts index dac9712e61c5..410b93e35c9f 100644 --- a/generators/docker-compose/docker-compose.spec.ts +++ b/generators/docker-compose/docker-compose.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import monitoringTypes from '../../lib/jdl/jhipster/monitoring-types.js'; -import applicationTypes from '../../lib/jdl/jhipster/application-types.js'; +import monitoringTypes from '../../lib/jhipster/monitoring-types.js'; +import applicationTypes from '../../lib/jhipster/application-types.js'; import { GENERATOR_DOCKER_COMPOSE } from '../generator-list.js'; import { getGenerator, defaultHelpers as helpers, runResult } from '../../testing/index.js'; diff --git a/generators/docker-compose/files.ts b/generators/docker-compose/files.ts index ff0c04e0f8d1..71eb8d702a01 100644 --- a/generators/docker-compose/files.ts +++ b/generators/docker-compose/files.ts @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { applicationTypes, authenticationTypes, monitoringTypes } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes, monitoringTypes } from '../../lib/jhipster/index.js'; const { PROMETHEUS } = monitoringTypes; const { MICROSERVICE } = applicationTypes; diff --git a/generators/docker-compose/generator.ts b/generators/docker-compose/generator.ts index 1da8c865dc6d..1d767c02ef2b 100644 --- a/generators/docker-compose/generator.ts +++ b/generators/docker-compose/generator.ts @@ -26,7 +26,7 @@ import { defaults } from 'lodash-es'; import BaseWorkspacesGenerator from '../base-workspaces/index.js'; -import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../lib/jdl/jhipster/index.js'; +import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../lib/jhipster/index.js'; import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js'; import { convertSecretToBase64, createBase64Secret, createFaker, stringHashCode } from '../base/support/index.js'; import { checkDocker } from '../base-workspaces/internal/docker-base.js'; diff --git a/generators/docker/generator.spec.ts b/generators/docker/generator.spec.ts index c26069754f7f..ecb162fe7937 100644 --- a/generators/docker/generator.spec.ts +++ b/generators/docker/generator.spec.ts @@ -31,7 +31,7 @@ import { } from '../../testing/index.js'; import { matchElasticSearchDocker } from '../spring-data-elasticsearch/__test-support/elastic-search-matcher.js'; -import { cacheTypes, databaseTypes, searchEngineTypes, serviceDiscoveryTypes } from '../../lib/jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes, searchEngineTypes, serviceDiscoveryTypes } from '../../lib/jhipster/index.js'; import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../server/options/message-broker.js'; import { shouldSupportFeatures } from '../../test/support/tests.js'; import { matchConsul, matchEureka } from './__test-support/service-discovery-matcher.js'; diff --git a/generators/entity/generator.ts b/generators/entity/generator.ts index 48a5b7ce769f..e0b4e18673e9 100644 --- a/generators/entity/generator.ts +++ b/generators/entity/generator.ts @@ -26,7 +26,7 @@ import { upperFirst } from 'lodash-es'; import type { Storage } from 'yeoman-generator'; import BaseApplicationGenerator from '../base-application/index.js'; import { JHIPSTER_CONFIG_DIR } from '../generator-constants.js'; -import { applicationTypes, reservedKeywords } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, reservedKeywords } from '../../lib/jhipster/index.js'; import { GENERATOR_ENTITIES } from '../generator-list.js'; import { getDBTypeFromDBValue, hibernateSnakeCase } from '../server/support/index.js'; import type { Entity } from '../../lib/types/application/entity.js'; diff --git a/generators/entity/prompts.ts b/generators/entity/prompts.ts index 151202a6c9ef..2348ac3b33f7 100644 --- a/generators/entity/prompts.ts +++ b/generators/entity/prompts.ts @@ -28,7 +28,7 @@ import { fieldTypes, reservedKeywords, validations, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; import { inputIsNumber, inputIsSignedDecimalNumber, inputIsSignedNumber } from './support/index.js'; import type EntityGenerator from './generator.js'; diff --git a/generators/export-jdl/generator.ts b/generators/export-jdl/generator.ts index 349adeb4fd7d..398b64e293d9 100644 --- a/generators/export-jdl/generator.ts +++ b/generators/export-jdl/generator.ts @@ -20,7 +20,7 @@ import chalk from 'chalk'; import BaseGenerator from '../base/index.js'; -import { applicationOptions } from '../../lib/jdl/jhipster/index.js'; +import { applicationOptions } from '../../lib/jhipster/index.js'; import { convertToJDL } from '../../lib/jdl/converters/json-to-jdl-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import jdlDefinition from '../app/jdl/index.js'; diff --git a/generators/java/generators/build-tool/command.ts b/generators/java/generators/build-tool/command.ts index caa2a616c92f..ea6b665a523c 100644 --- a/generators/java/generators/build-tool/command.ts +++ b/generators/java/generators/build-tool/command.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { buildToolTypes } from '../../../../lib/jdl/jhipster/index.js'; +import { buildToolTypes } from '../../../../lib/jhipster/index.js'; import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js'; import { asCommand } from '../../../type-utils.js'; diff --git a/generators/java/generators/build-tool/generator.ts b/generators/java/generators/build-tool/generator.ts index 6a6377b9ffe6..1c0cffb8ff86 100644 --- a/generators/java/generators/build-tool/generator.ts +++ b/generators/java/generators/build-tool/generator.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { buildToolTypes } from '../../../../lib/jdl/jhipster/index.js'; +import { buildToolTypes } from '../../../../lib/jhipster/index.js'; import BaseApplicationGenerator from '../../../base-application/index.js'; import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js'; import type { MavenDependency } from '../../../maven/types.js'; diff --git a/generators/kubernetes-helm/files.ts b/generators/kubernetes-helm/files.ts index ca1617ff9747..d629a4cf4638 100644 --- a/generators/kubernetes-helm/files.ts +++ b/generators/kubernetes-helm/files.ts @@ -24,7 +24,7 @@ import { monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; const { GATEWAY, MONOLITH } = applicationTypes; diff --git a/generators/kubernetes-helm/generator.ts b/generators/kubernetes-helm/generator.ts index 4cf9c4ee0c02..c6be90e8a1ec 100644 --- a/generators/kubernetes-helm/generator.ts +++ b/generators/kubernetes-helm/generator.ts @@ -33,7 +33,7 @@ import { setupHelmConstants, setupKubernetesConstants, } from '../kubernetes/kubernetes-base.js'; -import { messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; +import { messageBrokerTypes } from '../../lib/jhipster/index.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { checkDocker } from '../docker/support/index.js'; diff --git a/generators/kubernetes-knative/files.ts b/generators/kubernetes-knative/files.ts index 2799baab01a0..6cb71b880b7e 100644 --- a/generators/kubernetes-knative/files.ts +++ b/generators/kubernetes-knative/files.ts @@ -25,7 +25,7 @@ import { monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; const { GATEWAY, MONOLITH } = applicationTypes; diff --git a/generators/kubernetes-knative/generator.ts b/generators/kubernetes-knative/generator.ts index 9eba5dbf2d92..28ec1ac1693c 100644 --- a/generators/kubernetes-knative/generator.ts +++ b/generators/kubernetes-knative/generator.ts @@ -32,7 +32,7 @@ import { setupHelmConstants, setupKubernetesConstants, } from '../kubernetes/kubernetes-base.js'; -import { buildToolTypes, kubernetesPlatformTypes, messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; +import { buildToolTypes, kubernetesPlatformTypes, messageBrokerTypes } from '../../lib/jhipster/index.js'; import { getJdbcUrl } from '../spring-data-relational/support/index.js'; import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { checkDocker } from '../docker/support/index.js'; diff --git a/generators/kubernetes-knative/prompts.ts b/generators/kubernetes-knative/prompts.ts index 57a7742e941b..e9a625be4349 100644 --- a/generators/kubernetes-knative/prompts.ts +++ b/generators/kubernetes-knative/prompts.ts @@ -18,7 +18,7 @@ * limitations under the License. */ import k8sPrompts from '../kubernetes/prompts.js'; -import { kubernetesPlatformTypes } from '../../lib/jdl/jhipster/index.js'; +import { kubernetesPlatformTypes } from '../../lib/jhipster/index.js'; import { generatorDefaultConfig } from '../kubernetes/kubernetes-constants.js'; const { GeneratorTypes } = kubernetesPlatformTypes; diff --git a/generators/kubernetes/files.ts b/generators/kubernetes/files.ts index a87d2c0f4298..ff1298cf0ca2 100644 --- a/generators/kubernetes/files.ts +++ b/generators/kubernetes/files.ts @@ -27,7 +27,7 @@ import { monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; const { GATEWAY, MONOLITH } = applicationTypes; diff --git a/generators/kubernetes/generator.ts b/generators/kubernetes/generator.ts index 127f5c6d5d71..900cdd9092a3 100644 --- a/generators/kubernetes/generator.ts +++ b/generators/kubernetes/generator.ts @@ -23,7 +23,7 @@ import chalk from 'chalk'; import BaseWorkspacesGenerator from '../base-workspaces/index.js'; -import { buildToolTypes, messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; +import { buildToolTypes, messageBrokerTypes } from '../../lib/jhipster/index.js'; import { checkImages, configureImageNames, generateJwtSecret, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; diff --git a/generators/kubernetes/kubernetes-base.ts b/generators/kubernetes/kubernetes-base.ts index ac700fd30d09..578cddea1c4f 100644 --- a/generators/kubernetes/kubernetes-base.ts +++ b/generators/kubernetes/kubernetes-base.ts @@ -39,7 +39,7 @@ import { KUBERNETES_RBAC_API_VERSION, KUBERNETES_STATEFULSET_API_VERSION, } from '../generator-constants.js'; -import { applicationTypes, kubernetesPlatformTypes } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, kubernetesPlatformTypes } from '../../lib/jhipster/index.js'; import { defaultKubernetesConfig } from './kubernetes-constants.js'; const { MICROSERVICE } = applicationTypes; diff --git a/generators/kubernetes/kubernetes-constants.ts b/generators/kubernetes/kubernetes-constants.ts index 227fc59d088c..4f45a231fe67 100644 --- a/generators/kubernetes/kubernetes-constants.ts +++ b/generators/kubernetes/kubernetes-constants.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { kubernetesPlatformTypes, monitoringTypes } from '../../lib/jdl/jhipster/index.js'; +import { kubernetesPlatformTypes, monitoringTypes } from '../../lib/jhipster/index.js'; const { NO } = monitoringTypes; const { ServiceTypes, IngressTypes, GeneratorTypes } = kubernetesPlatformTypes; diff --git a/generators/kubernetes/prompts.ts b/generators/kubernetes/prompts.ts index c3679dbe8c34..9cf8abd8472d 100644 --- a/generators/kubernetes/prompts.ts +++ b/generators/kubernetes/prompts.ts @@ -18,7 +18,7 @@ * limitations under the License. */ import dockerPrompts from '../base-workspaces/internal/docker-prompts.js'; -import { applicationTypes, databaseTypes, kubernetesPlatformTypes } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, databaseTypes, kubernetesPlatformTypes } from '../../lib/jhipster/index.js'; import { defaultKubernetesConfig, ingressDefaultConfig } from './kubernetes-constants.js'; const { MONOLITH } = applicationTypes; diff --git a/generators/languages/generator.ts b/generators/languages/generator.ts index fe0f3ac10f90..d7a77a920222 100644 --- a/generators/languages/generator.ts +++ b/generators/languages/generator.ts @@ -29,7 +29,7 @@ import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/ import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js'; import { QUEUES } from '../base-application/priorities.js'; import { PRIORITY_NAMES } from '../base/priorities.js'; -import { clientFrameworkTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { findLanguageForTag, supportedLanguages } from './support/languages.js'; import TranslationData, { createTranslationsFileFilter, createTranslationsFilter } from './translation-data.js'; import { writeEntityFiles } from './entity-files.js'; diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index c7684bd6aa8a..28357f1f8cfd 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -29,7 +29,7 @@ import { prepareRelationship, } from '../base-application/support/index.js'; import { prepareSqlApplicationProperties } from '../spring-data-relational/support/index.js'; -import { fieldTypes } from '../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../lib/jhipster/index.js'; import type { MavenProperty } from '../maven/types.js'; import { liquibaseFiles } from './files.js'; import { diff --git a/generators/liquibase/support/post-prepare-entity.ts b/generators/liquibase/support/post-prepare-entity.ts index ac3f2f2c952c..596ae73138cd 100644 --- a/generators/liquibase/support/post-prepare-entity.ts +++ b/generators/liquibase/support/post-prepare-entity.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jhipster/index.js'; import type { LiquibaseEntity } from '../types.js'; import { asPostPreparingEachEntityTask } from '../../base-application/support/task-type-inference.js'; diff --git a/generators/liquibase/support/prepare-field.ts b/generators/liquibase/support/prepare-field.ts index 0e10a93dcd92..fb21d5087ab5 100644 --- a/generators/liquibase/support/prepare-field.ts +++ b/generators/liquibase/support/prepare-field.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { databaseTypes, fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../lib/jhipster/index.js'; import { mutateData } from '../../base/support/index.js'; const { MYSQL, MARIADB } = databaseTypes; diff --git a/generators/react/generator.spec.ts b/generators/react/generator.spec.ts index fa349d2ec53f..0b1b27399de3 100644 --- a/generators/react/generator.spec.ts +++ b/generators/react/generator.spec.ts @@ -6,7 +6,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 '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_REACT } from '../generator-list.js'; diff --git a/generators/react/generator.ts b/generators/react/generator.ts index 1683699bb22c..b4c847450d23 100644 --- a/generators/react/generator.ts +++ b/generators/react/generator.ts @@ -22,7 +22,7 @@ import { camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_REACT } from '../generator-list.js'; -import { clientFrameworkTypes, fieldTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../lib/jhipster/index.js'; import { generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, diff --git a/generators/server/__test-support/index.ts b/generators/server/__test-support/index.ts index bb9aacdb7143..86b9cf000916 100644 --- a/generators/server/__test-support/index.ts +++ b/generators/server/__test-support/index.ts @@ -1,6 +1,6 @@ import assert from 'assert'; -import { databaseTypes, messageBrokerTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes, messageBrokerTypes } from '../../../lib/jhipster/index.js'; import { GENERATOR_BOOTSTRAP, GENERATOR_JAVA, diff --git a/generators/server/command.ts b/generators/server/command.ts index 1adb85be3c38..74ac1a67a4fb 100644 --- a/generators/server/command.ts +++ b/generators/server/command.ts @@ -19,7 +19,7 @@ import chalk from 'chalk'; import type { JHipsterCommandDefinition } from '../../lib/command/index.js'; import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js'; -import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../lib/jdl/jhipster/index.js'; +import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../lib/jhipster/index.js'; const command: JHipsterCommandDefinition = { options: { diff --git a/generators/server/generator.ts b/generators/server/generator.ts index 18094e40a794..e224eb488b95 100644 --- a/generators/server/generator.ts +++ b/generators/server/generator.ts @@ -48,10 +48,10 @@ import { reservedKeywords, searchEngineTypes, validations, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; import { stringifyApplicationData } from '../base-application/support/index.js'; import { createNeedleCallback, mutateData } from '../base/support/index.js'; -import { isReservedPaginationWords } from '../../lib/jdl/jhipster/reserved-keywords.js'; +import { isReservedPaginationWords } from '../../lib/jhipster/reserved-keywords.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { isReservedH2Keyword } from '../spring-data-relational/support/h2-reserved-keywords.js'; import { diff --git a/generators/server/support/build-specification-mapper.ts b/generators/server/support/build-specification-mapper.ts index 6f92f103e04a..20da2edc04cf 100644 --- a/generators/server/support/build-specification-mapper.ts +++ b/generators/server/support/build-specification-mapper.ts @@ -1,4 +1,4 @@ -import { fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../../lib/jhipster/index.js'; const { STRING: TYPE_STRING, diff --git a/generators/server/support/config.ts b/generators/server/support/config.ts index 91e1b554b9dd..31fe8cf18e69 100644 --- a/generators/server/support/config.ts +++ b/generators/server/support/config.ts @@ -9,7 +9,7 @@ import { searchEngineTypes, serviceDiscoveryTypes, websocketTypes, -} from '../../../lib/jdl/jhipster/index.js'; +} from '../../../lib/jhipster/index.js'; import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.js'; import { CLIENT_DIST_DIR, diff --git a/generators/server/support/database.spec.ts b/generators/server/support/database.spec.ts index 338589717788..11c9dbc0f195 100644 --- a/generators/server/support/database.spec.ts +++ b/generators/server/support/database.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'esmocha'; -import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jhipster/index.js'; import { getDBTypeFromDBValue, getFKConstraintName, getJoinTableName, getUXConstraintName } from './database.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/database.ts b/generators/server/support/database.ts index 37a31c91c963..f9e4a7142b57 100644 --- a/generators/server/support/database.ts +++ b/generators/server/support/database.ts @@ -18,7 +18,7 @@ */ import crypto from 'crypto'; -import { databaseTypes, fieldTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../lib/jhipster/index.js'; import { databaseData } from '../../spring-data-relational/support/index.js'; import type { ValidationResult } from '../../base/api.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/prepare-entity.ts b/generators/server/support/prepare-entity.ts index 0a2ade3b6284..b3ad73184980 100644 --- a/generators/server/support/prepare-entity.ts +++ b/generators/server/support/prepare-entity.ts @@ -18,9 +18,9 @@ */ import path from 'path'; -import { databaseTypes, searchEngineTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes, searchEngineTypes } from '../../../lib/jhipster/index.js'; -import { isReservedTableName } from '../../../lib/jdl/jhipster/reserved-keywords.js'; +import { isReservedTableName } from '../../../lib/jhipster/reserved-keywords.js'; import { mutateData, normalizePathEnd } from '../../base/support/index.js'; import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/prepare-field.ts b/generators/server/support/prepare-field.ts index 1549d4715e5b..aabc4aa3364f 100644 --- a/generators/server/support/prepare-field.ts +++ b/generators/server/support/prepare-field.ts @@ -19,7 +19,7 @@ import assert from 'assert'; import { snakeCase, upperFirst } from 'lodash-es'; -import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../lib/jhipster/index.js'; import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js'; import { mutateData } from '../../../lib/utils/object.js'; import { getUXConstraintName } from './database.js'; diff --git a/generators/server/support/relationship.ts b/generators/server/support/relationship.ts index cbcb0ed9d17a..c9f5a0f8e36c 100644 --- a/generators/server/support/relationship.ts +++ b/generators/server/support/relationship.ts @@ -20,7 +20,7 @@ import type { JSONEntity } from '../../../lib/jdl/converters/types.js'; import { addOtherRelationship } from '../../base-application/support/index.js'; import type { ValidationResult } from '../../base/api.js'; -import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jhipster/index.js'; const { NO: NO_DATABASE, SQL, NEO4J } = databaseTypes; diff --git a/generators/server/support/templates/field-values.ts b/generators/server/support/templates/field-values.ts index b836fa554e0a..65a56a9d3460 100644 --- a/generators/server/support/templates/field-values.ts +++ b/generators/server/support/templates/field-values.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { databaseTypes, fieldTypes } from '../../../../lib/jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../../lib/jhipster/index.js'; const dbTypes = fieldTypes; const { STRING, UUID, LONG, INTEGER } = dbTypes.CommonDBTypes; diff --git a/generators/spring-boot/command.ts b/generators/spring-boot/command.ts index 28b436549fbf..f00ad9f728c6 100644 --- a/generators/spring-boot/command.ts +++ b/generators/spring-boot/command.ts @@ -20,7 +20,7 @@ import chalk from 'chalk'; import type { JHipsterCommandDefinition } from '../../lib/command/index.js'; import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js'; import { createBase64Secret, createSecret } from '../base/support/secret.js'; -import { applicationTypes, authenticationTypes } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../../lib/jhipster/index.js'; const { OAUTH2, SESSION, JWT } = authenticationTypes; const { GATEWAY, MICROSERVICE } = applicationTypes; diff --git a/generators/spring-boot/entity-files.ts b/generators/spring-boot/entity-files.ts index 433caecd8f24..1517704aa8d4 100644 --- a/generators/spring-boot/entity-files.ts +++ b/generators/spring-boot/entity-files.ts @@ -21,7 +21,7 @@ import * as _ from 'lodash-es'; import chalk from 'chalk'; import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock, moveToJavaPackageSrcDir } from '../java/support/index.js'; import { SERVER_TEST_SRC_DIR } from '../generator-constants.js'; -import { databaseTypes, entityOptions } from '../../lib/jdl/jhipster/index.js'; +import { databaseTypes, entityOptions } from '../../lib/jhipster/index.js'; import { asWritingEntitiesTask } from '../base-application/support/task-type-inference.js'; import { cleanupOldFiles } from './entity-cleanup.js'; diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index 71b3b307b373..9ae2efaa9465 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -58,7 +58,7 @@ import { searchEngineTypes, testFrameworkTypes, websocketTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js'; import { writeFiles as writeEntityFiles } from './entity-files.js'; import cleanupTask from './cleanup.js'; diff --git a/generators/spring-boot/prompts.ts b/generators/spring-boot/prompts.ts index 4469f49c0bfe..26fc96f92477 100644 --- a/generators/spring-boot/prompts.ts +++ b/generators/spring-boot/prompts.ts @@ -27,7 +27,7 @@ import { cacheTypes, databaseTypes, testFrameworkTypes, -} from '../../lib/jdl/jhipster/index.js'; +} from '../../lib/jhipster/index.js'; import { MESSAGE_BROKER } from '../server/options/index.js'; import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js'; import type CoreGenerator from '../base-core/generator.js'; diff --git a/generators/spring-cache/generator.spec.ts b/generators/spring-cache/generator.spec.ts index dbad9efc1bb8..2999ca89e380 100644 --- a/generators/spring-cache/generator.spec.ts +++ b/generators/spring-cache/generator.spec.ts @@ -7,7 +7,7 @@ import { fromMatrix, defaultHelpers as helpers, result } from '../../testing/ind import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { GENERATOR_SPRING_CACHE } from '../generator-list.js'; -import { buildToolTypes, cacheTypes } from '../../lib/jdl/jhipster/index.js'; +import { buildToolTypes, cacheTypes } from '../../lib/jhipster/index.js'; import Generator from './index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/generators/spring-cloud-stream/generator-pulsar.spec.ts b/generators/spring-cloud-stream/generator-pulsar.spec.ts index 315e389a84fc..46ed4cc57229 100644 --- a/generators/spring-cloud-stream/generator-pulsar.spec.ts +++ b/generators/spring-cloud-stream/generator-pulsar.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { buildSamplesFromMatrix, buildServerMatrix, defaultHelpers as helpers } from '../../testing/index.js'; -import { messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; +import { messageBrokerTypes } from '../../lib/jhipster/index.js'; import Generator from './index.js'; const { PULSAR } = messageBrokerTypes; diff --git a/generators/spring-cloud-stream/generator.spec.ts b/generators/spring-cloud-stream/generator.spec.ts index 85663802bda1..7837314a45a6 100644 --- a/generators/spring-cloud-stream/generator.spec.ts +++ b/generators/spring-cloud-stream/generator.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { buildSamplesFromMatrix, buildServerMatrix, defaultHelpers as helpers } from '../../testing/index.js'; -import { messageBrokerTypes } from '../../lib/jdl/jhipster/index.js'; +import { messageBrokerTypes } from '../../lib/jhipster/index.js'; import Generator from './index.js'; const { KAFKA } = messageBrokerTypes; diff --git a/generators/spring-data-cassandra/generator.spec.ts b/generators/spring-data-cassandra/generator.spec.ts index fabcf5601915..78239387844b 100644 --- a/generators/spring-data-cassandra/generator.spec.ts +++ b/generators/spring-data-cassandra/generator.spec.ts @@ -25,7 +25,7 @@ import { buildServerSamples, entitiesSimple as entities, defaultHelpers as helpe import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-cassandra/generator.ts b/generators/spring-data-cassandra/generator.ts index 1bdbda7d23c4..fd6563151a77 100644 --- a/generators/spring-data-cassandra/generator.ts +++ b/generators/spring-data-cassandra/generator.ts @@ -18,7 +18,7 @@ */ import BaseApplicationGenerator from '../base-application/index.js'; -import { PaginationTypes } from '../../lib/jdl/jhipster/entity-options.js'; +import { PaginationTypes } from '../../lib/jhipster/entity-options.js'; import writeCassandraFilesTask from './files.js'; import cleanupCassandraFilesTask from './cleanup.js'; import writeCassandraEntityFilesTask, { cleanupCassandraEntityFilesTask } from './entity-files.js'; diff --git a/generators/spring-data-couchbase/generator.spec.ts b/generators/spring-data-couchbase/generator.spec.ts index 0c026f37de69..29e4b8397254 100644 --- a/generators/spring-data-couchbase/generator.spec.ts +++ b/generators/spring-data-couchbase/generator.spec.ts @@ -31,7 +31,7 @@ import { } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; -import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-elasticsearch/generator.spec.ts b/generators/spring-data-elasticsearch/generator.spec.ts index 39c9b494dcdc..aa164ab62595 100644 --- a/generators/spring-data-elasticsearch/generator.spec.ts +++ b/generators/spring-data-elasticsearch/generator.spec.ts @@ -30,7 +30,7 @@ import { runResult, } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; -import { applicationTypes, authenticationTypes, databaseTypes, searchEngineTypes } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes, databaseTypes, searchEngineTypes } from '../../lib/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithSpringCloudStream } from '../server/__test-support/index.js'; import Generator from './generator.js'; import { matchElasticSearch, matchElasticSearchUser } from './__test-support/elastic-search-matcher.js'; diff --git a/generators/spring-data-mongodb/generator.spec.ts b/generators/spring-data-mongodb/generator.spec.ts index 38d6d74e07ca..63dfb8225fb1 100644 --- a/generators/spring-data-mongodb/generator.spec.ts +++ b/generators/spring-data-mongodb/generator.spec.ts @@ -31,7 +31,7 @@ import { import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-neo4j/generator.spec.ts b/generators/spring-data-neo4j/generator.spec.ts index c85cc0eebfad..bf68cc196c25 100644 --- a/generators/spring-data-neo4j/generator.spec.ts +++ b/generators/spring-data-neo4j/generator.spec.ts @@ -11,7 +11,7 @@ import { import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../lib/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-relational/generator.spec.ts b/generators/spring-data-relational/generator.spec.ts index 32bba2f8850e..8a7e12244fb0 100644 --- a/generators/spring-data-relational/generator.spec.ts +++ b/generators/spring-data-relational/generator.spec.ts @@ -14,7 +14,7 @@ import { import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { cacheTypes, databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes } from '../../lib/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithLiquibase, diff --git a/generators/spring-data-relational/generator.ts b/generators/spring-data-relational/generator.ts index 0a40c78f76dd..e6bed8d15190 100644 --- a/generators/spring-data-relational/generator.ts +++ b/generators/spring-data-relational/generator.ts @@ -20,8 +20,8 @@ import assert from 'assert'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_LIQUIBASE } from '../generator-list.js'; -import { isReservedTableName } from '../../lib/jdl/jhipster/reserved-keywords.js'; -import { databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { isReservedTableName } from '../../lib/jhipster/reserved-keywords.js'; +import { databaseTypes } from '../../lib/jhipster/index.js'; import writeTask from './files.js'; import cleanupTask from './cleanup.js'; import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js'; diff --git a/generators/spring-data-relational/sql-entities.spec.ts b/generators/spring-data-relational/sql-entities.spec.ts index 007c09e82d74..9441d4faa973 100644 --- a/generators/spring-data-relational/sql-entities.spec.ts +++ b/generators/spring-data-relational/sql-entities.spec.ts @@ -10,7 +10,7 @@ import { } from '../../testing/index.js'; import { filterBasicServerGenerators } from '../server/__test-support/index.js'; -import { cacheTypes, databaseTypes } from '../../lib/jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes } from '../../lib/jhipster/index.js'; import { GENERATOR_SERVER } from '../generator-list.js'; const { SQL: databaseType, H2_DISK, H2_MEMORY, POSTGRESQL, MARIADB, MYSQL, MSSQL, ORACLE } = databaseTypes; diff --git a/generators/spring-data-relational/support/application-properties.ts b/generators/spring-data-relational/support/application-properties.ts index 5912441ee597..ec228e755a49 100644 --- a/generators/spring-data-relational/support/application-properties.ts +++ b/generators/spring-data-relational/support/application-properties.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jhipster/index.js'; import { getDatabaseData } from './database-data.js'; import { getJdbcUrl, getR2dbcUrl } from './database-url.js'; diff --git a/generators/spring-data-relational/support/database-data.ts b/generators/spring-data-relational/support/database-data.ts index 9e969147cc09..3b80f3963125 100644 --- a/generators/spring-data-relational/support/database-data.ts +++ b/generators/spring-data-relational/support/database-data.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jhipster/index.js'; export type DatabaseData = { name: string; diff --git a/generators/spring-data-relational/support/database-url.spec.ts b/generators/spring-data-relational/support/database-url.spec.ts index 62a3bc45eff8..4fb98eba9816 100644 --- a/generators/spring-data-relational/support/database-url.spec.ts +++ b/generators/spring-data-relational/support/database-url.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'esmocha'; -import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jhipster/index.js'; import { getJdbcUrl, getR2dbcUrl } from './database-url.js'; const { H2_MEMORY, H2_DISK, MARIADB, MSSQL, MYSQL, ORACLE, POSTGRESQL } = databaseTypes; diff --git a/generators/spring-data-relational/support/database-url.ts b/generators/spring-data-relational/support/database-url.ts index dd73bad04161..cd7cac385a10 100644 --- a/generators/spring-data-relational/support/database-url.ts +++ b/generators/spring-data-relational/support/database-url.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { databaseTypes } from '../../../lib/jdl/jhipster/index.js'; +import { databaseTypes } from '../../../lib/jhipster/index.js'; import databaseData, { type getData } from './database-data.js'; const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, H2_DISK, H2_MEMORY } = databaseTypes; diff --git a/generators/vue/generator.spec.ts b/generators/vue/generator.spec.ts index 3f075276516a..912f7741d94e 100644 --- a/generators/vue/generator.spec.ts +++ b/generators/vue/generator.spec.ts @@ -6,7 +6,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 '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { GENERATOR_VUE } from '../generator-list.js'; import Generator from './index.js'; diff --git a/generators/vue/generator.ts b/generators/vue/generator.ts index dc8edf11e83a..a42eb36bae3c 100644 --- a/generators/vue/generator.ts +++ b/generators/vue/generator.ts @@ -22,7 +22,7 @@ import { isFileStateModified } from 'mem-fs-editor/state'; import { camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; -import { clientFrameworkTypes, fieldTypes } from '../../lib/jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../lib/jhipster/index.js'; import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_VUE } from '../generator-list.js'; import { generateEntityClientImports as formatEntityClientImports, diff --git a/lib/jdl/built-in-options/binary-options.ts b/lib/jdl/built-in-options/binary-options.ts index f27cbc0f4b47..f9ad466521ca 100644 --- a/lib/jdl/built-in-options/binary-options.ts +++ b/lib/jdl/built-in-options/binary-options.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import entityOptions from '../jhipster/entity-options.js'; +import entityOptions from '../../jhipster/entity-options.js'; const { MapperTypes, PaginationTypes, SearchTypes, ServiceTypes } = entityOptions; const { MAPSTRUCT } = MapperTypes; diff --git a/lib/jdl/built-in-options/index.ts b/lib/jdl/built-in-options/index.ts index 751de79485a8..66b3e7346600 100644 --- a/lib/jdl/built-in-options/index.ts +++ b/lib/jdl/built-in-options/index.ts @@ -18,4 +18,4 @@ export { deploymentOptions, /** @deprecated */ entityOptions, -} from '../jhipster/index.js'; +} from '../../jhipster/index.js'; diff --git a/lib/jdl/built-in-options/jdl-application-definition.spec.ts b/lib/jdl/built-in-options/jdl-application-definition.spec.ts index 09bd1647a79e..0bdbf31c651b 100644 --- a/lib/jdl/built-in-options/jdl-application-definition.spec.ts +++ b/lib/jdl/built-in-options/jdl-application-definition.spec.ts @@ -19,7 +19,7 @@ import { describe, it } from 'esmocha'; import { expect } from 'chai'; -import { applicationOptions } from '../jhipster/index.js'; +import { applicationOptions } from '../../jhipster/index.js'; import { getDefaultRuntime } from '../runtime.js'; const { OptionNames } = applicationOptions; diff --git a/lib/jdl/index.ts b/lib/jdl/index.ts index 3a7f5c31f723..f79ff7529bae 100644 --- a/lib/jdl/index.ts +++ b/lib/jdl/index.ts @@ -1,4 +1,4 @@ export * from './jdl-importer.js'; export * from './parsing/api.js'; -export * from './jhipster/index.js'; +export * from '../jhipster/index.js'; export * from '../utils/yo-rc.js'; diff --git a/lib/jdl/integration-test.spec.ts b/lib/jdl/integration-test.spec.ts index 3ef9981728b3..b9f64d7a1ae3 100644 --- a/lib/jdl/integration-test.spec.ts +++ b/lib/jdl/integration-test.spec.ts @@ -23,7 +23,7 @@ import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../testing/index.js'; import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../test/support/jdl/index.js'; -import { applicationTypes } from './jhipster/index.js'; +import { applicationTypes } from '../jhipster/index.js'; import exportToJDL from './exporters/jdl-exporter.js'; import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import type { ApplicationWithEntities } from './jdl-importer.js'; diff --git a/lib/jdl/jdl-importer.spec.ts b/lib/jdl/jdl-importer.spec.ts index 08321f4f1502..f05c2cc19c9a 100644 --- a/lib/jdl/jdl-importer.spec.ts +++ b/lib/jdl/jdl-importer.spec.ts @@ -24,7 +24,7 @@ import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { createImporterFromContent, createImporterFromFiles } from '../../test/support/jdl/index.js'; -import { applicationTypes, clientFrameworkTypes, databaseTypes } from './jhipster/index.js'; +import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../jhipster/index.js'; const { MONOLITH } = applicationTypes; const __filename = fileURLToPath(import.meta.url); diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index ada8eff6697d..f3fed29e24af 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -28,7 +28,7 @@ import exportDeployments from './exporters/jhipster-deployment-exporter.js'; import exportEntities from './exporters/jhipster-entity-exporter.js'; import createWithApplicationValidator from './validators/jdl-with-application-validator.js'; import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; -import { applicationOptions } from './jhipster/index.js'; +import { applicationOptions } from '../jhipster/index.js'; import type JDLObject from './models/jdl-object.js'; import type { ParsedJDLApplications } from './converters/parsed-jdl-to-jdl-object/types.js'; import type { PostProcessedJDLJSONApplication } from './exporters/types.js'; diff --git a/lib/jdl/runtime.ts b/lib/jdl/runtime.ts index a5c79a869276..38f6348bd48f 100644 --- a/lib/jdl/runtime.ts +++ b/lib/jdl/runtime.ts @@ -7,7 +7,7 @@ import type { JDLRuntime } from './types/runtime.js'; import type { JDLApplicationConfig, JDLValidatorOption } from './types/types.js'; import JDLApplicationDefinition from './built-in-options/jdl-application-definition.js'; import { buildApplicationTokens } from './parsing/lexer/application-tokens.js'; -import { builtInJDLApplicationConfig } from './jhipster/application-options.js'; +import { builtInJDLApplicationConfig } from '../jhipster/application-options.js'; const mergeDefinition = (definition: JDLApplicationConfig, defaultDefinition: JDLApplicationConfig) => { return { diff --git a/lib/jdl/jhipster/application-options.ts b/lib/jhipster/application-options.ts similarity index 99% rename from lib/jdl/jhipster/application-options.ts rename to lib/jhipster/application-options.ts index ff2d2f63cec4..800b9da12ad4 100644 --- a/lib/jdl/jhipster/application-options.ts +++ b/lib/jhipster/application-options.ts @@ -22,7 +22,7 @@ import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue, -} from '../types/types.js'; +} from '../jdl/types/types.js'; import applicationTypes from './application-types.js'; import authenticationTypes from './authentication-types.js'; import databaseTypes from './database-types.js'; diff --git a/lib/jdl/jhipster/application-types.ts b/lib/jhipster/application-types.ts similarity index 100% rename from lib/jdl/jhipster/application-types.ts rename to lib/jhipster/application-types.ts diff --git a/lib/jdl/jhipster/authentication-types.ts b/lib/jhipster/authentication-types.ts similarity index 100% rename from lib/jdl/jhipster/authentication-types.ts rename to lib/jhipster/authentication-types.ts diff --git a/lib/jdl/jhipster/build-tool-types.ts b/lib/jhipster/build-tool-types.ts similarity index 100% rename from lib/jdl/jhipster/build-tool-types.ts rename to lib/jhipster/build-tool-types.ts diff --git a/lib/jdl/jhipster/cache-types.ts b/lib/jhipster/cache-types.ts similarity index 100% rename from lib/jdl/jhipster/cache-types.ts rename to lib/jhipster/cache-types.ts diff --git a/lib/jdl/jhipster/client-framework-types.ts b/lib/jhipster/client-framework-types.ts similarity index 100% rename from lib/jdl/jhipster/client-framework-types.ts rename to lib/jhipster/client-framework-types.ts diff --git a/lib/jdl/jhipster/database-types.spec.ts b/lib/jhipster/database-types.spec.ts similarity index 100% rename from lib/jdl/jhipster/database-types.spec.ts rename to lib/jhipster/database-types.spec.ts diff --git a/lib/jdl/jhipster/database-types.ts b/lib/jhipster/database-types.ts similarity index 100% rename from lib/jdl/jhipster/database-types.ts rename to lib/jhipster/database-types.ts diff --git a/lib/jdl/jhipster/default-application-options.spec.ts b/lib/jhipster/default-application-options.spec.ts similarity index 100% rename from lib/jdl/jhipster/default-application-options.spec.ts rename to lib/jhipster/default-application-options.spec.ts diff --git a/lib/jdl/jhipster/default-application-options.ts b/lib/jhipster/default-application-options.ts similarity index 98% rename from lib/jdl/jhipster/default-application-options.ts rename to lib/jhipster/default-application-options.ts index e7e1b6f67853..046949ec2de6 100644 --- a/lib/jdl/jhipster/default-application-options.ts +++ b/lib/jhipster/default-application-options.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { MESSAGE_BROKER, MESSAGE_BROKER_NO } from '../../../generators/server/options/message-broker.js'; +import { MESSAGE_BROKER, MESSAGE_BROKER_NO } from '../../generators/server/options/message-broker.js'; import applicationTypes from './application-types.js'; import authenticationTypes from './authentication-types.js'; import databaseTypes from './database-types.js'; diff --git a/lib/jdl/jhipster/deployment-options.spec.ts b/lib/jhipster/deployment-options.spec.ts similarity index 100% rename from lib/jdl/jhipster/deployment-options.spec.ts rename to lib/jhipster/deployment-options.spec.ts diff --git a/lib/jdl/jhipster/deployment-options.ts b/lib/jhipster/deployment-options.ts similarity index 100% rename from lib/jdl/jhipster/deployment-options.ts rename to lib/jhipster/deployment-options.ts diff --git a/lib/jdl/jhipster/entity-options.ts b/lib/jhipster/entity-options.ts similarity index 100% rename from lib/jdl/jhipster/entity-options.ts rename to lib/jhipster/entity-options.ts diff --git a/lib/jdl/jhipster/field-types.spec.ts b/lib/jhipster/field-types.spec.ts similarity index 99% rename from lib/jdl/jhipster/field-types.spec.ts rename to lib/jhipster/field-types.spec.ts index 3aa1cf19680a..eb8d6ab92dea 100644 --- a/lib/jdl/jhipster/field-types.spec.ts +++ b/lib/jhipster/field-types.spec.ts @@ -21,7 +21,7 @@ import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { databaseTypes, fieldTypes, validations } from '../jhipster/index.js'; -import { JDLEnum } from '../models/index.js'; +import { JDLEnum } from '../jdl/models/index.js'; const { Validations: { MIN, MAXLENGTH, PATTERN }, diff --git a/lib/jdl/jhipster/field-types.ts b/lib/jhipster/field-types.ts similarity index 97% rename from lib/jdl/jhipster/field-types.ts rename to lib/jhipster/field-types.ts index ec4256b864e9..ced0cc75b24f 100644 --- a/lib/jdl/jhipster/field-types.ts +++ b/lib/jhipster/field-types.ts @@ -18,8 +18,8 @@ */ import { snakeCase } from 'lodash-es'; -import JDLEnum from '../models/jdl-enum.js'; -import validations from '../built-in-options/validations.js'; +import JDLEnum from '../jdl/models/jdl-enum.js'; +import validations from '../jdl/built-in-options/validations.js'; import databaseTypes from './database-types.js'; const { diff --git a/lib/jdl/jhipster/index.ts b/lib/jhipster/index.ts similarity index 92% rename from lib/jdl/jhipster/index.ts rename to lib/jhipster/index.ts index 955dc9472925..780865458d7b 100644 --- a/lib/jdl/jhipster/index.ts +++ b/lib/jhipster/index.ts @@ -19,8 +19,8 @@ export { default as reservedKeywords } from './reserved-keywords.js'; export { default as searchEngineTypes } from './search-engine-types.js'; export { default as serviceDiscoveryTypes } from './service-discovery-types.js'; export { default as testFrameworkTypes } from './test-framework-types.js'; -export { default as validations } from '../built-in-options/validations.js'; -export * from '../built-in-options/validations.js'; +export { default as validations } from '../jdl/built-in-options/validations.js'; +export * from '../jdl/built-in-options/validations.js'; export { default as websocketTypes } from './websocket-types.js'; export { default as checkAndReturnRelationshipOnValue } from './relationship-on-handler-options.js'; export { IngressTypes as ingressTypes } from './kubernetes-platform-types.js'; diff --git a/lib/jdl/jhipster/jdl-validator-definition.ts b/lib/jhipster/jdl-validator-definition.ts similarity index 97% rename from lib/jdl/jhipster/jdl-validator-definition.ts rename to lib/jhipster/jdl-validator-definition.ts index 470cf9f157f9..aa745675043b 100644 --- a/lib/jdl/jhipster/jdl-validator-definition.ts +++ b/lib/jhipster/jdl-validator-definition.ts @@ -17,14 +17,14 @@ * limitations under the License. */ -import type { JDLValidatorOption } from '../types/types.js'; +import type { JDLValidatorOption } from '../jdl/types/types.js'; import { ALPHABETIC, ALPHABETIC_LOWER, ALPHANUMERIC, ALPHANUMERIC_DASH, ALPHANUMERIC_UNDERSCORE, -} from '../built-in-options/validation-patterns.js'; +} from '../jdl/built-in-options/validation-patterns.js'; const JHI_PREFIX_NAME_PATTERN = /^[A-Za-z][A-Za-z0-9-_]*$/; const PACKAGE_NAME_PATTERN = /^[a-z_][a-z0-9_]*$/; diff --git a/lib/jdl/jhipster/kubernetes-platform-types.ts b/lib/jhipster/kubernetes-platform-types.ts similarity index 100% rename from lib/jdl/jhipster/kubernetes-platform-types.ts rename to lib/jhipster/kubernetes-platform-types.ts diff --git a/lib/jdl/jhipster/message-broker-types.ts b/lib/jhipster/message-broker-types.ts similarity index 100% rename from lib/jdl/jhipster/message-broker-types.ts rename to lib/jhipster/message-broker-types.ts diff --git a/lib/jdl/jhipster/monitoring-types.ts b/lib/jhipster/monitoring-types.ts similarity index 100% rename from lib/jdl/jhipster/monitoring-types.ts rename to lib/jhipster/monitoring-types.ts diff --git a/lib/jdl/jhipster/openapi-options.ts b/lib/jhipster/openapi-options.ts similarity index 100% rename from lib/jdl/jhipster/openapi-options.ts rename to lib/jhipster/openapi-options.ts diff --git a/lib/jdl/jhipster/openshift-platform-types.ts b/lib/jhipster/openshift-platform-types.ts similarity index 100% rename from lib/jdl/jhipster/openshift-platform-types.ts rename to lib/jhipster/openshift-platform-types.ts diff --git a/lib/jdl/jhipster/relationship-on-handler-options.ts b/lib/jhipster/relationship-on-handler-options.ts similarity index 100% rename from lib/jdl/jhipster/relationship-on-handler-options.ts rename to lib/jhipster/relationship-on-handler-options.ts diff --git a/lib/jdl/jhipster/reserved-keywords.spec.ts b/lib/jhipster/reserved-keywords.spec.ts similarity index 100% rename from lib/jdl/jhipster/reserved-keywords.spec.ts rename to lib/jhipster/reserved-keywords.spec.ts diff --git a/lib/jdl/jhipster/reserved-keywords.ts b/lib/jhipster/reserved-keywords.ts similarity index 77% rename from lib/jdl/jhipster/reserved-keywords.ts rename to lib/jhipster/reserved-keywords.ts index 035b539c14c4..408c222bca51 100644 --- a/lib/jdl/jhipster/reserved-keywords.ts +++ b/lib/jhipster/reserved-keywords.ts @@ -17,16 +17,16 @@ * limitations under the License. */ -import { angularReservedKeywords } from '../../../generators/angular/support/reserved-keywords.js'; -import { mysqlReservedKeywords } from '../../../generators/spring-data-relational/support/mysql-reserved-keywords.js'; -import { javaReservedKeywords } from '../../../generators/java/support/reserved-keywords.js'; -import { typescriptReservedKeywords } from '../../../generators/client/support/typescript.js'; -import { postgresqlReservedKeywords } from '../../../generators/spring-data-relational/support/postgresql-reserved-keywords.js'; -import { cassandraReservedKeywords } from '../../../generators/spring-data-cassandra/support/reserved-keywords.js'; -import { couchbaseReservedKeywords } from '../../../generators/spring-data-couchbase/support/reserved-keywords.js'; -import { oracleReservedKeywords } from '../../../generators/spring-data-relational/support/oracle-reserved-keywords.js'; -import { mssqlReservedKeywords } from '../../../generators/spring-data-relational/support/mssql-reserved-keywords.js'; -import { neo4jReservedKeywords } from '../../../generators/spring-data-neo4j/support/reserved-keywords.js'; +import { angularReservedKeywords } from '../../generators/angular/support/reserved-keywords.js'; +import { mysqlReservedKeywords } from '../../generators/spring-data-relational/support/mysql-reserved-keywords.js'; +import { javaReservedKeywords } from '../../generators/java/support/reserved-keywords.js'; +import { typescriptReservedKeywords } from '../../generators/client/support/typescript.js'; +import { postgresqlReservedKeywords } from '../../generators/spring-data-relational/support/postgresql-reserved-keywords.js'; +import { cassandraReservedKeywords } from '../../generators/spring-data-cassandra/support/reserved-keywords.js'; +import { couchbaseReservedKeywords } from '../../generators/spring-data-couchbase/support/reserved-keywords.js'; +import { oracleReservedKeywords } from '../../generators/spring-data-relational/support/oracle-reserved-keywords.js'; +import { mssqlReservedKeywords } from '../../generators/spring-data-relational/support/mssql-reserved-keywords.js'; +import { neo4jReservedKeywords } from '../../generators/spring-data-neo4j/support/reserved-keywords.js'; import PagingReservedKeywords from './reserved-keywords/paging.js'; import JHipsterReservedKeywords from './reserved-keywords/jhipster.js'; import applicationOptions from './application-options.js'; diff --git a/lib/jdl/jhipster/reserved-keywords/jhipster.ts b/lib/jhipster/reserved-keywords/jhipster.ts similarity index 100% rename from lib/jdl/jhipster/reserved-keywords/jhipster.ts rename to lib/jhipster/reserved-keywords/jhipster.ts diff --git a/lib/jdl/jhipster/reserved-keywords/paging.ts b/lib/jhipster/reserved-keywords/paging.ts similarity index 100% rename from lib/jdl/jhipster/reserved-keywords/paging.ts rename to lib/jhipster/reserved-keywords/paging.ts diff --git a/lib/jdl/jhipster/search-engine-types.ts b/lib/jhipster/search-engine-types.ts similarity index 100% rename from lib/jdl/jhipster/search-engine-types.ts rename to lib/jhipster/search-engine-types.ts diff --git a/lib/jdl/jhipster/service-discovery-types.ts b/lib/jhipster/service-discovery-types.ts similarity index 100% rename from lib/jdl/jhipster/service-discovery-types.ts rename to lib/jhipster/service-discovery-types.ts diff --git a/lib/jdl/jhipster/test-framework-types.ts b/lib/jhipster/test-framework-types.ts similarity index 100% rename from lib/jdl/jhipster/test-framework-types.ts rename to lib/jhipster/test-framework-types.ts diff --git a/lib/jdl/jhipster/websocket-types.ts b/lib/jhipster/websocket-types.ts similarity index 100% rename from lib/jdl/jhipster/websocket-types.ts rename to lib/jhipster/websocket-types.ts diff --git a/testing/support/application-samples.ts b/testing/support/application-samples.ts index 44fd6040eda7..694afb75a34a 100644 --- a/testing/support/application-samples.ts +++ b/testing/support/application-samples.ts @@ -1,4 +1,4 @@ -import { applicationTypes, authenticationTypes } from '../../lib/jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../../lib/jhipster/index.js'; const { JWT, OAUTH2, SESSION } = authenticationTypes; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; diff --git a/testing/support/entity-samples.ts b/testing/support/entity-samples.ts index 16b984eba745..92a25aefd710 100644 --- a/testing/support/entity-samples.ts +++ b/testing/support/entity-samples.ts @@ -1,4 +1,4 @@ -import { fieldTypes } from '../../lib/jdl/jhipster/index.js'; +import { fieldTypes } from '../../lib/jhipster/index.js'; const { CommonDBTypes: { UUID }, From e5e408ba5e44d7e1310c5c952aa4fa5f3918f62e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 7 Sep 2024 23:27:03 -0300 Subject: [PATCH 03/21] rename jdl/types/types to jdl/types/parsing-types --- .../bootstrap-application-base/support/export-jdl-transform.ts | 2 +- .../bootstrap-application-base/support/import-jdl-transform.ts | 2 +- generators/server/jdl/application-definition.ts | 2 +- generators/server/options/database-migration.ts | 2 +- generators/server/options/message-broker.ts | 2 +- generators/server/options/sync-user-with-idp.ts | 2 +- .../spring-cloud/generators/gateway/jdl/jdl-routes-option.ts | 2 +- lib/command/converter.ts | 2 +- lib/command/types.d.ts | 2 +- lib/jdl/built-in-options/jdl-application-definition.ts | 2 +- lib/jdl/converters/json-to-jdl-converter.ts | 2 +- lib/jdl/jdl-importer.ts | 2 +- lib/jdl/models/jdl-application-configuration-factory.ts | 2 +- lib/jdl/parsing/lexer/application-tokens.ts | 2 +- lib/jdl/runtime.ts | 2 +- lib/jdl/types/{types.d.ts => parsing-types.d.ts} | 0 lib/jdl/types/runtime.d.ts | 2 +- lib/jhipster/application-options.ts | 2 +- lib/jhipster/jdl-validator-definition.ts | 2 +- testing/helpers.ts | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename lib/jdl/types/{types.d.ts => parsing-types.d.ts} (100%) diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index e9f8ba959d81..18e7a080603f 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -8,7 +8,7 @@ import { GENERATOR_JHIPSTER } from '../../generator-constants.js'; import { getJDLObjectFromSingleApplication } from '../../../lib/jdl/converters/json-to-jdl-converter.js'; import type { JSONEntity } from '../../../lib/jdl/converters/types.js'; import { createRuntime } from '../../../lib/jdl/runtime.js'; -import type { JDLApplicationConfig } from '../../../lib/jdl/types/types.js'; +import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing-types.js'; export const exportJDLTransform = ({ destinationPath, diff --git a/generators/bootstrap-application-base/support/import-jdl-transform.ts b/generators/bootstrap-application-base/support/import-jdl-transform.ts index 26d4b939b496..737c488e6b42 100644 --- a/generators/bootstrap-application-base/support/import-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/import-jdl-transform.ts @@ -7,7 +7,7 @@ import { upperFirst } from 'lodash-es'; import { GENERATOR_JHIPSTER } from '../../generator-constants.js'; import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import { mergeYoRcContent } from '../../../lib/utils/yo-rc.js'; -import type { JDLApplicationConfig } from '../../../lib/jdl/types/types.js'; +import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing-types.js'; export const importJDLTransform = ({ destinationPath, diff --git a/generators/server/jdl/application-definition.ts b/generators/server/jdl/application-definition.ts index a273ed0432e3..743fa298948f 100644 --- a/generators/server/jdl/application-definition.ts +++ b/generators/server/jdl/application-definition.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { snakeCase, upperCase } from 'lodash-es'; -import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; +import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; import databaseMigrationOption from '../options/database-migration.js'; import messageBrokerOption from '../options/message-broker.js'; import { syncUserWithIdpDefinition } from '../options/index.js'; diff --git a/generators/server/options/database-migration.ts b/generators/server/options/database-migration.ts index 9ee824c4ecd2..11ad9ecd17ef 100644 --- a/generators/server/options/database-migration.ts +++ b/generators/server/options/database-migration.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; export const DATABASE_MIGRATION = 'databaseMigration'; export const DATABASE_MIGRATION_LIQUIBASE = 'liquibase'; diff --git a/generators/server/options/message-broker.ts b/generators/server/options/message-broker.ts index aef31bbfee02..da40c1a31301 100644 --- a/generators/server/options/message-broker.ts +++ b/generators/server/options/message-broker.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; import type { OptionWithDerivedProperties } from '../../base-application/application-options.js'; export const MESSAGE_BROKER = 'messageBroker'; diff --git a/generators/server/options/sync-user-with-idp.ts b/generators/server/options/sync-user-with-idp.ts index 77162e2084d3..4a03ea36b800 100644 --- a/generators/server/options/sync-user-with-idp.ts +++ b/generators/server/options/sync-user-with-idp.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; export const SYNC_USER_WITH_IDP = 'syncUserWithIdp'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts index df1f8bdf213b..0c7b31b3435b 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/types/parsing-types.js'; export const jdlRoutesOptions: JHipsterOptionDefinition = { name: 'routes', diff --git a/lib/command/converter.ts b/lib/command/converter.ts index 9919b79e2ad6..4619bcff7ad5 100644 --- a/lib/command/converter.ts +++ b/lib/command/converter.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../../jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../jdl/types/parsing-types.js'; import type { ConfigSpec, JHipsterArguments, JHipsterConfigs, JHipsterOption } from './types.js'; export const extractArgumentsFromConfigs = (configs: JHipsterConfigs | undefined): JHipsterArguments => { diff --git a/lib/command/types.d.ts b/lib/command/types.d.ts index b114b354b123..aff0658cab61 100644 --- a/lib/command/types.d.ts +++ b/lib/command/types.d.ts @@ -1,6 +1,6 @@ import type { ArgumentSpec, CliOptionSpec } from 'yeoman-generator'; import type { RequireAtLeastOne, SetOptional, Simplify, TaggedUnion, TupleToUnion, ValueOf } from 'type-fest'; -import type { JHipsterOptionDefinition } from '../../jdl/types/types.js'; +import type { JHipsterOptionDefinition } from '../jdl/types/parsing-types.js'; import type { DerivedPropertiesOf, DerivedPropertiesWithInferenceUnion } from '../types/utils/derived-properties.js'; import type { MergeUnion } from './support/merge-union.js'; diff --git a/lib/jdl/built-in-options/jdl-application-definition.ts b/lib/jdl/built-in-options/jdl-application-definition.ts index 9a088cbda878..b3b97b41a257 100644 --- a/lib/jdl/built-in-options/jdl-application-definition.ts +++ b/lib/jdl/built-in-options/jdl-application-definition.ts @@ -1,4 +1,4 @@ -import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue } from '../types/types.js'; +import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue } from '../types/parsing-types.js'; export default class JDLApplicationDefinition { optionValues: Record; diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts index 3d9c3796ce0c..89c3616fc67d 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -29,7 +29,7 @@ import type JDLApplication from '../models/jdl-application.js'; import type { JDLRuntime } from '../types/runtime.js'; import { createRuntime, getDefaultRuntime } from '../runtime.js'; import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; -import type { JDLApplicationConfig } from '../types/types.js'; +import type { JDLApplicationConfig } from '../types/parsing-types.js'; import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from './types.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; import { convertApplicationToJDL } from './json-to-jdl-application-converter.js'; diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index f3fed29e24af..a0f90725b815 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -33,7 +33,7 @@ import type JDLObject from './models/jdl-object.js'; import type { ParsedJDLApplications } from './converters/parsed-jdl-to-jdl-object/types.js'; import type { PostProcessedJDLJSONApplication } from './exporters/types.js'; import { GENERATOR_NAME } from './exporters/export-utils.js'; -import type { JDLApplicationConfig } from './types/types.js'; +import type { JDLApplicationConfig } from './types/parsing-types.js'; import type { JDLRuntime } from './types/runtime.js'; import { createRuntime, getDefaultRuntime } from './runtime.js'; diff --git a/lib/jdl/models/jdl-application-configuration-factory.ts b/lib/jdl/models/jdl-application-configuration-factory.ts index ec56ab443c46..565b7d6a7b44 100644 --- a/lib/jdl/models/jdl-application-configuration-factory.ts +++ b/lib/jdl/models/jdl-application-configuration-factory.ts @@ -18,7 +18,7 @@ */ import logger from '../utils/objects/logger.js'; -import type { JDLApplicationOptionTypeValue } from '../types/types.js'; +import type { JDLApplicationOptionTypeValue } from '../types/parsing-types.js'; import type { JDLRuntime } from '../types/runtime.js'; import JDLApplicationConfiguration from './jdl-application-configuration.js'; import StringJDLApplicationConfigurationOption from './string-jdl-application-configuration-option.js'; diff --git a/lib/jdl/parsing/lexer/application-tokens.ts b/lib/jdl/parsing/lexer/application-tokens.ts index daaa4d09f1b2..22bb86a64898 100644 --- a/lib/jdl/parsing/lexer/application-tokens.ts +++ b/lib/jdl/parsing/lexer/application-tokens.ts @@ -20,7 +20,7 @@ import type { ITokenConfig } from 'chevrotain'; import { Lexer } from 'chevrotain'; import { applicationOptions } from '../../built-in-options/index.js'; -import type { JDLTokenConfig } from '../../types/types.js'; +import type { JDLTokenConfig } from '../../types/parsing-types.js'; import createTokenFromConfig from './token-creator.js'; import { KEYWORD, UNARY_OPTION } from './shared-tokens.js'; diff --git a/lib/jdl/runtime.ts b/lib/jdl/runtime.ts index 38f6348bd48f..2eee6beb421f 100644 --- a/lib/jdl/runtime.ts +++ b/lib/jdl/runtime.ts @@ -4,7 +4,7 @@ import { buildTokens, createJDLLexer } from './parsing/lexer/lexer.js'; import JDLParser from './parsing/jdl-parser.js'; import { checkConfigKeys, checkTokens } from './parsing/self-checks/parsing-system-checker.js'; import type { JDLRuntime } from './types/runtime.js'; -import type { JDLApplicationConfig, JDLValidatorOption } from './types/types.js'; +import type { JDLApplicationConfig, JDLValidatorOption } from './types/parsing-types.js'; import JDLApplicationDefinition from './built-in-options/jdl-application-definition.js'; import { buildApplicationTokens } from './parsing/lexer/application-tokens.js'; import { builtInJDLApplicationConfig } from '../jhipster/application-options.js'; diff --git a/lib/jdl/types/types.d.ts b/lib/jdl/types/parsing-types.d.ts similarity index 100% rename from lib/jdl/types/types.d.ts rename to lib/jdl/types/parsing-types.d.ts diff --git a/lib/jdl/types/runtime.d.ts b/lib/jdl/types/runtime.d.ts index 295d6cb1e662..84c0dc293ed2 100644 --- a/lib/jdl/types/runtime.d.ts +++ b/lib/jdl/types/runtime.d.ts @@ -1,7 +1,7 @@ import type { Lexer, TokenType } from 'chevrotain'; import type JDLParser from '../parsing/jdl-parser.ts'; import type JDLApplicationDefinition from '../built-in-options/jdl-application-definition.ts'; -import type { JDLValidatorOption } from './types.js'; +import type { JDLValidatorOption } from './parsing-types.js'; export type JDLRuntime = { applicationDefinition: JDLApplicationDefinition; diff --git a/lib/jhipster/application-options.ts b/lib/jhipster/application-options.ts index 800b9da12ad4..221e73c0abc7 100644 --- a/lib/jhipster/application-options.ts +++ b/lib/jhipster/application-options.ts @@ -22,7 +22,7 @@ import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue, -} from '../jdl/types/types.js'; +} from '../jdl/types/parsing-types.js'; import applicationTypes from './application-types.js'; import authenticationTypes from './authentication-types.js'; import databaseTypes from './database-types.js'; diff --git a/lib/jhipster/jdl-validator-definition.ts b/lib/jhipster/jdl-validator-definition.ts index aa745675043b..0c2eacfa7b64 100644 --- a/lib/jhipster/jdl-validator-definition.ts +++ b/lib/jhipster/jdl-validator-definition.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JDLValidatorOption } from '../jdl/types/types.js'; +import type { JDLValidatorOption } from '../jdl/types/parsing-types.js'; import { ALPHABETIC, ALPHABETIC_LOWER, diff --git a/testing/helpers.ts b/testing/helpers.ts index d93f79dd2dea..feb15dd23167 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -13,7 +13,7 @@ import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from ' import BaseGenerator from '../generators/base/index.js'; import type { JHipsterGeneratorOptions } from '../generators/base/api.js'; import { getPackageRoot, isDistFolder } from '../lib/index.js'; -import type { JSONEntity } from '../jdl/converters/types.js'; +import type { JSONEntity } from '../lib/jdl/converters/types.js'; import type CoreGenerator from '../generators/base-core/generator.js'; import getGenerator from './get-generator.js'; From 86b4ce98a004298ed9b3f42b0f8b7908fe7c567a Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 7 Sep 2024 23:30:28 -0300 Subject: [PATCH 04/21] move converters/types to types/base-types --- generators/base-application/support/entity.ts | 2 +- generators/base-application/support/relationship.ts | 2 +- .../bootstrap-application-base/support/export-jdl-transform.ts | 2 +- generators/info/generator.ts | 2 +- generators/server/support/relationship.ts | 2 +- lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts | 2 +- .../jdl-to-json/jdl-to-json-relationship-converter.ts | 2 +- lib/jdl/converters/json-to-jdl-application-converter.ts | 2 +- lib/jdl/converters/json-to-jdl-converter.ts | 2 +- lib/jdl/converters/json-to-jdl-entity-converter.ts | 2 +- lib/jdl/exporters/export-utils.ts | 2 +- lib/jdl/exporters/jhipster-deployment-exporter.ts | 2 +- lib/jdl/exporters/jhipster-entity-exporter.ts | 2 +- lib/jdl/exporters/types.d.ts | 2 +- lib/jdl/jdl-importer.ts | 2 +- lib/jdl/readers/json-reader.ts | 2 +- lib/jdl/runtime.ts | 2 +- lib/jdl/{converters/types.d.ts => types/json-types.d.ts} | 0 testing/helpers.ts | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) rename lib/jdl/{converters/types.d.ts => types/json-types.d.ts} (100%) diff --git a/generators/base-application/support/entity.ts b/generators/base-application/support/entity.ts index e0967f18f8fd..8ef2006fc7c9 100644 --- a/generators/base-application/support/entity.ts +++ b/generators/base-application/support/entity.ts @@ -18,7 +18,7 @@ */ import { upperFirst } from 'lodash-es'; -import type { JSONEntity } from '../../../lib/jdl/converters/types.js'; +import type { JSONEntity } from '../../../lib/jdl/types/json-types.js'; export const findEntityInEntities = (entityName: string, entities: JSONEntity[]) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName)); diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts index 8ab225569d7f..931042832647 100644 --- a/generators/base-application/support/relationship.ts +++ b/generators/base-application/support/relationship.ts @@ -19,7 +19,7 @@ import { lowerFirst, upperFirst } from 'lodash-es'; -import type { JSONEntity, JSONRelationship } from '../../../lib/jdl/converters/types.js'; +import type { JSONEntity, JSONRelationship } from '../../../lib/jdl/types/json-types.js'; import type { ValidationResult } from '../../base/api.js'; import { stringifyApplicationData } from './debug.js'; import { findEntityInEntities } from './entity.js'; diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index 18e7a080603f..a4c02634a55c 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -6,7 +6,7 @@ import { Minimatch } from 'minimatch'; import { setModifiedFileState } from 'mem-fs-editor/state'; import { GENERATOR_JHIPSTER } from '../../generator-constants.js'; import { getJDLObjectFromSingleApplication } from '../../../lib/jdl/converters/json-to-jdl-converter.js'; -import type { JSONEntity } from '../../../lib/jdl/converters/types.js'; +import type { JSONEntity } from '../../../lib/jdl/types/json-types.js'; import { createRuntime } from '../../../lib/jdl/runtime.js'; import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing-types.js'; diff --git a/generators/info/generator.ts b/generators/info/generator.ts index 34b39f4c657e..b9eb08bf2113 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -26,7 +26,7 @@ import JSONToJDLEntityConverter from '../../lib/jdl/converters/json-to-jdl-entit import JSONToJDLOptionConverter from '../../lib/jdl/converters/json-to-jdl-option-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import { YO_RC_FILE } from '../generator-constants.js'; -import type { JSONEntity } from '../../lib/jdl/converters/types.js'; +import type { JSONEntity } from '../../lib/jdl/types/json-types.js'; import { applicationsLookup } from '../workspaces/support/applications-lookup.js'; import { replaceSensitiveConfig } from './support/utils.js'; diff --git a/generators/server/support/relationship.ts b/generators/server/support/relationship.ts index c9f5a0f8e36c..e4e1dc9759ae 100644 --- a/generators/server/support/relationship.ts +++ b/generators/server/support/relationship.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JSONEntity } from '../../../lib/jdl/converters/types.js'; +import type { JSONEntity } from '../../../lib/jdl/types/json-types.js'; import { addOtherRelationship } from '../../base-application/support/index.js'; import type { ValidationResult } from '../../base/api.js'; import { databaseTypes } from '../../../lib/jhipster/index.js'; diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts index 50f7bf5a628d..d66c06740024 100644 --- a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts @@ -22,7 +22,7 @@ import { fieldTypes, validations } from '../../built-in-options/index.js'; import { formatComment } from '../../utils/format-utils.js'; import { camelCase } from '../../utils/string-utils.js'; import type JDLObject from '../../models/jdl-object.js'; -import type { JSONField } from '../types.js'; +import type { JSONField } from '../../types/json-types.js'; import type { JDLEntity } from '../../models/index.js'; import type JDLField from '../../models/jdl-field.js'; diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts index 3def76cd718f..e5702060d8b6 100644 --- a/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts @@ -21,7 +21,7 @@ import { kebabCase } from 'lodash-es'; import { relationshipOptions, validations } from '../../built-in-options/index.js'; import { camelCase, lowerFirst } from '../../utils/string-utils.js'; import type JDLRelationship from '../../models/jdl-relationship.js'; -import type { JSONRelationship } from '../types.js'; +import type { JSONRelationship } from '../../types/json-types.js'; import type { RelationshipType } from '../../basic-types/relationships.js'; const { diff --git a/lib/jdl/converters/json-to-jdl-application-converter.ts b/lib/jdl/converters/json-to-jdl-application-converter.ts index cf846426908a..48d9c6e0e30f 100644 --- a/lib/jdl/converters/json-to-jdl-application-converter.ts +++ b/lib/jdl/converters/json-to-jdl-application-converter.ts @@ -20,7 +20,7 @@ import JDLObject from '../models/jdl-object.js'; import { createJDLApplication } from '../models/jdl-application-factory.js'; import type { JDLRuntime } from '../types/runtime.js'; -import type { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from './types.js'; +import type { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from '../types/json-types.js'; const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts index 89c3616fc67d..6b6cd7e36855 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -30,7 +30,7 @@ import type { JDLRuntime } from '../types/runtime.js'; import { createRuntime, getDefaultRuntime } from '../runtime.js'; import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; import type { JDLApplicationConfig } from '../types/parsing-types.js'; -import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from './types.js'; +import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../types/json-types.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; import { convertApplicationToJDL } from './json-to-jdl-application-converter.js'; diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.ts b/lib/jdl/converters/json-to-jdl-entity-converter.ts index 79c057e4c6f9..529d6b86fb53 100644 --- a/lib/jdl/converters/json-to-jdl-entity-converter.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.ts @@ -30,7 +30,7 @@ import { lowerFirst, upperFirst } from '../utils/string-utils.js'; import { binaryOptions, fieldTypes, relationshipOptions, unaryOptions } from '../built-in-options/index.js'; import { asJdlRelationshipType } from '../basic-types/relationship-types.js'; -import type { JSONEntity, JSONField, JSONRelationship } from './types.js'; +import type { JSONEntity, JSONField, JSONRelationship } from '../types/json-types.js'; const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes; const { BUILT_IN_ENTITY } = relationshipOptions; diff --git a/lib/jdl/exporters/export-utils.ts b/lib/jdl/exporters/export-utils.ts index 6182eba9a129..c6551dd5edb9 100644 --- a/lib/jdl/exporters/export-utils.ts +++ b/lib/jdl/exporters/export-utils.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import { doesFileExist } from '../utils/file-utils.js'; -import type { JHipsterYoRcContent } from '../converters/types.js'; +import type { JHipsterYoRcContent } from '../types/json-types.js'; import { mergeYoRcContent } from '../../utils/yo-rc.js'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/exporters/jhipster-deployment-exporter.ts b/lib/jdl/exporters/jhipster-deployment-exporter.ts index 261e9ba042c4..4cd65b006954 100644 --- a/lib/jdl/exporters/jhipster-deployment-exporter.ts +++ b/lib/jdl/exporters/jhipster-deployment-exporter.ts @@ -21,7 +21,7 @@ import path from 'path'; import { createFolderIfItDoesNotExist, doesFileExist } from '../utils/file-utils.js'; import DeploymentValidator from '../validators/deployment-validator.js'; import type JDLDeployment from '../models/jdl-deployment.js'; -import type { JHipsterYoRcContent } from '../converters/types.js'; +import type { JHipsterYoRcContent } from '../types/json-types.js'; import { GENERATOR_NAME, writeConfigFile } from './export-utils.js'; /** diff --git a/lib/jdl/exporters/jhipster-entity-exporter.ts b/lib/jdl/exporters/jhipster-entity-exporter.ts index 12d7b8474159..e73fbf160a22 100644 --- a/lib/jdl/exporters/jhipster-entity-exporter.ts +++ b/lib/jdl/exporters/jhipster-entity-exporter.ts @@ -22,7 +22,7 @@ import path from 'path'; import { applicationTypes } from '../built-in-options/index.js'; import { readJSONFile, toFilePath } from '../readers/json-file-reader.js'; import { doesFileExist } from '../utils/file-utils.js'; -import type { JSONEntity } from '../converters/types.js'; +import type { JSONEntity } from '../types/json-types.js'; import type { JhipsterJSONJDLExporterWrapper } from './types.js'; let configuration: any = {}; diff --git a/lib/jdl/exporters/types.d.ts b/lib/jdl/exporters/types.d.ts index e53d16f5c2f0..9e05a1ab984c 100644 --- a/lib/jdl/exporters/types.d.ts +++ b/lib/jdl/exporters/types.d.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { JSONEntity } from '../converters/types.js'; +import type { JSONEntity } from '../types/json-types.js'; import type { GENERATOR_NAME } from './export-utils.js'; export type JDLJSONApplicationContent = { diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index a0f90725b815..e62cab86076f 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -17,6 +17,7 @@ * limitations under the License. */ import { uniqBy } from 'lodash-es'; +import { applicationOptions } from '../jhipster/index.js'; import * as JDLReader from './readers/jdl-reader.js'; import ParsedJDLToJDLObjectConverter from './converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import { readJSONFile } from './readers/json-file-reader.js'; @@ -28,7 +29,6 @@ import exportDeployments from './exporters/jhipster-deployment-exporter.js'; import exportEntities from './exporters/jhipster-entity-exporter.js'; import createWithApplicationValidator from './validators/jdl-with-application-validator.js'; import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; -import { applicationOptions } from '../jhipster/index.js'; import type JDLObject from './models/jdl-object.js'; import type { ParsedJDLApplications } from './converters/parsed-jdl-to-jdl-object/types.js'; import type { PostProcessedJDLJSONApplication } from './exporters/types.js'; diff --git a/lib/jdl/readers/json-reader.ts b/lib/jdl/readers/json-reader.ts index 979f4749de19..bf9014c9d5ee 100644 --- a/lib/jdl/readers/json-reader.ts +++ b/lib/jdl/readers/json-reader.ts @@ -23,7 +23,7 @@ import { convertServerOptionsToJDL } from '../converters/json-to-jdl-option-conv import mergeJDLObjects from '../models/jdl-object-merger.js'; import { doesDirectoryExist } from '../utils/file-utils.js'; import type JDLObject from '../models/jdl-object.js'; -import type { JSONEntity } from '../converters/types.js'; +import type { JSONEntity } from '../types/json-types.js'; import { readJSONFile } from './json-file-reader.js'; /* Parse the given jhipster app dir and return a JDLObject */ diff --git a/lib/jdl/runtime.ts b/lib/jdl/runtime.ts index 2eee6beb421f..86dc07a7ba9b 100644 --- a/lib/jdl/runtime.ts +++ b/lib/jdl/runtime.ts @@ -1,5 +1,6 @@ import type { Lexer, TokenType } from 'chevrotain'; import jhipsterDefinition from '../../generators/app/jdl/index.js'; +import { builtInJDLApplicationConfig } from '../jhipster/application-options.js'; import { buildTokens, createJDLLexer } from './parsing/lexer/lexer.js'; import JDLParser from './parsing/jdl-parser.js'; import { checkConfigKeys, checkTokens } from './parsing/self-checks/parsing-system-checker.js'; @@ -7,7 +8,6 @@ import type { JDLRuntime } from './types/runtime.js'; import type { JDLApplicationConfig, JDLValidatorOption } from './types/parsing-types.js'; import JDLApplicationDefinition from './built-in-options/jdl-application-definition.js'; import { buildApplicationTokens } from './parsing/lexer/application-tokens.js'; -import { builtInJDLApplicationConfig } from '../jhipster/application-options.js'; const mergeDefinition = (definition: JDLApplicationConfig, defaultDefinition: JDLApplicationConfig) => { return { diff --git a/lib/jdl/converters/types.d.ts b/lib/jdl/types/json-types.d.ts similarity index 100% rename from lib/jdl/converters/types.d.ts rename to lib/jdl/types/json-types.d.ts diff --git a/testing/helpers.ts b/testing/helpers.ts index feb15dd23167..a3d8ccc2f057 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -13,7 +13,7 @@ import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from ' import BaseGenerator from '../generators/base/index.js'; import type { JHipsterGeneratorOptions } from '../generators/base/api.js'; import { getPackageRoot, isDistFolder } from '../lib/index.js'; -import type { JSONEntity } from '../lib/jdl/converters/types.js'; +import type { JSONEntity } from '../lib/jdl/types/json-types.js'; import type CoreGenerator from '../generators/base-core/generator.js'; import getGenerator from './get-generator.js'; From c0a9dd29a65f3e92bc0414aa5794a6d2fe05dd1e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 7 Sep 2024 23:35:30 -0300 Subject: [PATCH 05/21] move converters/parsed-jdl-to-jdl-object/types to types/parsed-types --- .../parsed-jdl-to-jdl-object/application-converter.ts | 2 +- .../converters/parsed-jdl-to-jdl-object/deployment-converter.ts | 2 +- lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts | 2 +- lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts | 2 +- lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts | 2 +- lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts | 2 +- .../parsed-jdl-to-jdl-object-converter.ts | 2 +- .../parsed-jdl-to-jdl-object/relationship-converter.ts | 2 +- .../converters/parsed-jdl-to-jdl-object/validation-converter.ts | 2 +- lib/jdl/jdl-importer.ts | 2 +- lib/jdl/models/jdl-deployment.ts | 2 +- lib/jdl/models/jdl-enum.ts | 2 +- .../parsed-jdl-to-jdl-object/types.ts => types/parsed-types.ts} | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename lib/jdl/{converters/parsed-jdl-to-jdl-object/types.ts => types/parsed-types.ts} (97%) diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts index 11785e370b05..edfc4bc019e3 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts @@ -24,7 +24,7 @@ import type JDLBinaryOption from '../../models/jdl-binary-option.js'; import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; import type JDLApplication from '../../models/jdl-application.js'; import type { JDLRuntime } from '../../types/runtime.js'; -import type { ParsedJDLApplication } from './types.js'; +import type { ParsedJDLApplication } from '../../types/parsed-types.js'; import { convertOptions } from './option-converter.js'; const { diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts index e544845bfdea..3472bc31051c 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts @@ -18,7 +18,7 @@ */ import JDLDeployment from '../../models/jdl-deployment.js'; -import type { ParsedJDLDeployment } from './types.js'; +import type { ParsedJDLDeployment } from '../../types/parsed-types.js'; export default { convertDeployments }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts index 2970a8cd2dfe..99715b282cf3 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts @@ -21,7 +21,7 @@ import { lowerFirst } from 'lodash-es'; import { JDLEntity } from '../../models/index.js'; import { formatComment } from '../../utils/format-utils.js'; import type JDLField from '../../models/jdl-field.js'; -import type { ParsedJDLEntity } from './types.js'; +import type { ParsedJDLEntity } from '../../types/parsed-types.js'; export default { convertEntities }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts index c0178e269906..5d4debe701c9 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts @@ -19,7 +19,7 @@ import { JDLEnum } from '../../models/index.js'; import { formatComment } from '../../utils/format-utils.js'; -import type { ParsedJDLEnum } from './types.js'; +import type { ParsedJDLEnum } from '../../types/parsed-types.js'; export default { convertEnums }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts index 95c48d28cfcf..884716753f0a 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts @@ -20,7 +20,7 @@ import JDLField from '../../models/jdl-field.js'; import { formatComment } from '../../utils/format-utils.js'; import { lowerFirst } from '../../utils/string-utils.js'; -import type { ParsedJDLEntityField } from './types.js'; +import type { ParsedJDLEntityField } from '../../types/parsed-types.js'; export default { convertField }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts index 85a1f9e01287..444ef8e62c09 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts @@ -21,7 +21,7 @@ import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; import { binaryOptions, unaryOptions } from '../../built-in-options/index.js'; import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; -import type { ParsedJDLOption, ParsedJDLUseOption } from './types.js'; +import type { ParsedJDLOption, ParsedJDLUseOption } from '../../types/parsed-types.js'; const { OptionValues, getOptionName } = binaryOptions; export default { convertOptions }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts index ea8312ece9c8..02531439eb38 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts @@ -41,7 +41,7 @@ import type { ParsedJDLEntity, ParsedJDLEntityField, ParsedJDLRoot, -} from './types.js'; +} from '../../types/parsed-types.js'; let parsedContent: ParsedJDLApplications; let configuration: ParsedJDLRoot; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts index 41ac5f8d3176..7b293c1c2149 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts @@ -21,7 +21,7 @@ import JDLRelationship from '../../models/jdl-relationship.js'; import { lowerFirst } from '../../utils/string-utils.js'; import { formatComment } from '../../utils/format-utils.js'; import { asJdlRelationshipType } from '../../basic-types/relationship-types.js'; -import type { ParsedJDLAnnotation, ParsedJDLRelationship } from './types.js'; +import type { ParsedJDLAnnotation, ParsedJDLRelationship } from '../../types/parsed-types.js'; export default { convertRelationships }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts index 3ffa1d72ffa0..7150c0c12103 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts @@ -19,7 +19,7 @@ import JDLValidation from '../../models/jdl-validation.js'; import { validations } from '../../built-in-options/index.js'; -import type { ParsedJDLValidation } from './types.js'; +import type { ParsedJDLValidation } from '../../types/parsed-types.js'; const { Validations: { PATTERN }, diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index e62cab86076f..83b366162f0f 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -30,7 +30,7 @@ import exportEntities from './exporters/jhipster-entity-exporter.js'; import createWithApplicationValidator from './validators/jdl-with-application-validator.js'; import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; import type JDLObject from './models/jdl-object.js'; -import type { ParsedJDLApplications } from './converters/parsed-jdl-to-jdl-object/types.js'; +import type { ParsedJDLApplications } from './types/parsed-types.js'; import type { PostProcessedJDLJSONApplication } from './exporters/types.js'; import { GENERATOR_NAME } from './exporters/export-utils.js'; import type { JDLApplicationConfig } from './types/parsing-types.js'; diff --git a/lib/jdl/models/jdl-deployment.ts b/lib/jdl/models/jdl-deployment.ts index 180fc0cf90f4..eda0f7b974a8 100644 --- a/lib/jdl/models/jdl-deployment.ts +++ b/lib/jdl/models/jdl-deployment.ts @@ -20,7 +20,7 @@ import { isEqual } from 'lodash-es'; import { applicationOptions, deploymentOptions } from '../built-in-options/index.js'; import { merge } from '../utils/object-utils.js'; import { join } from '../utils/set-utils.js'; -import type { ParsedJDLDeployment } from '../converters/parsed-jdl-to-jdl-object/types.js'; +import type { ParsedJDLDeployment } from '../types/parsed-types.js'; const { Options } = deploymentOptions; const arrayTypes = ['appsFolders', 'clusteredDbApps']; diff --git a/lib/jdl/models/jdl-enum.ts b/lib/jdl/models/jdl-enum.ts index c5552cd5bf2e..006141e803e5 100644 --- a/lib/jdl/models/jdl-enum.ts +++ b/lib/jdl/models/jdl-enum.ts @@ -18,7 +18,7 @@ */ import { merge } from '../utils/object-utils.js'; -import type { ParsedJDLEnumValue } from '../converters/parsed-jdl-to-jdl-object/types.js'; +import type { ParsedJDLEnumValue } from '../types/parsed-types.js'; import JDLEnumValue from './jdl-enum-value.js'; export default class JDLEnum { diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/types.ts b/lib/jdl/types/parsed-types.ts similarity index 97% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/types.ts rename to lib/jdl/types/parsed-types.ts index e7d2de1b4163..244e3f9e821f 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/types.ts +++ b/lib/jdl/types/parsed-types.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { RelationshipType } from '../../basic-types/relationships.js'; +import type { RelationshipType } from '../basic-types/relationships.js'; export type ParsedJDLAnnotation = { optionName: string; From dd4d9252a473bbb0b3841ae6dd5b8b819f2b9dbc Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 7 Sep 2024 23:56:44 -0300 Subject: [PATCH 06/21] jdl types reorganization --- generators/base-application/support/entity.ts | 2 +- .../base-application/support/relationship.ts | 2 +- .../support/export-jdl-transform.ts | 4 +-- .../support/import-jdl-transform.ts | 2 +- generators/info/generator.ts | 2 +- .../server/jdl/application-definition.ts | 2 +- .../server/options/database-migration.ts | 2 +- generators/server/options/message-broker.ts | 2 +- .../server/options/sync-user-with-idp.ts | 2 +- generators/server/support/relationship.ts | 2 +- .../gateway/jdl/jdl-routes-option.ts | 2 +- lib/command/converter.ts | 2 +- lib/command/types.d.ts | 2 +- lib/jdl/built-in-options/index.ts | 2 -- .../jdl-application-definition.ts | 2 +- .../jdl-to-json-field-converter.ts | 2 +- .../jdl-to-json-relationship-converter.ts | 2 +- .../json-to-jdl-application-converter.ts | 2 +- lib/jdl/converters/json-to-jdl-converter.ts | 4 +-- .../json-to-jdl-entity-converter.ts | 2 +- .../application-converter.ts | 2 +- .../deployment-converter.ts | 2 +- .../entity-converter.ts | 2 +- .../enum-converter.ts | 2 +- .../field-converter.ts | 2 +- .../option-converter.ts | 2 +- .../parsed-jdl-to-jdl-object-converter.ts | 16 ++++++------ .../relationship-converter.ts | 2 +- .../validation-converter.ts | 2 +- lib/jdl/exporters/export-utils.ts | 2 +- .../exporters/jhipster-deployment-exporter.ts | 2 +- lib/jdl/exporters/jhipster-entity-exporter.ts | 2 +- lib/jdl/exporters/types.d.ts | 2 +- lib/jdl/jdl-importer.ts | 4 +-- .../jdl-application-configuration-factory.ts | 2 +- lib/jdl/models/jdl-deployment.ts | 2 +- lib/jdl/models/jdl-enum.ts | 2 +- lib/jdl/parsing/lexer/application-tokens.ts | 2 +- lib/jdl/readers/json-reader.ts | 2 +- lib/jdl/runtime.ts | 2 +- .../{json-types.d.ts => json-config.d.ts} | 26 ------------------- .../types/{parsed-types.ts => parsed.d.ts} | 0 .../{parsing-types.d.ts => parsing.d.ts} | 0 lib/jdl/types/runtime.d.ts | 2 +- lib/jhipster/application-options.ts | 2 +- lib/jhipster/jdl-validator-definition.ts | 2 +- testing/helpers.ts | 2 +- 47 files changed, 53 insertions(+), 81 deletions(-) rename lib/jdl/types/{json-types.d.ts => json-config.d.ts} (75%) rename lib/jdl/types/{parsed-types.ts => parsed.d.ts} (100%) rename lib/jdl/types/{parsing-types.d.ts => parsing.d.ts} (100%) diff --git a/generators/base-application/support/entity.ts b/generators/base-application/support/entity.ts index 8ef2006fc7c9..a1a221722b41 100644 --- a/generators/base-application/support/entity.ts +++ b/generators/base-application/support/entity.ts @@ -18,7 +18,7 @@ */ import { upperFirst } from 'lodash-es'; -import type { JSONEntity } from '../../../lib/jdl/types/json-types.js'; +import type { JSONEntity } from '../../../lib/jdl/types/json-config.js'; export const findEntityInEntities = (entityName: string, entities: JSONEntity[]) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName)); diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts index 931042832647..a907d385b6ef 100644 --- a/generators/base-application/support/relationship.ts +++ b/generators/base-application/support/relationship.ts @@ -19,7 +19,7 @@ import { lowerFirst, upperFirst } from 'lodash-es'; -import type { JSONEntity, JSONRelationship } from '../../../lib/jdl/types/json-types.js'; +import type { JSONEntity, JSONRelationship } from '../../../lib/jdl/types/json-config.js'; import type { ValidationResult } from '../../base/api.js'; import { stringifyApplicationData } from './debug.js'; import { findEntityInEntities } from './entity.js'; diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index a4c02634a55c..3f1854e05154 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -6,9 +6,9 @@ import { Minimatch } from 'minimatch'; import { setModifiedFileState } from 'mem-fs-editor/state'; import { GENERATOR_JHIPSTER } from '../../generator-constants.js'; import { getJDLObjectFromSingleApplication } from '../../../lib/jdl/converters/json-to-jdl-converter.js'; -import type { JSONEntity } from '../../../lib/jdl/types/json-types.js'; +import type { JSONEntity } from '../../../lib/jdl/types/json-config.js'; import { createRuntime } from '../../../lib/jdl/runtime.js'; -import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing-types.js'; +import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing.js'; export const exportJDLTransform = ({ destinationPath, diff --git a/generators/bootstrap-application-base/support/import-jdl-transform.ts b/generators/bootstrap-application-base/support/import-jdl-transform.ts index 737c488e6b42..134736591b6d 100644 --- a/generators/bootstrap-application-base/support/import-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/import-jdl-transform.ts @@ -7,7 +7,7 @@ import { upperFirst } from 'lodash-es'; import { GENERATOR_JHIPSTER } from '../../generator-constants.js'; import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import { mergeYoRcContent } from '../../../lib/utils/yo-rc.js'; -import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing-types.js'; +import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing.js'; export const importJDLTransform = ({ destinationPath, diff --git a/generators/info/generator.ts b/generators/info/generator.ts index b9eb08bf2113..0b1ca6d19af0 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -26,7 +26,7 @@ import JSONToJDLEntityConverter from '../../lib/jdl/converters/json-to-jdl-entit import JSONToJDLOptionConverter from '../../lib/jdl/converters/json-to-jdl-option-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import { YO_RC_FILE } from '../generator-constants.js'; -import type { JSONEntity } from '../../lib/jdl/types/json-types.js'; +import type { JSONEntity } from '../../lib/jdl/types/json-config.js'; import { applicationsLookup } from '../workspaces/support/applications-lookup.js'; import { replaceSensitiveConfig } from './support/utils.js'; diff --git a/generators/server/jdl/application-definition.ts b/generators/server/jdl/application-definition.ts index 743fa298948f..3f6bdc33765c 100644 --- a/generators/server/jdl/application-definition.ts +++ b/generators/server/jdl/application-definition.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { snakeCase, upperCase } from 'lodash-es'; -import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; +import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; import databaseMigrationOption from '../options/database-migration.js'; import messageBrokerOption from '../options/message-broker.js'; import { syncUserWithIdpDefinition } from '../options/index.js'; diff --git a/generators/server/options/database-migration.ts b/generators/server/options/database-migration.ts index 11ad9ecd17ef..671b6d5f4ea6 100644 --- a/generators/server/options/database-migration.ts +++ b/generators/server/options/database-migration.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; export const DATABASE_MIGRATION = 'databaseMigration'; export const DATABASE_MIGRATION_LIQUIBASE = 'liquibase'; diff --git a/generators/server/options/message-broker.ts b/generators/server/options/message-broker.ts index da40c1a31301..468eba9bb32f 100644 --- a/generators/server/options/message-broker.ts +++ b/generators/server/options/message-broker.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; import type { OptionWithDerivedProperties } from '../../base-application/application-options.js'; export const MESSAGE_BROKER = 'messageBroker'; diff --git a/generators/server/options/sync-user-with-idp.ts b/generators/server/options/sync-user-with-idp.ts index 4a03ea36b800..648369e6921a 100644 --- a/generators/server/options/sync-user-with-idp.ts +++ b/generators/server/options/sync-user-with-idp.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing-types.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; export const SYNC_USER_WITH_IDP = 'syncUserWithIdp'; diff --git a/generators/server/support/relationship.ts b/generators/server/support/relationship.ts index e4e1dc9759ae..ac9161f4a269 100644 --- a/generators/server/support/relationship.ts +++ b/generators/server/support/relationship.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JSONEntity } from '../../../lib/jdl/types/json-types.js'; +import type { JSONEntity } from '../../../lib/jdl/types/json-config.js'; import { addOtherRelationship } from '../../base-application/support/index.js'; import type { ValidationResult } from '../../base/api.js'; import { databaseTypes } from '../../../lib/jhipster/index.js'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts index 0c7b31b3435b..bbff011bb5e3 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/types/parsing-types.js'; +import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/types/parsing.js'; export const jdlRoutesOptions: JHipsterOptionDefinition = { name: 'routes', diff --git a/lib/command/converter.ts b/lib/command/converter.ts index 4619bcff7ad5..05ea4c3f5dd5 100644 --- a/lib/command/converter.ts +++ b/lib/command/converter.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../jdl/types/parsing-types.js'; +import type { JHipsterOptionDefinition } from '../jdl/types/parsing.js'; import type { ConfigSpec, JHipsterArguments, JHipsterConfigs, JHipsterOption } from './types.js'; export const extractArgumentsFromConfigs = (configs: JHipsterConfigs | undefined): JHipsterArguments => { diff --git a/lib/command/types.d.ts b/lib/command/types.d.ts index aff0658cab61..e1fc66da764a 100644 --- a/lib/command/types.d.ts +++ b/lib/command/types.d.ts @@ -1,6 +1,6 @@ import type { ArgumentSpec, CliOptionSpec } from 'yeoman-generator'; import type { RequireAtLeastOne, SetOptional, Simplify, TaggedUnion, TupleToUnion, ValueOf } from 'type-fest'; -import type { JHipsterOptionDefinition } from '../jdl/types/parsing-types.js'; +import type { JHipsterOptionDefinition } from '../jdl/types/parsing.js'; import type { DerivedPropertiesOf, DerivedPropertiesWithInferenceUnion } from '../types/utils/derived-properties.js'; import type { MergeUnion } from './support/merge-union.js'; diff --git a/lib/jdl/built-in-options/index.ts b/lib/jdl/built-in-options/index.ts index 66b3e7346600..b73c17aad658 100644 --- a/lib/jdl/built-in-options/index.ts +++ b/lib/jdl/built-in-options/index.ts @@ -16,6 +16,4 @@ export { applicationOptions, /** @deprecated */ deploymentOptions, - /** @deprecated */ - entityOptions, } from '../../jhipster/index.js'; diff --git a/lib/jdl/built-in-options/jdl-application-definition.ts b/lib/jdl/built-in-options/jdl-application-definition.ts index b3b97b41a257..8e91a3a84383 100644 --- a/lib/jdl/built-in-options/jdl-application-definition.ts +++ b/lib/jdl/built-in-options/jdl-application-definition.ts @@ -1,4 +1,4 @@ -import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue } from '../types/parsing-types.js'; +import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue } from '../types/parsing.js'; export default class JDLApplicationDefinition { optionValues: Record; diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts index d66c06740024..a3684201929b 100644 --- a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts @@ -22,7 +22,7 @@ import { fieldTypes, validations } from '../../built-in-options/index.js'; import { formatComment } from '../../utils/format-utils.js'; import { camelCase } from '../../utils/string-utils.js'; import type JDLObject from '../../models/jdl-object.js'; -import type { JSONField } from '../../types/json-types.js'; +import type { JSONField } from '../../types/json-config.js'; import type { JDLEntity } from '../../models/index.js'; import type JDLField from '../../models/jdl-field.js'; diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts index e5702060d8b6..a3a608bfcfe5 100644 --- a/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts @@ -21,7 +21,7 @@ import { kebabCase } from 'lodash-es'; import { relationshipOptions, validations } from '../../built-in-options/index.js'; import { camelCase, lowerFirst } from '../../utils/string-utils.js'; import type JDLRelationship from '../../models/jdl-relationship.js'; -import type { JSONRelationship } from '../../types/json-types.js'; +import type { JSONRelationship } from '../../types/json-config.js'; import type { RelationshipType } from '../../basic-types/relationships.js'; const { diff --git a/lib/jdl/converters/json-to-jdl-application-converter.ts b/lib/jdl/converters/json-to-jdl-application-converter.ts index 48d9c6e0e30f..49f7847da01a 100644 --- a/lib/jdl/converters/json-to-jdl-application-converter.ts +++ b/lib/jdl/converters/json-to-jdl-application-converter.ts @@ -20,7 +20,7 @@ import JDLObject from '../models/jdl-object.js'; import { createJDLApplication } from '../models/jdl-application-factory.js'; import type { JDLRuntime } from '../types/runtime.js'; -import type { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from '../types/json-types.js'; +import type { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from '../types/json-config.js'; const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts index 6b6cd7e36855..8d5e2dcd99e9 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -29,8 +29,8 @@ import type JDLApplication from '../models/jdl-application.js'; import type { JDLRuntime } from '../types/runtime.js'; import { createRuntime, getDefaultRuntime } from '../runtime.js'; import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; -import type { JDLApplicationConfig } from '../types/parsing-types.js'; -import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../types/json-types.js'; +import type { JDLApplicationConfig } from '../types/parsing.js'; +import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../types/json-config.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; import { convertApplicationToJDL } from './json-to-jdl-application-converter.js'; diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.ts b/lib/jdl/converters/json-to-jdl-entity-converter.ts index 529d6b86fb53..3c2cda0edb25 100644 --- a/lib/jdl/converters/json-to-jdl-entity-converter.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.ts @@ -30,7 +30,7 @@ import { lowerFirst, upperFirst } from '../utils/string-utils.js'; import { binaryOptions, fieldTypes, relationshipOptions, unaryOptions } from '../built-in-options/index.js'; import { asJdlRelationshipType } from '../basic-types/relationship-types.js'; -import type { JSONEntity, JSONField, JSONRelationship } from '../types/json-types.js'; +import type { JSONEntity, JSONField, JSONRelationship } from '../types/json-config.js'; const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes; const { BUILT_IN_ENTITY } = relationshipOptions; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts index edfc4bc019e3..704e4c073290 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts @@ -24,7 +24,7 @@ import type JDLBinaryOption from '../../models/jdl-binary-option.js'; import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; import type JDLApplication from '../../models/jdl-application.js'; import type { JDLRuntime } from '../../types/runtime.js'; -import type { ParsedJDLApplication } from '../../types/parsed-types.js'; +import type { ParsedJDLApplication } from '../../types/parsed.js'; import { convertOptions } from './option-converter.js'; const { diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts index 3472bc31051c..f1c8d57c4d08 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts @@ -18,7 +18,7 @@ */ import JDLDeployment from '../../models/jdl-deployment.js'; -import type { ParsedJDLDeployment } from '../../types/parsed-types.js'; +import type { ParsedJDLDeployment } from '../../types/parsed.js'; export default { convertDeployments }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts index 99715b282cf3..a904000ab661 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts @@ -21,7 +21,7 @@ import { lowerFirst } from 'lodash-es'; import { JDLEntity } from '../../models/index.js'; import { formatComment } from '../../utils/format-utils.js'; import type JDLField from '../../models/jdl-field.js'; -import type { ParsedJDLEntity } from '../../types/parsed-types.js'; +import type { ParsedJDLEntity } from '../../types/parsed.js'; export default { convertEntities }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts index 5d4debe701c9..8298a916d4ad 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts @@ -19,7 +19,7 @@ import { JDLEnum } from '../../models/index.js'; import { formatComment } from '../../utils/format-utils.js'; -import type { ParsedJDLEnum } from '../../types/parsed-types.js'; +import type { ParsedJDLEnum } from '../../types/parsed.js'; export default { convertEnums }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts index 884716753f0a..fa816869f7b8 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts @@ -20,7 +20,7 @@ import JDLField from '../../models/jdl-field.js'; import { formatComment } from '../../utils/format-utils.js'; import { lowerFirst } from '../../utils/string-utils.js'; -import type { ParsedJDLEntityField } from '../../types/parsed-types.js'; +import type { ParsedJDLEntityField } from '../../types/parsed.js'; export default { convertField }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts index 444ef8e62c09..bc394b64fa92 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts @@ -21,7 +21,7 @@ import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; import { binaryOptions, unaryOptions } from '../../built-in-options/index.js'; import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; -import type { ParsedJDLOption, ParsedJDLUseOption } from '../../types/parsed-types.js'; +import type { ParsedJDLOption, ParsedJDLUseOption } from '../../types/parsed.js'; const { OptionValues, getOptionName } = binaryOptions; export default { convertOptions }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts index 02531439eb38..d0cf1337e4a0 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts @@ -26,6 +26,14 @@ import type JDLField from '../../models/jdl-field.js'; import type JDLValidation from '../../models/jdl-validation.js'; import type { JDLEntity } from '../../models/index.js'; import type { JDLRuntime } from '../../types/runtime.js'; +import type { + ParsedJDLAnnotation, + ParsedJDLApplication, + ParsedJDLApplications, + ParsedJDLEntity, + ParsedJDLEntityField, + ParsedJDLRoot, +} from '../../types/parsed.js'; import { convertApplications } from './application-converter.js'; import { convertEntities } from './entity-converter.js'; import { convertEnums } from './enum-converter.js'; @@ -34,14 +42,6 @@ import { convertValidations } from './validation-converter.js'; import { convertOptions } from './option-converter.js'; import { convertRelationships } from './relationship-converter.js'; import { convertDeployments } from './deployment-converter.js'; -import type { - ParsedJDLAnnotation, - ParsedJDLApplication, - ParsedJDLApplications, - ParsedJDLEntity, - ParsedJDLEntityField, - ParsedJDLRoot, -} from '../../types/parsed-types.js'; let parsedContent: ParsedJDLApplications; let configuration: ParsedJDLRoot; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts index 7b293c1c2149..bb5bacd5195e 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts @@ -21,7 +21,7 @@ import JDLRelationship from '../../models/jdl-relationship.js'; import { lowerFirst } from '../../utils/string-utils.js'; import { formatComment } from '../../utils/format-utils.js'; import { asJdlRelationshipType } from '../../basic-types/relationship-types.js'; -import type { ParsedJDLAnnotation, ParsedJDLRelationship } from '../../types/parsed-types.js'; +import type { ParsedJDLAnnotation, ParsedJDLRelationship } from '../../types/parsed.js'; export default { convertRelationships }; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts index 7150c0c12103..521d9f2f7ebb 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts @@ -19,7 +19,7 @@ import JDLValidation from '../../models/jdl-validation.js'; import { validations } from '../../built-in-options/index.js'; -import type { ParsedJDLValidation } from '../../types/parsed-types.js'; +import type { ParsedJDLValidation } from '../../types/parsed.js'; const { Validations: { PATTERN }, diff --git a/lib/jdl/exporters/export-utils.ts b/lib/jdl/exporters/export-utils.ts index c6551dd5edb9..918609f61b9a 100644 --- a/lib/jdl/exporters/export-utils.ts +++ b/lib/jdl/exporters/export-utils.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import { doesFileExist } from '../utils/file-utils.js'; -import type { JHipsterYoRcContent } from '../types/json-types.js'; +import type { JHipsterYoRcContent } from '../types/json-config.js'; import { mergeYoRcContent } from '../../utils/yo-rc.js'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/exporters/jhipster-deployment-exporter.ts b/lib/jdl/exporters/jhipster-deployment-exporter.ts index 4cd65b006954..8700f9b06de6 100644 --- a/lib/jdl/exporters/jhipster-deployment-exporter.ts +++ b/lib/jdl/exporters/jhipster-deployment-exporter.ts @@ -21,7 +21,7 @@ import path from 'path'; import { createFolderIfItDoesNotExist, doesFileExist } from '../utils/file-utils.js'; import DeploymentValidator from '../validators/deployment-validator.js'; import type JDLDeployment from '../models/jdl-deployment.js'; -import type { JHipsterYoRcContent } from '../types/json-types.js'; +import type { JHipsterYoRcContent } from '../types/json-config.js'; import { GENERATOR_NAME, writeConfigFile } from './export-utils.js'; /** diff --git a/lib/jdl/exporters/jhipster-entity-exporter.ts b/lib/jdl/exporters/jhipster-entity-exporter.ts index e73fbf160a22..4f8cd6c58a27 100644 --- a/lib/jdl/exporters/jhipster-entity-exporter.ts +++ b/lib/jdl/exporters/jhipster-entity-exporter.ts @@ -22,7 +22,7 @@ import path from 'path'; import { applicationTypes } from '../built-in-options/index.js'; import { readJSONFile, toFilePath } from '../readers/json-file-reader.js'; import { doesFileExist } from '../utils/file-utils.js'; -import type { JSONEntity } from '../types/json-types.js'; +import type { JSONEntity } from '../types/json-config.js'; import type { JhipsterJSONJDLExporterWrapper } from './types.js'; let configuration: any = {}; diff --git a/lib/jdl/exporters/types.d.ts b/lib/jdl/exporters/types.d.ts index 9e05a1ab984c..1df57ae64b42 100644 --- a/lib/jdl/exporters/types.d.ts +++ b/lib/jdl/exporters/types.d.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { JSONEntity } from '../types/json-types.js'; +import type { JSONEntity } from '../types/json-config.ts'; import type { GENERATOR_NAME } from './export-utils.js'; export type JDLJSONApplicationContent = { diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index 83b366162f0f..854bbd24d46b 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -30,10 +30,10 @@ import exportEntities from './exporters/jhipster-entity-exporter.js'; import createWithApplicationValidator from './validators/jdl-with-application-validator.js'; import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; import type JDLObject from './models/jdl-object.js'; -import type { ParsedJDLApplications } from './types/parsed-types.js'; +import type { ParsedJDLApplications } from './types/parsed.js'; import type { PostProcessedJDLJSONApplication } from './exporters/types.js'; import { GENERATOR_NAME } from './exporters/export-utils.js'; -import type { JDLApplicationConfig } from './types/parsing-types.js'; +import type { JDLApplicationConfig } from './types/parsing.js'; import type { JDLRuntime } from './types/runtime.js'; import { createRuntime, getDefaultRuntime } from './runtime.js'; diff --git a/lib/jdl/models/jdl-application-configuration-factory.ts b/lib/jdl/models/jdl-application-configuration-factory.ts index 565b7d6a7b44..000f1b5c90cc 100644 --- a/lib/jdl/models/jdl-application-configuration-factory.ts +++ b/lib/jdl/models/jdl-application-configuration-factory.ts @@ -18,7 +18,7 @@ */ import logger from '../utils/objects/logger.js'; -import type { JDLApplicationOptionTypeValue } from '../types/parsing-types.js'; +import type { JDLApplicationOptionTypeValue } from '../types/parsing.js'; import type { JDLRuntime } from '../types/runtime.js'; import JDLApplicationConfiguration from './jdl-application-configuration.js'; import StringJDLApplicationConfigurationOption from './string-jdl-application-configuration-option.js'; diff --git a/lib/jdl/models/jdl-deployment.ts b/lib/jdl/models/jdl-deployment.ts index eda0f7b974a8..f6f3155ce695 100644 --- a/lib/jdl/models/jdl-deployment.ts +++ b/lib/jdl/models/jdl-deployment.ts @@ -20,7 +20,7 @@ import { isEqual } from 'lodash-es'; import { applicationOptions, deploymentOptions } from '../built-in-options/index.js'; import { merge } from '../utils/object-utils.js'; import { join } from '../utils/set-utils.js'; -import type { ParsedJDLDeployment } from '../types/parsed-types.js'; +import type { ParsedJDLDeployment } from '../types/parsed.js'; const { Options } = deploymentOptions; const arrayTypes = ['appsFolders', 'clusteredDbApps']; diff --git a/lib/jdl/models/jdl-enum.ts b/lib/jdl/models/jdl-enum.ts index 006141e803e5..5acb689a0c2a 100644 --- a/lib/jdl/models/jdl-enum.ts +++ b/lib/jdl/models/jdl-enum.ts @@ -18,7 +18,7 @@ */ import { merge } from '../utils/object-utils.js'; -import type { ParsedJDLEnumValue } from '../types/parsed-types.js'; +import type { ParsedJDLEnumValue } from '../types/parsed.js'; import JDLEnumValue from './jdl-enum-value.js'; export default class JDLEnum { diff --git a/lib/jdl/parsing/lexer/application-tokens.ts b/lib/jdl/parsing/lexer/application-tokens.ts index 22bb86a64898..b3b5167bf469 100644 --- a/lib/jdl/parsing/lexer/application-tokens.ts +++ b/lib/jdl/parsing/lexer/application-tokens.ts @@ -20,7 +20,7 @@ import type { ITokenConfig } from 'chevrotain'; import { Lexer } from 'chevrotain'; import { applicationOptions } from '../../built-in-options/index.js'; -import type { JDLTokenConfig } from '../../types/parsing-types.js'; +import type { JDLTokenConfig } from '../../types/parsing.js'; import createTokenFromConfig from './token-creator.js'; import { KEYWORD, UNARY_OPTION } from './shared-tokens.js'; diff --git a/lib/jdl/readers/json-reader.ts b/lib/jdl/readers/json-reader.ts index bf9014c9d5ee..d74779573278 100644 --- a/lib/jdl/readers/json-reader.ts +++ b/lib/jdl/readers/json-reader.ts @@ -23,7 +23,7 @@ import { convertServerOptionsToJDL } from '../converters/json-to-jdl-option-conv import mergeJDLObjects from '../models/jdl-object-merger.js'; import { doesDirectoryExist } from '../utils/file-utils.js'; import type JDLObject from '../models/jdl-object.js'; -import type { JSONEntity } from '../types/json-types.js'; +import type { JSONEntity } from '../types/json-config.js'; import { readJSONFile } from './json-file-reader.js'; /* Parse the given jhipster app dir and return a JDLObject */ diff --git a/lib/jdl/runtime.ts b/lib/jdl/runtime.ts index 86dc07a7ba9b..beada4a0b135 100644 --- a/lib/jdl/runtime.ts +++ b/lib/jdl/runtime.ts @@ -5,7 +5,7 @@ import { buildTokens, createJDLLexer } from './parsing/lexer/lexer.js'; import JDLParser from './parsing/jdl-parser.js'; import { checkConfigKeys, checkTokens } from './parsing/self-checks/parsing-system-checker.js'; import type { JDLRuntime } from './types/runtime.js'; -import type { JDLApplicationConfig, JDLValidatorOption } from './types/parsing-types.js'; +import type { JDLApplicationConfig, JDLValidatorOption } from './types/parsing.js'; import JDLApplicationDefinition from './built-in-options/jdl-application-definition.js'; import { buildApplicationTokens } from './parsing/lexer/application-tokens.js'; diff --git a/lib/jdl/types/json-types.d.ts b/lib/jdl/types/json-config.d.ts similarity index 75% rename from lib/jdl/types/json-types.d.ts rename to lib/jdl/types/json-config.d.ts index 5a0be1d75457..5c73327fd0c9 100644 --- a/lib/jdl/types/json-types.d.ts +++ b/lib/jdl/types/json-config.d.ts @@ -53,32 +53,6 @@ export type JSONGeneratorJhipsterContentDeployment = { export type AbstractJSONGeneratorJhipsterContent = { baseName: string; applicationType?: string; - entities?: string[]; - jhipsterVersion?: string; - packageName?: string; - packageFolder?: string; - serverPort?: string; - authenticationType?: string; - buildTool?: string; - cacheProvider?: string; - clientPackageManager?: string; - creationTimestamp?: number; - databaseType?: string; - devDatabaseType?: string; - enableHibernateCache?: boolean; - enableTranslation?: boolean; - jhiPrefix?: string; - jwtSecretKey?: string; - languages?: string[]; - messageBroker?: string; - nativeLanguage?: string; - prodDatabaseType?: string; - searchEngine?: string; - serviceDiscoveryType?: string; - skipClient?: boolean; - skipUserManagement?: boolean; - testFrameworks?: string[]; - websocket?: string; } & JSONGeneratorJhipsterContentDeployment & Record; diff --git a/lib/jdl/types/parsed-types.ts b/lib/jdl/types/parsed.d.ts similarity index 100% rename from lib/jdl/types/parsed-types.ts rename to lib/jdl/types/parsed.d.ts diff --git a/lib/jdl/types/parsing-types.d.ts b/lib/jdl/types/parsing.d.ts similarity index 100% rename from lib/jdl/types/parsing-types.d.ts rename to lib/jdl/types/parsing.d.ts diff --git a/lib/jdl/types/runtime.d.ts b/lib/jdl/types/runtime.d.ts index 84c0dc293ed2..4422b00d79e1 100644 --- a/lib/jdl/types/runtime.d.ts +++ b/lib/jdl/types/runtime.d.ts @@ -1,7 +1,7 @@ import type { Lexer, TokenType } from 'chevrotain'; import type JDLParser from '../parsing/jdl-parser.ts'; import type JDLApplicationDefinition from '../built-in-options/jdl-application-definition.ts'; -import type { JDLValidatorOption } from './parsing-types.js'; +import type { JDLValidatorOption } from './parsing.js'; export type JDLRuntime = { applicationDefinition: JDLApplicationDefinition; diff --git a/lib/jhipster/application-options.ts b/lib/jhipster/application-options.ts index 221e73c0abc7..af0552628d98 100644 --- a/lib/jhipster/application-options.ts +++ b/lib/jhipster/application-options.ts @@ -22,7 +22,7 @@ import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue, -} from '../jdl/types/parsing-types.js'; +} from '../jdl/types/parsing.js'; import applicationTypes from './application-types.js'; import authenticationTypes from './authentication-types.js'; import databaseTypes from './database-types.js'; diff --git a/lib/jhipster/jdl-validator-definition.ts b/lib/jhipster/jdl-validator-definition.ts index 0c2eacfa7b64..855df9475502 100644 --- a/lib/jhipster/jdl-validator-definition.ts +++ b/lib/jhipster/jdl-validator-definition.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JDLValidatorOption } from '../jdl/types/parsing-types.js'; +import type { JDLValidatorOption } from '../jdl/types/parsing.js'; import { ALPHABETIC, ALPHABETIC_LOWER, diff --git a/testing/helpers.ts b/testing/helpers.ts index a3d8ccc2f057..35ede38699d6 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -13,7 +13,7 @@ import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from ' import BaseGenerator from '../generators/base/index.js'; import type { JHipsterGeneratorOptions } from '../generators/base/api.js'; import { getPackageRoot, isDistFolder } from '../lib/index.js'; -import type { JSONEntity } from '../lib/jdl/types/json-types.js'; +import type { JSONEntity } from '../lib/jdl/types/json-config.js'; import type CoreGenerator from '../generators/base-core/generator.js'; import getGenerator from './get-generator.js'; From 8a51f2b6c723de664179da2fa962c7177045291a Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 02:08:41 -0300 Subject: [PATCH 07/21] type adjusts --- generators/base-application/generator.ts | 7 +-- generators/base-application/support/entity.ts | 4 +- .../base-application/support/relationship.ts | 28 +++++----- .../support/export-jdl-transform.ts | 4 +- generators/info/generator.ts | 4 +- generators/server/support/relationship.ts | 7 +-- .../json-to-jdl-entity-converter.ts | 6 +-- lib/jdl/types/json-config.d.ts | 52 +++++-------------- lib/jhipster/field-types.ts | 2 +- lib/types/application/entity.d.ts | 1 + lib/types/application/field.d.ts | 1 - lib/types/application/relationship.d.ts | 1 + lib/types/base/entity.d.ts | 7 ++- lib/types/base/field.d.ts | 21 ++++++-- lib/types/base/relationship.d.ts | 4 +- 15 files changed, 70 insertions(+), 79 deletions(-) diff --git a/generators/base-application/generator.ts b/generators/base-application/generator.ts index a799a9faa059..db13bb33d77b 100644 --- a/generators/base-application/generator.ts +++ b/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 }[] { + 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 }[] = []; + 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 }); } diff --git a/generators/base-application/support/entity.ts b/generators/base-application/support/entity.ts index a1a221722b41..7564e325834f 100644 --- a/generators/base-application/support/entity.ts +++ b/generators/base-application/support/entity.ts @@ -18,7 +18,7 @@ */ import { upperFirst } from 'lodash-es'; -import type { JSONEntity } from '../../../lib/jdl/types/json-config.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)); diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts index a907d385b6ef..1a4f3e2826e5 100644 --- a/generators/base-application/support/relationship.ts +++ b/generators/base-application/support/relationship.ts @@ -19,18 +19,16 @@ import { lowerFirst, upperFirst } from 'lodash-es'; -import type { JSONEntity, JSONRelationship } from '../../../lib/jdl/types/json-config.js'; +import type { JSONEntity } from '../../../lib/jdl/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; diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index 3f1854e05154..7f474b117ebb 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -6,9 +6,9 @@ import { Minimatch } from 'minimatch'; import { setModifiedFileState } from 'mem-fs-editor/state'; import { GENERATOR_JHIPSTER } from '../../generator-constants.js'; import { getJDLObjectFromSingleApplication } from '../../../lib/jdl/converters/json-to-jdl-converter.js'; -import type { JSONEntity } from '../../../lib/jdl/types/json-config.js'; import { createRuntime } from '../../../lib/jdl/runtime.js'; import type { JDLApplicationConfig } from '../../../lib/jdl/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(); + const entitiesMap = new Map(); let yoRcFileInMemory: MemFsEditorFile | undefined; let jdlStoreFileInMemory: MemFsEditorFile | undefined; diff --git a/generators/info/generator.ts b/generators/info/generator.ts index 0b1ca6d19af0..3acb49958f14 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -26,8 +26,8 @@ import JSONToJDLEntityConverter from '../../lib/jdl/converters/json-to-jdl-entit import JSONToJDLOptionConverter from '../../lib/jdl/converters/json-to-jdl-option-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import { YO_RC_FILE } from '../generator-constants.js'; -import type { JSONEntity } from '../../lib/jdl/types/json-config.js'; import { applicationsLookup } from '../workspaces/support/applications-lookup.js'; +import type { Entity } from '../../lib/types/base/entity.js'; import { replaceSensitiveConfig } from './support/utils.js'; const isInfoCommand = commandName => commandName === 'info' || undefined; @@ -140,7 +140,7 @@ export default class InfoGenerator extends BaseApplicationGenerator { */ generateJDLFromEntities() { let jdlObject; - const entities = new Map(); + const entities = new Map(); try { this.getExistingEntities().forEach(entity => { entities.set(entity.name, entity.definition); diff --git a/generators/server/support/relationship.ts b/generators/server/support/relationship.ts index ac9161f4a269..cf7df3b591d8 100644 --- a/generators/server/support/relationship.ts +++ b/generators/server/support/relationship.ts @@ -17,14 +17,15 @@ * limitations under the License. */ -import type { JSONEntity } from '../../../lib/jdl/types/json-config.js'; import { addOtherRelationship } from '../../base-application/support/index.js'; import type { ValidationResult } from '../../base/api.js'; import { databaseTypes } from '../../../lib/jhipster/index.js'; +import type { Entity } from '../../../lib/types/application/entity.js'; +import type { Relationship } from '../../base-application/index.js'; const { NO: NO_DATABASE, SQL, NEO4J } = databaseTypes; -export const addEntitiesOtherRelationships = (entities: JSONEntity[]): ValidationResult => { +export const addEntitiesOtherRelationships = (entities: Entity[]): ValidationResult => { const result: { warning: string[] } = { warning: [] }; for (const entity of entities.filter(entity => !entity.builtIn)) { for (const relationship of entity.relationships ?? []) { @@ -42,7 +43,7 @@ export const addEntitiesOtherRelationships = (entities: JSONEntity[]): Validatio `Ignoring '${entity.name}' definitions as it is using a built-in Entity '${relationship.otherEntityName}': 'otherEntityRelationshipName' is set with value '${relationship.otherEntityRelationshipName}' at relationship '${relationship.relationshipName}' but no back-reference was found`, ); } else { - relationship.otherRelationship = addOtherRelationship(entity, relationship.otherEntity, relationship); + relationship.otherRelationship = addOtherRelationship(entity, relationship.otherEntity, relationship) as Relationship; } } } diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.ts b/lib/jdl/converters/json-to-jdl-entity-converter.ts index 3c2cda0edb25..849e928509d0 100644 --- a/lib/jdl/converters/json-to-jdl-entity-converter.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.ts @@ -104,13 +104,13 @@ function convertJSONToJDLField(field: JSONField): JDLField { comment: field.documentation, }); if (jdlField.type === BYTES) { - jdlField.type = getTypeForBlob(field.fieldTypeBlobContent); + jdlField.type = getTypeForBlob(field.fieldTypeBlobContent!); } addValidations(jdlField, field); return jdlField; } -function getTypeForBlob(blobContentType: string): string { +function getTypeForBlob(blobContentType: any): string { if ([ANY, IMAGE, TEXT].includes(blobContentType)) { return CommonDBTypes[`${blobContentType.toUpperCase()}_BLOB`]; } @@ -250,7 +250,7 @@ function getDestinationEntitySideAttributes( const foundDestinationSideEntity = destinationEntityRelationships?.find(destinationEntityFromRelationship => { return isEntityTheDestinationSideEntity( upperFirst(destinationEntityFromRelationship.otherEntityName), - destinationEntityFromRelationship.otherEntityRelationshipName, + destinationEntityFromRelationship.otherEntityRelationshipName!, ); }); if (!foundDestinationSideEntity) { diff --git a/lib/jdl/types/json-config.d.ts b/lib/jdl/types/json-config.d.ts index 5c73327fd0c9..416b156d8be6 100644 --- a/lib/jdl/types/json-config.d.ts +++ b/lib/jdl/types/json-config.d.ts @@ -1,68 +1,40 @@ +import type { Entity } from '../../types/base/entity.js'; +import type { Field } from '../../types/base/field.js'; +import type { Relationship } from '../../types/base/relationship.js'; import type { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.ts'; -import type { RelationshipSide, RelationshipType } from '../basic-types/relationships.js'; -export type JSONField = { - fieldName: string; - fieldType: string; - documentation?: string; - options?: Record; - fieldValidateRules?: string[]; -} & Record; - -export type JSONBlobField = { - fieldTypeBlobContent: 'image' | 'any' | 'text'; -} & JSONField; - -export type JSONFieldEnum = JSONField & { - fieldValues: string; - fieldTypeDocumentation?: string; - fieldValuesJavadocs?: Record; -}; +export type JSONField = Field & Record; -export type JSONFieldBlob = JSONField & { - fieldTypeBlobContent: string; -}; - -export type JSONRelationship = { - relationshipSide?: RelationshipSide; - relationshipName: string; - relationshipType: RelationshipType; - otherEntityName: string; - options?: Record; -} & Record; +export type JSONRelationship = Relationship & Record; -export type JSONEntity = { - documentation?: string; - fields?: JSONField[]; - relationships?: JSONRelationship[]; -} & Record; +export type JSONEntity = Entity & Record; -export type JSONBlueprint = { +type JSONBlueprint = { name: string; version?: string; } & Record; -export type JSONMicrofrontend = { +type JSONMicrofrontend = { baseName: string; }; -export type JSONGeneratorJhipsterContentDeployment = { +type JSONGeneratorJhipsterContentDeployment = { appsFolders?: string[]; clusteredDbApps?: string[]; }; -export type AbstractJSONGeneratorJhipsterContent = { +type AbstractJSONGeneratorJhipsterContent = { baseName: string; applicationType?: string; } & JSONGeneratorJhipsterContentDeployment & Record; -export type JSONGeneratorJhipsterContent = { +type JSONGeneratorJhipsterContent = { promptValues?: Partial; blueprints?: JSONBlueprint[] | null; microfrontends?: JSONMicrofrontend[] | null; } & AbstractJSONGeneratorJhipsterContent; -export type PostProcessedJSONGeneratorJhipsterContent = { +type PostProcessedJSONGeneratorJhipsterContent = { blueprints?: string[]; microfrontends?: string[]; } & AbstractJSONGeneratorJhipsterContent; diff --git a/lib/jhipster/field-types.ts b/lib/jhipster/field-types.ts index ced0cc75b24f..a94e1b1078c1 100644 --- a/lib/jhipster/field-types.ts +++ b/lib/jhipster/field-types.ts @@ -58,7 +58,7 @@ export const BlobTypes = { IMAGE: 'image', ANY: 'any', TEXT: 'text', -}; +} as const; const CommonDBValidations = { String: new Set([REQUIRED, UNIQUE, MINLENGTH, MAXLENGTH, PATTERN]), diff --git a/lib/types/application/entity.d.ts b/lib/types/application/entity.d.ts index 8716a2ec3cfa..7e5310f39095 100644 --- a/lib/types/application/entity.d.ts +++ b/lib/types/application/entity.d.ts @@ -46,6 +46,7 @@ export interface Entity extends true ? Relationship> : R)[]; + otherRelationships: (IsNever extends true ? Relationship> : R)[]; primaryKey?: PrimaryKey; diff --git a/lib/types/application/field.d.ts b/lib/types/application/field.d.ts index b721b8b04a16..be81330d1d8d 100644 --- a/lib/types/application/field.d.ts +++ b/lib/types/application/field.d.ts @@ -10,7 +10,6 @@ export interface Field extends BaseField { skipClient?: boolean; skipServer?: boolean; - fieldTypeBlobContent?: string; blobContentTypeText?: string; filterableField?: boolean; diff --git a/lib/types/application/relationship.d.ts b/lib/types/application/relationship.d.ts index a214c5874805..b9bf42dd5e88 100644 --- a/lib/types/application/relationship.d.ts +++ b/lib/types/application/relationship.d.ts @@ -12,6 +12,7 @@ export interface Relationship extends BaseRelationshi relationshipNameCapitalized: string; otherEntity: E; + otherRelationship: Relationship>; collection: boolean; skipClient?: boolean; diff --git a/lib/types/base/entity.d.ts b/lib/types/base/entity.d.ts index ff90f2b956d4..86de9c656d7b 100644 --- a/lib/types/base/entity.d.ts +++ b/lib/types/base/entity.d.ts @@ -1,10 +1,15 @@ import type { Field } from './field.js'; import type { Relationship } from './relationship.js'; -export type Entity = { +type MicroserviceEntity = { + databaseType?: string; +}; + +export type Entity = MicroserviceEntity & { name: string; changelogDate?: string; dto?: string; + documentation?: string; fields?: F[]; relationships?: R[]; diff --git a/lib/types/base/field.d.ts b/lib/types/base/field.d.ts index fa9c4e54334d..319989aeb9ad 100644 --- a/lib/types/base/field.d.ts +++ b/lib/types/base/field.d.ts @@ -17,8 +17,21 @@ * limitations under the License. */ -export type Field = { - fieldName: string; - fieldType: string; - options?: Record; +type FieldEnum = { + fieldValues: string; + fieldTypeDocumentation?: string; + fieldValuesJavadocs?: Record; }; + +type FieldBlob = { + fieldTypeBlobContent: 'image' | 'any' | 'text'; +}; + +export type Field = Partial & + Partial & { + fieldName: string; + fieldType: string; + documentation?: string; + options?: Record; + fieldValidateRules?: string[]; + }; diff --git a/lib/types/base/relationship.d.ts b/lib/types/base/relationship.d.ts index 762426a4b651..a22f8e249b2e 100644 --- a/lib/types/base/relationship.d.ts +++ b/lib/types/base/relationship.d.ts @@ -20,11 +20,11 @@ export type Relationship = { relationshipName: string; otherEntityName: string; - relationshipType: string; + relationshipType: 'one-to-one' | 'one-to-many' | 'many-to-one' | 'many-to-many'; relationshipSide?: 'left' | 'right'; otherEntityRelationshipName?: string; otherEntityField?: string; - options?: Record; + options?: Record; }; From 306182e41333413f919840b8fda5bd353300f675 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 02:13:57 -0300 Subject: [PATCH 08/21] type adjusts --- lib/jdl/built-in-options/index.ts | 2 ++ .../applications/jhipster-application-formatter.ts | 7 ++++++- lib/jdl/exporters/jhipster-entity-exporter.ts | 2 +- lib/jdl/jdl-importer.ts | 2 +- lib/jdl/{exporters/types.d.ts => types/exporter.d.ts} | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) rename lib/jdl/{exporters/types.d.ts => types/exporter.d.ts} (93%) diff --git a/lib/jdl/built-in-options/index.ts b/lib/jdl/built-in-options/index.ts index b73c17aad658..66b3e7346600 100644 --- a/lib/jdl/built-in-options/index.ts +++ b/lib/jdl/built-in-options/index.ts @@ -16,4 +16,6 @@ export { applicationOptions, /** @deprecated */ deploymentOptions, + /** @deprecated */ + entityOptions, } from '../../jhipster/index.js'; diff --git a/lib/jdl/exporters/applications/jhipster-application-formatter.ts b/lib/jdl/exporters/applications/jhipster-application-formatter.ts index 8f0a96a3c207..3f1efbd49975 100644 --- a/lib/jdl/exporters/applications/jhipster-application-formatter.ts +++ b/lib/jdl/exporters/applications/jhipster-application-formatter.ts @@ -19,7 +19,12 @@ import type JDLApplication from '../../models/jdl-application.js'; import { GENERATOR_NAME } from '../export-utils.js'; -import type { JDLJSONApplication, JDLJSONApplicationContent, PostProcessedJDLJSONApplication, RawJDLJSONApplication } from '../types.js'; +import type { + JDLJSONApplication, + JDLJSONApplicationContent, + PostProcessedJDLJSONApplication, + RawJDLJSONApplication, +} from '../../types/exporter.js'; import type JDLApplicationConfigurationOption from '../../models/jdl-application-configuration-option.js'; import type JDLApplicationConfiguration from '../../models/jdl-application-configuration.js'; diff --git a/lib/jdl/exporters/jhipster-entity-exporter.ts b/lib/jdl/exporters/jhipster-entity-exporter.ts index 4f8cd6c58a27..86252513d5e5 100644 --- a/lib/jdl/exporters/jhipster-entity-exporter.ts +++ b/lib/jdl/exporters/jhipster-entity-exporter.ts @@ -23,7 +23,7 @@ import { applicationTypes } from '../built-in-options/index.js'; import { readJSONFile, toFilePath } from '../readers/json-file-reader.js'; import { doesFileExist } from '../utils/file-utils.js'; import type { JSONEntity } from '../types/json-config.js'; -import type { JhipsterJSONJDLExporterWrapper } from './types.js'; +import type { JhipsterJSONJDLExporterWrapper } from '../types/exporter.js'; let configuration: any = {}; diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index 854bbd24d46b..1ad9cf4287da 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -31,7 +31,7 @@ import createWithApplicationValidator from './validators/jdl-with-application-va import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; import type JDLObject from './models/jdl-object.js'; import type { ParsedJDLApplications } from './types/parsed.js'; -import type { PostProcessedJDLJSONApplication } from './exporters/types.js'; +import type { PostProcessedJDLJSONApplication } from './types/exporter.js'; import { GENERATOR_NAME } from './exporters/export-utils.js'; import type { JDLApplicationConfig } from './types/parsing.js'; import type { JDLRuntime } from './types/runtime.js'; diff --git a/lib/jdl/exporters/types.d.ts b/lib/jdl/types/exporter.d.ts similarity index 93% rename from lib/jdl/exporters/types.d.ts rename to lib/jdl/types/exporter.d.ts index 1df57ae64b42..d91b451fc20a 100644 --- a/lib/jdl/exporters/types.d.ts +++ b/lib/jdl/types/exporter.d.ts @@ -16,8 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { JSONEntity } from '../types/json-config.ts'; -import type { GENERATOR_NAME } from './export-utils.js'; +import type { GENERATOR_NAME } from '../exporters/export-utils.js'; +import type { JSONEntity } from './json-config.js'; export type JDLJSONApplicationContent = { entities?: string[]; From 244a86f8dfe775059e5aef41e9ea30c2a9eff5fd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 12:48:37 -0300 Subject: [PATCH 09/21] adjusts --- .../jdl => lib/jdl/__test-support__}/index.ts | 23 ++++++++----------- ...ith-applications-to-json-converter.spec.ts | 2 +- .../json-to-jdl-application-converter.spec.ts | 2 +- .../application-converter.spec.ts | 2 +- ...parsed-jdl-to-jdl-object-converter.spec.ts | 2 +- lib/jdl/integration-test.spec.ts | 2 +- lib/jdl/jdl-importer.spec.ts | 2 +- lib/jdl/linters/jdl-linter.spec.ts | 2 +- lib/jdl/models/jdl-object-merger.spec.ts | 2 +- lib/jdl/models/jdl-object.spec.ts | 2 +- lib/jdl/readers/jdl-reader.spec.ts | 2 +- 11 files changed, 20 insertions(+), 23 deletions(-) rename {test/support/jdl => lib/jdl/__test-support__}/index.ts (68%) diff --git a/test/support/jdl/index.ts b/lib/jdl/__test-support__/index.ts similarity index 68% rename from test/support/jdl/index.ts rename to lib/jdl/__test-support__/index.ts index 750208d59ee6..588689e0048a 100644 --- a/test/support/jdl/index.ts +++ b/lib/jdl/__test-support__/index.ts @@ -1,23 +1,20 @@ -import { getDefaultRuntime } from '../../../lib/jdl//runtime.js'; -import { - parseFromContent as originalParseFromContent, - parseFromFiles as originalParseFromFiles, -} from '../../../lib/jdl//readers/jdl-reader.js'; -import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../../../lib/jdl//converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; +import { getDefaultRuntime } from '../runtime.js'; +import { parseFromContent as originalParseFromContent, parseFromFiles as originalParseFromFiles } from '../readers/jdl-reader.js'; +import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import { createImporterFromContent as originalCreateImporterFromContent, createImporterFromFiles as originalCreateImporterFromFiles, -} from '../../../lib/jdl//jdl-importer.js'; -import type { ParsedJDLApplication, ParsedJDLRoot } from '../../../lib/jdl//converters/parsed-jdl-to-jdl-object/types.js'; +} from '../jdl-importer.js'; +import type { ParsedJDLApplication, ParsedJDLRoot } from '../types/parsed.js'; import definition from '../../../generators/app/jdl/index.js'; import { createJDLLinterFromContent as originalCreateJDLLinterFromContent, createJDLLinterFromFile as originalCreateJDLLinterFromFile, -} from '../../../lib/jdl//linters/jdl-linter.js'; -import { convertApplications as originalConvertApplications } from '../../../lib/jdl//converters/parsed-jdl-to-jdl-object/application-converter.js'; -import { createJDLApplication as originalCreateJDLApplication } from '../../../lib/jdl//models/jdl-application-factory.js'; -import type { JHipsterYoRcContentAndJDLWrapper } from '../../../lib/jdl//converters/json-to-jdl-application-converter.js'; -import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../../../lib/jdl//converters/json-to-jdl-application-converter.js'; +} from '../linters/jdl-linter.js'; +import { convertApplications as originalConvertApplications } from '../converters/parsed-jdl-to-jdl-object/application-converter.js'; +import { createJDLApplication as originalCreateJDLApplication } from '../models/jdl-application-factory.js'; +import type { JHipsterYoRcContentAndJDLWrapper } from '../converters/json-to-jdl-application-converter.js'; +import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../converters/json-to-jdl-application-converter.js'; const runtime = getDefaultRuntime(); diff --git a/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts index 1985603f2254..25ae5f0092b3 100644 --- a/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts @@ -43,7 +43,7 @@ import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; import logger from '../../utils/objects/logger.js'; -import { createJDLApplication } from '../../../../test/support/jdl/index.js'; +import { createJDLApplication } from '../.././__test-support__/index.js'; import { convert } from './jdl-with-applications-to-json-converter.js'; const { diff --git a/lib/jdl/converters/json-to-jdl-application-converter.spec.ts b/lib/jdl/converters/json-to-jdl-application-converter.spec.ts index 33b35aa5fe9a..f990f527fc0e 100644 --- a/lib/jdl/converters/json-to-jdl-application-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-application-converter.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; import { createJDLApplication } from '../models/jdl-application-factory.js'; import JDLObject from '../models/jdl-object.js'; import { applicationTypes } from '../built-in-options/index.js'; -import { convertApplicationsToJDL } from '../../../test/support/jdl/index.js'; +import { convertApplicationsToJDL } from '.././__test-support__/index.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts index 78c4fb932190..4ba6c82e0e88 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts @@ -20,7 +20,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes } from '../../built-in-options/index.js'; -import { convertApplications, createJDLApplication } from '../../../../test/support/jdl/index.js'; +import { convertApplications, createJDLApplication } from '../.././__test-support__/index.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index 4d66de1d378a..5e8d740af465 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -36,7 +36,7 @@ import { unaryOptions, validations, } from '../../built-in-options/index.js'; -import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../../../test/support/jdl/index.js'; +import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../.././__test-support__/index.js'; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; const { OptionNames } = applicationOptions; diff --git a/lib/jdl/integration-test.spec.ts b/lib/jdl/integration-test.spec.ts index b9f64d7a1ae3..31af3bf3c1e2 100644 --- a/lib/jdl/integration-test.spec.ts +++ b/lib/jdl/integration-test.spec.ts @@ -22,8 +22,8 @@ import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../testing/index.js'; -import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../test/support/jdl/index.js'; import { applicationTypes } from '../jhipster/index.js'; +import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from './__test-support__/index.js'; import exportToJDL from './exporters/jdl-exporter.js'; import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import type { ApplicationWithEntities } from './jdl-importer.js'; diff --git a/lib/jdl/jdl-importer.spec.ts b/lib/jdl/jdl-importer.spec.ts index f05c2cc19c9a..83d84a9ade9b 100644 --- a/lib/jdl/jdl-importer.spec.ts +++ b/lib/jdl/jdl-importer.spec.ts @@ -23,8 +23,8 @@ import { readFileSync, rmSync } from 'fs'; import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { createImporterFromContent, createImporterFromFiles } from '../../test/support/jdl/index.js'; import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../jhipster/index.js'; +import { createImporterFromContent, createImporterFromFiles } from './__test-support__/index.js'; const { MONOLITH } = applicationTypes; const __filename = fileURLToPath(import.meta.url); diff --git a/lib/jdl/linters/jdl-linter.spec.ts b/lib/jdl/linters/jdl-linter.spec.ts index 92998455c274..84a072ee4a2f 100644 --- a/lib/jdl/linters/jdl-linter.spec.ts +++ b/lib/jdl/linters/jdl-linter.spec.ts @@ -23,7 +23,7 @@ import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../../testing/index.js'; -import { createJDLLinterFromContent, createJDLLinterFromFile } from '../../../test/support/jdl/index.js'; +import { createJDLLinterFromContent, createJDLLinterFromFile } from '.././__test-support__/index.js'; import type { JDLLinter } from './jdl-linter.js'; import type Issues from './issues/issues.js'; import type EnumIssue from './issues/enum-issue.js'; diff --git a/lib/jdl/models/jdl-object-merger.spec.ts b/lib/jdl/models/jdl-object-merger.spec.ts index 91bf2a3e178d..c45ad9f2a831 100644 --- a/lib/jdl/models/jdl-object-merger.spec.ts +++ b/lib/jdl/models/jdl-object-merger.spec.ts @@ -27,7 +27,7 @@ import JDLField from '../models/jdl-field.js'; import JDLRelationship from '../models/jdl-relationship.js'; import JDLUnaryOption from '../models/jdl-unary-option.js'; import mergeJDLObjects from '../models/jdl-object-merger.js'; -import { createJDLApplication } from '../../../test/support/jdl/index.js'; +import { createJDLApplication } from '.././__test-support__/index.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/models/jdl-object.spec.ts b/lib/jdl/models/jdl-object.spec.ts index fd99c1421e43..b4139989c8e6 100644 --- a/lib/jdl/models/jdl-object.spec.ts +++ b/lib/jdl/models/jdl-object.spec.ts @@ -23,7 +23,7 @@ import { relationshipTypes } from '../basic-types/index.js'; import { applicationTypes, binaryOptions, unaryOptions } from '../built-in-options/index.js'; import JDLObject from '../models/jdl-object.js'; -import { createJDLApplication } from '../../../test/support/jdl/index.js'; +import { createJDLApplication } from '.././__test-support__/index.js'; import JDLDeployment from '../models/jdl-deployment.js'; import { JDLEntity, JDLEnum } from '../models/index.js'; import JDLField from '../models/jdl-field.js'; diff --git a/lib/jdl/readers/jdl-reader.spec.ts b/lib/jdl/readers/jdl-reader.spec.ts index a6031d13b31f..066fbde3a07d 100644 --- a/lib/jdl/readers/jdl-reader.spec.ts +++ b/lib/jdl/readers/jdl-reader.spec.ts @@ -24,7 +24,7 @@ import { fileURLToPath } from 'url'; import { after, beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import { basicHelpers as helpers } from '../../../testing/index.js'; -import { parseFromContent, parseFromFiles } from '../../../test/support/jdl/index.js'; +import { parseFromContent, parseFromFiles } from '.././__test-support__/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); From 87308ede744caad39fccb5f53698dd3855575bac Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 13:02:32 -0300 Subject: [PATCH 10/21] move lib/jdl to lib/jdl/core --- generators/base-application/support/prepare-entity.ts | 2 +- generators/base-application/support/relationship.ts | 2 +- .../support/export-jdl-transform.ts | 6 +++--- .../support/import-jdl-transform.ts | 4 ++-- generators/export-jdl/generator.ts | 2 +- generators/info/generator.ts | 4 ++-- generators/jdl/generator.ts | 4 ++-- generators/jdl/internal/application.ts | 2 +- generators/liquibase/incremental-liquibase.spec.ts | 2 +- generators/server/jdl/application-definition.ts | 2 +- generators/server/options/database-migration.spec.ts | 4 ++-- generators/server/options/database-migration.ts | 2 +- generators/server/options/message-broker.spec.ts | 4 ++-- generators/server/options/message-broker.ts | 2 +- generators/server/options/sync-user-with-idp.spec.ts | 4 ++-- generators/server/options/sync-user-with-idp.ts | 2 +- generators/spring-boot/options/feign-client.spec.ts | 4 ++-- .../generators/gateway/jdl/jdl-routes-option.spec.ts | 6 +++--- .../generators/gateway/jdl/jdl-routes-option.ts | 2 +- lib/command/converter.ts | 2 +- lib/command/types.d.ts | 2 +- .../{ => core}/__snapshots__/jdl-importer.spec.ts.snap | 0 lib/jdl/{ => core}/__test-files__/MyEntity.json | 0 lib/jdl/{ => core}/__test-files__/annotations.jdl | 0 .../{ => core}/__test-files__/annotations_and_options.jdl | 0 lib/jdl/{ => core}/__test-files__/application.jdl | 0 .../__test-files__/application_with_blueprints.jdl | 0 .../__test-files__/application_with_entities.jdl | 0 .../application_with_entity_dto_suffixes.jdl | 0 .../__test-files__/application_wrong_basename.jdl | 0 lib/jdl/{ => core}/__test-files__/applications.jdl | 0 lib/jdl/{ => core}/__test-files__/applications2.jdl | 0 lib/jdl/{ => core}/__test-files__/applications3.jdl | 0 .../applications_with_and_without_entities.jdl | 0 .../__test-files__/authority_entity_to_relationship.jdl | 0 lib/jdl/{ => core}/__test-files__/big_sample.jdl | 0 lib/jdl/{ => core}/__test-files__/blob_jdl.jdl | 0 .../{ => core}/__test-files__/capitalized_annotations.jdl | 0 lib/jdl/{ => core}/__test-files__/cassandra_jdl.jdl | 0 .../__test-files__/cassandra_with_relationships.jdl | 0 lib/jdl/{ => core}/__test-files__/client_root_folder.jdl | 0 .../__test-files__/client_root_folder_no_microservice.jdl | 0 lib/jdl/{ => core}/__test-files__/complex_jdl.jdl | 0 lib/jdl/{ => core}/__test-files__/complex_jdl_2.jdl | 0 lib/jdl/{ => core}/__test-files__/constants.jdl | 0 lib/jdl/{ => core}/__test-files__/couchbase_jdl.jdl | 0 lib/jdl/{ => core}/__test-files__/deployments.jdl | 0 .../__test-files__/different_relationship_types.jdl | 0 lib/jdl/{ => core}/__test-files__/enum.jdl | 0 lib/jdl/{ => core}/__test-files__/enum_with_values.jdl | 0 lib/jdl/{ => core}/__test-files__/field_comments.jdl | 0 .../{ => core}/__test-files__/filtering_with_service.jdl | 0 .../__test-files__/filtering_without_service.jdl | 0 lib/jdl/{ => core}/__test-files__/fluent_methods.jdl | 0 lib/jdl/{ => core}/__test-files__/fluent_methods2.jdl | 0 lib/jdl/{ => core}/__test-files__/following_comments.jdl | 0 lib/jdl/{ => core}/__test-files__/id_field.jdl | 0 lib/jdl/{ => core}/__test-files__/integration/file1.jdl | 0 lib/jdl/{ => core}/__test-files__/integration/file2.jdl | 0 lib/jdl/{ => core}/__test-files__/invalid_field_type.jdl | 0 lib/jdl/{ => core}/__test-files__/invalid_file.txt | 0 lib/jdl/{ => core}/__test-files__/invalid_file2 | 0 lib/jdl/{ => core}/__test-files__/invalid_option.jdl | 0 .../__test-files__/jhipster_app/.jhipster/BadEntity.json | 0 .../jhipster_app/.jhipster/CassBankAccount.json | 0 .../__test-files__/jhipster_app/.jhipster/Country.json | 0 .../__test-files__/jhipster_app/.jhipster/Department.json | 0 .../__test-files__/jhipster_app/.jhipster/Employee.json | 0 .../jhipster_app/.jhipster/InvalidBlobType.json | 0 .../__test-files__/jhipster_app/.jhipster/Job.json | 0 .../__test-files__/jhipster_app/.jhipster/JobHistory.json | 0 .../__test-files__/jhipster_app/.jhipster/Location.json | 0 .../__test-files__/jhipster_app/.jhipster/NoEntity.txt | 0 .../__test-files__/jhipster_app/.jhipster/Region.json | 0 .../__test-files__/jhipster_app/.jhipster/Task.json | 0 .../{ => core}/__test-files__/jhipster_app/.yo-rc.json | 0 .../app_with_entities/.jhipster/Country.json | 0 .../app_with_entities/.jhipster/Department.json | 0 .../app_with_entities/.jhipster/Employee.json | 0 .../app_with_entities/.jhipster/Job.json | 0 .../app_with_entities/.jhipster/JobHistory.json | 0 .../app_with_entities/.jhipster/Location.json | 0 .../app_with_entities/.jhipster/Region.json | 0 .../app_with_entities/.jhipster/Task.json | 0 .../json_to_jdl_converter/app_with_entities/.yo-rc.json | 0 .../multi_apps/app1/.jhipster/Region.json | 0 .../json_to_jdl_converter/multi_apps/app1/.yo-rc.json | 0 .../multi_apps/app2/.jhipster/Country.json | 0 .../multi_apps/app2/.jhipster/Location.json | 0 .../json_to_jdl_converter/multi_apps/app2/.yo-rc.json | 0 .../json_to_jdl_converter/multi_apps/app3/.yo-rc.json | 0 .../with_authority/.jhipster/TestEntity.json | 0 .../json_to_jdl_converter/with_authority/.yo-rc.json | 0 .../with_user/.jhipster/TestEntity.json | 0 .../json_to_jdl_converter/with_user/.yo-rc.json | 0 .../{ => core}/__test-files__/lint/duplicate_entities.jdl | 0 .../{ => core}/__test-files__/lint/duplicate_enums.jdl | 0 .../{ => core}/__test-files__/lint/duplicate_fields.jdl | 0 .../__test-files__/lint/ungrouped_relationships.jdl | 0 lib/jdl/{ => core}/__test-files__/lint/unused_enums.jdl | 0 .../__test-files__/lint/useless_commas_fields.jdl | 0 .../__test-files__/lint/useless_entity_curly_braces.jdl | 0 .../__test-files__/lint/useless_table_names.jdl | 0 lib/jdl/{ => core}/__test-files__/mongo_jdl.jdl | 0 .../{ => core}/__test-files__/multiple_jdl_comments.jdl | 0 lib/jdl/{ => core}/__test-files__/no_injected_field.jdl | 0 lib/jdl/{ => core}/__test-files__/no_microservice.jdl | 0 .../{ => core}/__test-files__/non_existent_validation.jdl | 0 .../__test-files__/pattern_validation_with_quote.jdl | 0 lib/jdl/{ => core}/__test-files__/realistic_sample.jdl | 0 lib/jdl/{ => core}/__test-files__/regex_validation.jdl | 0 .../__test-files__/relationship_built_in_entity.jdl | 0 .../{ => core}/__test-files__/required_relationships.jdl | 0 lib/jdl/{ => core}/__test-files__/simple.jdl | 0 .../__test-files__/simple_microservice_setup.jdl | 0 lib/jdl/{ => core}/__test-files__/two_microservices.jdl | 0 .../__test-files__/underscore_application_name.jdl | 0 .../unexistent_entities_for_relationship.jdl | 0 lib/jdl/{ => core}/__test-files__/unique.jdl | 0 .../__test-files__/user_entity_from_relationship.jdl | 0 .../__test-files__/user_entity_to_relationship.jdl | 0 lib/jdl/{ => core}/__test-files__/valid_jdl.jdl | 0 lib/jdl/{ => core}/__test-files__/valid_jdl2.jdl | 0 lib/jdl/{ => core}/__test-support__/index.ts | 2 +- lib/jdl/{ => core}/basic-types/index.ts | 0 lib/jdl/{ => core}/basic-types/json-entity.spec.ts | 0 lib/jdl/{ => core}/basic-types/json-entity.ts | 0 lib/jdl/{ => core}/basic-types/relationship-types.spec.ts | 0 lib/jdl/{ => core}/basic-types/relationship-types.ts | 0 lib/jdl/{ => core}/basic-types/relationships.ts | 0 .../{ => core}/built-in-options/binary-options.spec.ts | 0 lib/jdl/{ => core}/built-in-options/binary-options.ts | 2 +- lib/jdl/{ => core}/built-in-options/index.ts | 2 +- .../built-in-options/jdl-application-definition.spec.ts | 2 +- .../built-in-options/jdl-application-definition.ts | 0 .../built-in-options/relationship-options.spec.ts | 0 .../{ => core}/built-in-options/relationship-options.ts | 0 lib/jdl/{ => core}/built-in-options/unary-options.spec.ts | 0 lib/jdl/{ => core}/built-in-options/unary-options.ts | 0 .../{ => core}/built-in-options/validation-patterns.ts | 0 lib/jdl/{ => core}/built-in-options/validations.spec.ts | 0 lib/jdl/{ => core}/built-in-options/validations.ts | 0 .../jdl-to-json/jdl-to-json-basic-entity-converter.ts | 0 ...jdl-to-json-basic-entity-information-converter.spec.ts | 0 .../jdl-to-json/jdl-to-json-field-converter.spec.ts | 0 .../converters/jdl-to-json/jdl-to-json-field-converter.ts | 0 .../jdl-to-json/jdl-to-json-option-converter.spec.ts | 0 .../jdl-to-json/jdl-to-json-option-converter.ts | 0 .../jdl-to-json-relationship-converter.spec.ts | 0 .../jdl-to-json/jdl-to-json-relationship-converter.ts | 0 .../jdl-with-applications-to-json-converter.spec.ts | 0 .../jdl-with-applications-to-json-converter.ts | 0 .../jdl-without-application-to-json-converter.spec.ts | 0 .../jdl-without-application-to-json-converter.ts | 0 .../converters/json-to-jdl-application-converter.spec.ts | 0 .../converters/json-to-jdl-application-converter.ts | 0 .../{ => core}/converters/json-to-jdl-converter.spec.ts | 2 +- lib/jdl/{ => core}/converters/json-to-jdl-converter.ts | 4 ++-- .../converters/json-to-jdl-entity-converter.spec.ts | 0 .../{ => core}/converters/json-to-jdl-entity-converter.ts | 0 .../converters/json-to-jdl-option-converter.spec.ts | 0 .../{ => core}/converters/json-to-jdl-option-converter.ts | 0 .../__snapshots__/option-converter.spec.ts.snap | 0 .../application-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/application-converter.ts | 0 .../parsed-jdl-to-jdl-object/deployment-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/deployment-converter.ts | 0 .../parsed-jdl-to-jdl-object/entity-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/entity-converter.ts | 0 .../parsed-jdl-to-jdl-object/enum-converter.spec.ts | 0 .../converters/parsed-jdl-to-jdl-object/enum-converter.ts | 0 .../parsed-jdl-to-jdl-object/field-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/field-converter.ts | 0 .../parsed-jdl-to-jdl-object/option-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/option-converter.ts | 0 .../parsed-jdl-to-jdl-object-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object-converter.ts | 0 .../relationship-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/relationship-converter.ts | 0 .../parsed-jdl-to-jdl-object/validation-converter.spec.ts | 0 .../parsed-jdl-to-jdl-object/validation-converter.ts | 0 .../applications/jhipster-application-formatter.ts | 0 lib/jdl/{ => core}/exporters/export-utils.spec.ts | 2 +- lib/jdl/{ => core}/exporters/export-utils.ts | 2 +- lib/jdl/{ => core}/exporters/jdl-exporter.spec.ts | 2 +- lib/jdl/{ => core}/exporters/jdl-exporter.ts | 0 .../exporters/jhipster-deployment-exporter.spec.ts | 2 +- .../{ => core}/exporters/jhipster-deployment-exporter.ts | 0 .../{ => core}/exporters/jhipster-entity-exporter.spec.ts | 2 +- lib/jdl/{ => core}/exporters/jhipster-entity-exporter.ts | 0 lib/jdl/{ => core}/integration-test.spec.ts | 4 ++-- lib/jdl/{ => core}/jdl-importer.spec.ts | 2 +- lib/jdl/{ => core}/jdl-importer.ts | 2 +- lib/jdl/{ => core}/linters/entity-linter.ts | 0 lib/jdl/{ => core}/linters/enum-linter.ts | 0 lib/jdl/{ => core}/linters/field-linter.ts | 0 lib/jdl/{ => core}/linters/issues/abstract-issue.ts | 0 lib/jdl/{ => core}/linters/issues/entity-issue.spec.ts | 0 lib/jdl/{ => core}/linters/issues/entity-issue.ts | 0 lib/jdl/{ => core}/linters/issues/enum-issue.spec.ts | 0 lib/jdl/{ => core}/linters/issues/enum-issue.ts | 0 lib/jdl/{ => core}/linters/issues/field-issue.spec.ts | 0 lib/jdl/{ => core}/linters/issues/field-issue.ts | 0 lib/jdl/{ => core}/linters/issues/issues.spec.ts | 0 lib/jdl/{ => core}/linters/issues/issues.ts | 0 .../{ => core}/linters/issues/relationship-issue.spec.ts | 0 lib/jdl/{ => core}/linters/issues/relationship-issue.ts | 0 lib/jdl/{ => core}/linters/jdl-linter.spec.ts | 2 +- lib/jdl/{ => core}/linters/jdl-linter.ts | 0 lib/jdl/{ => core}/linters/relationship-linter.ts | 0 lib/jdl/{ => core}/linters/rule-levels.ts | 0 lib/jdl/{ => core}/linters/rule.spec.ts | 0 lib/jdl/{ => core}/linters/rule.ts | 0 lib/jdl/{ => core}/linters/rules.spec.ts | 0 lib/jdl/{ => core}/linters/rules.ts | 0 lib/jdl/{ => core}/matchers/entity-matcher.ts | 0 lib/jdl/{ => core}/matchers/field-matcher.ts | 0 lib/jdl/{ => core}/models/abstract-jdl-option.spec.ts | 0 lib/jdl/{ => core}/models/abstract-jdl-option.ts | 0 .../boolean-jdl-application-configuration-option.ts | 0 lib/jdl/{ => core}/models/index.ts | 0 .../integer-jdl-application-configuration-option.ts | 0 .../models/jdl-application-configuration-factory.spec.ts | 0 .../models/jdl-application-configuration-factory.ts | 0 .../models/jdl-application-configuration-option.ts | 0 .../models/jdl-application-configuration.spec.ts | 0 .../{ => core}/models/jdl-application-configuration.ts | 0 .../{ => core}/models/jdl-application-entities.spec.ts | 0 lib/jdl/{ => core}/models/jdl-application-entities.ts | 0 lib/jdl/{ => core}/models/jdl-application-factory.spec.ts | 0 lib/jdl/{ => core}/models/jdl-application-factory.ts | 0 lib/jdl/{ => core}/models/jdl-application.spec.ts | 0 lib/jdl/{ => core}/models/jdl-application.ts | 0 lib/jdl/{ => core}/models/jdl-binary-option.spec.ts | 0 lib/jdl/{ => core}/models/jdl-binary-option.ts | 0 lib/jdl/{ => core}/models/jdl-deployment.spec.ts | 0 lib/jdl/{ => core}/models/jdl-deployment.ts | 0 lib/jdl/{ => core}/models/jdl-entity.spec.ts | 0 lib/jdl/{ => core}/models/jdl-entity.ts | 0 lib/jdl/{ => core}/models/jdl-enum-value.spec.ts | 0 lib/jdl/{ => core}/models/jdl-enum-value.ts | 0 lib/jdl/{ => core}/models/jdl-enum.spec.ts | 0 lib/jdl/{ => core}/models/jdl-enum.ts | 0 lib/jdl/{ => core}/models/jdl-enums.spec.ts | 0 lib/jdl/{ => core}/models/jdl-enums.ts | 0 lib/jdl/{ => core}/models/jdl-field.spec.ts | 0 lib/jdl/{ => core}/models/jdl-field.ts | 0 lib/jdl/{ => core}/models/jdl-object-merger.spec.ts | 0 lib/jdl/{ => core}/models/jdl-object-merger.ts | 0 lib/jdl/{ => core}/models/jdl-object-wrapper.ts | 0 lib/jdl/{ => core}/models/jdl-object.spec.ts | 0 lib/jdl/{ => core}/models/jdl-object.ts | 0 lib/jdl/{ => core}/models/jdl-options.spec.ts | 0 lib/jdl/{ => core}/models/jdl-options.ts | 0 lib/jdl/{ => core}/models/jdl-relationship.spec.ts | 0 lib/jdl/{ => core}/models/jdl-relationship.ts | 0 lib/jdl/{ => core}/models/jdl-relationships.spec.ts | 0 lib/jdl/{ => core}/models/jdl-relationships.ts | 0 lib/jdl/{ => core}/models/jdl-unary-option.spec.ts | 0 lib/jdl/{ => core}/models/jdl-unary-option.ts | 0 lib/jdl/{ => core}/models/jdl-validation.spec.ts | 0 lib/jdl/{ => core}/models/jdl-validation.ts | 0 .../models/list-jdl-application-configuration-option.ts | 0 .../models/string-jdl-application-configuration-option.ts | 0 lib/jdl/{ => core}/parsing/api.ts | 0 lib/jdl/{ => core}/parsing/dsl-api.spec.ts | 0 .../parsing/generated/generated-serialized-grammar.js | 0 lib/jdl/{ => core}/parsing/generated/grammar.html | 0 lib/jdl/{ => core}/parsing/grammar.spec.ts | 0 lib/jdl/{ => core}/parsing/jdl-ast-builder-visitor.ts | 0 lib/jdl/{ => core}/parsing/jdl-parser.ts | 0 lib/jdl/{ => core}/parsing/jdl-parsing-types.d.ts | 0 lib/jdl/{ => core}/parsing/jdl-post-parsing-tasks.ts | 0 lib/jdl/{ => core}/parsing/lexer/application-tokens.ts | 0 lib/jdl/{ => core}/parsing/lexer/deployment-tokens.ts | 0 lib/jdl/{ => core}/parsing/lexer/lexer.spec.ts | 0 lib/jdl/{ => core}/parsing/lexer/lexer.ts | 0 lib/jdl/{ => core}/parsing/lexer/minmax-tokens.ts | 0 lib/jdl/{ => core}/parsing/lexer/option-tokens.ts | 0 .../{ => core}/parsing/lexer/relationship-type-tokens.ts | 0 lib/jdl/{ => core}/parsing/lexer/shared-tokens.ts | 0 lib/jdl/{ => core}/parsing/lexer/token-creator.spec.ts | 0 lib/jdl/{ => core}/parsing/lexer/token-creator.ts | 0 lib/jdl/{ => core}/parsing/lexer/validation-tokens.ts | 0 .../parsing/self-checks/parsing-system-checker.ts | 0 .../parsing/self-checks/token-collector-visitor.ts | 0 lib/jdl/{ => core}/parsing/validator.spec.ts | 0 lib/jdl/{ => core}/parsing/validator.ts | 0 lib/jdl/{ => core}/readers/file-reader.spec.ts | 2 +- lib/jdl/{ => core}/readers/file-reader.ts | 0 lib/jdl/{ => core}/readers/jdl-reader.spec.ts | 2 +- lib/jdl/{ => core}/readers/jdl-reader.ts | 0 lib/jdl/{ => core}/readers/json-file-reader.spec.ts | 0 lib/jdl/{ => core}/readers/json-file-reader.ts | 0 lib/jdl/{ => core}/readers/json-reader.spec.ts | 0 lib/jdl/{ => core}/readers/json-reader.ts | 0 lib/jdl/{ => core}/runtime.ts | 4 ++-- lib/jdl/{ => core}/types/exporter.d.ts | 0 lib/jdl/{ => core}/types/json-config.d.ts | 8 ++++---- lib/jdl/{ => core}/types/parsed.d.ts | 0 lib/jdl/{ => core}/types/parsing.d.ts | 0 lib/jdl/{ => core}/types/runtime.d.ts | 0 lib/jdl/{ => core}/utils/array-utils.spec.ts | 0 lib/jdl/{ => core}/utils/array-utils.ts | 0 lib/jdl/{ => core}/utils/deprecation-utils.ts | 0 .../{ => core}/utils/entity-table-name-creator.spec.ts | 0 lib/jdl/{ => core}/utils/entity-table-name-creator.ts | 2 +- lib/jdl/{ => core}/utils/file-utils.ts | 0 lib/jdl/{ => core}/utils/files-utils.spec.ts | 3 ++- lib/jdl/{ => core}/utils/format-utils.spec.ts | 0 lib/jdl/{ => core}/utils/format-utils.ts | 0 lib/jdl/{ => core}/utils/object-utils.spec.ts | 0 lib/jdl/{ => core}/utils/object-utils.ts | 0 lib/jdl/{ => core}/utils/objects/logger.ts | 2 +- lib/jdl/{ => core}/utils/set-utils.spec.ts | 0 lib/jdl/{ => core}/utils/set-utils.ts | 0 lib/jdl/{ => core}/utils/string-utils.ts | 0 lib/jdl/{ => core}/utils/string_utils.spec.ts | 0 .../{ => core}/validators/binary-option-validator.spec.ts | 0 lib/jdl/{ => core}/validators/binary-option-validator.ts | 0 .../{ => core}/validators/deployment-validator.spec.ts | 0 lib/jdl/{ => core}/validators/deployment-validator.ts | 0 lib/jdl/{ => core}/validators/entity-validator.spec.ts | 0 lib/jdl/{ => core}/validators/entity-validator.ts | 0 lib/jdl/{ => core}/validators/enum-validator.spec.ts | 0 lib/jdl/{ => core}/validators/enum-validator.ts | 0 lib/jdl/{ => core}/validators/field-validator.spec.ts | 0 lib/jdl/{ => core}/validators/field-validator.ts | 0 .../validators/jdl-with-application-validator.spec.ts | 0 .../validators/jdl-with-application-validator.ts | 0 .../validators/jdl-without-application-validator.spec.ts | 0 .../validators/jdl-without-application-validator.ts | 0 lib/jdl/{ => core}/validators/option-validator.ts | 0 .../{ => core}/validators/relationship-validator.spec.ts | 0 lib/jdl/{ => core}/validators/relationship-validator.ts | 0 .../{ => core}/validators/unary-option-validator.spec.ts | 0 lib/jdl/{ => core}/validators/unary-option-validator.ts | 0 .../{ => core}/validators/validation-validator.spec.ts | 0 lib/jdl/{ => core}/validators/validation-validator.ts | 0 lib/jdl/{ => core}/validators/validator.ts | 0 lib/jdl/index.ts | 4 ++-- lib/jhipster/application-options.ts | 2 +- lib/jhipster/field-types.spec.ts | 2 +- lib/jhipster/field-types.ts | 4 ++-- lib/jhipster/index.ts | 4 ++-- lib/jhipster/jdl-validator-definition.ts | 4 ++-- test/integration-test.spec.ts | 2 +- test/needle-api/needle-client-angular.spec.ts | 2 +- test/needle-api/needle-client-react-generator.spec.ts | 2 +- test/needle-api/needle-client-react.spec.ts | 2 +- test/needle-api/needle-client-vue-generator.spec.ts | 2 +- test/needle-api/needle-client-vue.spec.ts | 2 +- testing/helpers.ts | 2 +- 353 files changed, 78 insertions(+), 77 deletions(-) rename lib/jdl/{ => core}/__snapshots__/jdl-importer.spec.ts.snap (100%) rename lib/jdl/{ => core}/__test-files__/MyEntity.json (100%) rename lib/jdl/{ => core}/__test-files__/annotations.jdl (100%) rename lib/jdl/{ => core}/__test-files__/annotations_and_options.jdl (100%) rename lib/jdl/{ => core}/__test-files__/application.jdl (100%) rename lib/jdl/{ => core}/__test-files__/application_with_blueprints.jdl (100%) rename lib/jdl/{ => core}/__test-files__/application_with_entities.jdl (100%) rename lib/jdl/{ => core}/__test-files__/application_with_entity_dto_suffixes.jdl (100%) rename lib/jdl/{ => core}/__test-files__/application_wrong_basename.jdl (100%) rename lib/jdl/{ => core}/__test-files__/applications.jdl (100%) rename lib/jdl/{ => core}/__test-files__/applications2.jdl (100%) rename lib/jdl/{ => core}/__test-files__/applications3.jdl (100%) rename lib/jdl/{ => core}/__test-files__/applications_with_and_without_entities.jdl (100%) rename lib/jdl/{ => core}/__test-files__/authority_entity_to_relationship.jdl (100%) rename lib/jdl/{ => core}/__test-files__/big_sample.jdl (100%) rename lib/jdl/{ => core}/__test-files__/blob_jdl.jdl (100%) rename lib/jdl/{ => core}/__test-files__/capitalized_annotations.jdl (100%) rename lib/jdl/{ => core}/__test-files__/cassandra_jdl.jdl (100%) rename lib/jdl/{ => core}/__test-files__/cassandra_with_relationships.jdl (100%) rename lib/jdl/{ => core}/__test-files__/client_root_folder.jdl (100%) rename lib/jdl/{ => core}/__test-files__/client_root_folder_no_microservice.jdl (100%) rename lib/jdl/{ => core}/__test-files__/complex_jdl.jdl (100%) rename lib/jdl/{ => core}/__test-files__/complex_jdl_2.jdl (100%) rename lib/jdl/{ => core}/__test-files__/constants.jdl (100%) rename lib/jdl/{ => core}/__test-files__/couchbase_jdl.jdl (100%) rename lib/jdl/{ => core}/__test-files__/deployments.jdl (100%) rename lib/jdl/{ => core}/__test-files__/different_relationship_types.jdl (100%) rename lib/jdl/{ => core}/__test-files__/enum.jdl (100%) rename lib/jdl/{ => core}/__test-files__/enum_with_values.jdl (100%) rename lib/jdl/{ => core}/__test-files__/field_comments.jdl (100%) rename lib/jdl/{ => core}/__test-files__/filtering_with_service.jdl (100%) rename lib/jdl/{ => core}/__test-files__/filtering_without_service.jdl (100%) rename lib/jdl/{ => core}/__test-files__/fluent_methods.jdl (100%) rename lib/jdl/{ => core}/__test-files__/fluent_methods2.jdl (100%) rename lib/jdl/{ => core}/__test-files__/following_comments.jdl (100%) rename lib/jdl/{ => core}/__test-files__/id_field.jdl (100%) rename lib/jdl/{ => core}/__test-files__/integration/file1.jdl (100%) rename lib/jdl/{ => core}/__test-files__/integration/file2.jdl (100%) rename lib/jdl/{ => core}/__test-files__/invalid_field_type.jdl (100%) rename lib/jdl/{ => core}/__test-files__/invalid_file.txt (100%) rename lib/jdl/{ => core}/__test-files__/invalid_file2 (100%) rename lib/jdl/{ => core}/__test-files__/invalid_option.jdl (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/BadEntity.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/CassBankAccount.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Country.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Department.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Employee.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Job.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/JobHistory.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Location.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/NoEntity.txt (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Region.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.jhipster/Task.json (100%) rename lib/jdl/{ => core}/__test-files__/jhipster_app/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json (100%) rename lib/jdl/{ => core}/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json (100%) rename lib/jdl/{ => core}/__test-files__/lint/duplicate_entities.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/duplicate_enums.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/duplicate_fields.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/ungrouped_relationships.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/unused_enums.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/useless_commas_fields.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/useless_entity_curly_braces.jdl (100%) rename lib/jdl/{ => core}/__test-files__/lint/useless_table_names.jdl (100%) rename lib/jdl/{ => core}/__test-files__/mongo_jdl.jdl (100%) rename lib/jdl/{ => core}/__test-files__/multiple_jdl_comments.jdl (100%) rename lib/jdl/{ => core}/__test-files__/no_injected_field.jdl (100%) rename lib/jdl/{ => core}/__test-files__/no_microservice.jdl (100%) rename lib/jdl/{ => core}/__test-files__/non_existent_validation.jdl (100%) rename lib/jdl/{ => core}/__test-files__/pattern_validation_with_quote.jdl (100%) rename lib/jdl/{ => core}/__test-files__/realistic_sample.jdl (100%) rename lib/jdl/{ => core}/__test-files__/regex_validation.jdl (100%) rename lib/jdl/{ => core}/__test-files__/relationship_built_in_entity.jdl (100%) rename lib/jdl/{ => core}/__test-files__/required_relationships.jdl (100%) rename lib/jdl/{ => core}/__test-files__/simple.jdl (100%) rename lib/jdl/{ => core}/__test-files__/simple_microservice_setup.jdl (100%) rename lib/jdl/{ => core}/__test-files__/two_microservices.jdl (100%) rename lib/jdl/{ => core}/__test-files__/underscore_application_name.jdl (100%) rename lib/jdl/{ => core}/__test-files__/unexistent_entities_for_relationship.jdl (100%) rename lib/jdl/{ => core}/__test-files__/unique.jdl (100%) rename lib/jdl/{ => core}/__test-files__/user_entity_from_relationship.jdl (100%) rename lib/jdl/{ => core}/__test-files__/user_entity_to_relationship.jdl (100%) rename lib/jdl/{ => core}/__test-files__/valid_jdl.jdl (100%) rename lib/jdl/{ => core}/__test-files__/valid_jdl2.jdl (100%) rename lib/jdl/{ => core}/__test-support__/index.ts (97%) rename lib/jdl/{ => core}/basic-types/index.ts (100%) rename lib/jdl/{ => core}/basic-types/json-entity.spec.ts (100%) rename lib/jdl/{ => core}/basic-types/json-entity.ts (100%) rename lib/jdl/{ => core}/basic-types/relationship-types.spec.ts (100%) rename lib/jdl/{ => core}/basic-types/relationship-types.ts (100%) rename lib/jdl/{ => core}/basic-types/relationships.ts (100%) rename lib/jdl/{ => core}/built-in-options/binary-options.spec.ts (100%) rename lib/jdl/{ => core}/built-in-options/binary-options.ts (97%) rename lib/jdl/{ => core}/built-in-options/index.ts (94%) rename lib/jdl/{ => core}/built-in-options/jdl-application-definition.spec.ts (98%) rename lib/jdl/{ => core}/built-in-options/jdl-application-definition.ts (100%) rename lib/jdl/{ => core}/built-in-options/relationship-options.spec.ts (100%) rename lib/jdl/{ => core}/built-in-options/relationship-options.ts (100%) rename lib/jdl/{ => core}/built-in-options/unary-options.spec.ts (100%) rename lib/jdl/{ => core}/built-in-options/unary-options.ts (100%) rename lib/jdl/{ => core}/built-in-options/validation-patterns.ts (100%) rename lib/jdl/{ => core}/built-in-options/validations.spec.ts (100%) rename lib/jdl/{ => core}/built-in-options/validations.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-field-converter.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-option-converter.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-to-json-relationship-converter.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/jdl-to-json/jdl-without-application-to-json-converter.ts (100%) rename lib/jdl/{ => core}/converters/json-to-jdl-application-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/json-to-jdl-application-converter.ts (100%) rename lib/jdl/{ => core}/converters/json-to-jdl-converter.spec.ts (99%) rename lib/jdl/{ => core}/converters/json-to-jdl-converter.ts (97%) rename lib/jdl/{ => core}/converters/json-to-jdl-entity-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/json-to-jdl-entity-converter.ts (100%) rename lib/jdl/{ => core}/converters/json-to-jdl-option-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/json-to-jdl-option-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/application-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/deployment-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/entity-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/enum-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/field-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/option-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/relationship-converter.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts (100%) rename lib/jdl/{ => core}/converters/parsed-jdl-to-jdl-object/validation-converter.ts (100%) rename lib/jdl/{ => core}/exporters/applications/jhipster-application-formatter.ts (100%) rename lib/jdl/{ => core}/exporters/export-utils.spec.ts (98%) rename lib/jdl/{ => core}/exporters/export-utils.ts (96%) rename lib/jdl/{ => core}/exporters/jdl-exporter.spec.ts (98%) rename lib/jdl/{ => core}/exporters/jdl-exporter.ts (100%) rename lib/jdl/{ => core}/exporters/jhipster-deployment-exporter.spec.ts (98%) rename lib/jdl/{ => core}/exporters/jhipster-deployment-exporter.ts (100%) rename lib/jdl/{ => core}/exporters/jhipster-entity-exporter.spec.ts (99%) rename lib/jdl/{ => core}/exporters/jhipster-entity-exporter.ts (100%) rename lib/jdl/{ => core}/integration-test.spec.ts (98%) rename lib/jdl/{ => core}/jdl-importer.spec.ts (99%) rename lib/jdl/{ => core}/jdl-importer.ts (99%) rename lib/jdl/{ => core}/linters/entity-linter.ts (100%) rename lib/jdl/{ => core}/linters/enum-linter.ts (100%) rename lib/jdl/{ => core}/linters/field-linter.ts (100%) rename lib/jdl/{ => core}/linters/issues/abstract-issue.ts (100%) rename lib/jdl/{ => core}/linters/issues/entity-issue.spec.ts (100%) rename lib/jdl/{ => core}/linters/issues/entity-issue.ts (100%) rename lib/jdl/{ => core}/linters/issues/enum-issue.spec.ts (100%) rename lib/jdl/{ => core}/linters/issues/enum-issue.ts (100%) rename lib/jdl/{ => core}/linters/issues/field-issue.spec.ts (100%) rename lib/jdl/{ => core}/linters/issues/field-issue.ts (100%) rename lib/jdl/{ => core}/linters/issues/issues.spec.ts (100%) rename lib/jdl/{ => core}/linters/issues/issues.ts (100%) rename lib/jdl/{ => core}/linters/issues/relationship-issue.spec.ts (100%) rename lib/jdl/{ => core}/linters/issues/relationship-issue.ts (100%) rename lib/jdl/{ => core}/linters/jdl-linter.spec.ts (99%) rename lib/jdl/{ => core}/linters/jdl-linter.ts (100%) rename lib/jdl/{ => core}/linters/relationship-linter.ts (100%) rename lib/jdl/{ => core}/linters/rule-levels.ts (100%) rename lib/jdl/{ => core}/linters/rule.spec.ts (100%) rename lib/jdl/{ => core}/linters/rule.ts (100%) rename lib/jdl/{ => core}/linters/rules.spec.ts (100%) rename lib/jdl/{ => core}/linters/rules.ts (100%) rename lib/jdl/{ => core}/matchers/entity-matcher.ts (100%) rename lib/jdl/{ => core}/matchers/field-matcher.ts (100%) rename lib/jdl/{ => core}/models/abstract-jdl-option.spec.ts (100%) rename lib/jdl/{ => core}/models/abstract-jdl-option.ts (100%) rename lib/jdl/{ => core}/models/boolean-jdl-application-configuration-option.ts (100%) rename lib/jdl/{ => core}/models/index.ts (100%) rename lib/jdl/{ => core}/models/integer-jdl-application-configuration-option.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-configuration-factory.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-configuration-factory.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-configuration-option.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-configuration.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-configuration.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-entities.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-entities.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-factory.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-application-factory.ts (100%) rename lib/jdl/{ => core}/models/jdl-application.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-application.ts (100%) rename lib/jdl/{ => core}/models/jdl-binary-option.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-binary-option.ts (100%) rename lib/jdl/{ => core}/models/jdl-deployment.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-deployment.ts (100%) rename lib/jdl/{ => core}/models/jdl-entity.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-entity.ts (100%) rename lib/jdl/{ => core}/models/jdl-enum-value.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-enum-value.ts (100%) rename lib/jdl/{ => core}/models/jdl-enum.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-enum.ts (100%) rename lib/jdl/{ => core}/models/jdl-enums.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-enums.ts (100%) rename lib/jdl/{ => core}/models/jdl-field.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-field.ts (100%) rename lib/jdl/{ => core}/models/jdl-object-merger.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-object-merger.ts (100%) rename lib/jdl/{ => core}/models/jdl-object-wrapper.ts (100%) rename lib/jdl/{ => core}/models/jdl-object.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-object.ts (100%) rename lib/jdl/{ => core}/models/jdl-options.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-options.ts (100%) rename lib/jdl/{ => core}/models/jdl-relationship.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-relationship.ts (100%) rename lib/jdl/{ => core}/models/jdl-relationships.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-relationships.ts (100%) rename lib/jdl/{ => core}/models/jdl-unary-option.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-unary-option.ts (100%) rename lib/jdl/{ => core}/models/jdl-validation.spec.ts (100%) rename lib/jdl/{ => core}/models/jdl-validation.ts (100%) rename lib/jdl/{ => core}/models/list-jdl-application-configuration-option.ts (100%) rename lib/jdl/{ => core}/models/string-jdl-application-configuration-option.ts (100%) rename lib/jdl/{ => core}/parsing/api.ts (100%) rename lib/jdl/{ => core}/parsing/dsl-api.spec.ts (100%) rename lib/jdl/{ => core}/parsing/generated/generated-serialized-grammar.js (100%) rename lib/jdl/{ => core}/parsing/generated/grammar.html (100%) rename lib/jdl/{ => core}/parsing/grammar.spec.ts (100%) rename lib/jdl/{ => core}/parsing/jdl-ast-builder-visitor.ts (100%) rename lib/jdl/{ => core}/parsing/jdl-parser.ts (100%) rename lib/jdl/{ => core}/parsing/jdl-parsing-types.d.ts (100%) rename lib/jdl/{ => core}/parsing/jdl-post-parsing-tasks.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/application-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/deployment-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/lexer.spec.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/lexer.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/minmax-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/option-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/relationship-type-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/shared-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/token-creator.spec.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/token-creator.ts (100%) rename lib/jdl/{ => core}/parsing/lexer/validation-tokens.ts (100%) rename lib/jdl/{ => core}/parsing/self-checks/parsing-system-checker.ts (100%) rename lib/jdl/{ => core}/parsing/self-checks/token-collector-visitor.ts (100%) rename lib/jdl/{ => core}/parsing/validator.spec.ts (100%) rename lib/jdl/{ => core}/parsing/validator.ts (100%) rename lib/jdl/{ => core}/readers/file-reader.spec.ts (97%) rename lib/jdl/{ => core}/readers/file-reader.ts (100%) rename lib/jdl/{ => core}/readers/jdl-reader.spec.ts (98%) rename lib/jdl/{ => core}/readers/jdl-reader.ts (100%) rename lib/jdl/{ => core}/readers/json-file-reader.spec.ts (100%) rename lib/jdl/{ => core}/readers/json-file-reader.ts (100%) rename lib/jdl/{ => core}/readers/json-reader.spec.ts (100%) rename lib/jdl/{ => core}/readers/json-reader.ts (100%) rename lib/jdl/{ => core}/runtime.ts (94%) rename lib/jdl/{ => core}/types/exporter.d.ts (100%) rename lib/jdl/{ => core}/types/json-config.d.ts (83%) rename lib/jdl/{ => core}/types/parsed.d.ts (100%) rename lib/jdl/{ => core}/types/parsing.d.ts (100%) rename lib/jdl/{ => core}/types/runtime.d.ts (100%) rename lib/jdl/{ => core}/utils/array-utils.spec.ts (100%) rename lib/jdl/{ => core}/utils/array-utils.ts (100%) rename lib/jdl/{ => core}/utils/deprecation-utils.ts (100%) rename lib/jdl/{ => core}/utils/entity-table-name-creator.spec.ts (100%) rename lib/jdl/{ => core}/utils/entity-table-name-creator.ts (95%) rename lib/jdl/{ => core}/utils/file-utils.ts (100%) rename lib/jdl/{ => core}/utils/files-utils.spec.ts (97%) rename lib/jdl/{ => core}/utils/format-utils.spec.ts (100%) rename lib/jdl/{ => core}/utils/format-utils.ts (100%) rename lib/jdl/{ => core}/utils/object-utils.spec.ts (100%) rename lib/jdl/{ => core}/utils/object-utils.ts (100%) rename lib/jdl/{ => core}/utils/objects/logger.ts (93%) rename lib/jdl/{ => core}/utils/set-utils.spec.ts (100%) rename lib/jdl/{ => core}/utils/set-utils.ts (100%) rename lib/jdl/{ => core}/utils/string-utils.ts (100%) rename lib/jdl/{ => core}/utils/string_utils.spec.ts (100%) rename lib/jdl/{ => core}/validators/binary-option-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/binary-option-validator.ts (100%) rename lib/jdl/{ => core}/validators/deployment-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/deployment-validator.ts (100%) rename lib/jdl/{ => core}/validators/entity-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/entity-validator.ts (100%) rename lib/jdl/{ => core}/validators/enum-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/enum-validator.ts (100%) rename lib/jdl/{ => core}/validators/field-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/field-validator.ts (100%) rename lib/jdl/{ => core}/validators/jdl-with-application-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/jdl-with-application-validator.ts (100%) rename lib/jdl/{ => core}/validators/jdl-without-application-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/jdl-without-application-validator.ts (100%) rename lib/jdl/{ => core}/validators/option-validator.ts (100%) rename lib/jdl/{ => core}/validators/relationship-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/relationship-validator.ts (100%) rename lib/jdl/{ => core}/validators/unary-option-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/unary-option-validator.ts (100%) rename lib/jdl/{ => core}/validators/validation-validator.spec.ts (100%) rename lib/jdl/{ => core}/validators/validation-validator.ts (100%) rename lib/jdl/{ => core}/validators/validator.ts (100%) diff --git a/generators/base-application/support/prepare-entity.ts b/generators/base-application/support/prepare-entity.ts index 3ecb36e244a4..eb64049887df 100644 --- a/generators/base-application/support/prepare-entity.ts +++ b/generators/base-application/support/prepare-entity.ts @@ -31,7 +31,7 @@ import { } from '../../base/support/index.js'; import { getEntityParentPathAddition, getTypescriptKeyType } from '../../client/support/index.js'; import { applicationTypes, databaseTypes, entityOptions, fieldTypes, searchEngineTypes } from '../../../lib/jhipster/index.js'; -import { binaryOptions } from '../../../lib/jdl/built-in-options/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'; diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts index 1a4f3e2826e5..cbefd4301e37 100644 --- a/generators/base-application/support/relationship.ts +++ b/generators/base-application/support/relationship.ts @@ -19,7 +19,7 @@ import { lowerFirst, upperFirst } from 'lodash-es'; -import type { JSONEntity } from '../../../lib/jdl/types/json-config.js'; +import type { JSONEntity } from '../../../lib/jdl/core/types/json-config.js'; import type { ValidationResult } from '../../base/api.js'; import type { Entity } from '../../../lib/types/application/entity.js'; import type { Relationship } from '../../../lib/types/application/relationship.js'; diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index 7f474b117ebb..1bb01f05cb48 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -5,9 +5,9 @@ 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 '../../../lib/jdl/converters/json-to-jdl-converter.js'; -import { createRuntime } from '../../../lib/jdl/runtime.js'; -import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing.js'; +import { getJDLObjectFromSingleApplication } from '../../../lib/jdl/core/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 = ({ diff --git a/generators/bootstrap-application-base/support/import-jdl-transform.ts b/generators/bootstrap-application-base/support/import-jdl-transform.ts index 134736591b6d..69624bc3a73d 100644 --- a/generators/bootstrap-application-base/support/import-jdl-transform.ts +++ b/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 '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; import { mergeYoRcContent } from '../../../lib/utils/yo-rc.js'; -import type { JDLApplicationConfig } from '../../../lib/jdl/types/parsing.js'; +import type { JDLApplicationConfig } from '../../../lib/jdl/core/types/parsing.js'; export const importJDLTransform = ({ destinationPath, diff --git a/generators/export-jdl/generator.ts b/generators/export-jdl/generator.ts index 398b64e293d9..d460859fb348 100644 --- a/generators/export-jdl/generator.ts +++ b/generators/export-jdl/generator.ts @@ -21,7 +21,7 @@ import chalk from 'chalk'; import BaseGenerator from '../base/index.js'; import { applicationOptions } from '../../lib/jhipster/index.js'; -import { convertToJDL } from '../../lib/jdl/converters/json-to-jdl-converter.js'; +import { convertToJDL } from '../../lib/jdl/core/converters/json-to-jdl-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import jdlDefinition from '../app/jdl/index.js'; diff --git a/generators/info/generator.ts b/generators/info/generator.ts index 3acb49958f14..5d14b07a1034 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -22,8 +22,8 @@ import chalk from 'chalk'; import BaseApplicationGenerator from '../base-application/index.js'; -import JSONToJDLEntityConverter from '../../lib/jdl/converters/json-to-jdl-entity-converter.js'; -import JSONToJDLOptionConverter from '../../lib/jdl/converters/json-to-jdl-option-converter.js'; +import JSONToJDLEntityConverter from '../../lib/jdl/core/converters/json-to-jdl-entity-converter.js'; +import JSONToJDLOptionConverter from '../../lib/jdl/core/converters/json-to-jdl-option-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import { YO_RC_FILE } from '../generator-constants.js'; import { applicationsLookup } from '../workspaces/support/applications-lookup.js'; diff --git a/generators/jdl/generator.ts b/generators/jdl/generator.ts index 426576cae2f3..f26a4b9e02a9 100644 --- a/generators/jdl/generator.ts +++ b/generators/jdl/generator.ts @@ -27,8 +27,8 @@ import { downloadJdlFile } from '../../cli/download.mjs'; import EnvironmentBuilder from '../../cli/environment-builder.mjs'; import { CLI_NAME } from '../../cli/utils.mjs'; import { GENERATOR_APP, GENERATOR_ENTITIES, GENERATOR_WORKSPACES } from '../generator-list.js'; -import type { ApplicationWithEntities } from '../../lib/jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../lib/jdl/jdl-importer.js'; +import type { ApplicationWithEntities } from '../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../lib/jdl/core/jdl-importer.js'; import { GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR } from '../generator-constants.js'; import { mergeYoRcContent } from '../../lib/utils/yo-rc.js'; import { normalizeBlueprintName } from '../base/internal/blueprint.js'; diff --git a/generators/jdl/internal/application.ts b/generators/jdl/internal/application.ts index da281ccf9e38..a34669eaf0d4 100644 --- a/generators/jdl/internal/application.ts +++ b/generators/jdl/internal/application.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { ApplicationWithEntities } from '../../../lib/jdl/jdl-importer.js'; +import type { ApplicationWithEntities } from '../../../lib/jdl/core/jdl-importer.js'; export const addApplicationIndex = (applicationsWithEntities: ApplicationWithEntities[]) => { applicationsWithEntities.forEach((applicationWithEntities, applicationIndex) => { diff --git a/generators/liquibase/incremental-liquibase.spec.ts b/generators/liquibase/incremental-liquibase.spec.ts index fbe22800ff15..2dcf262afa6b 100644 --- a/generators/liquibase/incremental-liquibase.spec.ts +++ b/generators/liquibase/incremental-liquibase.spec.ts @@ -4,7 +4,7 @@ import { fileURLToPath } from 'url'; import { after, before, describe, expect, it } from 'esmocha'; import { skipPrettierHelpers as helpers, runResult } from '../../testing/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; -import { createImporterFromContent } from '../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../lib/jdl/core/jdl-importer.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); diff --git a/generators/server/jdl/application-definition.ts b/generators/server/jdl/application-definition.ts index 3f6bdc33765c..edac81d9283d 100644 --- a/generators/server/jdl/application-definition.ts +++ b/generators/server/jdl/application-definition.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { snakeCase, upperCase } from 'lodash-es'; -import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; +import type { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../lib/jdl/core/types/parsing.js'; import databaseMigrationOption from '../options/database-migration.js'; import messageBrokerOption from '../options/message-broker.js'; import { syncUserWithIdpDefinition } from '../options/index.js'; diff --git a/generators/server/options/database-migration.spec.ts b/generators/server/options/database-migration.spec.ts index 331e45af7278..b7aa1e66adcb 100644 --- a/generators/server/options/database-migration.spec.ts +++ b/generators/server/options/database-migration.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import optionDefinition from './database-migration.js'; import { DATABASE_MIGRATION as optionName } from './index.js'; diff --git a/generators/server/options/database-migration.ts b/generators/server/options/database-migration.ts index 671b6d5f4ea6..3e54544015ba 100644 --- a/generators/server/options/database-migration.ts +++ b/generators/server/options/database-migration.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/core/types/parsing.js'; export const DATABASE_MIGRATION = 'databaseMigration'; export const DATABASE_MIGRATION_LIQUIBASE = 'liquibase'; diff --git a/generators/server/options/message-broker.spec.ts b/generators/server/options/message-broker.spec.ts index 4c6fed21d676..24e2c8c6fb50 100644 --- a/generators/server/options/message-broker.spec.ts +++ b/generators/server/options/message-broker.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import optionDefinition from './message-broker.js'; import { MESSAGE_BROKER } from './index.js'; diff --git a/generators/server/options/message-broker.ts b/generators/server/options/message-broker.ts index 468eba9bb32f..8ba3099176ce 100644 --- a/generators/server/options/message-broker.ts +++ b/generators/server/options/message-broker.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/core/types/parsing.js'; import type { OptionWithDerivedProperties } from '../../base-application/application-options.js'; export const MESSAGE_BROKER = 'messageBroker'; diff --git a/generators/server/options/sync-user-with-idp.spec.ts b/generators/server/options/sync-user-with-idp.spec.ts index 4bb808a56168..c8cc0496760b 100644 --- a/generators/server/options/sync-user-with-idp.spec.ts +++ b/generators/server/options/sync-user-with-idp.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import { SYNC_USER_WITH_IDP as optionName } from './sync-user-with-idp.js'; diff --git a/generators/server/options/sync-user-with-idp.ts b/generators/server/options/sync-user-with-idp.ts index 648369e6921a..7f8a2954376d 100644 --- a/generators/server/options/sync-user-with-idp.ts +++ b/generators/server/options/sync-user-with-idp.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import type { JHipsterOptionDefinition } from '../../../lib/jdl/types/parsing.js'; +import type { JHipsterOptionDefinition } from '../../../lib/jdl/core/types/parsing.js'; export const SYNC_USER_WITH_IDP = 'syncUserWithIdp'; diff --git a/generators/spring-boot/options/feign-client.spec.ts b/generators/spring-boot/options/feign-client.spec.ts index 013be7af896b..ffeda6dcb5f8 100644 --- a/generators/spring-boot/options/feign-client.spec.ts +++ b/generators/spring-boot/options/feign-client.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; import definition from '../../app/jdl/index.js'; const optionName = 'feignClient'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts index 66cfd95278ad..81bf75ef9033 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts @@ -1,7 +1,7 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../../../lib/jdl/jdl-importer.js'; -import { createImporterFromContent } from '../../../../../lib/jdl/jdl-importer.js'; -import { convertSingleContentToJDL } from '../../../../../lib/jdl/converters/json-to-jdl-converter.js'; +import type { ImportState } from '../../../../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../../../../lib/jdl/core/jdl-importer.js'; +import { convertSingleContentToJDL } from '../../../../../lib/jdl/core/converters/json-to-jdl-converter.js'; const optionName = 'routes'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts index bbff011bb5e3..aaa34278f6c2 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/types/parsing.js'; +import type { JHipsterOptionDefinition } from '../../../../../lib/jdl/core/types/parsing.js'; export const jdlRoutesOptions: JHipsterOptionDefinition = { name: 'routes', diff --git a/lib/command/converter.ts b/lib/command/converter.ts index 05ea4c3f5dd5..223edbf8715b 100644 --- a/lib/command/converter.ts +++ b/lib/command/converter.ts @@ -1,4 +1,4 @@ -import type { JHipsterOptionDefinition } from '../jdl/types/parsing.js'; +import type { JHipsterOptionDefinition } from '../jdl/core/types/parsing.js'; import type { ConfigSpec, JHipsterArguments, JHipsterConfigs, JHipsterOption } from './types.js'; export const extractArgumentsFromConfigs = (configs: JHipsterConfigs | undefined): JHipsterArguments => { diff --git a/lib/command/types.d.ts b/lib/command/types.d.ts index e1fc66da764a..09caa1389b70 100644 --- a/lib/command/types.d.ts +++ b/lib/command/types.d.ts @@ -1,6 +1,6 @@ import type { ArgumentSpec, CliOptionSpec } from 'yeoman-generator'; import type { RequireAtLeastOne, SetOptional, Simplify, TaggedUnion, TupleToUnion, ValueOf } from 'type-fest'; -import type { JHipsterOptionDefinition } from '../jdl/types/parsing.js'; +import type { JHipsterOptionDefinition } from '../jdl/core/types/parsing.js'; import type { DerivedPropertiesOf, DerivedPropertiesWithInferenceUnion } from '../types/utils/derived-properties.js'; import type { MergeUnion } from './support/merge-union.js'; diff --git a/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap b/lib/jdl/core/__snapshots__/jdl-importer.spec.ts.snap similarity index 100% rename from lib/jdl/__snapshots__/jdl-importer.spec.ts.snap rename to lib/jdl/core/__snapshots__/jdl-importer.spec.ts.snap diff --git a/lib/jdl/__test-files__/MyEntity.json b/lib/jdl/core/__test-files__/MyEntity.json similarity index 100% rename from lib/jdl/__test-files__/MyEntity.json rename to lib/jdl/core/__test-files__/MyEntity.json diff --git a/lib/jdl/__test-files__/annotations.jdl b/lib/jdl/core/__test-files__/annotations.jdl similarity index 100% rename from lib/jdl/__test-files__/annotations.jdl rename to lib/jdl/core/__test-files__/annotations.jdl diff --git a/lib/jdl/__test-files__/annotations_and_options.jdl b/lib/jdl/core/__test-files__/annotations_and_options.jdl similarity index 100% rename from lib/jdl/__test-files__/annotations_and_options.jdl rename to lib/jdl/core/__test-files__/annotations_and_options.jdl diff --git a/lib/jdl/__test-files__/application.jdl b/lib/jdl/core/__test-files__/application.jdl similarity index 100% rename from lib/jdl/__test-files__/application.jdl rename to lib/jdl/core/__test-files__/application.jdl diff --git a/lib/jdl/__test-files__/application_with_blueprints.jdl b/lib/jdl/core/__test-files__/application_with_blueprints.jdl similarity index 100% rename from lib/jdl/__test-files__/application_with_blueprints.jdl rename to lib/jdl/core/__test-files__/application_with_blueprints.jdl diff --git a/lib/jdl/__test-files__/application_with_entities.jdl b/lib/jdl/core/__test-files__/application_with_entities.jdl similarity index 100% rename from lib/jdl/__test-files__/application_with_entities.jdl rename to lib/jdl/core/__test-files__/application_with_entities.jdl diff --git a/lib/jdl/__test-files__/application_with_entity_dto_suffixes.jdl b/lib/jdl/core/__test-files__/application_with_entity_dto_suffixes.jdl similarity index 100% rename from lib/jdl/__test-files__/application_with_entity_dto_suffixes.jdl rename to lib/jdl/core/__test-files__/application_with_entity_dto_suffixes.jdl diff --git a/lib/jdl/__test-files__/application_wrong_basename.jdl b/lib/jdl/core/__test-files__/application_wrong_basename.jdl similarity index 100% rename from lib/jdl/__test-files__/application_wrong_basename.jdl rename to lib/jdl/core/__test-files__/application_wrong_basename.jdl diff --git a/lib/jdl/__test-files__/applications.jdl b/lib/jdl/core/__test-files__/applications.jdl similarity index 100% rename from lib/jdl/__test-files__/applications.jdl rename to lib/jdl/core/__test-files__/applications.jdl diff --git a/lib/jdl/__test-files__/applications2.jdl b/lib/jdl/core/__test-files__/applications2.jdl similarity index 100% rename from lib/jdl/__test-files__/applications2.jdl rename to lib/jdl/core/__test-files__/applications2.jdl diff --git a/lib/jdl/__test-files__/applications3.jdl b/lib/jdl/core/__test-files__/applications3.jdl similarity index 100% rename from lib/jdl/__test-files__/applications3.jdl rename to lib/jdl/core/__test-files__/applications3.jdl diff --git a/lib/jdl/__test-files__/applications_with_and_without_entities.jdl b/lib/jdl/core/__test-files__/applications_with_and_without_entities.jdl similarity index 100% rename from lib/jdl/__test-files__/applications_with_and_without_entities.jdl rename to lib/jdl/core/__test-files__/applications_with_and_without_entities.jdl diff --git a/lib/jdl/__test-files__/authority_entity_to_relationship.jdl b/lib/jdl/core/__test-files__/authority_entity_to_relationship.jdl similarity index 100% rename from lib/jdl/__test-files__/authority_entity_to_relationship.jdl rename to lib/jdl/core/__test-files__/authority_entity_to_relationship.jdl diff --git a/lib/jdl/__test-files__/big_sample.jdl b/lib/jdl/core/__test-files__/big_sample.jdl similarity index 100% rename from lib/jdl/__test-files__/big_sample.jdl rename to lib/jdl/core/__test-files__/big_sample.jdl diff --git a/lib/jdl/__test-files__/blob_jdl.jdl b/lib/jdl/core/__test-files__/blob_jdl.jdl similarity index 100% rename from lib/jdl/__test-files__/blob_jdl.jdl rename to lib/jdl/core/__test-files__/blob_jdl.jdl diff --git a/lib/jdl/__test-files__/capitalized_annotations.jdl b/lib/jdl/core/__test-files__/capitalized_annotations.jdl similarity index 100% rename from lib/jdl/__test-files__/capitalized_annotations.jdl rename to lib/jdl/core/__test-files__/capitalized_annotations.jdl diff --git a/lib/jdl/__test-files__/cassandra_jdl.jdl b/lib/jdl/core/__test-files__/cassandra_jdl.jdl similarity index 100% rename from lib/jdl/__test-files__/cassandra_jdl.jdl rename to lib/jdl/core/__test-files__/cassandra_jdl.jdl diff --git a/lib/jdl/__test-files__/cassandra_with_relationships.jdl b/lib/jdl/core/__test-files__/cassandra_with_relationships.jdl similarity index 100% rename from lib/jdl/__test-files__/cassandra_with_relationships.jdl rename to lib/jdl/core/__test-files__/cassandra_with_relationships.jdl diff --git a/lib/jdl/__test-files__/client_root_folder.jdl b/lib/jdl/core/__test-files__/client_root_folder.jdl similarity index 100% rename from lib/jdl/__test-files__/client_root_folder.jdl rename to lib/jdl/core/__test-files__/client_root_folder.jdl diff --git a/lib/jdl/__test-files__/client_root_folder_no_microservice.jdl b/lib/jdl/core/__test-files__/client_root_folder_no_microservice.jdl similarity index 100% rename from lib/jdl/__test-files__/client_root_folder_no_microservice.jdl rename to lib/jdl/core/__test-files__/client_root_folder_no_microservice.jdl diff --git a/lib/jdl/__test-files__/complex_jdl.jdl b/lib/jdl/core/__test-files__/complex_jdl.jdl similarity index 100% rename from lib/jdl/__test-files__/complex_jdl.jdl rename to lib/jdl/core/__test-files__/complex_jdl.jdl diff --git a/lib/jdl/__test-files__/complex_jdl_2.jdl b/lib/jdl/core/__test-files__/complex_jdl_2.jdl similarity index 100% rename from lib/jdl/__test-files__/complex_jdl_2.jdl rename to lib/jdl/core/__test-files__/complex_jdl_2.jdl diff --git a/lib/jdl/__test-files__/constants.jdl b/lib/jdl/core/__test-files__/constants.jdl similarity index 100% rename from lib/jdl/__test-files__/constants.jdl rename to lib/jdl/core/__test-files__/constants.jdl diff --git a/lib/jdl/__test-files__/couchbase_jdl.jdl b/lib/jdl/core/__test-files__/couchbase_jdl.jdl similarity index 100% rename from lib/jdl/__test-files__/couchbase_jdl.jdl rename to lib/jdl/core/__test-files__/couchbase_jdl.jdl diff --git a/lib/jdl/__test-files__/deployments.jdl b/lib/jdl/core/__test-files__/deployments.jdl similarity index 100% rename from lib/jdl/__test-files__/deployments.jdl rename to lib/jdl/core/__test-files__/deployments.jdl diff --git a/lib/jdl/__test-files__/different_relationship_types.jdl b/lib/jdl/core/__test-files__/different_relationship_types.jdl similarity index 100% rename from lib/jdl/__test-files__/different_relationship_types.jdl rename to lib/jdl/core/__test-files__/different_relationship_types.jdl diff --git a/lib/jdl/__test-files__/enum.jdl b/lib/jdl/core/__test-files__/enum.jdl similarity index 100% rename from lib/jdl/__test-files__/enum.jdl rename to lib/jdl/core/__test-files__/enum.jdl diff --git a/lib/jdl/__test-files__/enum_with_values.jdl b/lib/jdl/core/__test-files__/enum_with_values.jdl similarity index 100% rename from lib/jdl/__test-files__/enum_with_values.jdl rename to lib/jdl/core/__test-files__/enum_with_values.jdl diff --git a/lib/jdl/__test-files__/field_comments.jdl b/lib/jdl/core/__test-files__/field_comments.jdl similarity index 100% rename from lib/jdl/__test-files__/field_comments.jdl rename to lib/jdl/core/__test-files__/field_comments.jdl diff --git a/lib/jdl/__test-files__/filtering_with_service.jdl b/lib/jdl/core/__test-files__/filtering_with_service.jdl similarity index 100% rename from lib/jdl/__test-files__/filtering_with_service.jdl rename to lib/jdl/core/__test-files__/filtering_with_service.jdl diff --git a/lib/jdl/__test-files__/filtering_without_service.jdl b/lib/jdl/core/__test-files__/filtering_without_service.jdl similarity index 100% rename from lib/jdl/__test-files__/filtering_without_service.jdl rename to lib/jdl/core/__test-files__/filtering_without_service.jdl diff --git a/lib/jdl/__test-files__/fluent_methods.jdl b/lib/jdl/core/__test-files__/fluent_methods.jdl similarity index 100% rename from lib/jdl/__test-files__/fluent_methods.jdl rename to lib/jdl/core/__test-files__/fluent_methods.jdl diff --git a/lib/jdl/__test-files__/fluent_methods2.jdl b/lib/jdl/core/__test-files__/fluent_methods2.jdl similarity index 100% rename from lib/jdl/__test-files__/fluent_methods2.jdl rename to lib/jdl/core/__test-files__/fluent_methods2.jdl diff --git a/lib/jdl/__test-files__/following_comments.jdl b/lib/jdl/core/__test-files__/following_comments.jdl similarity index 100% rename from lib/jdl/__test-files__/following_comments.jdl rename to lib/jdl/core/__test-files__/following_comments.jdl diff --git a/lib/jdl/__test-files__/id_field.jdl b/lib/jdl/core/__test-files__/id_field.jdl similarity index 100% rename from lib/jdl/__test-files__/id_field.jdl rename to lib/jdl/core/__test-files__/id_field.jdl diff --git a/lib/jdl/__test-files__/integration/file1.jdl b/lib/jdl/core/__test-files__/integration/file1.jdl similarity index 100% rename from lib/jdl/__test-files__/integration/file1.jdl rename to lib/jdl/core/__test-files__/integration/file1.jdl diff --git a/lib/jdl/__test-files__/integration/file2.jdl b/lib/jdl/core/__test-files__/integration/file2.jdl similarity index 100% rename from lib/jdl/__test-files__/integration/file2.jdl rename to lib/jdl/core/__test-files__/integration/file2.jdl diff --git a/lib/jdl/__test-files__/invalid_field_type.jdl b/lib/jdl/core/__test-files__/invalid_field_type.jdl similarity index 100% rename from lib/jdl/__test-files__/invalid_field_type.jdl rename to lib/jdl/core/__test-files__/invalid_field_type.jdl diff --git a/lib/jdl/__test-files__/invalid_file.txt b/lib/jdl/core/__test-files__/invalid_file.txt similarity index 100% rename from lib/jdl/__test-files__/invalid_file.txt rename to lib/jdl/core/__test-files__/invalid_file.txt diff --git a/lib/jdl/__test-files__/invalid_file2 b/lib/jdl/core/__test-files__/invalid_file2 similarity index 100% rename from lib/jdl/__test-files__/invalid_file2 rename to lib/jdl/core/__test-files__/invalid_file2 diff --git a/lib/jdl/__test-files__/invalid_option.jdl b/lib/jdl/core/__test-files__/invalid_option.jdl similarity index 100% rename from lib/jdl/__test-files__/invalid_option.jdl rename to lib/jdl/core/__test-files__/invalid_option.jdl diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/BadEntity.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/BadEntity.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/BadEntity.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/BadEntity.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/CassBankAccount.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/CassBankAccount.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/CassBankAccount.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/CassBankAccount.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Country.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Country.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Country.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Country.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Department.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Department.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Department.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Department.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Employee.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Employee.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Employee.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Employee.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Job.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Job.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Job.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Job.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/JobHistory.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/JobHistory.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/JobHistory.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/JobHistory.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Location.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Location.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Location.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Location.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/NoEntity.txt b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/NoEntity.txt similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/NoEntity.txt rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/NoEntity.txt diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Region.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Region.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Region.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Region.json diff --git a/lib/jdl/__test-files__/jhipster_app/.jhipster/Task.json b/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Task.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.jhipster/Task.json rename to lib/jdl/core/__test-files__/jhipster_app/.jhipster/Task.json diff --git a/lib/jdl/__test-files__/jhipster_app/.yo-rc.json b/lib/jdl/core/__test-files__/jhipster_app/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/jhipster_app/.yo-rc.json rename to lib/jdl/core/__test-files__/jhipster_app/.yo-rc.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json diff --git a/lib/jdl/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json b/lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json similarity index 100% rename from lib/jdl/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json rename to lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json diff --git a/lib/jdl/__test-files__/lint/duplicate_entities.jdl b/lib/jdl/core/__test-files__/lint/duplicate_entities.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/duplicate_entities.jdl rename to lib/jdl/core/__test-files__/lint/duplicate_entities.jdl diff --git a/lib/jdl/__test-files__/lint/duplicate_enums.jdl b/lib/jdl/core/__test-files__/lint/duplicate_enums.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/duplicate_enums.jdl rename to lib/jdl/core/__test-files__/lint/duplicate_enums.jdl diff --git a/lib/jdl/__test-files__/lint/duplicate_fields.jdl b/lib/jdl/core/__test-files__/lint/duplicate_fields.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/duplicate_fields.jdl rename to lib/jdl/core/__test-files__/lint/duplicate_fields.jdl diff --git a/lib/jdl/__test-files__/lint/ungrouped_relationships.jdl b/lib/jdl/core/__test-files__/lint/ungrouped_relationships.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/ungrouped_relationships.jdl rename to lib/jdl/core/__test-files__/lint/ungrouped_relationships.jdl diff --git a/lib/jdl/__test-files__/lint/unused_enums.jdl b/lib/jdl/core/__test-files__/lint/unused_enums.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/unused_enums.jdl rename to lib/jdl/core/__test-files__/lint/unused_enums.jdl diff --git a/lib/jdl/__test-files__/lint/useless_commas_fields.jdl b/lib/jdl/core/__test-files__/lint/useless_commas_fields.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/useless_commas_fields.jdl rename to lib/jdl/core/__test-files__/lint/useless_commas_fields.jdl diff --git a/lib/jdl/__test-files__/lint/useless_entity_curly_braces.jdl b/lib/jdl/core/__test-files__/lint/useless_entity_curly_braces.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/useless_entity_curly_braces.jdl rename to lib/jdl/core/__test-files__/lint/useless_entity_curly_braces.jdl diff --git a/lib/jdl/__test-files__/lint/useless_table_names.jdl b/lib/jdl/core/__test-files__/lint/useless_table_names.jdl similarity index 100% rename from lib/jdl/__test-files__/lint/useless_table_names.jdl rename to lib/jdl/core/__test-files__/lint/useless_table_names.jdl diff --git a/lib/jdl/__test-files__/mongo_jdl.jdl b/lib/jdl/core/__test-files__/mongo_jdl.jdl similarity index 100% rename from lib/jdl/__test-files__/mongo_jdl.jdl rename to lib/jdl/core/__test-files__/mongo_jdl.jdl diff --git a/lib/jdl/__test-files__/multiple_jdl_comments.jdl b/lib/jdl/core/__test-files__/multiple_jdl_comments.jdl similarity index 100% rename from lib/jdl/__test-files__/multiple_jdl_comments.jdl rename to lib/jdl/core/__test-files__/multiple_jdl_comments.jdl diff --git a/lib/jdl/__test-files__/no_injected_field.jdl b/lib/jdl/core/__test-files__/no_injected_field.jdl similarity index 100% rename from lib/jdl/__test-files__/no_injected_field.jdl rename to lib/jdl/core/__test-files__/no_injected_field.jdl diff --git a/lib/jdl/__test-files__/no_microservice.jdl b/lib/jdl/core/__test-files__/no_microservice.jdl similarity index 100% rename from lib/jdl/__test-files__/no_microservice.jdl rename to lib/jdl/core/__test-files__/no_microservice.jdl diff --git a/lib/jdl/__test-files__/non_existent_validation.jdl b/lib/jdl/core/__test-files__/non_existent_validation.jdl similarity index 100% rename from lib/jdl/__test-files__/non_existent_validation.jdl rename to lib/jdl/core/__test-files__/non_existent_validation.jdl diff --git a/lib/jdl/__test-files__/pattern_validation_with_quote.jdl b/lib/jdl/core/__test-files__/pattern_validation_with_quote.jdl similarity index 100% rename from lib/jdl/__test-files__/pattern_validation_with_quote.jdl rename to lib/jdl/core/__test-files__/pattern_validation_with_quote.jdl diff --git a/lib/jdl/__test-files__/realistic_sample.jdl b/lib/jdl/core/__test-files__/realistic_sample.jdl similarity index 100% rename from lib/jdl/__test-files__/realistic_sample.jdl rename to lib/jdl/core/__test-files__/realistic_sample.jdl diff --git a/lib/jdl/__test-files__/regex_validation.jdl b/lib/jdl/core/__test-files__/regex_validation.jdl similarity index 100% rename from lib/jdl/__test-files__/regex_validation.jdl rename to lib/jdl/core/__test-files__/regex_validation.jdl diff --git a/lib/jdl/__test-files__/relationship_built_in_entity.jdl b/lib/jdl/core/__test-files__/relationship_built_in_entity.jdl similarity index 100% rename from lib/jdl/__test-files__/relationship_built_in_entity.jdl rename to lib/jdl/core/__test-files__/relationship_built_in_entity.jdl diff --git a/lib/jdl/__test-files__/required_relationships.jdl b/lib/jdl/core/__test-files__/required_relationships.jdl similarity index 100% rename from lib/jdl/__test-files__/required_relationships.jdl rename to lib/jdl/core/__test-files__/required_relationships.jdl diff --git a/lib/jdl/__test-files__/simple.jdl b/lib/jdl/core/__test-files__/simple.jdl similarity index 100% rename from lib/jdl/__test-files__/simple.jdl rename to lib/jdl/core/__test-files__/simple.jdl diff --git a/lib/jdl/__test-files__/simple_microservice_setup.jdl b/lib/jdl/core/__test-files__/simple_microservice_setup.jdl similarity index 100% rename from lib/jdl/__test-files__/simple_microservice_setup.jdl rename to lib/jdl/core/__test-files__/simple_microservice_setup.jdl diff --git a/lib/jdl/__test-files__/two_microservices.jdl b/lib/jdl/core/__test-files__/two_microservices.jdl similarity index 100% rename from lib/jdl/__test-files__/two_microservices.jdl rename to lib/jdl/core/__test-files__/two_microservices.jdl diff --git a/lib/jdl/__test-files__/underscore_application_name.jdl b/lib/jdl/core/__test-files__/underscore_application_name.jdl similarity index 100% rename from lib/jdl/__test-files__/underscore_application_name.jdl rename to lib/jdl/core/__test-files__/underscore_application_name.jdl diff --git a/lib/jdl/__test-files__/unexistent_entities_for_relationship.jdl b/lib/jdl/core/__test-files__/unexistent_entities_for_relationship.jdl similarity index 100% rename from lib/jdl/__test-files__/unexistent_entities_for_relationship.jdl rename to lib/jdl/core/__test-files__/unexistent_entities_for_relationship.jdl diff --git a/lib/jdl/__test-files__/unique.jdl b/lib/jdl/core/__test-files__/unique.jdl similarity index 100% rename from lib/jdl/__test-files__/unique.jdl rename to lib/jdl/core/__test-files__/unique.jdl diff --git a/lib/jdl/__test-files__/user_entity_from_relationship.jdl b/lib/jdl/core/__test-files__/user_entity_from_relationship.jdl similarity index 100% rename from lib/jdl/__test-files__/user_entity_from_relationship.jdl rename to lib/jdl/core/__test-files__/user_entity_from_relationship.jdl diff --git a/lib/jdl/__test-files__/user_entity_to_relationship.jdl b/lib/jdl/core/__test-files__/user_entity_to_relationship.jdl similarity index 100% rename from lib/jdl/__test-files__/user_entity_to_relationship.jdl rename to lib/jdl/core/__test-files__/user_entity_to_relationship.jdl diff --git a/lib/jdl/__test-files__/valid_jdl.jdl b/lib/jdl/core/__test-files__/valid_jdl.jdl similarity index 100% rename from lib/jdl/__test-files__/valid_jdl.jdl rename to lib/jdl/core/__test-files__/valid_jdl.jdl diff --git a/lib/jdl/__test-files__/valid_jdl2.jdl b/lib/jdl/core/__test-files__/valid_jdl2.jdl similarity index 100% rename from lib/jdl/__test-files__/valid_jdl2.jdl rename to lib/jdl/core/__test-files__/valid_jdl2.jdl diff --git a/lib/jdl/__test-support__/index.ts b/lib/jdl/core/__test-support__/index.ts similarity index 97% rename from lib/jdl/__test-support__/index.ts rename to lib/jdl/core/__test-support__/index.ts index 588689e0048a..96b55ad196f7 100644 --- a/lib/jdl/__test-support__/index.ts +++ b/lib/jdl/core/__test-support__/index.ts @@ -6,7 +6,7 @@ import { createImporterFromFiles as originalCreateImporterFromFiles, } from '../jdl-importer.js'; import type { ParsedJDLApplication, ParsedJDLRoot } from '../types/parsed.js'; -import definition from '../../../generators/app/jdl/index.js'; +import definition from '../../../../generators/app/jdl/index.js'; import { createJDLLinterFromContent as originalCreateJDLLinterFromContent, createJDLLinterFromFile as originalCreateJDLLinterFromFile, diff --git a/lib/jdl/basic-types/index.ts b/lib/jdl/core/basic-types/index.ts similarity index 100% rename from lib/jdl/basic-types/index.ts rename to lib/jdl/core/basic-types/index.ts diff --git a/lib/jdl/basic-types/json-entity.spec.ts b/lib/jdl/core/basic-types/json-entity.spec.ts similarity index 100% rename from lib/jdl/basic-types/json-entity.spec.ts rename to lib/jdl/core/basic-types/json-entity.spec.ts diff --git a/lib/jdl/basic-types/json-entity.ts b/lib/jdl/core/basic-types/json-entity.ts similarity index 100% rename from lib/jdl/basic-types/json-entity.ts rename to lib/jdl/core/basic-types/json-entity.ts diff --git a/lib/jdl/basic-types/relationship-types.spec.ts b/lib/jdl/core/basic-types/relationship-types.spec.ts similarity index 100% rename from lib/jdl/basic-types/relationship-types.spec.ts rename to lib/jdl/core/basic-types/relationship-types.spec.ts diff --git a/lib/jdl/basic-types/relationship-types.ts b/lib/jdl/core/basic-types/relationship-types.ts similarity index 100% rename from lib/jdl/basic-types/relationship-types.ts rename to lib/jdl/core/basic-types/relationship-types.ts diff --git a/lib/jdl/basic-types/relationships.ts b/lib/jdl/core/basic-types/relationships.ts similarity index 100% rename from lib/jdl/basic-types/relationships.ts rename to lib/jdl/core/basic-types/relationships.ts diff --git a/lib/jdl/built-in-options/binary-options.spec.ts b/lib/jdl/core/built-in-options/binary-options.spec.ts similarity index 100% rename from lib/jdl/built-in-options/binary-options.spec.ts rename to lib/jdl/core/built-in-options/binary-options.spec.ts diff --git a/lib/jdl/built-in-options/binary-options.ts b/lib/jdl/core/built-in-options/binary-options.ts similarity index 97% rename from lib/jdl/built-in-options/binary-options.ts rename to lib/jdl/core/built-in-options/binary-options.ts index f9ad466521ca..866339ba686d 100644 --- a/lib/jdl/built-in-options/binary-options.ts +++ b/lib/jdl/core/built-in-options/binary-options.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import entityOptions from '../../jhipster/entity-options.js'; +import entityOptions from '../../../jhipster/entity-options.js'; const { MapperTypes, PaginationTypes, SearchTypes, ServiceTypes } = entityOptions; const { MAPSTRUCT } = MapperTypes; diff --git a/lib/jdl/built-in-options/index.ts b/lib/jdl/core/built-in-options/index.ts similarity index 94% rename from lib/jdl/built-in-options/index.ts rename to lib/jdl/core/built-in-options/index.ts index 66b3e7346600..f651fd10ae7f 100644 --- a/lib/jdl/built-in-options/index.ts +++ b/lib/jdl/core/built-in-options/index.ts @@ -18,4 +18,4 @@ export { deploymentOptions, /** @deprecated */ entityOptions, -} from '../../jhipster/index.js'; +} from '../../../jhipster/index.js'; diff --git a/lib/jdl/built-in-options/jdl-application-definition.spec.ts b/lib/jdl/core/built-in-options/jdl-application-definition.spec.ts similarity index 98% rename from lib/jdl/built-in-options/jdl-application-definition.spec.ts rename to lib/jdl/core/built-in-options/jdl-application-definition.spec.ts index 0bdbf31c651b..38eaddb3f8fb 100644 --- a/lib/jdl/built-in-options/jdl-application-definition.spec.ts +++ b/lib/jdl/core/built-in-options/jdl-application-definition.spec.ts @@ -19,7 +19,7 @@ import { describe, it } from 'esmocha'; import { expect } from 'chai'; -import { applicationOptions } from '../../jhipster/index.js'; +import { applicationOptions } from '../../../jhipster/index.js'; import { getDefaultRuntime } from '../runtime.js'; const { OptionNames } = applicationOptions; diff --git a/lib/jdl/built-in-options/jdl-application-definition.ts b/lib/jdl/core/built-in-options/jdl-application-definition.ts similarity index 100% rename from lib/jdl/built-in-options/jdl-application-definition.ts rename to lib/jdl/core/built-in-options/jdl-application-definition.ts diff --git a/lib/jdl/built-in-options/relationship-options.spec.ts b/lib/jdl/core/built-in-options/relationship-options.spec.ts similarity index 100% rename from lib/jdl/built-in-options/relationship-options.spec.ts rename to lib/jdl/core/built-in-options/relationship-options.spec.ts diff --git a/lib/jdl/built-in-options/relationship-options.ts b/lib/jdl/core/built-in-options/relationship-options.ts similarity index 100% rename from lib/jdl/built-in-options/relationship-options.ts rename to lib/jdl/core/built-in-options/relationship-options.ts diff --git a/lib/jdl/built-in-options/unary-options.spec.ts b/lib/jdl/core/built-in-options/unary-options.spec.ts similarity index 100% rename from lib/jdl/built-in-options/unary-options.spec.ts rename to lib/jdl/core/built-in-options/unary-options.spec.ts diff --git a/lib/jdl/built-in-options/unary-options.ts b/lib/jdl/core/built-in-options/unary-options.ts similarity index 100% rename from lib/jdl/built-in-options/unary-options.ts rename to lib/jdl/core/built-in-options/unary-options.ts diff --git a/lib/jdl/built-in-options/validation-patterns.ts b/lib/jdl/core/built-in-options/validation-patterns.ts similarity index 100% rename from lib/jdl/built-in-options/validation-patterns.ts rename to lib/jdl/core/built-in-options/validation-patterns.ts diff --git a/lib/jdl/built-in-options/validations.spec.ts b/lib/jdl/core/built-in-options/validations.spec.ts similarity index 100% rename from lib/jdl/built-in-options/validations.spec.ts rename to lib/jdl/core/built-in-options/validations.spec.ts diff --git a/lib/jdl/built-in-options/validations.ts b/lib/jdl/core/built-in-options/validations.ts similarity index 100% rename from lib/jdl/built-in-options/validations.ts rename to lib/jdl/core/built-in-options/validations.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts b/lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts b/lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts b/lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts diff --git a/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts b/lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.ts similarity index 100% rename from lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts rename to lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.ts diff --git a/lib/jdl/converters/json-to-jdl-application-converter.spec.ts b/lib/jdl/core/converters/json-to-jdl-application-converter.spec.ts similarity index 100% rename from lib/jdl/converters/json-to-jdl-application-converter.spec.ts rename to lib/jdl/core/converters/json-to-jdl-application-converter.spec.ts diff --git a/lib/jdl/converters/json-to-jdl-application-converter.ts b/lib/jdl/core/converters/json-to-jdl-application-converter.ts similarity index 100% rename from lib/jdl/converters/json-to-jdl-application-converter.ts rename to lib/jdl/core/converters/json-to-jdl-application-converter.ts diff --git a/lib/jdl/converters/json-to-jdl-converter.spec.ts b/lib/jdl/core/converters/json-to-jdl-converter.spec.ts similarity index 99% rename from lib/jdl/converters/json-to-jdl-converter.spec.ts rename to lib/jdl/core/converters/json-to-jdl-converter.spec.ts index 0373243d75d5..eb455c4a5ddb 100644 --- a/lib/jdl/converters/json-to-jdl-converter.spec.ts +++ b/lib/jdl/core/converters/json-to-jdl-converter.spec.ts @@ -23,7 +23,7 @@ import { fileURLToPath } from 'url'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { convertSingleContentToJDL, convertToJDL } from '../converters/json-to-jdl-converter.js'; -import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../../testing/index.js'; +import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/core/converters/json-to-jdl-converter.ts similarity index 97% rename from lib/jdl/converters/json-to-jdl-converter.ts rename to lib/jdl/core/converters/json-to-jdl-converter.ts index 8d5e2dcd99e9..9764cbb49a54 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/core/converters/json-to-jdl-converter.ts @@ -24,11 +24,11 @@ import mergeJDLObjects from '../models/jdl-object-merger.js'; import { doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; import { readJSONFile } from '../readers/json-file-reader.js'; import exportJDLObject from '../exporters/jdl-exporter.js'; -import { removeFieldsWithNullishValues } from '../../utils/object.js'; +import { removeFieldsWithNullishValues } from '../../../utils/object.js'; import type JDLApplication from '../models/jdl-application.js'; import type { JDLRuntime } from '../types/runtime.js'; import { createRuntime, getDefaultRuntime } from '../runtime.js'; -import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; +import { YO_RC_CONFIG_KEY } from '../../../utils/yo-rc.js'; import type { JDLApplicationConfig } from '../types/parsing.js'; import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../types/json-config.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts b/lib/jdl/core/converters/json-to-jdl-entity-converter.spec.ts similarity index 100% rename from lib/jdl/converters/json-to-jdl-entity-converter.spec.ts rename to lib/jdl/core/converters/json-to-jdl-entity-converter.spec.ts diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.ts b/lib/jdl/core/converters/json-to-jdl-entity-converter.ts similarity index 100% rename from lib/jdl/converters/json-to-jdl-entity-converter.ts rename to lib/jdl/core/converters/json-to-jdl-entity-converter.ts diff --git a/lib/jdl/converters/json-to-jdl-option-converter.spec.ts b/lib/jdl/core/converters/json-to-jdl-option-converter.spec.ts similarity index 100% rename from lib/jdl/converters/json-to-jdl-option-converter.spec.ts rename to lib/jdl/core/converters/json-to-jdl-option-converter.spec.ts diff --git a/lib/jdl/converters/json-to-jdl-option-converter.ts b/lib/jdl/core/converters/json-to-jdl-option-converter.ts similarity index 100% rename from lib/jdl/converters/json-to-jdl-option-converter.ts rename to lib/jdl/core/converters/json-to-jdl-option-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts b/lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.ts similarity index 100% rename from lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts rename to lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.ts diff --git a/lib/jdl/exporters/applications/jhipster-application-formatter.ts b/lib/jdl/core/exporters/applications/jhipster-application-formatter.ts similarity index 100% rename from lib/jdl/exporters/applications/jhipster-application-formatter.ts rename to lib/jdl/core/exporters/applications/jhipster-application-formatter.ts diff --git a/lib/jdl/exporters/export-utils.spec.ts b/lib/jdl/core/exporters/export-utils.spec.ts similarity index 98% rename from lib/jdl/exporters/export-utils.spec.ts rename to lib/jdl/core/exporters/export-utils.spec.ts index 2ec24059043b..0f21240fcb9c 100644 --- a/lib/jdl/exporters/export-utils.spec.ts +++ b/lib/jdl/core/exporters/export-utils.spec.ts @@ -22,7 +22,7 @@ import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { beforeEach, describe, expect, it } from 'esmocha'; import { writeConfigFile } from '../exporters/export-utils.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/lib/jdl/exporters/export-utils.ts b/lib/jdl/core/exporters/export-utils.ts similarity index 96% rename from lib/jdl/exporters/export-utils.ts rename to lib/jdl/core/exporters/export-utils.ts index 918609f61b9a..fae10886b3de 100644 --- a/lib/jdl/exporters/export-utils.ts +++ b/lib/jdl/core/exporters/export-utils.ts @@ -20,7 +20,7 @@ import fs from 'fs'; import { doesFileExist } from '../utils/file-utils.js'; import type { JHipsterYoRcContent } from '../types/json-config.js'; -import { mergeYoRcContent } from '../../utils/yo-rc.js'; +import { mergeYoRcContent } from '../../../utils/yo-rc.js'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/exporters/jdl-exporter.spec.ts b/lib/jdl/core/exporters/jdl-exporter.spec.ts similarity index 98% rename from lib/jdl/exporters/jdl-exporter.spec.ts rename to lib/jdl/core/exporters/jdl-exporter.spec.ts index a5abb90bbc3e..8ed01f0ac2e7 100644 --- a/lib/jdl/exporters/jdl-exporter.spec.ts +++ b/lib/jdl/core/exporters/jdl-exporter.spec.ts @@ -26,7 +26,7 @@ import exportToJDL from '../exporters/jdl-exporter.js'; import JDLApplication from '../models/jdl-application.js'; import type { JDLJSONApplicationConfiguration } from '../parsing/jdl-parsing-types.js'; import { applicationOptions } from '../built-in-options/index.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; import { getDefaultRuntime } from '../runtime.js'; const { diff --git a/lib/jdl/exporters/jdl-exporter.ts b/lib/jdl/core/exporters/jdl-exporter.ts similarity index 100% rename from lib/jdl/exporters/jdl-exporter.ts rename to lib/jdl/core/exporters/jdl-exporter.ts diff --git a/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts b/lib/jdl/core/exporters/jhipster-deployment-exporter.spec.ts similarity index 98% rename from lib/jdl/exporters/jhipster-deployment-exporter.spec.ts rename to lib/jdl/core/exporters/jhipster-deployment-exporter.spec.ts index 3a1c8473d893..93c9b40b74d6 100644 --- a/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts +++ b/lib/jdl/core/exporters/jhipster-deployment-exporter.spec.ts @@ -24,7 +24,7 @@ import { expect } from 'chai'; import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; import JDLDeployment from '../models/jdl-deployment.js'; import { deploymentOptions } from '../built-in-options/index.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; const { DeploymentTypes: { DOCKERCOMPOSE, KUBERNETES }, diff --git a/lib/jdl/exporters/jhipster-deployment-exporter.ts b/lib/jdl/core/exporters/jhipster-deployment-exporter.ts similarity index 100% rename from lib/jdl/exporters/jhipster-deployment-exporter.ts rename to lib/jdl/core/exporters/jhipster-deployment-exporter.ts diff --git a/lib/jdl/exporters/jhipster-entity-exporter.spec.ts b/lib/jdl/core/exporters/jhipster-entity-exporter.spec.ts similarity index 99% rename from lib/jdl/exporters/jhipster-entity-exporter.spec.ts rename to lib/jdl/core/exporters/jhipster-entity-exporter.spec.ts index 563539ce2987..7010521f8e71 100644 --- a/lib/jdl/exporters/jhipster-entity-exporter.spec.ts +++ b/lib/jdl/core/exporters/jhipster-entity-exporter.spec.ts @@ -23,7 +23,7 @@ import exportEntities from '../exporters/jhipster-entity-exporter.js'; import { applicationTypes, entityOptions } from '../built-in-options/index.js'; import { doesDirectoryExist } from '../utils/file-utils.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; const { MapperTypes, PaginationTypes, ServiceTypes } = entityOptions; const { MONOLITH, MICROSERVICE } = applicationTypes; diff --git a/lib/jdl/exporters/jhipster-entity-exporter.ts b/lib/jdl/core/exporters/jhipster-entity-exporter.ts similarity index 100% rename from lib/jdl/exporters/jhipster-entity-exporter.ts rename to lib/jdl/core/exporters/jhipster-entity-exporter.ts diff --git a/lib/jdl/integration-test.spec.ts b/lib/jdl/core/integration-test.spec.ts similarity index 98% rename from lib/jdl/integration-test.spec.ts rename to lib/jdl/core/integration-test.spec.ts index 31af3bf3c1e2..30199ce5cfdf 100644 --- a/lib/jdl/integration-test.spec.ts +++ b/lib/jdl/core/integration-test.spec.ts @@ -21,8 +21,8 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import { basicHelpers as helpers } from '../../testing/index.js'; -import { applicationTypes } from '../jhipster/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; +import { applicationTypes } from '../../jhipster/index.js'; import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from './__test-support__/index.js'; import exportToJDL from './exporters/jdl-exporter.js'; import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; diff --git a/lib/jdl/jdl-importer.spec.ts b/lib/jdl/core/jdl-importer.spec.ts similarity index 99% rename from lib/jdl/jdl-importer.spec.ts rename to lib/jdl/core/jdl-importer.spec.ts index 83d84a9ade9b..60eec5f46ab4 100644 --- a/lib/jdl/jdl-importer.spec.ts +++ b/lib/jdl/core/jdl-importer.spec.ts @@ -23,7 +23,7 @@ import { readFileSync, rmSync } from 'fs'; import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../jhipster/index.js'; +import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../../jhipster/index.js'; import { createImporterFromContent, createImporterFromFiles } from './__test-support__/index.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/core/jdl-importer.ts similarity index 99% rename from lib/jdl/jdl-importer.ts rename to lib/jdl/core/jdl-importer.ts index 1ad9cf4287da..1a7f5d409d9a 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/core/jdl-importer.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { uniqBy } from 'lodash-es'; -import { applicationOptions } from '../jhipster/index.js'; +import { applicationOptions } from '../../jhipster/index.js'; import * as JDLReader from './readers/jdl-reader.js'; import ParsedJDLToJDLObjectConverter from './converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import { readJSONFile } from './readers/json-file-reader.js'; diff --git a/lib/jdl/linters/entity-linter.ts b/lib/jdl/core/linters/entity-linter.ts similarity index 100% rename from lib/jdl/linters/entity-linter.ts rename to lib/jdl/core/linters/entity-linter.ts diff --git a/lib/jdl/linters/enum-linter.ts b/lib/jdl/core/linters/enum-linter.ts similarity index 100% rename from lib/jdl/linters/enum-linter.ts rename to lib/jdl/core/linters/enum-linter.ts diff --git a/lib/jdl/linters/field-linter.ts b/lib/jdl/core/linters/field-linter.ts similarity index 100% rename from lib/jdl/linters/field-linter.ts rename to lib/jdl/core/linters/field-linter.ts diff --git a/lib/jdl/linters/issues/abstract-issue.ts b/lib/jdl/core/linters/issues/abstract-issue.ts similarity index 100% rename from lib/jdl/linters/issues/abstract-issue.ts rename to lib/jdl/core/linters/issues/abstract-issue.ts diff --git a/lib/jdl/linters/issues/entity-issue.spec.ts b/lib/jdl/core/linters/issues/entity-issue.spec.ts similarity index 100% rename from lib/jdl/linters/issues/entity-issue.spec.ts rename to lib/jdl/core/linters/issues/entity-issue.spec.ts diff --git a/lib/jdl/linters/issues/entity-issue.ts b/lib/jdl/core/linters/issues/entity-issue.ts similarity index 100% rename from lib/jdl/linters/issues/entity-issue.ts rename to lib/jdl/core/linters/issues/entity-issue.ts diff --git a/lib/jdl/linters/issues/enum-issue.spec.ts b/lib/jdl/core/linters/issues/enum-issue.spec.ts similarity index 100% rename from lib/jdl/linters/issues/enum-issue.spec.ts rename to lib/jdl/core/linters/issues/enum-issue.spec.ts diff --git a/lib/jdl/linters/issues/enum-issue.ts b/lib/jdl/core/linters/issues/enum-issue.ts similarity index 100% rename from lib/jdl/linters/issues/enum-issue.ts rename to lib/jdl/core/linters/issues/enum-issue.ts diff --git a/lib/jdl/linters/issues/field-issue.spec.ts b/lib/jdl/core/linters/issues/field-issue.spec.ts similarity index 100% rename from lib/jdl/linters/issues/field-issue.spec.ts rename to lib/jdl/core/linters/issues/field-issue.spec.ts diff --git a/lib/jdl/linters/issues/field-issue.ts b/lib/jdl/core/linters/issues/field-issue.ts similarity index 100% rename from lib/jdl/linters/issues/field-issue.ts rename to lib/jdl/core/linters/issues/field-issue.ts diff --git a/lib/jdl/linters/issues/issues.spec.ts b/lib/jdl/core/linters/issues/issues.spec.ts similarity index 100% rename from lib/jdl/linters/issues/issues.spec.ts rename to lib/jdl/core/linters/issues/issues.spec.ts diff --git a/lib/jdl/linters/issues/issues.ts b/lib/jdl/core/linters/issues/issues.ts similarity index 100% rename from lib/jdl/linters/issues/issues.ts rename to lib/jdl/core/linters/issues/issues.ts diff --git a/lib/jdl/linters/issues/relationship-issue.spec.ts b/lib/jdl/core/linters/issues/relationship-issue.spec.ts similarity index 100% rename from lib/jdl/linters/issues/relationship-issue.spec.ts rename to lib/jdl/core/linters/issues/relationship-issue.spec.ts diff --git a/lib/jdl/linters/issues/relationship-issue.ts b/lib/jdl/core/linters/issues/relationship-issue.ts similarity index 100% rename from lib/jdl/linters/issues/relationship-issue.ts rename to lib/jdl/core/linters/issues/relationship-issue.ts diff --git a/lib/jdl/linters/jdl-linter.spec.ts b/lib/jdl/core/linters/jdl-linter.spec.ts similarity index 99% rename from lib/jdl/linters/jdl-linter.spec.ts rename to lib/jdl/core/linters/jdl-linter.spec.ts index 84a072ee4a2f..fd2807722983 100644 --- a/lib/jdl/linters/jdl-linter.spec.ts +++ b/lib/jdl/core/linters/jdl-linter.spec.ts @@ -22,7 +22,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; import { createJDLLinterFromContent, createJDLLinterFromFile } from '.././__test-support__/index.js'; import type { JDLLinter } from './jdl-linter.js'; import type Issues from './issues/issues.js'; diff --git a/lib/jdl/linters/jdl-linter.ts b/lib/jdl/core/linters/jdl-linter.ts similarity index 100% rename from lib/jdl/linters/jdl-linter.ts rename to lib/jdl/core/linters/jdl-linter.ts diff --git a/lib/jdl/linters/relationship-linter.ts b/lib/jdl/core/linters/relationship-linter.ts similarity index 100% rename from lib/jdl/linters/relationship-linter.ts rename to lib/jdl/core/linters/relationship-linter.ts diff --git a/lib/jdl/linters/rule-levels.ts b/lib/jdl/core/linters/rule-levels.ts similarity index 100% rename from lib/jdl/linters/rule-levels.ts rename to lib/jdl/core/linters/rule-levels.ts diff --git a/lib/jdl/linters/rule.spec.ts b/lib/jdl/core/linters/rule.spec.ts similarity index 100% rename from lib/jdl/linters/rule.spec.ts rename to lib/jdl/core/linters/rule.spec.ts diff --git a/lib/jdl/linters/rule.ts b/lib/jdl/core/linters/rule.ts similarity index 100% rename from lib/jdl/linters/rule.ts rename to lib/jdl/core/linters/rule.ts diff --git a/lib/jdl/linters/rules.spec.ts b/lib/jdl/core/linters/rules.spec.ts similarity index 100% rename from lib/jdl/linters/rules.spec.ts rename to lib/jdl/core/linters/rules.spec.ts diff --git a/lib/jdl/linters/rules.ts b/lib/jdl/core/linters/rules.ts similarity index 100% rename from lib/jdl/linters/rules.ts rename to lib/jdl/core/linters/rules.ts diff --git a/lib/jdl/matchers/entity-matcher.ts b/lib/jdl/core/matchers/entity-matcher.ts similarity index 100% rename from lib/jdl/matchers/entity-matcher.ts rename to lib/jdl/core/matchers/entity-matcher.ts diff --git a/lib/jdl/matchers/field-matcher.ts b/lib/jdl/core/matchers/field-matcher.ts similarity index 100% rename from lib/jdl/matchers/field-matcher.ts rename to lib/jdl/core/matchers/field-matcher.ts diff --git a/lib/jdl/models/abstract-jdl-option.spec.ts b/lib/jdl/core/models/abstract-jdl-option.spec.ts similarity index 100% rename from lib/jdl/models/abstract-jdl-option.spec.ts rename to lib/jdl/core/models/abstract-jdl-option.spec.ts diff --git a/lib/jdl/models/abstract-jdl-option.ts b/lib/jdl/core/models/abstract-jdl-option.ts similarity index 100% rename from lib/jdl/models/abstract-jdl-option.ts rename to lib/jdl/core/models/abstract-jdl-option.ts diff --git a/lib/jdl/models/boolean-jdl-application-configuration-option.ts b/lib/jdl/core/models/boolean-jdl-application-configuration-option.ts similarity index 100% rename from lib/jdl/models/boolean-jdl-application-configuration-option.ts rename to lib/jdl/core/models/boolean-jdl-application-configuration-option.ts diff --git a/lib/jdl/models/index.ts b/lib/jdl/core/models/index.ts similarity index 100% rename from lib/jdl/models/index.ts rename to lib/jdl/core/models/index.ts diff --git a/lib/jdl/models/integer-jdl-application-configuration-option.ts b/lib/jdl/core/models/integer-jdl-application-configuration-option.ts similarity index 100% rename from lib/jdl/models/integer-jdl-application-configuration-option.ts rename to lib/jdl/core/models/integer-jdl-application-configuration-option.ts diff --git a/lib/jdl/models/jdl-application-configuration-factory.spec.ts b/lib/jdl/core/models/jdl-application-configuration-factory.spec.ts similarity index 100% rename from lib/jdl/models/jdl-application-configuration-factory.spec.ts rename to lib/jdl/core/models/jdl-application-configuration-factory.spec.ts diff --git a/lib/jdl/models/jdl-application-configuration-factory.ts b/lib/jdl/core/models/jdl-application-configuration-factory.ts similarity index 100% rename from lib/jdl/models/jdl-application-configuration-factory.ts rename to lib/jdl/core/models/jdl-application-configuration-factory.ts diff --git a/lib/jdl/models/jdl-application-configuration-option.ts b/lib/jdl/core/models/jdl-application-configuration-option.ts similarity index 100% rename from lib/jdl/models/jdl-application-configuration-option.ts rename to lib/jdl/core/models/jdl-application-configuration-option.ts diff --git a/lib/jdl/models/jdl-application-configuration.spec.ts b/lib/jdl/core/models/jdl-application-configuration.spec.ts similarity index 100% rename from lib/jdl/models/jdl-application-configuration.spec.ts rename to lib/jdl/core/models/jdl-application-configuration.spec.ts diff --git a/lib/jdl/models/jdl-application-configuration.ts b/lib/jdl/core/models/jdl-application-configuration.ts similarity index 100% rename from lib/jdl/models/jdl-application-configuration.ts rename to lib/jdl/core/models/jdl-application-configuration.ts diff --git a/lib/jdl/models/jdl-application-entities.spec.ts b/lib/jdl/core/models/jdl-application-entities.spec.ts similarity index 100% rename from lib/jdl/models/jdl-application-entities.spec.ts rename to lib/jdl/core/models/jdl-application-entities.spec.ts diff --git a/lib/jdl/models/jdl-application-entities.ts b/lib/jdl/core/models/jdl-application-entities.ts similarity index 100% rename from lib/jdl/models/jdl-application-entities.ts rename to lib/jdl/core/models/jdl-application-entities.ts diff --git a/lib/jdl/models/jdl-application-factory.spec.ts b/lib/jdl/core/models/jdl-application-factory.spec.ts similarity index 100% rename from lib/jdl/models/jdl-application-factory.spec.ts rename to lib/jdl/core/models/jdl-application-factory.spec.ts diff --git a/lib/jdl/models/jdl-application-factory.ts b/lib/jdl/core/models/jdl-application-factory.ts similarity index 100% rename from lib/jdl/models/jdl-application-factory.ts rename to lib/jdl/core/models/jdl-application-factory.ts diff --git a/lib/jdl/models/jdl-application.spec.ts b/lib/jdl/core/models/jdl-application.spec.ts similarity index 100% rename from lib/jdl/models/jdl-application.spec.ts rename to lib/jdl/core/models/jdl-application.spec.ts diff --git a/lib/jdl/models/jdl-application.ts b/lib/jdl/core/models/jdl-application.ts similarity index 100% rename from lib/jdl/models/jdl-application.ts rename to lib/jdl/core/models/jdl-application.ts diff --git a/lib/jdl/models/jdl-binary-option.spec.ts b/lib/jdl/core/models/jdl-binary-option.spec.ts similarity index 100% rename from lib/jdl/models/jdl-binary-option.spec.ts rename to lib/jdl/core/models/jdl-binary-option.spec.ts diff --git a/lib/jdl/models/jdl-binary-option.ts b/lib/jdl/core/models/jdl-binary-option.ts similarity index 100% rename from lib/jdl/models/jdl-binary-option.ts rename to lib/jdl/core/models/jdl-binary-option.ts diff --git a/lib/jdl/models/jdl-deployment.spec.ts b/lib/jdl/core/models/jdl-deployment.spec.ts similarity index 100% rename from lib/jdl/models/jdl-deployment.spec.ts rename to lib/jdl/core/models/jdl-deployment.spec.ts diff --git a/lib/jdl/models/jdl-deployment.ts b/lib/jdl/core/models/jdl-deployment.ts similarity index 100% rename from lib/jdl/models/jdl-deployment.ts rename to lib/jdl/core/models/jdl-deployment.ts diff --git a/lib/jdl/models/jdl-entity.spec.ts b/lib/jdl/core/models/jdl-entity.spec.ts similarity index 100% rename from lib/jdl/models/jdl-entity.spec.ts rename to lib/jdl/core/models/jdl-entity.spec.ts diff --git a/lib/jdl/models/jdl-entity.ts b/lib/jdl/core/models/jdl-entity.ts similarity index 100% rename from lib/jdl/models/jdl-entity.ts rename to lib/jdl/core/models/jdl-entity.ts diff --git a/lib/jdl/models/jdl-enum-value.spec.ts b/lib/jdl/core/models/jdl-enum-value.spec.ts similarity index 100% rename from lib/jdl/models/jdl-enum-value.spec.ts rename to lib/jdl/core/models/jdl-enum-value.spec.ts diff --git a/lib/jdl/models/jdl-enum-value.ts b/lib/jdl/core/models/jdl-enum-value.ts similarity index 100% rename from lib/jdl/models/jdl-enum-value.ts rename to lib/jdl/core/models/jdl-enum-value.ts diff --git a/lib/jdl/models/jdl-enum.spec.ts b/lib/jdl/core/models/jdl-enum.spec.ts similarity index 100% rename from lib/jdl/models/jdl-enum.spec.ts rename to lib/jdl/core/models/jdl-enum.spec.ts diff --git a/lib/jdl/models/jdl-enum.ts b/lib/jdl/core/models/jdl-enum.ts similarity index 100% rename from lib/jdl/models/jdl-enum.ts rename to lib/jdl/core/models/jdl-enum.ts diff --git a/lib/jdl/models/jdl-enums.spec.ts b/lib/jdl/core/models/jdl-enums.spec.ts similarity index 100% rename from lib/jdl/models/jdl-enums.spec.ts rename to lib/jdl/core/models/jdl-enums.spec.ts diff --git a/lib/jdl/models/jdl-enums.ts b/lib/jdl/core/models/jdl-enums.ts similarity index 100% rename from lib/jdl/models/jdl-enums.ts rename to lib/jdl/core/models/jdl-enums.ts diff --git a/lib/jdl/models/jdl-field.spec.ts b/lib/jdl/core/models/jdl-field.spec.ts similarity index 100% rename from lib/jdl/models/jdl-field.spec.ts rename to lib/jdl/core/models/jdl-field.spec.ts diff --git a/lib/jdl/models/jdl-field.ts b/lib/jdl/core/models/jdl-field.ts similarity index 100% rename from lib/jdl/models/jdl-field.ts rename to lib/jdl/core/models/jdl-field.ts diff --git a/lib/jdl/models/jdl-object-merger.spec.ts b/lib/jdl/core/models/jdl-object-merger.spec.ts similarity index 100% rename from lib/jdl/models/jdl-object-merger.spec.ts rename to lib/jdl/core/models/jdl-object-merger.spec.ts diff --git a/lib/jdl/models/jdl-object-merger.ts b/lib/jdl/core/models/jdl-object-merger.ts similarity index 100% rename from lib/jdl/models/jdl-object-merger.ts rename to lib/jdl/core/models/jdl-object-merger.ts diff --git a/lib/jdl/models/jdl-object-wrapper.ts b/lib/jdl/core/models/jdl-object-wrapper.ts similarity index 100% rename from lib/jdl/models/jdl-object-wrapper.ts rename to lib/jdl/core/models/jdl-object-wrapper.ts diff --git a/lib/jdl/models/jdl-object.spec.ts b/lib/jdl/core/models/jdl-object.spec.ts similarity index 100% rename from lib/jdl/models/jdl-object.spec.ts rename to lib/jdl/core/models/jdl-object.spec.ts diff --git a/lib/jdl/models/jdl-object.ts b/lib/jdl/core/models/jdl-object.ts similarity index 100% rename from lib/jdl/models/jdl-object.ts rename to lib/jdl/core/models/jdl-object.ts diff --git a/lib/jdl/models/jdl-options.spec.ts b/lib/jdl/core/models/jdl-options.spec.ts similarity index 100% rename from lib/jdl/models/jdl-options.spec.ts rename to lib/jdl/core/models/jdl-options.spec.ts diff --git a/lib/jdl/models/jdl-options.ts b/lib/jdl/core/models/jdl-options.ts similarity index 100% rename from lib/jdl/models/jdl-options.ts rename to lib/jdl/core/models/jdl-options.ts diff --git a/lib/jdl/models/jdl-relationship.spec.ts b/lib/jdl/core/models/jdl-relationship.spec.ts similarity index 100% rename from lib/jdl/models/jdl-relationship.spec.ts rename to lib/jdl/core/models/jdl-relationship.spec.ts diff --git a/lib/jdl/models/jdl-relationship.ts b/lib/jdl/core/models/jdl-relationship.ts similarity index 100% rename from lib/jdl/models/jdl-relationship.ts rename to lib/jdl/core/models/jdl-relationship.ts diff --git a/lib/jdl/models/jdl-relationships.spec.ts b/lib/jdl/core/models/jdl-relationships.spec.ts similarity index 100% rename from lib/jdl/models/jdl-relationships.spec.ts rename to lib/jdl/core/models/jdl-relationships.spec.ts diff --git a/lib/jdl/models/jdl-relationships.ts b/lib/jdl/core/models/jdl-relationships.ts similarity index 100% rename from lib/jdl/models/jdl-relationships.ts rename to lib/jdl/core/models/jdl-relationships.ts diff --git a/lib/jdl/models/jdl-unary-option.spec.ts b/lib/jdl/core/models/jdl-unary-option.spec.ts similarity index 100% rename from lib/jdl/models/jdl-unary-option.spec.ts rename to lib/jdl/core/models/jdl-unary-option.spec.ts diff --git a/lib/jdl/models/jdl-unary-option.ts b/lib/jdl/core/models/jdl-unary-option.ts similarity index 100% rename from lib/jdl/models/jdl-unary-option.ts rename to lib/jdl/core/models/jdl-unary-option.ts diff --git a/lib/jdl/models/jdl-validation.spec.ts b/lib/jdl/core/models/jdl-validation.spec.ts similarity index 100% rename from lib/jdl/models/jdl-validation.spec.ts rename to lib/jdl/core/models/jdl-validation.spec.ts diff --git a/lib/jdl/models/jdl-validation.ts b/lib/jdl/core/models/jdl-validation.ts similarity index 100% rename from lib/jdl/models/jdl-validation.ts rename to lib/jdl/core/models/jdl-validation.ts diff --git a/lib/jdl/models/list-jdl-application-configuration-option.ts b/lib/jdl/core/models/list-jdl-application-configuration-option.ts similarity index 100% rename from lib/jdl/models/list-jdl-application-configuration-option.ts rename to lib/jdl/core/models/list-jdl-application-configuration-option.ts diff --git a/lib/jdl/models/string-jdl-application-configuration-option.ts b/lib/jdl/core/models/string-jdl-application-configuration-option.ts similarity index 100% rename from lib/jdl/models/string-jdl-application-configuration-option.ts rename to lib/jdl/core/models/string-jdl-application-configuration-option.ts diff --git a/lib/jdl/parsing/api.ts b/lib/jdl/core/parsing/api.ts similarity index 100% rename from lib/jdl/parsing/api.ts rename to lib/jdl/core/parsing/api.ts diff --git a/lib/jdl/parsing/dsl-api.spec.ts b/lib/jdl/core/parsing/dsl-api.spec.ts similarity index 100% rename from lib/jdl/parsing/dsl-api.spec.ts rename to lib/jdl/core/parsing/dsl-api.spec.ts diff --git a/lib/jdl/parsing/generated/generated-serialized-grammar.js b/lib/jdl/core/parsing/generated/generated-serialized-grammar.js similarity index 100% rename from lib/jdl/parsing/generated/generated-serialized-grammar.js rename to lib/jdl/core/parsing/generated/generated-serialized-grammar.js diff --git a/lib/jdl/parsing/generated/grammar.html b/lib/jdl/core/parsing/generated/grammar.html similarity index 100% rename from lib/jdl/parsing/generated/grammar.html rename to lib/jdl/core/parsing/generated/grammar.html diff --git a/lib/jdl/parsing/grammar.spec.ts b/lib/jdl/core/parsing/grammar.spec.ts similarity index 100% rename from lib/jdl/parsing/grammar.spec.ts rename to lib/jdl/core/parsing/grammar.spec.ts diff --git a/lib/jdl/parsing/jdl-ast-builder-visitor.ts b/lib/jdl/core/parsing/jdl-ast-builder-visitor.ts similarity index 100% rename from lib/jdl/parsing/jdl-ast-builder-visitor.ts rename to lib/jdl/core/parsing/jdl-ast-builder-visitor.ts diff --git a/lib/jdl/parsing/jdl-parser.ts b/lib/jdl/core/parsing/jdl-parser.ts similarity index 100% rename from lib/jdl/parsing/jdl-parser.ts rename to lib/jdl/core/parsing/jdl-parser.ts diff --git a/lib/jdl/parsing/jdl-parsing-types.d.ts b/lib/jdl/core/parsing/jdl-parsing-types.d.ts similarity index 100% rename from lib/jdl/parsing/jdl-parsing-types.d.ts rename to lib/jdl/core/parsing/jdl-parsing-types.d.ts diff --git a/lib/jdl/parsing/jdl-post-parsing-tasks.ts b/lib/jdl/core/parsing/jdl-post-parsing-tasks.ts similarity index 100% rename from lib/jdl/parsing/jdl-post-parsing-tasks.ts rename to lib/jdl/core/parsing/jdl-post-parsing-tasks.ts diff --git a/lib/jdl/parsing/lexer/application-tokens.ts b/lib/jdl/core/parsing/lexer/application-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/application-tokens.ts rename to lib/jdl/core/parsing/lexer/application-tokens.ts diff --git a/lib/jdl/parsing/lexer/deployment-tokens.ts b/lib/jdl/core/parsing/lexer/deployment-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/deployment-tokens.ts rename to lib/jdl/core/parsing/lexer/deployment-tokens.ts diff --git a/lib/jdl/parsing/lexer/lexer.spec.ts b/lib/jdl/core/parsing/lexer/lexer.spec.ts similarity index 100% rename from lib/jdl/parsing/lexer/lexer.spec.ts rename to lib/jdl/core/parsing/lexer/lexer.spec.ts diff --git a/lib/jdl/parsing/lexer/lexer.ts b/lib/jdl/core/parsing/lexer/lexer.ts similarity index 100% rename from lib/jdl/parsing/lexer/lexer.ts rename to lib/jdl/core/parsing/lexer/lexer.ts diff --git a/lib/jdl/parsing/lexer/minmax-tokens.ts b/lib/jdl/core/parsing/lexer/minmax-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/minmax-tokens.ts rename to lib/jdl/core/parsing/lexer/minmax-tokens.ts diff --git a/lib/jdl/parsing/lexer/option-tokens.ts b/lib/jdl/core/parsing/lexer/option-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/option-tokens.ts rename to lib/jdl/core/parsing/lexer/option-tokens.ts diff --git a/lib/jdl/parsing/lexer/relationship-type-tokens.ts b/lib/jdl/core/parsing/lexer/relationship-type-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/relationship-type-tokens.ts rename to lib/jdl/core/parsing/lexer/relationship-type-tokens.ts diff --git a/lib/jdl/parsing/lexer/shared-tokens.ts b/lib/jdl/core/parsing/lexer/shared-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/shared-tokens.ts rename to lib/jdl/core/parsing/lexer/shared-tokens.ts diff --git a/lib/jdl/parsing/lexer/token-creator.spec.ts b/lib/jdl/core/parsing/lexer/token-creator.spec.ts similarity index 100% rename from lib/jdl/parsing/lexer/token-creator.spec.ts rename to lib/jdl/core/parsing/lexer/token-creator.spec.ts diff --git a/lib/jdl/parsing/lexer/token-creator.ts b/lib/jdl/core/parsing/lexer/token-creator.ts similarity index 100% rename from lib/jdl/parsing/lexer/token-creator.ts rename to lib/jdl/core/parsing/lexer/token-creator.ts diff --git a/lib/jdl/parsing/lexer/validation-tokens.ts b/lib/jdl/core/parsing/lexer/validation-tokens.ts similarity index 100% rename from lib/jdl/parsing/lexer/validation-tokens.ts rename to lib/jdl/core/parsing/lexer/validation-tokens.ts diff --git a/lib/jdl/parsing/self-checks/parsing-system-checker.ts b/lib/jdl/core/parsing/self-checks/parsing-system-checker.ts similarity index 100% rename from lib/jdl/parsing/self-checks/parsing-system-checker.ts rename to lib/jdl/core/parsing/self-checks/parsing-system-checker.ts diff --git a/lib/jdl/parsing/self-checks/token-collector-visitor.ts b/lib/jdl/core/parsing/self-checks/token-collector-visitor.ts similarity index 100% rename from lib/jdl/parsing/self-checks/token-collector-visitor.ts rename to lib/jdl/core/parsing/self-checks/token-collector-visitor.ts diff --git a/lib/jdl/parsing/validator.spec.ts b/lib/jdl/core/parsing/validator.spec.ts similarity index 100% rename from lib/jdl/parsing/validator.spec.ts rename to lib/jdl/core/parsing/validator.spec.ts diff --git a/lib/jdl/parsing/validator.ts b/lib/jdl/core/parsing/validator.ts similarity index 100% rename from lib/jdl/parsing/validator.ts rename to lib/jdl/core/parsing/validator.ts diff --git a/lib/jdl/readers/file-reader.spec.ts b/lib/jdl/core/readers/file-reader.spec.ts similarity index 97% rename from lib/jdl/readers/file-reader.spec.ts rename to lib/jdl/core/readers/file-reader.spec.ts index cdfba4690a47..82236dd81d76 100644 --- a/lib/jdl/readers/file-reader.spec.ts +++ b/lib/jdl/core/readers/file-reader.spec.ts @@ -21,7 +21,7 @@ import fs from 'fs'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { readFile, readFiles } from '../readers/file-reader.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; describe('jdl - FileReader', () => { beforeEach(async () => { diff --git a/lib/jdl/readers/file-reader.ts b/lib/jdl/core/readers/file-reader.ts similarity index 100% rename from lib/jdl/readers/file-reader.ts rename to lib/jdl/core/readers/file-reader.ts diff --git a/lib/jdl/readers/jdl-reader.spec.ts b/lib/jdl/core/readers/jdl-reader.spec.ts similarity index 98% rename from lib/jdl/readers/jdl-reader.spec.ts rename to lib/jdl/core/readers/jdl-reader.spec.ts index 066fbde3a07d..1c10018c0c1f 100644 --- a/lib/jdl/readers/jdl-reader.spec.ts +++ b/lib/jdl/core/readers/jdl-reader.spec.ts @@ -23,7 +23,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { after, beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; import { parseFromContent, parseFromFiles } from '.././__test-support__/index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/lib/jdl/readers/jdl-reader.ts b/lib/jdl/core/readers/jdl-reader.ts similarity index 100% rename from lib/jdl/readers/jdl-reader.ts rename to lib/jdl/core/readers/jdl-reader.ts diff --git a/lib/jdl/readers/json-file-reader.spec.ts b/lib/jdl/core/readers/json-file-reader.spec.ts similarity index 100% rename from lib/jdl/readers/json-file-reader.spec.ts rename to lib/jdl/core/readers/json-file-reader.spec.ts diff --git a/lib/jdl/readers/json-file-reader.ts b/lib/jdl/core/readers/json-file-reader.ts similarity index 100% rename from lib/jdl/readers/json-file-reader.ts rename to lib/jdl/core/readers/json-file-reader.ts diff --git a/lib/jdl/readers/json-reader.spec.ts b/lib/jdl/core/readers/json-reader.spec.ts similarity index 100% rename from lib/jdl/readers/json-reader.spec.ts rename to lib/jdl/core/readers/json-reader.spec.ts diff --git a/lib/jdl/readers/json-reader.ts b/lib/jdl/core/readers/json-reader.ts similarity index 100% rename from lib/jdl/readers/json-reader.ts rename to lib/jdl/core/readers/json-reader.ts diff --git a/lib/jdl/runtime.ts b/lib/jdl/core/runtime.ts similarity index 94% rename from lib/jdl/runtime.ts rename to lib/jdl/core/runtime.ts index beada4a0b135..c49415b43469 100644 --- a/lib/jdl/runtime.ts +++ b/lib/jdl/core/runtime.ts @@ -1,6 +1,6 @@ import type { Lexer, TokenType } from 'chevrotain'; -import jhipsterDefinition from '../../generators/app/jdl/index.js'; -import { builtInJDLApplicationConfig } from '../jhipster/application-options.js'; +import jhipsterDefinition from '../../../generators/app/jdl/index.js'; +import { builtInJDLApplicationConfig } from '../../jhipster/application-options.js'; import { buildTokens, createJDLLexer } from './parsing/lexer/lexer.js'; import JDLParser from './parsing/jdl-parser.js'; import { checkConfigKeys, checkTokens } from './parsing/self-checks/parsing-system-checker.js'; diff --git a/lib/jdl/types/exporter.d.ts b/lib/jdl/core/types/exporter.d.ts similarity index 100% rename from lib/jdl/types/exporter.d.ts rename to lib/jdl/core/types/exporter.d.ts diff --git a/lib/jdl/types/json-config.d.ts b/lib/jdl/core/types/json-config.d.ts similarity index 83% rename from lib/jdl/types/json-config.d.ts rename to lib/jdl/core/types/json-config.d.ts index 416b156d8be6..55c86f2cc826 100644 --- a/lib/jdl/types/json-config.d.ts +++ b/lib/jdl/core/types/json-config.d.ts @@ -1,7 +1,7 @@ -import type { Entity } from '../../types/base/entity.js'; -import type { Field } from '../../types/base/field.js'; -import type { Relationship } from '../../types/base/relationship.js'; -import type { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.ts'; +import type { Entity } from '../../../types/base/entity.js'; +import type { Field } from '../../../types/base/field.js'; +import type { Relationship } from '../../../types/base/relationship.js'; +import type { YO_RC_CONFIG_KEY } from '../../../utils/yo-rc.ts'; export type JSONField = Field & Record; diff --git a/lib/jdl/types/parsed.d.ts b/lib/jdl/core/types/parsed.d.ts similarity index 100% rename from lib/jdl/types/parsed.d.ts rename to lib/jdl/core/types/parsed.d.ts diff --git a/lib/jdl/types/parsing.d.ts b/lib/jdl/core/types/parsing.d.ts similarity index 100% rename from lib/jdl/types/parsing.d.ts rename to lib/jdl/core/types/parsing.d.ts diff --git a/lib/jdl/types/runtime.d.ts b/lib/jdl/core/types/runtime.d.ts similarity index 100% rename from lib/jdl/types/runtime.d.ts rename to lib/jdl/core/types/runtime.d.ts diff --git a/lib/jdl/utils/array-utils.spec.ts b/lib/jdl/core/utils/array-utils.spec.ts similarity index 100% rename from lib/jdl/utils/array-utils.spec.ts rename to lib/jdl/core/utils/array-utils.spec.ts diff --git a/lib/jdl/utils/array-utils.ts b/lib/jdl/core/utils/array-utils.ts similarity index 100% rename from lib/jdl/utils/array-utils.ts rename to lib/jdl/core/utils/array-utils.ts diff --git a/lib/jdl/utils/deprecation-utils.ts b/lib/jdl/core/utils/deprecation-utils.ts similarity index 100% rename from lib/jdl/utils/deprecation-utils.ts rename to lib/jdl/core/utils/deprecation-utils.ts diff --git a/lib/jdl/utils/entity-table-name-creator.spec.ts b/lib/jdl/core/utils/entity-table-name-creator.spec.ts similarity index 100% rename from lib/jdl/utils/entity-table-name-creator.spec.ts rename to lib/jdl/core/utils/entity-table-name-creator.spec.ts diff --git a/lib/jdl/utils/entity-table-name-creator.ts b/lib/jdl/core/utils/entity-table-name-creator.ts similarity index 95% rename from lib/jdl/utils/entity-table-name-creator.ts rename to lib/jdl/core/utils/entity-table-name-creator.ts index 062bf5439bbd..ebe8cd69546d 100644 --- a/lib/jdl/utils/entity-table-name-creator.ts +++ b/lib/jdl/core/utils/entity-table-name-creator.ts @@ -18,7 +18,7 @@ */ import { snakeCase } from 'lodash-es'; -import { hibernateSnakeCase } from '../../../generators/server/support/string.js'; +import { hibernateSnakeCase } from '../../../../generators/server/support/string.js'; /** * @deprecated TODO v9 drop this function and don't calculate entityTableName. diff --git a/lib/jdl/utils/file-utils.ts b/lib/jdl/core/utils/file-utils.ts similarity index 100% rename from lib/jdl/utils/file-utils.ts rename to lib/jdl/core/utils/file-utils.ts diff --git a/lib/jdl/utils/files-utils.spec.ts b/lib/jdl/core/utils/files-utils.spec.ts similarity index 97% rename from lib/jdl/utils/files-utils.spec.ts rename to lib/jdl/core/utils/files-utils.spec.ts index 5e9ede7d01d3..49e715817d76 100644 --- a/lib/jdl/utils/files-utils.spec.ts +++ b/lib/jdl/core/utils/files-utils.spec.ts @@ -23,6 +23,7 @@ import { fileURLToPath } from 'url'; import { after, before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { createFolderIfItDoesNotExist, doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; +import { getPackageRoot } from '../../../index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); @@ -93,7 +94,7 @@ describe('jdl - FileUtils', () => { describe('when passing a file that exists', () => { it('should fail', () => { expect(() => { - createFolderIfItDoesNotExist(path.join(__dirname, '..', '..', '..', 'package.json')); + createFolderIfItDoesNotExist(path.join(getPackageRoot(), 'package.json')); }).to.throw(/^The directory to create '.*?package\.json' is a file\.$/); }); }); diff --git a/lib/jdl/utils/format-utils.spec.ts b/lib/jdl/core/utils/format-utils.spec.ts similarity index 100% rename from lib/jdl/utils/format-utils.spec.ts rename to lib/jdl/core/utils/format-utils.spec.ts diff --git a/lib/jdl/utils/format-utils.ts b/lib/jdl/core/utils/format-utils.ts similarity index 100% rename from lib/jdl/utils/format-utils.ts rename to lib/jdl/core/utils/format-utils.ts diff --git a/lib/jdl/utils/object-utils.spec.ts b/lib/jdl/core/utils/object-utils.spec.ts similarity index 100% rename from lib/jdl/utils/object-utils.spec.ts rename to lib/jdl/core/utils/object-utils.spec.ts diff --git a/lib/jdl/utils/object-utils.ts b/lib/jdl/core/utils/object-utils.ts similarity index 100% rename from lib/jdl/utils/object-utils.ts rename to lib/jdl/core/utils/object-utils.ts diff --git a/lib/jdl/utils/objects/logger.ts b/lib/jdl/core/utils/objects/logger.ts similarity index 93% rename from lib/jdl/utils/objects/logger.ts rename to lib/jdl/core/utils/objects/logger.ts index 9fbc869b2c6e..3a426c8a3c79 100644 --- a/lib/jdl/utils/objects/logger.ts +++ b/lib/jdl/core/utils/objects/logger.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { createJHipsterLogger } from '../../../utils/logger.js'; +import { createJHipsterLogger } from '../../../../utils/logger.js'; const logger = createJHipsterLogger({ namespace: 'jhipster:jdl' }); diff --git a/lib/jdl/utils/set-utils.spec.ts b/lib/jdl/core/utils/set-utils.spec.ts similarity index 100% rename from lib/jdl/utils/set-utils.spec.ts rename to lib/jdl/core/utils/set-utils.spec.ts diff --git a/lib/jdl/utils/set-utils.ts b/lib/jdl/core/utils/set-utils.ts similarity index 100% rename from lib/jdl/utils/set-utils.ts rename to lib/jdl/core/utils/set-utils.ts diff --git a/lib/jdl/utils/string-utils.ts b/lib/jdl/core/utils/string-utils.ts similarity index 100% rename from lib/jdl/utils/string-utils.ts rename to lib/jdl/core/utils/string-utils.ts diff --git a/lib/jdl/utils/string_utils.spec.ts b/lib/jdl/core/utils/string_utils.spec.ts similarity index 100% rename from lib/jdl/utils/string_utils.spec.ts rename to lib/jdl/core/utils/string_utils.spec.ts diff --git a/lib/jdl/validators/binary-option-validator.spec.ts b/lib/jdl/core/validators/binary-option-validator.spec.ts similarity index 100% rename from lib/jdl/validators/binary-option-validator.spec.ts rename to lib/jdl/core/validators/binary-option-validator.spec.ts diff --git a/lib/jdl/validators/binary-option-validator.ts b/lib/jdl/core/validators/binary-option-validator.ts similarity index 100% rename from lib/jdl/validators/binary-option-validator.ts rename to lib/jdl/core/validators/binary-option-validator.ts diff --git a/lib/jdl/validators/deployment-validator.spec.ts b/lib/jdl/core/validators/deployment-validator.spec.ts similarity index 100% rename from lib/jdl/validators/deployment-validator.spec.ts rename to lib/jdl/core/validators/deployment-validator.spec.ts diff --git a/lib/jdl/validators/deployment-validator.ts b/lib/jdl/core/validators/deployment-validator.ts similarity index 100% rename from lib/jdl/validators/deployment-validator.ts rename to lib/jdl/core/validators/deployment-validator.ts diff --git a/lib/jdl/validators/entity-validator.spec.ts b/lib/jdl/core/validators/entity-validator.spec.ts similarity index 100% rename from lib/jdl/validators/entity-validator.spec.ts rename to lib/jdl/core/validators/entity-validator.spec.ts diff --git a/lib/jdl/validators/entity-validator.ts b/lib/jdl/core/validators/entity-validator.ts similarity index 100% rename from lib/jdl/validators/entity-validator.ts rename to lib/jdl/core/validators/entity-validator.ts diff --git a/lib/jdl/validators/enum-validator.spec.ts b/lib/jdl/core/validators/enum-validator.spec.ts similarity index 100% rename from lib/jdl/validators/enum-validator.spec.ts rename to lib/jdl/core/validators/enum-validator.spec.ts diff --git a/lib/jdl/validators/enum-validator.ts b/lib/jdl/core/validators/enum-validator.ts similarity index 100% rename from lib/jdl/validators/enum-validator.ts rename to lib/jdl/core/validators/enum-validator.ts diff --git a/lib/jdl/validators/field-validator.spec.ts b/lib/jdl/core/validators/field-validator.spec.ts similarity index 100% rename from lib/jdl/validators/field-validator.spec.ts rename to lib/jdl/core/validators/field-validator.spec.ts diff --git a/lib/jdl/validators/field-validator.ts b/lib/jdl/core/validators/field-validator.ts similarity index 100% rename from lib/jdl/validators/field-validator.ts rename to lib/jdl/core/validators/field-validator.ts diff --git a/lib/jdl/validators/jdl-with-application-validator.spec.ts b/lib/jdl/core/validators/jdl-with-application-validator.spec.ts similarity index 100% rename from lib/jdl/validators/jdl-with-application-validator.spec.ts rename to lib/jdl/core/validators/jdl-with-application-validator.spec.ts diff --git a/lib/jdl/validators/jdl-with-application-validator.ts b/lib/jdl/core/validators/jdl-with-application-validator.ts similarity index 100% rename from lib/jdl/validators/jdl-with-application-validator.ts rename to lib/jdl/core/validators/jdl-with-application-validator.ts diff --git a/lib/jdl/validators/jdl-without-application-validator.spec.ts b/lib/jdl/core/validators/jdl-without-application-validator.spec.ts similarity index 100% rename from lib/jdl/validators/jdl-without-application-validator.spec.ts rename to lib/jdl/core/validators/jdl-without-application-validator.spec.ts diff --git a/lib/jdl/validators/jdl-without-application-validator.ts b/lib/jdl/core/validators/jdl-without-application-validator.ts similarity index 100% rename from lib/jdl/validators/jdl-without-application-validator.ts rename to lib/jdl/core/validators/jdl-without-application-validator.ts diff --git a/lib/jdl/validators/option-validator.ts b/lib/jdl/core/validators/option-validator.ts similarity index 100% rename from lib/jdl/validators/option-validator.ts rename to lib/jdl/core/validators/option-validator.ts diff --git a/lib/jdl/validators/relationship-validator.spec.ts b/lib/jdl/core/validators/relationship-validator.spec.ts similarity index 100% rename from lib/jdl/validators/relationship-validator.spec.ts rename to lib/jdl/core/validators/relationship-validator.spec.ts diff --git a/lib/jdl/validators/relationship-validator.ts b/lib/jdl/core/validators/relationship-validator.ts similarity index 100% rename from lib/jdl/validators/relationship-validator.ts rename to lib/jdl/core/validators/relationship-validator.ts diff --git a/lib/jdl/validators/unary-option-validator.spec.ts b/lib/jdl/core/validators/unary-option-validator.spec.ts similarity index 100% rename from lib/jdl/validators/unary-option-validator.spec.ts rename to lib/jdl/core/validators/unary-option-validator.spec.ts diff --git a/lib/jdl/validators/unary-option-validator.ts b/lib/jdl/core/validators/unary-option-validator.ts similarity index 100% rename from lib/jdl/validators/unary-option-validator.ts rename to lib/jdl/core/validators/unary-option-validator.ts diff --git a/lib/jdl/validators/validation-validator.spec.ts b/lib/jdl/core/validators/validation-validator.spec.ts similarity index 100% rename from lib/jdl/validators/validation-validator.spec.ts rename to lib/jdl/core/validators/validation-validator.spec.ts diff --git a/lib/jdl/validators/validation-validator.ts b/lib/jdl/core/validators/validation-validator.ts similarity index 100% rename from lib/jdl/validators/validation-validator.ts rename to lib/jdl/core/validators/validation-validator.ts diff --git a/lib/jdl/validators/validator.ts b/lib/jdl/core/validators/validator.ts similarity index 100% rename from lib/jdl/validators/validator.ts rename to lib/jdl/core/validators/validator.ts diff --git a/lib/jdl/index.ts b/lib/jdl/index.ts index f79ff7529bae..0b44bffab2af 100644 --- a/lib/jdl/index.ts +++ b/lib/jdl/index.ts @@ -1,4 +1,4 @@ -export * from './jdl-importer.js'; -export * from './parsing/api.js'; +export * from './core/jdl-importer.js'; +export * from './core/parsing/api.js'; export * from '../jhipster/index.js'; export * from '../utils/yo-rc.js'; diff --git a/lib/jhipster/application-options.ts b/lib/jhipster/application-options.ts index af0552628d98..f20d30aaa4ef 100644 --- a/lib/jhipster/application-options.ts +++ b/lib/jhipster/application-options.ts @@ -22,7 +22,7 @@ import type { JDLApplicationOptionType, JDLApplicationOptionTypeValue, JDLApplicationOptionValue, -} from '../jdl/types/parsing.js'; +} from '../jdl/core/types/parsing.js'; import applicationTypes from './application-types.js'; import authenticationTypes from './authentication-types.js'; import databaseTypes from './database-types.js'; diff --git a/lib/jhipster/field-types.spec.ts b/lib/jhipster/field-types.spec.ts index eb8d6ab92dea..79d3c77d5e5f 100644 --- a/lib/jhipster/field-types.spec.ts +++ b/lib/jhipster/field-types.spec.ts @@ -21,7 +21,7 @@ import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { databaseTypes, fieldTypes, validations } from '../jhipster/index.js'; -import { JDLEnum } from '../jdl/models/index.js'; +import { JDLEnum } from '../jdl/core/models/index.js'; const { Validations: { MIN, MAXLENGTH, PATTERN }, diff --git a/lib/jhipster/field-types.ts b/lib/jhipster/field-types.ts index a94e1b1078c1..2cc3e1a3e89d 100644 --- a/lib/jhipster/field-types.ts +++ b/lib/jhipster/field-types.ts @@ -18,8 +18,8 @@ */ import { snakeCase } from 'lodash-es'; -import JDLEnum from '../jdl/models/jdl-enum.js'; -import validations from '../jdl/built-in-options/validations.js'; +import JDLEnum from '../jdl/core/models/jdl-enum.js'; +import validations from '../jdl/core/built-in-options/validations.js'; import databaseTypes from './database-types.js'; const { diff --git a/lib/jhipster/index.ts b/lib/jhipster/index.ts index 780865458d7b..3dbc2e6b1504 100644 --- a/lib/jhipster/index.ts +++ b/lib/jhipster/index.ts @@ -19,8 +19,8 @@ export { default as reservedKeywords } from './reserved-keywords.js'; export { default as searchEngineTypes } from './search-engine-types.js'; export { default as serviceDiscoveryTypes } from './service-discovery-types.js'; export { default as testFrameworkTypes } from './test-framework-types.js'; -export { default as validations } from '../jdl/built-in-options/validations.js'; -export * from '../jdl/built-in-options/validations.js'; +export { default as validations } from '../jdl/core/built-in-options/validations.js'; +export * from '../jdl/core/built-in-options/validations.js'; export { default as websocketTypes } from './websocket-types.js'; export { default as checkAndReturnRelationshipOnValue } from './relationship-on-handler-options.js'; export { IngressTypes as ingressTypes } from './kubernetes-platform-types.js'; diff --git a/lib/jhipster/jdl-validator-definition.ts b/lib/jhipster/jdl-validator-definition.ts index 855df9475502..13f8ef43a995 100644 --- a/lib/jhipster/jdl-validator-definition.ts +++ b/lib/jhipster/jdl-validator-definition.ts @@ -17,14 +17,14 @@ * limitations under the License. */ -import type { JDLValidatorOption } from '../jdl/types/parsing.js'; +import type { JDLValidatorOption } from '../jdl/core/types/parsing.js'; import { ALPHABETIC, ALPHABETIC_LOWER, ALPHANUMERIC, ALPHANUMERIC_DASH, ALPHANUMERIC_UNDERSCORE, -} from '../jdl/built-in-options/validation-patterns.js'; +} from '../jdl/core/built-in-options/validation-patterns.js'; const JHI_PREFIX_NAME_PATTERN = /^[A-Za-z][A-Za-z0-9-_]*$/; const PACKAGE_NAME_PATTERN = /^[a-z_][a-z0-9_]*$/; diff --git a/test/integration-test.spec.ts b/test/integration-test.spec.ts index 082519399f5c..a03735933ea0 100644 --- a/test/integration-test.spec.ts +++ b/test/integration-test.spec.ts @@ -23,7 +23,7 @@ import { fileURLToPath } from 'url'; import { before, describe, it } from 'esmocha'; import sortKeys from 'sort-keys'; -import { applicationTypes, authenticationTypes } from '../lib/jdl//jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../lib/jdl/core//jhipster/index.js'; import { formatDateForChangelog } from '../generators/base/support/index.js'; const writeJsonSync = (file, content) => writeFileSync(file, JSON.stringify(content, null, 2)); diff --git a/test/needle-api/needle-client-angular.spec.ts b/test/needle-api/needle-client-angular.spec.ts index 39519fdb2ec5..f7ab70fdc184 100644 --- a/test/needle-api/needle-client-angular.spec.ts +++ b/test/needle-api/needle-client-angular.spec.ts @@ -1,6 +1,6 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; -import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-react-generator.spec.ts b/test/needle-api/needle-client-react-generator.spec.ts index 6c7cfe7b3db4..5e2443b78f40 100644 --- a/test/needle-api/needle-client-react-generator.spec.ts +++ b/test/needle-api/needle-client-react-generator.spec.ts @@ -1,7 +1,7 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; import ReactGenerator from '../../generators/react/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-react.spec.ts b/test/needle-api/needle-client-react.spec.ts index c71cb3ab5c28..f7f19c450dc3 100644 --- a/test/needle-api/needle-client-react.spec.ts +++ b/test/needle-api/needle-client-react.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_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; import ReactGenerator from '../../generators/react/index.js'; diff --git a/test/needle-api/needle-client-vue-generator.spec.ts b/test/needle-api/needle-client-vue-generator.spec.ts index 51ce85441cf0..d812d89ced3a 100644 --- a/test/needle-api/needle-client-vue-generator.spec.ts +++ b/test/needle-api/needle-client-vue-generator.spec.ts @@ -2,7 +2,7 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; import VueGenerator from '../../generators/vue/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-vue.spec.ts b/test/needle-api/needle-client-vue.spec.ts index 9b51f740202e..170c9f1ab1b3 100644 --- a/test/needle-api/needle-client-vue.spec.ts +++ b/test/needle-api/needle-client-vue.spec.ts @@ -2,7 +2,7 @@ import { before, describe } from 'esmocha'; import { getGenerator, basicHelpers as helpers } from '../../testing/index.js'; import ClientGenerator from '../../generators/client/index.js'; -import { clientFrameworkTypes } from '../../lib/jdl//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; const { VUE } = clientFrameworkTypes; diff --git a/testing/helpers.ts b/testing/helpers.ts index 35ede38699d6..b2c69e3361da 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -13,7 +13,7 @@ import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from ' import BaseGenerator from '../generators/base/index.js'; import type { JHipsterGeneratorOptions } from '../generators/base/api.js'; import { getPackageRoot, isDistFolder } from '../lib/index.js'; -import type { JSONEntity } from '../lib/jdl/types/json-config.js'; +import type { JSONEntity } from '../lib/jdl/core/types/json-config.js'; import type CoreGenerator from '../generators/base-core/generator.js'; import getGenerator from './get-generator.js'; From fc552ec6dfcc5fb08135dfd746ef6f15e3901dd8 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 13:19:53 -0300 Subject: [PATCH 11/21] add __test-files__ to .prettierignore --- .prettierignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierignore b/.prettierignore index baa1ba926cf6..8d68d67ee4c5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -10,3 +10,4 @@ jdl/**/.jhipster/** test/fixtures/** dist coverage +__test-files__ From bbe388aa281448ecfb2946ebc630e2c1c8690872 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 13:26:55 -0300 Subject: [PATCH 12/21] adjusts --- test/integration-test.spec.ts | 2 +- test/needle-api/needle-client-angular.spec.ts | 2 +- test/needle-api/needle-client-react-generator.spec.ts | 2 +- test/needle-api/needle-client-react.spec.ts | 2 +- test/needle-api/needle-client-vue-generator.spec.ts | 2 +- test/needle-api/needle-client-vue.spec.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration-test.spec.ts b/test/integration-test.spec.ts index a03735933ea0..daf79a0a16f7 100644 --- a/test/integration-test.spec.ts +++ b/test/integration-test.spec.ts @@ -23,7 +23,7 @@ import { fileURLToPath } from 'url'; import { before, describe, it } from 'esmocha'; import sortKeys from 'sort-keys'; -import { applicationTypes, authenticationTypes } from '../lib/jdl/core//jhipster/index.js'; +import { applicationTypes, authenticationTypes } from '../lib/jhipster/index.js'; import { formatDateForChangelog } from '../generators/base/support/index.js'; const writeJsonSync = (file, content) => writeFileSync(file, JSON.stringify(content, null, 2)); diff --git a/test/needle-api/needle-client-angular.spec.ts b/test/needle-api/needle-client-angular.spec.ts index f7ab70fdc184..269815dd2468 100644 --- a/test/needle-api/needle-client-angular.spec.ts +++ b/test/needle-api/needle-client-angular.spec.ts @@ -1,6 +1,6 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; -import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-react-generator.spec.ts b/test/needle-api/needle-client-react-generator.spec.ts index 5e2443b78f40..c33c5b1b0e12 100644 --- a/test/needle-api/needle-client-react-generator.spec.ts +++ b/test/needle-api/needle-client-react-generator.spec.ts @@ -1,7 +1,7 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import ReactGenerator from '../../generators/react/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-react.spec.ts b/test/needle-api/needle-client-react.spec.ts index f7f19c450dc3..0237c440d4a8 100644 --- a/test/needle-api/needle-client-react.spec.ts +++ b/test/needle-api/needle-client-react.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_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; import ReactGenerator from '../../generators/react/index.js'; diff --git a/test/needle-api/needle-client-vue-generator.spec.ts b/test/needle-api/needle-client-vue-generator.spec.ts index d812d89ced3a..9bf4f267ef7d 100644 --- a/test/needle-api/needle-client-vue-generator.spec.ts +++ b/test/needle-api/needle-client-vue-generator.spec.ts @@ -2,7 +2,7 @@ import { before, describe, it } from 'esmocha'; import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; -import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; import VueGenerator from '../../generators/vue/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-vue.spec.ts b/test/needle-api/needle-client-vue.spec.ts index 170c9f1ab1b3..fcb5c3ce8b1c 100644 --- a/test/needle-api/needle-client-vue.spec.ts +++ b/test/needle-api/needle-client-vue.spec.ts @@ -2,7 +2,7 @@ import { before, describe } from 'esmocha'; import { getGenerator, basicHelpers as helpers } from '../../testing/index.js'; import ClientGenerator from '../../generators/client/index.js'; -import { clientFrameworkTypes } from '../../lib/jdl/core//jhipster/index.js'; +import { clientFrameworkTypes } from '../../lib/jhipster/index.js'; const { VUE } = clientFrameworkTypes; From ade704febdc58a9b27c113a806727afa9f08621b Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:01:06 -0300 Subject: [PATCH 13/21] move lib/jdl/core/converters to lib/jdl/converters --- .../support/export-jdl-transform.ts | 2 +- generators/export-jdl/generator.ts | 2 +- generators/info/generator.ts | 4 +-- .../gateway/jdl/jdl-routes-option.spec.ts | 2 +- .../jdl-to-json-basic-entity-converter.ts | 8 +++--- ...basic-entity-information-converter.spec.ts | 2 +- .../jdl-to-json-field-converter.spec.ts | 10 +++---- .../jdl-to-json-field-converter.ts | 14 +++++----- .../jdl-to-json-option-converter.spec.ts | 16 +++++------ .../jdl-to-json-option-converter.ts | 12 ++++---- ...jdl-to-json-relationship-converter.spec.ts | 6 ++-- .../jdl-to-json-relationship-converter.ts | 10 +++---- ...ith-applications-to-json-converter.spec.ts | 28 +++++++++---------- ...jdl-with-applications-to-json-converter.ts | 8 +++--- ...hout-application-to-json-converter.spec.ts | 24 ++++++++-------- ...l-without-application-to-json-converter.ts | 6 ++-- .../json-to-jdl-application-converter.spec.ts | 8 +++--- .../json-to-jdl-application-converter.ts | 8 +++--- .../converters/json-to-jdl-converter.spec.ts | 4 +-- .../converters/json-to-jdl-converter.ts | 24 ++++++++-------- .../json-to-jdl-entity-converter.spec.ts | 4 +-- .../json-to-jdl-entity-converter.ts | 28 +++++++++---------- .../json-to-jdl-option-converter.spec.ts | 8 +++--- .../json-to-jdl-option-converter.ts | 6 ++-- .../option-converter.spec.ts.snap | 0 .../application-converter.spec.ts | 4 +-- .../application-converter.ts | 16 +++++------ .../deployment-converter.spec.ts | 0 .../deployment-converter.ts | 4 +-- .../entity-converter.spec.ts | 0 .../entity-converter.ts | 8 +++--- .../enum-converter.spec.ts | 0 .../enum-converter.ts | 6 ++-- .../field-converter.spec.ts | 2 +- .../field-converter.ts | 8 +++--- .../option-converter.spec.ts | 2 +- .../option-converter.ts | 10 +++---- ...parsed-jdl-to-jdl-object-converter.spec.ts | 16 +++++------ .../parsed-jdl-to-jdl-object-converter.ts | 20 ++++++------- .../relationship-converter.spec.ts | 0 .../relationship-converter.ts | 10 +++---- .../validation-converter.spec.ts | 0 .../validation-converter.ts | 6 ++-- lib/jdl/core/__test-support__/index.ts | 8 +++--- lib/jdl/core/integration-test.spec.ts | 2 +- lib/jdl/core/jdl-importer.ts | 6 ++-- lib/jdl/core/readers/json-reader.ts | 4 +-- 47 files changed, 188 insertions(+), 188 deletions(-) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts (86%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts (98%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts (97%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-field-converter.ts (91%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts (94%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-option-converter.ts (91%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts (99%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-to-json-relationship-converter.ts (95%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts (98%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts (95%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts (98%) rename lib/jdl/{core => }/converters/jdl-to-json/jdl-without-application-to-json-converter.ts (94%) rename lib/jdl/{core => }/converters/json-to-jdl-application-converter.spec.ts (90%) rename lib/jdl/{core => }/converters/json-to-jdl-application-converter.ts (87%) rename lib/jdl/{core => }/converters/json-to-jdl-converter.spec.ts (99%) rename lib/jdl/{core => }/converters/json-to-jdl-converter.ts (87%) rename lib/jdl/{core => }/converters/json-to-jdl-entity-converter.spec.ts (99%) rename lib/jdl/{core => }/converters/json-to-jdl-entity-converter.ts (94%) rename lib/jdl/{core => }/converters/json-to-jdl-option-converter.spec.ts (87%) rename lib/jdl/{core => }/converters/json-to-jdl-option-converter.ts (89%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap (100%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts (98%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/application-converter.ts (85%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts (100%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/deployment-converter.ts (90%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts (100%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/entity-converter.ts (88%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts (100%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/enum-converter.ts (89%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts (97%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/field-converter.ts (84%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts (98%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/option-converter.ts (92%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts (98%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts (92%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts (100%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/relationship-converter.ts (90%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts (100%) rename lib/jdl/{core => }/converters/parsed-jdl-to-jdl-object/validation-converter.ts (93%) diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index 1bb01f05cb48..2aeff0bc50f9 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -5,7 +5,7 @@ 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 '../../../lib/jdl/core/converters/json-to-jdl-converter.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'; diff --git a/generators/export-jdl/generator.ts b/generators/export-jdl/generator.ts index d460859fb348..398b64e293d9 100644 --- a/generators/export-jdl/generator.ts +++ b/generators/export-jdl/generator.ts @@ -21,7 +21,7 @@ import chalk from 'chalk'; import BaseGenerator from '../base/index.js'; import { applicationOptions } from '../../lib/jhipster/index.js'; -import { convertToJDL } from '../../lib/jdl/core/converters/json-to-jdl-converter.js'; +import { convertToJDL } from '../../lib/jdl/converters/json-to-jdl-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import jdlDefinition from '../app/jdl/index.js'; diff --git a/generators/info/generator.ts b/generators/info/generator.ts index 5d14b07a1034..3acb49958f14 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -22,8 +22,8 @@ import chalk from 'chalk'; import BaseApplicationGenerator from '../base-application/index.js'; -import JSONToJDLEntityConverter from '../../lib/jdl/core/converters/json-to-jdl-entity-converter.js'; -import JSONToJDLOptionConverter from '../../lib/jdl/core/converters/json-to-jdl-option-converter.js'; +import JSONToJDLEntityConverter from '../../lib/jdl/converters/json-to-jdl-entity-converter.js'; +import JSONToJDLOptionConverter from '../../lib/jdl/converters/json-to-jdl-option-converter.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; import { YO_RC_FILE } from '../generator-constants.js'; import { applicationsLookup } from '../workspaces/support/applications-lookup.js'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts index 81bf75ef9033..23205f2aea19 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts @@ -1,7 +1,7 @@ import { before, describe, expect, it } from 'esmocha'; import type { ImportState } from '../../../../../lib/jdl/core/jdl-importer.js'; import { createImporterFromContent } from '../../../../../lib/jdl/core/jdl-importer.js'; -import { convertSingleContentToJDL } from '../../../../../lib/jdl/core/converters/json-to-jdl-converter.js'; +import { convertSingleContentToJDL } from '../../../../../lib/jdl/converters/json-to-jdl-converter.js'; const optionName = 'routes'; diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts similarity index 86% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts index d43e97a40d41..2e2b7d5ecfb1 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import JSONEntity from '../../basic-types/json-entity.js'; -import { formatComment } from '../../utils/format-utils.js'; -import { getTableNameFromEntityNameFallback } from '../../utils/entity-table-name-creator.js'; -import type { JDLEntity } from '../../models/index.js'; +import JSONEntity from '../../core/basic-types/json-entity.js'; +import { formatComment } from '../../core/utils/format-utils.js'; +import { getTableNameFromEntityNameFallback } from '../../core/utils/entity-table-name-creator.js'; +import type { JDLEntity } from '../../core/models/index.js'; export default { convert, diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts similarity index 98% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts index b45f59f1a40c..442c4837033a 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts @@ -23,7 +23,7 @@ import sinonChai from 'sinon-chai'; chai.use(sinonChai); -import { JDLEntity } from '../../models/index.js'; +import { JDLEntity } from '../../core/models/index.js'; import { convert } from './jdl-to-json-basic-entity-converter.js'; describe('jdl - JDLToJSONBasicEntityConverter', () => { diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts similarity index 97% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts index 9085ddbf3b2c..d777cc442dd5 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts @@ -19,11 +19,11 @@ import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import JDLObject from '../../models/jdl-object.js'; -import { JDLEntity, JDLEnum } from '../../models/index.js'; -import JDLField from '../../models/jdl-field.js'; -import JDLValidation from '../../models/jdl-validation.js'; -import { fieldTypes, validations } from '../../built-in-options/index.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { JDLEntity, JDLEnum } from '../../core/models/index.js'; +import JDLField from '../../core/models/jdl-field.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; +import { fieldTypes, validations } from '../../core/built-in-options/index.js'; import { convert } from './jdl-to-json-field-converter.js'; const { CommonDBTypes } = fieldTypes; diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts similarity index 91% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts index a3684201929b..0fdd68686a51 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-field-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts @@ -18,13 +18,13 @@ */ import { capitalize } from 'lodash-es'; -import { fieldTypes, validations } from '../../built-in-options/index.js'; -import { formatComment } from '../../utils/format-utils.js'; -import { camelCase } from '../../utils/string-utils.js'; -import type JDLObject from '../../models/jdl-object.js'; -import type { JSONField } from '../../types/json-config.js'; -import type { JDLEntity } from '../../models/index.js'; -import type JDLField from '../../models/jdl-field.js'; +import { fieldTypes, validations } from '../../core/built-in-options/index.js'; +import { formatComment } from '../../core/utils/format-utils.js'; +import { camelCase } from '../../core/utils/string-utils.js'; +import type JDLObject from '../../core/models/jdl-object.js'; +import type { JSONField } from '../../core/types/json-config.js'; +import type { JDLEntity } from '../../core/models/index.js'; +import type JDLField from '../../core/models/jdl-field.js'; const { Validations: { UNIQUE, REQUIRED }, diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts similarity index 94% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts index 8352de96123b..1850e92be7ed 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts @@ -24,12 +24,12 @@ import sinonChai from 'sinon-chai'; chai.use(sinonChai); -import JDLObject from '../../models/jdl-object.js'; -import { JDLEntity } from '../../models/index.js'; -import JDLUnaryOption from '../../models/jdl-unary-option.js'; -import JDLBinaryOption from '../../models/jdl-binary-option.js'; -import { binaryOptions, unaryOptions } from '../../built-in-options/index.js'; -import logger from '../../utils/objects/logger.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { JDLEntity } from '../../core/models/index.js'; +import JDLUnaryOption from '../../core/models/jdl-unary-option.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import { binaryOptions, unaryOptions } from '../../core/built-in-options/index.js'; +import logger from '../../core/utils/objects/logger.js'; import { convert } from './jdl-to-json-option-converter.js'; describe('jdl - JDLToJSONOptionConverter', () => { @@ -95,7 +95,7 @@ describe('jdl - JDLToJSONOptionConverter', () => { }), new JDLBinaryOption({ name: binaryOptions.Options.CLIENT_ROOT_FOLDER, - value: '../client_root_folder', + value: '../core/client_root_folder', entityNames: ['A'], }), new JDLBinaryOption({ @@ -134,7 +134,7 @@ describe('jdl - JDLToJSONOptionConverter', () => { jestExpect(convertedOptions).toMatchInlineSnapshot(` { "angularJSSuffix": "suffix", - "clientRootFolder": "../client_root_folder", + "clientRootFolder": "../core/client_root_folder", "dto": "mapstruct", "embedded": true, "fluentMethods": false, diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts similarity index 91% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts index 1795564c28ed..6573449987d9 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-option-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts @@ -17,12 +17,12 @@ * limitations under the License. */ -import logger from '../../utils/objects/logger.js'; -import { binaryOptions, unaryOptions } from '../../built-in-options/index.js'; -import type JDLObject from '../../models/jdl-object.js'; -import type JDLApplication from '../../models/jdl-application.js'; -import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; -import type JDLBinaryOption from '../../models/jdl-binary-option.js'; +import logger from '../../core/utils/objects/logger.js'; +import { binaryOptions, unaryOptions } from '../../core/built-in-options/index.js'; +import type JDLObject from '../../core/models/jdl-object.js'; +import type JDLApplication from '../../core/models/jdl-application.js'; +import type AbstractJDLOption from '../../core/models/abstract-jdl-option.js'; +import type JDLBinaryOption from '../../core/models/jdl-binary-option.js'; const { FILTER, NO_FLUENT_METHOD, READ_ONLY, EMBEDDED, SKIP_CLIENT, SKIP_SERVER } = unaryOptions; diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts similarity index 99% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts index 9526fcb4b63e..074aabf6651e 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts @@ -19,9 +19,9 @@ import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import JDLRelationship from '../../models/jdl-relationship.js'; -import { relationshipTypes } from '../../basic-types/index.js'; -import { relationshipOptions } from '../../built-in-options/index.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; +import { relationshipOptions } from '../../core/built-in-options/index.js'; import { convert } from './jdl-to-json-relationship-converter.js'; const { ONE_TO_ONE, MANY_TO_MANY, MANY_TO_ONE, ONE_TO_MANY } = relationshipTypes; diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts similarity index 95% rename from lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts index a3a608bfcfe5..809ce08bd1f6 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-to-json-relationship-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts @@ -18,11 +18,11 @@ */ import { kebabCase } from 'lodash-es'; -import { relationshipOptions, validations } from '../../built-in-options/index.js'; -import { camelCase, lowerFirst } from '../../utils/string-utils.js'; -import type JDLRelationship from '../../models/jdl-relationship.js'; -import type { JSONRelationship } from '../../types/json-config.js'; -import type { RelationshipType } from '../../basic-types/relationships.js'; +import { relationshipOptions, validations } from '../../core/built-in-options/index.js'; +import { camelCase, lowerFirst } from '../../core/utils/string-utils.js'; +import type JDLRelationship from '../../core/models/jdl-relationship.js'; +import type { JSONRelationship } from '../../core/types/json-config.js'; +import type { RelationshipType } from '../../core/basic-types/relationships.js'; const { Validations: { REQUIRED }, diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts similarity index 98% rename from lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts index 25ae5f0092b3..353d03ebb050 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts @@ -24,7 +24,7 @@ import sinonChai from 'sinon-chai'; chai.use(sinonChai); -import { relationshipTypes } from '../../basic-types/index.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; import { applicationTypes, binaryOptions, @@ -33,17 +33,17 @@ import { relationshipOptions, unaryOptions, validations, -} from '../../built-in-options/index.js'; -import JDLObject from '../../models/jdl-object.js'; -import { JDLEntity, JDLEnum } from '../../models/index.js'; -import JDLField from '../../models/jdl-field.js'; -import JDLValidation from '../../models/jdl-validation.js'; -import JDLRelationship from '../../models/jdl-relationship.js'; -import JDLUnaryOption from '../../models/jdl-unary-option.js'; -import JDLBinaryOption from '../../models/jdl-binary-option.js'; - -import logger from '../../utils/objects/logger.js'; -import { createJDLApplication } from '../.././__test-support__/index.js'; +} from '../../core/built-in-options/index.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { JDLEntity, JDLEnum } from '../../core/models/index.js'; +import JDLField from '../../core/models/jdl-field.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; +import JDLUnaryOption from '../../core/models/jdl-unary-option.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; + +import logger from '../../core/utils/objects/logger.js'; +import { createJDLApplication } from '../../core/__test-support__/index.js'; import { convert } from './jdl-with-applications-to-json-converter.js'; const { @@ -239,7 +239,7 @@ JSONEntity { }), new JDLBinaryOption({ name: binaryOptions.Options.CLIENT_ROOT_FOLDER, - value: '../client_root_folder', + value: '../core/client_root_folder', entityNames: new Set(['A']), }), new JDLBinaryOption({ @@ -288,7 +288,7 @@ JSONEntity { "applications": [ "toto", ], - "clientRootFolder": "../client_root_folder", + "clientRootFolder": "../core/client_root_folder", "documentation": "The best entity", "dto": "mapstruct", "embedded": true, diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts similarity index 95% rename from lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts index fa06b79944dd..598046c62463 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import type JDLObject from '../../models/jdl-object.js'; -import type JDLApplication from '../../models/jdl-application.js'; -import type JSONEntity from '../../basic-types/json-entity.js'; -import type { JdlObjectWrapper } from '../../models/jdl-object-wrapper.js'; +import type JDLObject from '../../core/models/jdl-object.js'; +import type JDLApplication from '../../core/models/jdl-application.js'; +import type JSONEntity from '../../core/basic-types/json-entity.js'; +import type { JdlObjectWrapper } from '../../core/models/jdl-object-wrapper.js'; import BasicEntityConverter from './jdl-to-json-basic-entity-converter.js'; import FieldConverter from './jdl-to-json-field-converter.js'; import RelationshipConverter from './jdl-to-json-relationship-converter.js'; diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts b/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts similarity index 98% rename from lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts rename to lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts index d999f1031b66..d656b20a4544 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts @@ -24,7 +24,7 @@ import sinonChai from 'sinon-chai'; chai.use(sinonChai); -import { relationshipTypes } from '../../basic-types/index.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; import { applicationTypes, @@ -34,16 +34,16 @@ import { relationshipOptions, unaryOptions, validations, -} from '../../built-in-options/index.js'; +} from '../../core/built-in-options/index.js'; -import JDLObject from '../../models/jdl-object.js'; -import { JDLEntity, JDLEnum } from '../../models/index.js'; -import JDLField from '../../models/jdl-field.js'; -import JDLValidation from '../../models/jdl-validation.js'; -import JDLRelationship from '../../models/jdl-relationship.js'; -import JDLUnaryOption from '../../models/jdl-unary-option.js'; -import JDLBinaryOption from '../../models/jdl-binary-option.js'; -import logger from '../../utils/objects/logger.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { JDLEntity, JDLEnum } from '../../core/models/index.js'; +import JDLField from '../../core/models/jdl-field.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; +import JDLUnaryOption from '../../core/models/jdl-unary-option.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import logger from '../../core/utils/objects/logger.js'; import { convert } from './jdl-without-application-to-json-converter.js'; const { @@ -220,7 +220,7 @@ JSONEntity { }), new JDLBinaryOption({ name: binaryOptions.Options.CLIENT_ROOT_FOLDER, - value: '../client_root_folder', + value: '../core/client_root_folder', entityNames: new Set(['A']), }), new JDLBinaryOption({ @@ -266,7 +266,7 @@ JSONEntity { "angularJSSuffix": "suffix", "annotations": {}, "applications": "*", - "clientRootFolder": "../client_root_folder", + "clientRootFolder": "../core/client_root_folder", "documentation": "The best entity", "dto": "mapstruct", "embedded": true, diff --git a/lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts similarity index 94% rename from lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.ts rename to lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts index b5d559a356e5..d3bc50665eb7 100644 --- a/lib/jdl/core/converters/jdl-to-json/jdl-without-application-to-json-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import type JDLObject from '../../models/jdl-object.js'; -import type JSONEntity from '../../basic-types/json-entity.js'; -import type { JdlObjectWrapper } from '../../models/jdl-object-wrapper.js'; +import type JDLObject from '../../core/models/jdl-object.js'; +import type JSONEntity from '../../core/basic-types/json-entity.js'; +import type { JdlObjectWrapper } from '../../core/models/jdl-object-wrapper.js'; import BasicEntityConverter from './jdl-to-json-basic-entity-converter.js'; import FieldConverter from './jdl-to-json-field-converter.js'; import RelationshipConverter from './jdl-to-json-relationship-converter.js'; diff --git a/lib/jdl/core/converters/json-to-jdl-application-converter.spec.ts b/lib/jdl/converters/json-to-jdl-application-converter.spec.ts similarity index 90% rename from lib/jdl/core/converters/json-to-jdl-application-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-application-converter.spec.ts index f990f527fc0e..fa6f2d996624 100644 --- a/lib/jdl/core/converters/json-to-jdl-application-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-application-converter.spec.ts @@ -19,10 +19,10 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { createJDLApplication } from '../models/jdl-application-factory.js'; -import JDLObject from '../models/jdl-object.js'; -import { applicationTypes } from '../built-in-options/index.js'; -import { convertApplicationsToJDL } from '.././__test-support__/index.js'; +import { createJDLApplication } from '../core/models/jdl-application-factory.js'; +import JDLObject from '../core/models/jdl-object.js'; +import { applicationTypes } from '../core/built-in-options/index.js'; +import { convertApplicationsToJDL } from '../core/__test-support__/index.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/core/converters/json-to-jdl-application-converter.ts b/lib/jdl/converters/json-to-jdl-application-converter.ts similarity index 87% rename from lib/jdl/core/converters/json-to-jdl-application-converter.ts rename to lib/jdl/converters/json-to-jdl-application-converter.ts index 49f7847da01a..3f6615e3ad37 100644 --- a/lib/jdl/core/converters/json-to-jdl-application-converter.ts +++ b/lib/jdl/converters/json-to-jdl-application-converter.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import JDLObject from '../models/jdl-object.js'; -import { createJDLApplication } from '../models/jdl-application-factory.js'; -import type { JDLRuntime } from '../types/runtime.js'; -import type { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from '../types/json-config.js'; +import JDLObject from '../core/models/jdl-object.js'; +import { createJDLApplication } from '../core/models/jdl-application-factory.js'; +import type { JDLRuntime } from '../core/types/runtime.js'; +import type { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from '../core/types/json-config.js'; const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/core/converters/json-to-jdl-converter.spec.ts b/lib/jdl/converters/json-to-jdl-converter.spec.ts similarity index 99% rename from lib/jdl/core/converters/json-to-jdl-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-converter.spec.ts index eb455c4a5ddb..015f390b7fbf 100644 --- a/lib/jdl/core/converters/json-to-jdl-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-converter.spec.ts @@ -22,8 +22,8 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { convertSingleContentToJDL, convertToJDL } from '../converters/json-to-jdl-converter.js'; -import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../../../testing/index.js'; +import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../../testing/index.js'; +import { convertSingleContentToJDL, convertToJDL } from './json-to-jdl-converter.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/lib/jdl/core/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts similarity index 87% rename from lib/jdl/core/converters/json-to-jdl-converter.ts rename to lib/jdl/converters/json-to-jdl-converter.ts index 9764cbb49a54..f02829425aab 100644 --- a/lib/jdl/core/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -19,18 +19,18 @@ import path from 'path'; import fs from 'fs'; -import JDLObject from '../models/jdl-object.js'; -import mergeJDLObjects from '../models/jdl-object-merger.js'; -import { doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; -import { readJSONFile } from '../readers/json-file-reader.js'; -import exportJDLObject from '../exporters/jdl-exporter.js'; -import { removeFieldsWithNullishValues } from '../../../utils/object.js'; -import type JDLApplication from '../models/jdl-application.js'; -import type { JDLRuntime } from '../types/runtime.js'; -import { createRuntime, getDefaultRuntime } from '../runtime.js'; -import { YO_RC_CONFIG_KEY } from '../../../utils/yo-rc.js'; -import type { JDLApplicationConfig } from '../types/parsing.js'; -import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../types/json-config.js'; +import JDLObject from '../core/models/jdl-object.js'; +import mergeJDLObjects from '../core/models/jdl-object-merger.js'; +import { doesDirectoryExist, doesFileExist } from '../core/utils/file-utils.js'; +import { readJSONFile } from '../core/readers/json-file-reader.js'; +import exportJDLObject from '../core/exporters/jdl-exporter.js'; +import { removeFieldsWithNullishValues } from '../../utils/object.js'; +import type JDLApplication from '../core/models/jdl-application.js'; +import type { JDLRuntime } from '../core/types/runtime.js'; +import { createRuntime, getDefaultRuntime } from '../core/runtime.js'; +import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; +import type { JDLApplicationConfig } from '../core/types/parsing.js'; +import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../core/types/json-config.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; import { convertApplicationToJDL } from './json-to-jdl-application-converter.js'; diff --git a/lib/jdl/core/converters/json-to-jdl-entity-converter.spec.ts b/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts similarity index 99% rename from lib/jdl/core/converters/json-to-jdl-entity-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-entity-converter.spec.ts index 0d06daf206a2..676bbd98a7b8 100644 --- a/lib/jdl/core/converters/json-to-jdl-entity-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts @@ -22,8 +22,8 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { convertEntitiesToJDL } from '../converters/json-to-jdl-entity-converter.js'; -import { binaryOptions, relationshipOptions, unaryOptions } from '../built-in-options/index.js'; +import { binaryOptions, relationshipOptions, unaryOptions } from '../core/built-in-options/index.js'; +import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/lib/jdl/core/converters/json-to-jdl-entity-converter.ts b/lib/jdl/converters/json-to-jdl-entity-converter.ts similarity index 94% rename from lib/jdl/core/converters/json-to-jdl-entity-converter.ts rename to lib/jdl/converters/json-to-jdl-entity-converter.ts index 849e928509d0..0e5f11395f97 100644 --- a/lib/jdl/core/converters/json-to-jdl-entity-converter.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.ts @@ -17,20 +17,20 @@ * limitations under the License. */ -import JDLObject from '../models/jdl-object.js'; -import { JDLEntity, JDLEnum } from '../models/index.js'; -import JDLField from '../models/jdl-field.js'; -import JDLValidation from '../models/jdl-validation.js'; -import type { JDLRelationshipModel, JDLRelationshipOptions, JDLSourceEntitySide } from '../models/jdl-relationship.js'; -import JDLRelationship from '../models/jdl-relationship.js'; -import JDLUnaryOption from '../models/jdl-unary-option.js'; -import JDLBinaryOption from '../models/jdl-binary-option.js'; - -import { lowerFirst, upperFirst } from '../utils/string-utils.js'; - -import { binaryOptions, fieldTypes, relationshipOptions, unaryOptions } from '../built-in-options/index.js'; -import { asJdlRelationshipType } from '../basic-types/relationship-types.js'; -import type { JSONEntity, JSONField, JSONRelationship } from '../types/json-config.js'; +import JDLObject from '../core/models/jdl-object.js'; +import { JDLEntity, JDLEnum } from '../core/models/index.js'; +import JDLField from '../core/models/jdl-field.js'; +import JDLValidation from '../core/models/jdl-validation.js'; +import type { JDLRelationshipModel, JDLRelationshipOptions, JDLSourceEntitySide } from '../core/models/jdl-relationship.js'; +import JDLRelationship from '../core/models/jdl-relationship.js'; +import JDLUnaryOption from '../core/models/jdl-unary-option.js'; +import JDLBinaryOption from '../core/models/jdl-binary-option.js'; + +import { lowerFirst, upperFirst } from '../core/utils/string-utils.js'; + +import { binaryOptions, fieldTypes, relationshipOptions, unaryOptions } from '../core/built-in-options/index.js'; +import { asJdlRelationshipType } from '../core/basic-types/relationship-types.js'; +import type { JSONEntity, JSONField, JSONRelationship } from '../core/types/json-config.js'; const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes; const { BUILT_IN_ENTITY } = relationshipOptions; diff --git a/lib/jdl/core/converters/json-to-jdl-option-converter.spec.ts b/lib/jdl/converters/json-to-jdl-option-converter.spec.ts similarity index 87% rename from lib/jdl/core/converters/json-to-jdl-option-converter.spec.ts rename to lib/jdl/converters/json-to-jdl-option-converter.spec.ts index c7505f92e9bc..385d34e28170 100644 --- a/lib/jdl/core/converters/json-to-jdl-option-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-option-converter.spec.ts @@ -19,10 +19,10 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { convertServerOptionsToJDL } from '../converters/json-to-jdl-option-converter.js'; -import JDLObject from '../models/jdl-object.js'; -import JDLUnaryOption from '../models/jdl-unary-option.js'; -import { unaryOptions } from '../built-in-options/index.js'; +import JDLObject from '../core/models/jdl-object.js'; +import JDLUnaryOption from '../core/models/jdl-unary-option.js'; +import { unaryOptions } from '../core/built-in-options/index.js'; +import { convertServerOptionsToJDL } from './json-to-jdl-option-converter.js'; const { SKIP_CLIENT } = unaryOptions; diff --git a/lib/jdl/core/converters/json-to-jdl-option-converter.ts b/lib/jdl/converters/json-to-jdl-option-converter.ts similarity index 89% rename from lib/jdl/core/converters/json-to-jdl-option-converter.ts rename to lib/jdl/converters/json-to-jdl-option-converter.ts index c8c4dee61c0d..1dc9dd55e4ab 100644 --- a/lib/jdl/core/converters/json-to-jdl-option-converter.ts +++ b/lib/jdl/converters/json-to-jdl-option-converter.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import JDLObject from '../models/jdl-object.js'; -import { unaryOptions } from '../built-in-options/index.js'; -import JDLUnaryOption from '../models/jdl-unary-option.js'; +import JDLObject from '../core/models/jdl-object.js'; +import { unaryOptions } from '../core/built-in-options/index.js'; +import JDLUnaryOption from '../core/models/jdl-unary-option.js'; const { SKIP_CLIENT, SKIP_SERVER } = unaryOptions; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap b/lib/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap similarity index 100% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap rename to lib/jdl/converters/parsed-jdl-to-jdl-object/__snapshots__/option-converter.spec.ts.snap diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts similarity index 98% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts index 4ba6c82e0e88..d8d5132d848a 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts @@ -19,8 +19,8 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes } from '../../built-in-options/index.js'; -import { convertApplications, createJDLApplication } from '../.././__test-support__/index.js'; +import { applicationTypes } from '../../core/built-in-options/index.js'; +import { convertApplications, createJDLApplication } from '../../core/__test-support__/index.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts similarity index 85% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts index 704e4c073290..6686574b846e 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/application-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts @@ -17,14 +17,14 @@ * limitations under the License. */ -import { createJDLApplication } from '../../models/jdl-application-factory.js'; -import { applicationOptions as ApplicationOptions } from '../../built-in-options/index.js'; -import type JDLUnaryOption from '../../models/jdl-unary-option.js'; -import type JDLBinaryOption from '../../models/jdl-binary-option.js'; -import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; -import type JDLApplication from '../../models/jdl-application.js'; -import type { JDLRuntime } from '../../types/runtime.js'; -import type { ParsedJDLApplication } from '../../types/parsed.js'; +import { createJDLApplication } from '../../core/models/jdl-application-factory.js'; +import { applicationOptions as ApplicationOptions } from '../../core/built-in-options/index.js'; +import type JDLUnaryOption from '../../core/models/jdl-unary-option.js'; +import type JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import type AbstractJDLOption from '../../core/models/abstract-jdl-option.js'; +import type JDLApplication from '../../core/models/jdl-application.js'; +import type { JDLRuntime } from '../../core/types/runtime.js'; +import type { ParsedJDLApplication } from '../../core/types/parsed.js'; import { convertOptions } from './option-converter.js'; const { diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts similarity index 100% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts similarity index 90% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts index f1c8d57c4d08..b8ca99420ae5 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/deployment-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.ts @@ -17,8 +17,8 @@ * limitations under the License. */ -import JDLDeployment from '../../models/jdl-deployment.js'; -import type { ParsedJDLDeployment } from '../../types/parsed.js'; +import JDLDeployment from '../../core/models/jdl-deployment.js'; +import type { ParsedJDLDeployment } from '../../core/types/parsed.js'; export default { convertDeployments }; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts similarity index 100% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts similarity index 88% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts index a904000ab661..55cc85a174b9 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/entity-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts @@ -18,10 +18,10 @@ */ import { lowerFirst } from 'lodash-es'; -import { JDLEntity } from '../../models/index.js'; -import { formatComment } from '../../utils/format-utils.js'; -import type JDLField from '../../models/jdl-field.js'; -import type { ParsedJDLEntity } from '../../types/parsed.js'; +import { JDLEntity } from '../../core/models/index.js'; +import { formatComment } from '../../core/utils/format-utils.js'; +import type JDLField from '../../core/models/jdl-field.js'; +import type { ParsedJDLEntity } from '../../core/types/parsed.js'; export default { convertEntities }; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts similarity index 100% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts similarity index 89% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts index 8298a916d4ad..96b2c564f21a 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/enum-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { JDLEnum } from '../../models/index.js'; -import { formatComment } from '../../utils/format-utils.js'; -import type { ParsedJDLEnum } from '../../types/parsed.js'; +import { JDLEnum } from '../../core/models/index.js'; +import { formatComment } from '../../core/utils/format-utils.js'; +import type { ParsedJDLEnum } from '../../core/types/parsed.js'; export default { convertEnums }; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts similarity index 97% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts index 8074527c9921..dabe00cc6d67 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts @@ -18,7 +18,7 @@ */ import { before, describe, expect, it } from 'esmocha'; -import type JDLField from '../../models/jdl-field.js'; +import type JDLField from '../../core/models/jdl-field.js'; import { convertField } from './field-converter.js'; describe('jdl - FieldConverter', () => { diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts similarity index 84% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts index fa816869f7b8..bb5fdc408460 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/field-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import JDLField from '../../models/jdl-field.js'; -import { formatComment } from '../../utils/format-utils.js'; -import { lowerFirst } from '../../utils/string-utils.js'; -import type { ParsedJDLEntityField } from '../../types/parsed.js'; +import JDLField from '../../core/models/jdl-field.js'; +import { formatComment } from '../../core/utils/format-utils.js'; +import { lowerFirst } from '../../core/utils/string-utils.js'; +import type { ParsedJDLEntityField } from '../../core/types/parsed.js'; export default { convertField }; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts similarity index 98% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts index a6b0736a26b9..60a9935b559b 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts @@ -18,7 +18,7 @@ */ import { before, describe, expect, it } from 'esmocha'; -import { binaryOptions, unaryOptions } from '../../built-in-options/index.js'; +import { binaryOptions, unaryOptions } from '../../core/built-in-options/index.js'; import { convertOptions } from './option-converter.js'; describe('jdl - OptionConverter', () => { diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts similarity index 92% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts index bc394b64fa92..e165efe103f1 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/option-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts @@ -17,11 +17,11 @@ * limitations under the License. */ -import JDLUnaryOption from '../../models/jdl-unary-option.js'; -import JDLBinaryOption from '../../models/jdl-binary-option.js'; -import { binaryOptions, unaryOptions } from '../../built-in-options/index.js'; -import type AbstractJDLOption from '../../models/abstract-jdl-option.js'; -import type { ParsedJDLOption, ParsedJDLUseOption } from '../../types/parsed.js'; +import JDLUnaryOption from '../../core/models/jdl-unary-option.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import { binaryOptions, unaryOptions } from '../../core/built-in-options/index.js'; +import type AbstractJDLOption from '../../core/models/abstract-jdl-option.js'; +import type { ParsedJDLOption, ParsedJDLUseOption } from '../../core/types/parsed.js'; const { OptionValues, getOptionName } = binaryOptions; export default { convertOptions }; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts similarity index 98% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index 5e8d740af465..23d674f17b8f 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -21,12 +21,12 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import matchEntity from '../../matchers/entity-matcher.js'; -import { JDLEntity, JDLEnum } from '../../models/index.js'; -import JDLField from '../../models/jdl-field.js'; -import JDLValidation from '../../models/jdl-validation.js'; -import JDLUnaryOption from '../../models/jdl-unary-option.js'; -import JDLBinaryOption from '../../models/jdl-binary-option.js'; +import matchEntity from '../../core/matchers/entity-matcher.js'; +import { JDLEntity, JDLEnum } from '../../core/models/index.js'; +import JDLField from '../../core/models/jdl-field.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; +import JDLUnaryOption from '../../core/models/jdl-unary-option.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; import { applicationOptions, applicationTypes, @@ -35,8 +35,8 @@ import { fieldTypes, unaryOptions, validations, -} from '../../built-in-options/index.js'; -import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../.././__test-support__/index.js'; +} from '../../core/built-in-options/index.js'; +import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../core/__test-support__/index.js'; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; const { OptionNames } = applicationOptions; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts similarity index 92% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts index d0cf1337e4a0..f13b0bae97e2 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts @@ -17,15 +17,15 @@ * limitations under the License. */ import { lowerFirst } from 'lodash-es'; -import JDLObject from '../../models/jdl-object.js'; -import JDLBinaryOption from '../../models/jdl-binary-option.js'; -import { applicationTypes, binaryOptions } from '../../built-in-options/index.js'; - -import type JDLApplication from '../../models/jdl-application.js'; -import type JDLField from '../../models/jdl-field.js'; -import type JDLValidation from '../../models/jdl-validation.js'; -import type { JDLEntity } from '../../models/index.js'; -import type { JDLRuntime } from '../../types/runtime.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import { applicationTypes, binaryOptions } from '../../core/built-in-options/index.js'; + +import type JDLApplication from '../../core/models/jdl-application.js'; +import type JDLField from '../../core/models/jdl-field.js'; +import type JDLValidation from '../../core/models/jdl-validation.js'; +import type { JDLEntity } from '../../core/models/index.js'; +import type { JDLRuntime } from '../../core/types/runtime.js'; import type { ParsedJDLAnnotation, ParsedJDLApplication, @@ -33,7 +33,7 @@ import type { ParsedJDLEntity, ParsedJDLEntityField, ParsedJDLRoot, -} from '../../types/parsed.js'; +} from '../../core/types/parsed.js'; import { convertApplications } from './application-converter.js'; import { convertEntities } from './entity-converter.js'; import { convertEnums } from './enum-converter.js'; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts similarity index 100% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts similarity index 90% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts index bb5bacd5195e..0f17504192cf 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/relationship-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts @@ -17,11 +17,11 @@ * limitations under the License. */ -import JDLRelationship from '../../models/jdl-relationship.js'; -import { lowerFirst } from '../../utils/string-utils.js'; -import { formatComment } from '../../utils/format-utils.js'; -import { asJdlRelationshipType } from '../../basic-types/relationship-types.js'; -import type { ParsedJDLAnnotation, ParsedJDLRelationship } from '../../types/parsed.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; +import { lowerFirst } from '../../core/utils/string-utils.js'; +import { formatComment } from '../../core/utils/format-utils.js'; +import { asJdlRelationshipType } from '../../core/basic-types/relationship-types.js'; +import type { ParsedJDLAnnotation, ParsedJDLRelationship } from '../../core/types/parsed.js'; export default { convertRelationships }; diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts similarity index 100% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts diff --git a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts similarity index 93% rename from lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.ts rename to lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts index 521d9f2f7ebb..edfa53b5fcc4 100644 --- a/lib/jdl/core/converters/parsed-jdl-to-jdl-object/validation-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import JDLValidation from '../../models/jdl-validation.js'; -import { validations } from '../../built-in-options/index.js'; -import type { ParsedJDLValidation } from '../../types/parsed.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; +import { validations } from '../../core/built-in-options/index.js'; +import type { ParsedJDLValidation } from '../../core/types/parsed.js'; const { Validations: { PATTERN }, diff --git a/lib/jdl/core/__test-support__/index.ts b/lib/jdl/core/__test-support__/index.ts index 96b55ad196f7..ab4c52b41dd4 100644 --- a/lib/jdl/core/__test-support__/index.ts +++ b/lib/jdl/core/__test-support__/index.ts @@ -1,6 +1,6 @@ import { getDefaultRuntime } from '../runtime.js'; import { parseFromContent as originalParseFromContent, parseFromFiles as originalParseFromFiles } from '../readers/jdl-reader.js'; -import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; +import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import { createImporterFromContent as originalCreateImporterFromContent, createImporterFromFiles as originalCreateImporterFromFiles, @@ -11,10 +11,10 @@ import { createJDLLinterFromContent as originalCreateJDLLinterFromContent, createJDLLinterFromFile as originalCreateJDLLinterFromFile, } from '../linters/jdl-linter.js'; -import { convertApplications as originalConvertApplications } from '../converters/parsed-jdl-to-jdl-object/application-converter.js'; +import { convertApplications as originalConvertApplications } from '../../converters/parsed-jdl-to-jdl-object/application-converter.js'; import { createJDLApplication as originalCreateJDLApplication } from '../models/jdl-application-factory.js'; -import type { JHipsterYoRcContentAndJDLWrapper } from '../converters/json-to-jdl-application-converter.js'; -import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../converters/json-to-jdl-application-converter.js'; +import type { JHipsterYoRcContentAndJDLWrapper } from '../../converters/json-to-jdl-application-converter.js'; +import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../../converters/json-to-jdl-application-converter.js'; const runtime = getDefaultRuntime(); diff --git a/lib/jdl/core/integration-test.spec.ts b/lib/jdl/core/integration-test.spec.ts index 30199ce5cfdf..adfebfa245c5 100644 --- a/lib/jdl/core/integration-test.spec.ts +++ b/lib/jdl/core/integration-test.spec.ts @@ -23,9 +23,9 @@ import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../../testing/index.js'; import { applicationTypes } from '../../jhipster/index.js'; +import { convert as convertWithoutApplication } from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from './__test-support__/index.js'; import exportToJDL from './exporters/jdl-exporter.js'; -import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import type { ApplicationWithEntities } from './jdl-importer.js'; const { MONOLITH } = applicationTypes; diff --git a/lib/jdl/core/jdl-importer.ts b/lib/jdl/core/jdl-importer.ts index 1a7f5d409d9a..e0612762b579 100644 --- a/lib/jdl/core/jdl-importer.ts +++ b/lib/jdl/core/jdl-importer.ts @@ -18,12 +18,12 @@ */ import { uniqBy } from 'lodash-es'; import { applicationOptions } from '../../jhipster/index.js'; +import ParsedJDLToJDLObjectConverter from '../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; +import JDLWithoutApplicationToJSONConverter from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; +import { convert } from '../converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; import * as JDLReader from './readers/jdl-reader.js'; -import ParsedJDLToJDLObjectConverter from './converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import { readJSONFile } from './readers/json-file-reader.js'; import { doesFileExist } from './utils/file-utils.js'; -import JDLWithoutApplicationToJSONConverter from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; -import { convert } from './converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; import { formatApplicationToExport, formatApplicationsToExport } from './exporters/applications/jhipster-application-formatter.js'; import exportDeployments from './exporters/jhipster-deployment-exporter.js'; import exportEntities from './exporters/jhipster-entity-exporter.js'; diff --git a/lib/jdl/core/readers/json-reader.ts b/lib/jdl/core/readers/json-reader.ts index d74779573278..e7392eb1974c 100644 --- a/lib/jdl/core/readers/json-reader.ts +++ b/lib/jdl/core/readers/json-reader.ts @@ -18,8 +18,8 @@ */ import fs from 'fs'; -import { convertEntitiesToJDL } from '../converters/json-to-jdl-entity-converter.js'; -import { convertServerOptionsToJDL } from '../converters/json-to-jdl-option-converter.js'; +import { convertEntitiesToJDL } from '../../converters/json-to-jdl-entity-converter.js'; +import { convertServerOptionsToJDL } from '../../converters/json-to-jdl-option-converter.js'; import mergeJDLObjects from '../models/jdl-object-merger.js'; import { doesDirectoryExist } from '../utils/file-utils.js'; import type JDLObject from '../models/jdl-object.js'; From 829678597980555063d3f4ccf3b9b8f331638055 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:15:25 -0300 Subject: [PATCH 14/21] add jdl test files helper --- .../converters/json-to-jdl-converter.spec.ts | 5 +- .../json-to-jdl-entity-converter.spec.ts | 21 ++----- ...parsed-jdl-to-jdl-object-converter.spec.ts | 62 +++++++++---------- .../files}/MyEntity.json | 0 .../files}/annotations.jdl | 0 .../files}/annotations_and_options.jdl | 0 .../files}/application.jdl | 0 .../files}/application_with_blueprints.jdl | 0 .../files}/application_with_entities.jdl | 0 .../application_with_entity_dto_suffixes.jdl | 0 .../files}/application_wrong_basename.jdl | 0 .../files}/applications.jdl | 0 .../files}/applications2.jdl | 0 .../files}/applications3.jdl | 0 ...applications_with_and_without_entities.jdl | 0 .../authority_entity_to_relationship.jdl | 0 .../files}/big_sample.jdl | 0 .../files}/blob_jdl.jdl | 0 .../files}/capitalized_annotations.jdl | 0 .../files}/cassandra_jdl.jdl | 0 .../files}/cassandra_with_relationships.jdl | 0 .../files}/client_root_folder.jdl | 0 .../client_root_folder_no_microservice.jdl | 0 .../files}/complex_jdl.jdl | 0 .../files}/complex_jdl_2.jdl | 0 .../files}/constants.jdl | 0 .../files}/couchbase_jdl.jdl | 0 .../files}/deployments.jdl | 0 .../files}/different_relationship_types.jdl | 0 .../files}/enum.jdl | 0 .../files}/enum_with_values.jdl | 0 .../files}/field_comments.jdl | 0 .../files}/filtering_with_service.jdl | 0 .../files}/filtering_without_service.jdl | 0 .../files}/fluent_methods.jdl | 0 .../files}/fluent_methods2.jdl | 0 .../files}/following_comments.jdl | 0 .../files}/id_field.jdl | 0 .../files}/integration/file1.jdl | 0 .../files}/integration/file2.jdl | 0 .../files}/invalid_field_type.jdl | 0 .../files}/invalid_file.txt | 0 .../files}/invalid_file2 | 0 .../files}/invalid_option.jdl | 0 .../jhipster_app/.jhipster/BadEntity.json | 0 .../.jhipster/CassBankAccount.json | 0 .../jhipster_app/.jhipster/Country.json | 0 .../jhipster_app/.jhipster/Department.json | 0 .../jhipster_app/.jhipster/Employee.json | 0 .../.jhipster/InvalidBlobType.json | 0 .../files}/jhipster_app/.jhipster/Job.json | 0 .../jhipster_app/.jhipster/JobHistory.json | 0 .../jhipster_app/.jhipster/Location.json | 0 .../jhipster_app/.jhipster/NoEntity.txt | 0 .../files}/jhipster_app/.jhipster/Region.json | 0 .../files}/jhipster_app/.jhipster/Task.json | 0 .../files}/jhipster_app/.yo-rc.json | 0 .../app_with_entities/.jhipster/Country.json | 0 .../.jhipster/Department.json | 0 .../app_with_entities/.jhipster/Employee.json | 0 .../app_with_entities/.jhipster/Job.json | 0 .../.jhipster/JobHistory.json | 0 .../app_with_entities/.jhipster/Location.json | 0 .../app_with_entities/.jhipster/Region.json | 0 .../app_with_entities/.jhipster/Task.json | 0 .../app_with_entities/.yo-rc.json | 0 .../multi_apps/app1/.jhipster/Region.json | 0 .../multi_apps/app1/.yo-rc.json | 0 .../multi_apps/app2/.jhipster/Country.json | 0 .../multi_apps/app2/.jhipster/Location.json | 0 .../multi_apps/app2/.yo-rc.json | 0 .../multi_apps/app3/.yo-rc.json | 0 .../with_authority/.jhipster/TestEntity.json | 0 .../with_authority/.yo-rc.json | 0 .../with_user/.jhipster/TestEntity.json | 0 .../with_user/.yo-rc.json | 0 .../files}/lint/duplicate_entities.jdl | 0 .../files}/lint/duplicate_enums.jdl | 0 .../files}/lint/duplicate_fields.jdl | 0 .../files}/lint/ungrouped_relationships.jdl | 0 .../files}/lint/unused_enums.jdl | 0 .../files}/lint/useless_commas_fields.jdl | 0 .../lint/useless_entity_curly_braces.jdl | 0 .../files}/lint/useless_table_names.jdl | 0 .../files}/mongo_jdl.jdl | 0 .../files}/multiple_jdl_comments.jdl | 0 .../files}/no_injected_field.jdl | 0 .../files}/no_microservice.jdl | 0 .../files}/non_existent_validation.jdl | 0 .../files}/pattern_validation_with_quote.jdl | 0 .../files}/realistic_sample.jdl | 0 .../files}/regex_validation.jdl | 0 .../files}/relationship_built_in_entity.jdl | 0 .../files}/required_relationships.jdl | 0 .../files}/simple.jdl | 0 .../files}/simple_microservice_setup.jdl | 0 .../files}/two_microservices.jdl | 0 .../files}/underscore_application_name.jdl | 0 .../unexistent_entities_for_relationship.jdl | 0 .../files}/unique.jdl | 0 .../files}/user_entity_from_relationship.jdl | 0 .../files}/user_entity_to_relationship.jdl | 0 .../files}/valid_jdl.jdl | 0 .../files}/valid_jdl2.jdl | 0 lib/jdl/core/__test-support__/index.ts | 7 +++ lib/jdl/core/integration-test.spec.ts | 12 +++- lib/jdl/core/jdl-importer.spec.ts | 35 +++++------ lib/jdl/core/linters/jdl-linter.spec.ts | 18 +++--- lib/jdl/core/readers/jdl-reader.spec.ts | 21 +++---- lib/jdl/core/readers/json-reader.spec.ts | 13 ++-- lib/jdl/core/utils/files-utils.spec.ts | 3 +- 111 files changed, 98 insertions(+), 99 deletions(-) rename lib/jdl/core/{__test-files__ => __test-support__/files}/MyEntity.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/annotations.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/annotations_and_options.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/application.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/application_with_blueprints.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/application_with_entities.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/application_with_entity_dto_suffixes.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/application_wrong_basename.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/applications.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/applications2.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/applications3.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/applications_with_and_without_entities.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/authority_entity_to_relationship.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/big_sample.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/blob_jdl.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/capitalized_annotations.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/cassandra_jdl.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/cassandra_with_relationships.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/client_root_folder.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/client_root_folder_no_microservice.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/complex_jdl.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/complex_jdl_2.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/constants.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/couchbase_jdl.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/deployments.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/different_relationship_types.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/enum.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/enum_with_values.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/field_comments.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/filtering_with_service.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/filtering_without_service.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/fluent_methods.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/fluent_methods2.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/following_comments.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/id_field.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/integration/file1.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/integration/file2.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/invalid_field_type.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/invalid_file.txt (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/invalid_file2 (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/invalid_option.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/BadEntity.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/CassBankAccount.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Country.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Department.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Employee.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/InvalidBlobType.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Job.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/JobHistory.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Location.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/NoEntity.txt (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Region.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.jhipster/Task.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/jhipster_app/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Country.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Department.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Job.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Location.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Region.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.jhipster/Task.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/app_with_entities/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/multi_apps/app1/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/multi_apps/app2/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/multi_apps/app3/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/with_authority/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/with_user/.jhipster/TestEntity.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/json_to_jdl_converter/with_user/.yo-rc.json (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/duplicate_entities.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/duplicate_enums.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/duplicate_fields.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/ungrouped_relationships.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/unused_enums.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/useless_commas_fields.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/useless_entity_curly_braces.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/lint/useless_table_names.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/mongo_jdl.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/multiple_jdl_comments.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/no_injected_field.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/no_microservice.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/non_existent_validation.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/pattern_validation_with_quote.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/realistic_sample.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/regex_validation.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/relationship_built_in_entity.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/required_relationships.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/simple.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/simple_microservice_setup.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/two_microservices.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/underscore_application_name.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/unexistent_entities_for_relationship.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/unique.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/user_entity_from_relationship.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/user_entity_to_relationship.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/valid_jdl.jdl (100%) rename lib/jdl/core/{__test-files__ => __test-support__/files}/valid_jdl2.jdl (100%) diff --git a/lib/jdl/converters/json-to-jdl-converter.spec.ts b/lib/jdl/converters/json-to-jdl-converter.spec.ts index 015f390b7fbf..8f75ee47c00c 100644 --- a/lib/jdl/converters/json-to-jdl-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-converter.spec.ts @@ -23,6 +23,7 @@ import { fileURLToPath } from 'url'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../../testing/index.js'; +import { getTestFile } from '../core/__test-support__/index.js'; import { convertSingleContentToJDL, convertToJDL } from './json-to-jdl-converter.js'; const __filename = fileURLToPath(import.meta.url); @@ -119,7 +120,7 @@ describe('jdl - JSONToJDLConverter', () => { describe('with entities', () => { beforeEach(() => { - const dir = path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'app_with_entities'); + const dir = getTestFile('json_to_jdl_converter', 'app_with_entities'); convertToJDL(dir); jdlFileContent = fs.readFileSync(path.join(dir, 'app.jdl'), 'utf-8'); }); @@ -238,7 +239,7 @@ describe('jdl - JSONToJDLConverter', () => { let jdlFileContent; beforeEach(() => { - rootDir = path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'multi_apps'); + rootDir = getTestFile('json_to_jdl_converter', 'multi_apps'); jdlFilename = 'app.jdl'; convertToJDL(rootDir); jdlFileContent = fs.readFileSync(path.join(rootDir, jdlFilename), 'utf-8'); diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts b/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts index 676bbd98a7b8..58355928340c 100644 --- a/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.spec.ts @@ -18,11 +18,12 @@ */ import fs from 'fs'; -import path, { dirname } from 'path'; +import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { binaryOptions, relationshipOptions, unaryOptions } from '../core/built-in-options/index.js'; +import { getTestFile } from '../core/__test-support__/index.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; const __filename = fileURLToPath(import.meta.url); @@ -244,12 +245,7 @@ describe('jdl - JSONToJDLEntityConverter', () => { [ 'TestEntity', JSON.parse( - fs - .readFileSync( - path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'with_user', '.jhipster', 'TestEntity.json'), - 'utf-8', - ) - .toString(), + fs.readFileSync(getTestFile('json_to_jdl_converter', 'with_user', '.jhipster', 'TestEntity.json'), 'utf-8').toString(), ), ], ]); @@ -267,12 +263,7 @@ describe('jdl - JSONToJDLEntityConverter', () => { [ 'TestEntity', JSON.parse( - fs - .readFileSync( - path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'with_authority', '.jhipster', 'TestEntity.json'), - 'utf-8', - ) - .toString(), + fs.readFileSync(getTestFile('json_to_jdl_converter', 'with_authority', '.jhipster', 'TestEntity.json'), 'utf-8').toString(), ), ], ]); @@ -286,7 +277,5 @@ describe('jdl - JSONToJDLEntityConverter', () => { }); function readJsonEntity(entityName) { - return JSON.parse( - fs.readFileSync(path.join(__dirname, '..', '__test-files__', 'jhipster_app', '.jhipster', `${entityName}.json`), 'utf-8').toString(), - ); + return JSON.parse(fs.readFileSync(getTestFile('jhipster_app', '.jhipster', `${entityName}.json`), 'utf-8').toString()); } diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index 23d674f17b8f..2ab150bc2fa3 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import path, { dirname } from 'path'; +import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; @@ -36,7 +36,7 @@ import { unaryOptions, validations, } from '../../core/built-in-options/index.js'; -import { parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../core/__test-support__/index.js'; +import { getTestFile, parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../core/__test-support__/index.js'; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; const { OptionNames } = applicationOptions; @@ -73,7 +73,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'complex_jdl.jdl')]); + const input = parseFromFiles([getTestFile('complex_jdl.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -213,7 +213,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let input; before(() => { - input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'invalid_field_type.jdl')]); + input = parseFromFiles([getTestFile('invalid_field_type.jdl')]); }); it('should not check for field types', () => { @@ -228,7 +228,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let relationship; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'required_relationships.jdl')]); + const input = parseFromFiles([getTestFile('required_relationships.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -244,7 +244,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'id_field.jdl')]); + const input = parseFromFiles([getTestFile('id_field.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -270,7 +270,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'user_entity_to_relationship.jdl')]); + const input = parseFromFiles([getTestFile('user_entity_to_relationship.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -285,7 +285,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'authority_entity_to_relationship.jdl')]); + const input = parseFromFiles([getTestFile('authority_entity_to_relationship.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -300,7 +300,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let input; before(() => { - input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'invalid_option.jdl')]); + input = parseFromFiles([getTestFile('invalid_option.jdl')]); }); it('should not fail', () => { @@ -314,7 +314,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let enumField; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'enum.jdl')]); + const input = parseFromFiles([getTestFile('enum.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -344,7 +344,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'fluent_methods.jdl')]); + input = parseFromFiles([getTestFile('fluent_methods.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -363,7 +363,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'following_comments.jdl')]); + const input = parseFromFiles([getTestFile('following_comments.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -391,7 +391,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let options; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'complex_jdl_2.jdl')]); + const input = parseFromFiles([getTestFile('complex_jdl_2.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -427,7 +427,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'field_comments.jdl')]); + const input = parseFromFiles([getTestFile('field_comments.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -444,7 +444,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'constants.jdl')]); + const input = parseFromFiles([getTestFile('constants.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -487,7 +487,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let input; before(() => { - input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'cassandra_jdl.jdl')]); + input = parseFromFiles([getTestFile('cassandra_jdl.jdl')]); }); it('should fail', () => { @@ -504,7 +504,7 @@ describe('jdl - ParsedJDLToJDLObjectConverter', () => { let parsedConfig; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'application.jdl')]); + const input = parseFromFiles([getTestFile('application.jdl')]); const jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -559,7 +559,7 @@ JDLApplication { let deployment; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'deployments.jdl')]); + const input = parseFromFiles([getTestFile('deployments.jdl')]); const jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -593,7 +593,7 @@ JDLDeployment { let filterOption; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'filtering_without_service.jdl')]); + const input = parseFromFiles([getTestFile('filtering_without_service.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -611,7 +611,7 @@ JDLDeployment { let clientRootFolderOption; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'simple_microservice_setup.jdl')]); + const input = parseFromFiles([getTestFile('simple_microservice_setup.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MICROSERVICE, @@ -629,7 +629,7 @@ JDLDeployment { let clientRootFolderOption; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'client_root_folder.jdl')]); + const input = parseFromFiles([getTestFile('client_root_folder.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -650,7 +650,7 @@ JDLDeployment { let microserviceOption; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'no_microservice.jdl')]); + const input = parseFromFiles([getTestFile('no_microservice.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MICROSERVICE, @@ -669,7 +669,7 @@ JDLDeployment { let microserviceOption; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'simple_microservice_setup.jdl')]); + const input = parseFromFiles([getTestFile('simple_microservice_setup.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MICROSERVICE, @@ -688,7 +688,7 @@ JDLDeployment { let entityNames; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'application_with_entities.jdl')]); + const input = parseFromFiles([getTestFile('application_with_entities.jdl')]); const jdlObject = parseFromConfigurationObject({ parsedContent: input, }); @@ -710,7 +710,7 @@ JDLDeployment { let relationshipManyToMany; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'no_injected_field.jdl')]); + const input = parseFromFiles([getTestFile('no_injected_field.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -739,7 +739,7 @@ JDLDeployment { let relationshipAnnotationOnDestination; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'annotations.jdl')]); + const input = parseFromFiles([getTestFile('annotations.jdl')]); const jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -800,7 +800,7 @@ JDLDeployment { let relationshipAnnotationOnDestination; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'capitalized_annotations.jdl')]); + const input = parseFromFiles([getTestFile('capitalized_annotations.jdl')]); const jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -859,7 +859,7 @@ JDLDeployment { let entityC; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'annotations_and_options.jdl')]); + const input = parseFromFiles([getTestFile('annotations_and_options.jdl')]); const jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -901,7 +901,7 @@ JDLDeployment { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'pattern_validation_with_quote.jdl')]); + const input = parseFromFiles([getTestFile('pattern_validation_with_quote.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -916,7 +916,7 @@ JDLDeployment { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'unique.jdl')]); + const input = parseFromFiles([getTestFile('unique.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, @@ -932,7 +932,7 @@ JDLDeployment { let jdlObject; before(() => { - const input = parseFromFiles([path.join(__dirname, '..', '..', '__test-files__', 'relationship_built_in_entity.jdl')]); + const input = parseFromFiles([getTestFile('relationship_built_in_entity.jdl')]); jdlObject = parseFromConfigurationObject({ parsedContent: input, applicationType: MONOLITH, diff --git a/lib/jdl/core/__test-files__/MyEntity.json b/lib/jdl/core/__test-support__/files/MyEntity.json similarity index 100% rename from lib/jdl/core/__test-files__/MyEntity.json rename to lib/jdl/core/__test-support__/files/MyEntity.json diff --git a/lib/jdl/core/__test-files__/annotations.jdl b/lib/jdl/core/__test-support__/files/annotations.jdl similarity index 100% rename from lib/jdl/core/__test-files__/annotations.jdl rename to lib/jdl/core/__test-support__/files/annotations.jdl diff --git a/lib/jdl/core/__test-files__/annotations_and_options.jdl b/lib/jdl/core/__test-support__/files/annotations_and_options.jdl similarity index 100% rename from lib/jdl/core/__test-files__/annotations_and_options.jdl rename to lib/jdl/core/__test-support__/files/annotations_and_options.jdl diff --git a/lib/jdl/core/__test-files__/application.jdl b/lib/jdl/core/__test-support__/files/application.jdl similarity index 100% rename from lib/jdl/core/__test-files__/application.jdl rename to lib/jdl/core/__test-support__/files/application.jdl diff --git a/lib/jdl/core/__test-files__/application_with_blueprints.jdl b/lib/jdl/core/__test-support__/files/application_with_blueprints.jdl similarity index 100% rename from lib/jdl/core/__test-files__/application_with_blueprints.jdl rename to lib/jdl/core/__test-support__/files/application_with_blueprints.jdl diff --git a/lib/jdl/core/__test-files__/application_with_entities.jdl b/lib/jdl/core/__test-support__/files/application_with_entities.jdl similarity index 100% rename from lib/jdl/core/__test-files__/application_with_entities.jdl rename to lib/jdl/core/__test-support__/files/application_with_entities.jdl diff --git a/lib/jdl/core/__test-files__/application_with_entity_dto_suffixes.jdl b/lib/jdl/core/__test-support__/files/application_with_entity_dto_suffixes.jdl similarity index 100% rename from lib/jdl/core/__test-files__/application_with_entity_dto_suffixes.jdl rename to lib/jdl/core/__test-support__/files/application_with_entity_dto_suffixes.jdl diff --git a/lib/jdl/core/__test-files__/application_wrong_basename.jdl b/lib/jdl/core/__test-support__/files/application_wrong_basename.jdl similarity index 100% rename from lib/jdl/core/__test-files__/application_wrong_basename.jdl rename to lib/jdl/core/__test-support__/files/application_wrong_basename.jdl diff --git a/lib/jdl/core/__test-files__/applications.jdl b/lib/jdl/core/__test-support__/files/applications.jdl similarity index 100% rename from lib/jdl/core/__test-files__/applications.jdl rename to lib/jdl/core/__test-support__/files/applications.jdl diff --git a/lib/jdl/core/__test-files__/applications2.jdl b/lib/jdl/core/__test-support__/files/applications2.jdl similarity index 100% rename from lib/jdl/core/__test-files__/applications2.jdl rename to lib/jdl/core/__test-support__/files/applications2.jdl diff --git a/lib/jdl/core/__test-files__/applications3.jdl b/lib/jdl/core/__test-support__/files/applications3.jdl similarity index 100% rename from lib/jdl/core/__test-files__/applications3.jdl rename to lib/jdl/core/__test-support__/files/applications3.jdl diff --git a/lib/jdl/core/__test-files__/applications_with_and_without_entities.jdl b/lib/jdl/core/__test-support__/files/applications_with_and_without_entities.jdl similarity index 100% rename from lib/jdl/core/__test-files__/applications_with_and_without_entities.jdl rename to lib/jdl/core/__test-support__/files/applications_with_and_without_entities.jdl diff --git a/lib/jdl/core/__test-files__/authority_entity_to_relationship.jdl b/lib/jdl/core/__test-support__/files/authority_entity_to_relationship.jdl similarity index 100% rename from lib/jdl/core/__test-files__/authority_entity_to_relationship.jdl rename to lib/jdl/core/__test-support__/files/authority_entity_to_relationship.jdl diff --git a/lib/jdl/core/__test-files__/big_sample.jdl b/lib/jdl/core/__test-support__/files/big_sample.jdl similarity index 100% rename from lib/jdl/core/__test-files__/big_sample.jdl rename to lib/jdl/core/__test-support__/files/big_sample.jdl diff --git a/lib/jdl/core/__test-files__/blob_jdl.jdl b/lib/jdl/core/__test-support__/files/blob_jdl.jdl similarity index 100% rename from lib/jdl/core/__test-files__/blob_jdl.jdl rename to lib/jdl/core/__test-support__/files/blob_jdl.jdl diff --git a/lib/jdl/core/__test-files__/capitalized_annotations.jdl b/lib/jdl/core/__test-support__/files/capitalized_annotations.jdl similarity index 100% rename from lib/jdl/core/__test-files__/capitalized_annotations.jdl rename to lib/jdl/core/__test-support__/files/capitalized_annotations.jdl diff --git a/lib/jdl/core/__test-files__/cassandra_jdl.jdl b/lib/jdl/core/__test-support__/files/cassandra_jdl.jdl similarity index 100% rename from lib/jdl/core/__test-files__/cassandra_jdl.jdl rename to lib/jdl/core/__test-support__/files/cassandra_jdl.jdl diff --git a/lib/jdl/core/__test-files__/cassandra_with_relationships.jdl b/lib/jdl/core/__test-support__/files/cassandra_with_relationships.jdl similarity index 100% rename from lib/jdl/core/__test-files__/cassandra_with_relationships.jdl rename to lib/jdl/core/__test-support__/files/cassandra_with_relationships.jdl diff --git a/lib/jdl/core/__test-files__/client_root_folder.jdl b/lib/jdl/core/__test-support__/files/client_root_folder.jdl similarity index 100% rename from lib/jdl/core/__test-files__/client_root_folder.jdl rename to lib/jdl/core/__test-support__/files/client_root_folder.jdl diff --git a/lib/jdl/core/__test-files__/client_root_folder_no_microservice.jdl b/lib/jdl/core/__test-support__/files/client_root_folder_no_microservice.jdl similarity index 100% rename from lib/jdl/core/__test-files__/client_root_folder_no_microservice.jdl rename to lib/jdl/core/__test-support__/files/client_root_folder_no_microservice.jdl diff --git a/lib/jdl/core/__test-files__/complex_jdl.jdl b/lib/jdl/core/__test-support__/files/complex_jdl.jdl similarity index 100% rename from lib/jdl/core/__test-files__/complex_jdl.jdl rename to lib/jdl/core/__test-support__/files/complex_jdl.jdl diff --git a/lib/jdl/core/__test-files__/complex_jdl_2.jdl b/lib/jdl/core/__test-support__/files/complex_jdl_2.jdl similarity index 100% rename from lib/jdl/core/__test-files__/complex_jdl_2.jdl rename to lib/jdl/core/__test-support__/files/complex_jdl_2.jdl diff --git a/lib/jdl/core/__test-files__/constants.jdl b/lib/jdl/core/__test-support__/files/constants.jdl similarity index 100% rename from lib/jdl/core/__test-files__/constants.jdl rename to lib/jdl/core/__test-support__/files/constants.jdl diff --git a/lib/jdl/core/__test-files__/couchbase_jdl.jdl b/lib/jdl/core/__test-support__/files/couchbase_jdl.jdl similarity index 100% rename from lib/jdl/core/__test-files__/couchbase_jdl.jdl rename to lib/jdl/core/__test-support__/files/couchbase_jdl.jdl diff --git a/lib/jdl/core/__test-files__/deployments.jdl b/lib/jdl/core/__test-support__/files/deployments.jdl similarity index 100% rename from lib/jdl/core/__test-files__/deployments.jdl rename to lib/jdl/core/__test-support__/files/deployments.jdl diff --git a/lib/jdl/core/__test-files__/different_relationship_types.jdl b/lib/jdl/core/__test-support__/files/different_relationship_types.jdl similarity index 100% rename from lib/jdl/core/__test-files__/different_relationship_types.jdl rename to lib/jdl/core/__test-support__/files/different_relationship_types.jdl diff --git a/lib/jdl/core/__test-files__/enum.jdl b/lib/jdl/core/__test-support__/files/enum.jdl similarity index 100% rename from lib/jdl/core/__test-files__/enum.jdl rename to lib/jdl/core/__test-support__/files/enum.jdl diff --git a/lib/jdl/core/__test-files__/enum_with_values.jdl b/lib/jdl/core/__test-support__/files/enum_with_values.jdl similarity index 100% rename from lib/jdl/core/__test-files__/enum_with_values.jdl rename to lib/jdl/core/__test-support__/files/enum_with_values.jdl diff --git a/lib/jdl/core/__test-files__/field_comments.jdl b/lib/jdl/core/__test-support__/files/field_comments.jdl similarity index 100% rename from lib/jdl/core/__test-files__/field_comments.jdl rename to lib/jdl/core/__test-support__/files/field_comments.jdl diff --git a/lib/jdl/core/__test-files__/filtering_with_service.jdl b/lib/jdl/core/__test-support__/files/filtering_with_service.jdl similarity index 100% rename from lib/jdl/core/__test-files__/filtering_with_service.jdl rename to lib/jdl/core/__test-support__/files/filtering_with_service.jdl diff --git a/lib/jdl/core/__test-files__/filtering_without_service.jdl b/lib/jdl/core/__test-support__/files/filtering_without_service.jdl similarity index 100% rename from lib/jdl/core/__test-files__/filtering_without_service.jdl rename to lib/jdl/core/__test-support__/files/filtering_without_service.jdl diff --git a/lib/jdl/core/__test-files__/fluent_methods.jdl b/lib/jdl/core/__test-support__/files/fluent_methods.jdl similarity index 100% rename from lib/jdl/core/__test-files__/fluent_methods.jdl rename to lib/jdl/core/__test-support__/files/fluent_methods.jdl diff --git a/lib/jdl/core/__test-files__/fluent_methods2.jdl b/lib/jdl/core/__test-support__/files/fluent_methods2.jdl similarity index 100% rename from lib/jdl/core/__test-files__/fluent_methods2.jdl rename to lib/jdl/core/__test-support__/files/fluent_methods2.jdl diff --git a/lib/jdl/core/__test-files__/following_comments.jdl b/lib/jdl/core/__test-support__/files/following_comments.jdl similarity index 100% rename from lib/jdl/core/__test-files__/following_comments.jdl rename to lib/jdl/core/__test-support__/files/following_comments.jdl diff --git a/lib/jdl/core/__test-files__/id_field.jdl b/lib/jdl/core/__test-support__/files/id_field.jdl similarity index 100% rename from lib/jdl/core/__test-files__/id_field.jdl rename to lib/jdl/core/__test-support__/files/id_field.jdl diff --git a/lib/jdl/core/__test-files__/integration/file1.jdl b/lib/jdl/core/__test-support__/files/integration/file1.jdl similarity index 100% rename from lib/jdl/core/__test-files__/integration/file1.jdl rename to lib/jdl/core/__test-support__/files/integration/file1.jdl diff --git a/lib/jdl/core/__test-files__/integration/file2.jdl b/lib/jdl/core/__test-support__/files/integration/file2.jdl similarity index 100% rename from lib/jdl/core/__test-files__/integration/file2.jdl rename to lib/jdl/core/__test-support__/files/integration/file2.jdl diff --git a/lib/jdl/core/__test-files__/invalid_field_type.jdl b/lib/jdl/core/__test-support__/files/invalid_field_type.jdl similarity index 100% rename from lib/jdl/core/__test-files__/invalid_field_type.jdl rename to lib/jdl/core/__test-support__/files/invalid_field_type.jdl diff --git a/lib/jdl/core/__test-files__/invalid_file.txt b/lib/jdl/core/__test-support__/files/invalid_file.txt similarity index 100% rename from lib/jdl/core/__test-files__/invalid_file.txt rename to lib/jdl/core/__test-support__/files/invalid_file.txt diff --git a/lib/jdl/core/__test-files__/invalid_file2 b/lib/jdl/core/__test-support__/files/invalid_file2 similarity index 100% rename from lib/jdl/core/__test-files__/invalid_file2 rename to lib/jdl/core/__test-support__/files/invalid_file2 diff --git a/lib/jdl/core/__test-files__/invalid_option.jdl b/lib/jdl/core/__test-support__/files/invalid_option.jdl similarity index 100% rename from lib/jdl/core/__test-files__/invalid_option.jdl rename to lib/jdl/core/__test-support__/files/invalid_option.jdl diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/BadEntity.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/BadEntity.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/BadEntity.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/BadEntity.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/CassBankAccount.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/CassBankAccount.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/CassBankAccount.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/CassBankAccount.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Country.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Country.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Country.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Country.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Department.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Department.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Department.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Department.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Employee.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Employee.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Employee.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Employee.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/InvalidBlobType.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/InvalidBlobType.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/InvalidBlobType.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Job.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Job.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Job.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Job.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/JobHistory.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/JobHistory.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/JobHistory.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/JobHistory.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Location.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Location.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Location.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Location.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/NoEntity.txt b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/NoEntity.txt similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/NoEntity.txt rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/NoEntity.txt diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Region.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Region.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Region.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Region.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.jhipster/Task.json b/lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Task.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.jhipster/Task.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.jhipster/Task.json diff --git a/lib/jdl/core/__test-files__/jhipster_app/.yo-rc.json b/lib/jdl/core/__test-support__/files/jhipster_app/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/jhipster_app/.yo-rc.json rename to lib/jdl/core/__test-support__/files/jhipster_app/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Country.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Country.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Department.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Department.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Job.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Job.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Location.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Location.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Region.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Region.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Task.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.jhipster/Task.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/app_with_entities/.yo-rc.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/app_with_entities/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app1/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app1/.yo-rc.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app1/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app2/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app2/.yo-rc.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app2/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app3/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/multi_apps/app3/.yo-rc.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/multi_apps/app3/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_authority/.jhipster/TestEntity.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_authority/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/with_authority/.yo-rc.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_authority/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_user/.jhipster/TestEntity.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.jhipster/TestEntity.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_user/.jhipster/TestEntity.json diff --git a/lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json b/lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_user/.yo-rc.json similarity index 100% rename from lib/jdl/core/__test-files__/json_to_jdl_converter/with_user/.yo-rc.json rename to lib/jdl/core/__test-support__/files/json_to_jdl_converter/with_user/.yo-rc.json diff --git a/lib/jdl/core/__test-files__/lint/duplicate_entities.jdl b/lib/jdl/core/__test-support__/files/lint/duplicate_entities.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/duplicate_entities.jdl rename to lib/jdl/core/__test-support__/files/lint/duplicate_entities.jdl diff --git a/lib/jdl/core/__test-files__/lint/duplicate_enums.jdl b/lib/jdl/core/__test-support__/files/lint/duplicate_enums.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/duplicate_enums.jdl rename to lib/jdl/core/__test-support__/files/lint/duplicate_enums.jdl diff --git a/lib/jdl/core/__test-files__/lint/duplicate_fields.jdl b/lib/jdl/core/__test-support__/files/lint/duplicate_fields.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/duplicate_fields.jdl rename to lib/jdl/core/__test-support__/files/lint/duplicate_fields.jdl diff --git a/lib/jdl/core/__test-files__/lint/ungrouped_relationships.jdl b/lib/jdl/core/__test-support__/files/lint/ungrouped_relationships.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/ungrouped_relationships.jdl rename to lib/jdl/core/__test-support__/files/lint/ungrouped_relationships.jdl diff --git a/lib/jdl/core/__test-files__/lint/unused_enums.jdl b/lib/jdl/core/__test-support__/files/lint/unused_enums.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/unused_enums.jdl rename to lib/jdl/core/__test-support__/files/lint/unused_enums.jdl diff --git a/lib/jdl/core/__test-files__/lint/useless_commas_fields.jdl b/lib/jdl/core/__test-support__/files/lint/useless_commas_fields.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/useless_commas_fields.jdl rename to lib/jdl/core/__test-support__/files/lint/useless_commas_fields.jdl diff --git a/lib/jdl/core/__test-files__/lint/useless_entity_curly_braces.jdl b/lib/jdl/core/__test-support__/files/lint/useless_entity_curly_braces.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/useless_entity_curly_braces.jdl rename to lib/jdl/core/__test-support__/files/lint/useless_entity_curly_braces.jdl diff --git a/lib/jdl/core/__test-files__/lint/useless_table_names.jdl b/lib/jdl/core/__test-support__/files/lint/useless_table_names.jdl similarity index 100% rename from lib/jdl/core/__test-files__/lint/useless_table_names.jdl rename to lib/jdl/core/__test-support__/files/lint/useless_table_names.jdl diff --git a/lib/jdl/core/__test-files__/mongo_jdl.jdl b/lib/jdl/core/__test-support__/files/mongo_jdl.jdl similarity index 100% rename from lib/jdl/core/__test-files__/mongo_jdl.jdl rename to lib/jdl/core/__test-support__/files/mongo_jdl.jdl diff --git a/lib/jdl/core/__test-files__/multiple_jdl_comments.jdl b/lib/jdl/core/__test-support__/files/multiple_jdl_comments.jdl similarity index 100% rename from lib/jdl/core/__test-files__/multiple_jdl_comments.jdl rename to lib/jdl/core/__test-support__/files/multiple_jdl_comments.jdl diff --git a/lib/jdl/core/__test-files__/no_injected_field.jdl b/lib/jdl/core/__test-support__/files/no_injected_field.jdl similarity index 100% rename from lib/jdl/core/__test-files__/no_injected_field.jdl rename to lib/jdl/core/__test-support__/files/no_injected_field.jdl diff --git a/lib/jdl/core/__test-files__/no_microservice.jdl b/lib/jdl/core/__test-support__/files/no_microservice.jdl similarity index 100% rename from lib/jdl/core/__test-files__/no_microservice.jdl rename to lib/jdl/core/__test-support__/files/no_microservice.jdl diff --git a/lib/jdl/core/__test-files__/non_existent_validation.jdl b/lib/jdl/core/__test-support__/files/non_existent_validation.jdl similarity index 100% rename from lib/jdl/core/__test-files__/non_existent_validation.jdl rename to lib/jdl/core/__test-support__/files/non_existent_validation.jdl diff --git a/lib/jdl/core/__test-files__/pattern_validation_with_quote.jdl b/lib/jdl/core/__test-support__/files/pattern_validation_with_quote.jdl similarity index 100% rename from lib/jdl/core/__test-files__/pattern_validation_with_quote.jdl rename to lib/jdl/core/__test-support__/files/pattern_validation_with_quote.jdl diff --git a/lib/jdl/core/__test-files__/realistic_sample.jdl b/lib/jdl/core/__test-support__/files/realistic_sample.jdl similarity index 100% rename from lib/jdl/core/__test-files__/realistic_sample.jdl rename to lib/jdl/core/__test-support__/files/realistic_sample.jdl diff --git a/lib/jdl/core/__test-files__/regex_validation.jdl b/lib/jdl/core/__test-support__/files/regex_validation.jdl similarity index 100% rename from lib/jdl/core/__test-files__/regex_validation.jdl rename to lib/jdl/core/__test-support__/files/regex_validation.jdl diff --git a/lib/jdl/core/__test-files__/relationship_built_in_entity.jdl b/lib/jdl/core/__test-support__/files/relationship_built_in_entity.jdl similarity index 100% rename from lib/jdl/core/__test-files__/relationship_built_in_entity.jdl rename to lib/jdl/core/__test-support__/files/relationship_built_in_entity.jdl diff --git a/lib/jdl/core/__test-files__/required_relationships.jdl b/lib/jdl/core/__test-support__/files/required_relationships.jdl similarity index 100% rename from lib/jdl/core/__test-files__/required_relationships.jdl rename to lib/jdl/core/__test-support__/files/required_relationships.jdl diff --git a/lib/jdl/core/__test-files__/simple.jdl b/lib/jdl/core/__test-support__/files/simple.jdl similarity index 100% rename from lib/jdl/core/__test-files__/simple.jdl rename to lib/jdl/core/__test-support__/files/simple.jdl diff --git a/lib/jdl/core/__test-files__/simple_microservice_setup.jdl b/lib/jdl/core/__test-support__/files/simple_microservice_setup.jdl similarity index 100% rename from lib/jdl/core/__test-files__/simple_microservice_setup.jdl rename to lib/jdl/core/__test-support__/files/simple_microservice_setup.jdl diff --git a/lib/jdl/core/__test-files__/two_microservices.jdl b/lib/jdl/core/__test-support__/files/two_microservices.jdl similarity index 100% rename from lib/jdl/core/__test-files__/two_microservices.jdl rename to lib/jdl/core/__test-support__/files/two_microservices.jdl diff --git a/lib/jdl/core/__test-files__/underscore_application_name.jdl b/lib/jdl/core/__test-support__/files/underscore_application_name.jdl similarity index 100% rename from lib/jdl/core/__test-files__/underscore_application_name.jdl rename to lib/jdl/core/__test-support__/files/underscore_application_name.jdl diff --git a/lib/jdl/core/__test-files__/unexistent_entities_for_relationship.jdl b/lib/jdl/core/__test-support__/files/unexistent_entities_for_relationship.jdl similarity index 100% rename from lib/jdl/core/__test-files__/unexistent_entities_for_relationship.jdl rename to lib/jdl/core/__test-support__/files/unexistent_entities_for_relationship.jdl diff --git a/lib/jdl/core/__test-files__/unique.jdl b/lib/jdl/core/__test-support__/files/unique.jdl similarity index 100% rename from lib/jdl/core/__test-files__/unique.jdl rename to lib/jdl/core/__test-support__/files/unique.jdl diff --git a/lib/jdl/core/__test-files__/user_entity_from_relationship.jdl b/lib/jdl/core/__test-support__/files/user_entity_from_relationship.jdl similarity index 100% rename from lib/jdl/core/__test-files__/user_entity_from_relationship.jdl rename to lib/jdl/core/__test-support__/files/user_entity_from_relationship.jdl diff --git a/lib/jdl/core/__test-files__/user_entity_to_relationship.jdl b/lib/jdl/core/__test-support__/files/user_entity_to_relationship.jdl similarity index 100% rename from lib/jdl/core/__test-files__/user_entity_to_relationship.jdl rename to lib/jdl/core/__test-support__/files/user_entity_to_relationship.jdl diff --git a/lib/jdl/core/__test-files__/valid_jdl.jdl b/lib/jdl/core/__test-support__/files/valid_jdl.jdl similarity index 100% rename from lib/jdl/core/__test-files__/valid_jdl.jdl rename to lib/jdl/core/__test-support__/files/valid_jdl.jdl diff --git a/lib/jdl/core/__test-files__/valid_jdl2.jdl b/lib/jdl/core/__test-support__/files/valid_jdl2.jdl similarity index 100% rename from lib/jdl/core/__test-files__/valid_jdl2.jdl rename to lib/jdl/core/__test-support__/files/valid_jdl2.jdl diff --git a/lib/jdl/core/__test-support__/index.ts b/lib/jdl/core/__test-support__/index.ts index ab4c52b41dd4..0ae56e1a5282 100644 --- a/lib/jdl/core/__test-support__/index.ts +++ b/lib/jdl/core/__test-support__/index.ts @@ -1,3 +1,5 @@ +import path, { dirname } from 'path'; +import { fileURLToPath } from 'url'; import { getDefaultRuntime } from '../runtime.js'; import { parseFromContent as originalParseFromContent, parseFromFiles as originalParseFromFiles } from '../readers/jdl-reader.js'; import { parseFromConfigurationObject as originalParseFromConfigurationObject } from '../../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; @@ -16,6 +18,9 @@ import { createJDLApplication as originalCreateJDLApplication } from '../models/ import type { JHipsterYoRcContentAndJDLWrapper } from '../../converters/json-to-jdl-application-converter.js'; import { convertApplicationsToJDL as originalConvertApplicationsToJDL } from '../../converters/json-to-jdl-application-converter.js'; +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + const runtime = getDefaultRuntime(); export const createImporterFromContent = (content: any, configuration?: any) => @@ -36,3 +41,5 @@ export const createJDLApplication = (config: any, namespaceConfigs?: Record originalConvertApplicationsToJDL(applications, runtime); + +export const getTestFile = (...args: string[]) => path.join(__dirname, 'files', ...args); diff --git a/lib/jdl/core/integration-test.spec.ts b/lib/jdl/core/integration-test.spec.ts index adfebfa245c5..6c23639b1c69 100644 --- a/lib/jdl/core/integration-test.spec.ts +++ b/lib/jdl/core/integration-test.spec.ts @@ -17,14 +17,20 @@ * limitations under the License. */ -import path, { dirname } from 'path'; +import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../../testing/index.js'; import { applicationTypes } from '../../jhipster/index.js'; import { convert as convertWithoutApplication } from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; -import { createImporterFromContent, parseFromConfigurationObject, parseFromContent, parseFromFiles } from './__test-support__/index.js'; +import { + createImporterFromContent, + getTestFile, + parseFromConfigurationObject, + parseFromContent, + parseFromFiles, +} from './__test-support__/index.js'; import exportToJDL from './exporters/jdl-exporter.js'; import type { ApplicationWithEntities } from './jdl-importer.js'; @@ -43,7 +49,7 @@ describe('jdl - integration tests', () => { beforeEach(() => { originalContent = parseFromConfigurationObject({ - parsedContent: parseFromFiles([path.join(__dirname, '__test-files__', 'big_sample.jdl')]), + parsedContent: parseFromFiles([getTestFile('big_sample.jdl')]), applicationType: MONOLITH, }); exportToJDL(originalContent, 'exported.jdl'); diff --git a/lib/jdl/core/jdl-importer.spec.ts b/lib/jdl/core/jdl-importer.spec.ts index 60eec5f46ab4..2cf9d9e3e4ea 100644 --- a/lib/jdl/core/jdl-importer.spec.ts +++ b/lib/jdl/core/jdl-importer.spec.ts @@ -24,7 +24,7 @@ import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../../jhipster/index.js'; -import { createImporterFromContent, createImporterFromFiles } from './__test-support__/index.js'; +import { createImporterFromContent, createImporterFromFiles, getTestFile } from './__test-support__/index.js'; const { MONOLITH } = applicationTypes; const __filename = fileURLToPath(import.meta.url); @@ -68,7 +68,7 @@ relationship OneToMany { let returned; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'big_sample.jdl')], { + const importer = createImporterFromFiles([getTestFile('big_sample.jdl')], { applicationName: 'MyApp', applicationType: MONOLITH, databaseType: databaseTypes.SQL, @@ -103,7 +103,7 @@ relationship OneToOne { } `, { - application: JSON.parse(readFileSync(path.join(__dirname, '__test-files__', 'jhipster_app', '.yo-rc.json'), 'utf-8')), + application: JSON.parse(readFileSync(getTestFile('jhipster_app', '.yo-rc.json'), 'utf-8')), }, ); }); @@ -116,7 +116,7 @@ relationship OneToOne { let returned; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'application_with_entities.jdl')]); + const importer = createImporterFromFiles([getTestFile('application_with_entities.jdl')]); returned = importer.import(); }); @@ -141,7 +141,7 @@ relationship OneToOne { const APPLICATION_NAMES = ['app1', 'app2']; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'applications_with_and_without_entities.jdl')]); + const importer = createImporterFromFiles([getTestFile('applications_with_and_without_entities.jdl')]); returned = importer.import(); }); @@ -208,7 +208,7 @@ relationship OneToOne { let returned; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'application_with_entity_dto_suffixes.jdl')]); + const importer = createImporterFromFiles([getTestFile('application_with_entity_dto_suffixes.jdl')]); returned = importer.import(); }); @@ -232,7 +232,7 @@ relationship OneToOne { let contents: any; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'applications2.jdl')]); + const importer = createImporterFromFiles([getTestFile('applications2.jdl')]); contents = importer.import(); }); @@ -243,10 +243,7 @@ relationship OneToOne { describe('when parsing multiple JDL files with applications and entities', () => { let importState; before(() => { - const importer = createImporterFromFiles([ - path.join(__dirname, '__test-files__', 'integration', 'file1.jdl'), - path.join(__dirname, '__test-files__', 'integration', 'file2.jdl'), - ]); + const importer = createImporterFromFiles([getTestFile('integration', 'file1.jdl'), getTestFile('integration', 'file2.jdl')]); importState = importer.import(); }); @@ -272,7 +269,7 @@ relationship OneToOne { let importer; before(() => { - importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'simple.jdl')], { + importer = createImporterFromFiles([getTestFile('simple.jdl')], { applicationName: 'MyApp', applicationType: MONOLITH, databaseType: databaseTypes.NO, @@ -287,7 +284,7 @@ relationship OneToOne { let returned; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'annotations.jdl')], { + const importer = createImporterFromFiles([getTestFile('annotations.jdl')], { applicationName: 'toto', databaseType: databaseTypes.SQL, }); @@ -315,7 +312,7 @@ relationship OneToOne { let returned; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'regex_validation.jdl')], { + const importer = createImporterFromFiles([getTestFile('regex_validation.jdl')], { applicationName: 'MyApp', applicationType: MONOLITH, databaseType: databaseTypes.SQL, @@ -331,7 +328,7 @@ relationship OneToOne { let returned; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'pattern_validation_with_quote.jdl')], { + const importer = createImporterFromFiles([getTestFile('pattern_validation_with_quote.jdl')], { applicationName: 'MyApp', applicationType: MONOLITH, databaseType: databaseTypes.SQL, @@ -347,7 +344,7 @@ relationship OneToOne { let importState: any; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'applications3.jdl')]); + const importer = createImporterFromFiles([getTestFile('applications3.jdl')]); importState = importer.import(); }); @@ -360,7 +357,7 @@ relationship OneToOne { const DEPLOYMENT_NAMES = ['docker-compose', 'kubernetes']; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'deployments.jdl')]); + const importer = createImporterFromFiles([getTestFile('deployments.jdl')]); importer.import(); DEPLOYMENT_NAMES.forEach(name => { contents.push(JSON.parse(readFileSync(path.join(name, '.yo-rc.json'), 'utf-8'))); @@ -381,7 +378,7 @@ relationship OneToOne { let importState; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'enum_with_values.jdl')], { + const importer = createImporterFromFiles([getTestFile('enum_with_values.jdl')], { applicationName: 'toto', applicationType: 'monolith', databaseType: 'sql', @@ -473,7 +470,7 @@ ${entities}`, let parameter; before(() => { - const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'application_with_blueprints.jdl')]); + const importer = createImporterFromFiles([getTestFile('application_with_blueprints.jdl')]); const logger = { warn: callParameter => { parameter = callParameter; diff --git a/lib/jdl/core/linters/jdl-linter.spec.ts b/lib/jdl/core/linters/jdl-linter.spec.ts index fd2807722983..5b4548a68994 100644 --- a/lib/jdl/core/linters/jdl-linter.spec.ts +++ b/lib/jdl/core/linters/jdl-linter.spec.ts @@ -18,12 +18,12 @@ */ import { writeFileSync } from 'fs'; -import path, { dirname } from 'path'; +import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../../../testing/index.js'; -import { createJDLLinterFromContent, createJDLLinterFromFile } from '.././__test-support__/index.js'; +import { createJDLLinterFromContent, createJDLLinterFromFile, getTestFile } from '.././__test-support__/index.js'; import type { JDLLinter } from './jdl-linter.js'; import type Issues from './issues/issues.js'; import type EnumIssue from './issues/enum-issue.js'; @@ -76,7 +76,7 @@ describe('jdl - JDLLinter', () => { let reportedIssues: Issues; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'useless_entity_curly_braces.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'useless_entity_curly_braces.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issue = issues.entities[0]; @@ -95,7 +95,7 @@ describe('jdl - JDLLinter', () => { let reportedIssues: { getIssues: () => any; getNumberOfIssues: () => any }; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'useless_table_names.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'useless_table_names.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issueForB = issues.entities[0]; @@ -118,7 +118,7 @@ describe('jdl - JDLLinter', () => { let issueForB: { ruleName: any }; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'duplicate_entities.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'duplicate_entities.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issueForA = issues.entities[0]; @@ -138,7 +138,7 @@ describe('jdl - JDLLinter', () => { let issueForBb: { ruleName: any }; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'duplicate_fields.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'duplicate_fields.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issueForAa = issues.fields[0]; @@ -157,7 +157,7 @@ describe('jdl - JDLLinter', () => { let issueForA: { ruleName: any }; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'duplicate_enums.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'duplicate_enums.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issueForA = issues.enums[0]; @@ -176,7 +176,7 @@ describe('jdl - JDLLinter', () => { let issueFor3: EnumIssue; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'unused_enums.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'unused_enums.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issueFor2 = issues.enums[0]; @@ -197,7 +197,7 @@ describe('jdl - JDLLinter', () => { let issueForAToC: relationshipIssue; beforeEach(() => { - linter = createJDLLinterFromFile(path.join(__dirname, '..', '__test-files__', 'lint', 'ungrouped_relationships.jdl')); + linter = createJDLLinterFromFile(getTestFile('lint', 'ungrouped_relationships.jdl')); reportedIssues = linter.check(); const issues = reportedIssues.getIssues(); issueForAToB = issues.relationships[0]; diff --git a/lib/jdl/core/readers/jdl-reader.spec.ts b/lib/jdl/core/readers/jdl-reader.spec.ts index 1c10018c0c1f..4d43227e51da 100644 --- a/lib/jdl/core/readers/jdl-reader.spec.ts +++ b/lib/jdl/core/readers/jdl-reader.spec.ts @@ -18,13 +18,13 @@ */ import fs from 'fs'; -import path, { dirname } from 'path'; +import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { after, beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import { basicHelpers as helpers } from '../../../../testing/index.js'; -import { parseFromContent, parseFromFiles } from '.././__test-support__/index.js'; +import { getTestFile, parseFromContent, parseFromFiles } from '.././__test-support__/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); @@ -75,16 +75,16 @@ describe('jdl - JDLReader', () => { describe('when passing valid arguments', () => { describe('when passing an empty file', () => { beforeEach(() => { - fs.writeFileSync(path.join(__dirname, '..', '__test-files__', 'test_file.jdl'), ''); + fs.writeFileSync(getTestFile('test_file.jdl'), ''); }); after(() => { - fs.unlinkSync(path.join(__dirname, '..', '__test-files__', 'test_file.jdl')); + fs.unlinkSync(getTestFile('test_file.jdl')); }); it('should fail', () => { expect(() => { - parseFromFiles([path.join(__dirname, '..', '__test-files__', 'test_file.jdl')]); + parseFromFiles([getTestFile('test_file.jdl')]); }).to.throw(/^File content must be passed, it is currently empty\.$/); }); }); @@ -103,7 +103,7 @@ describe('jdl - JDLReader', () => { let content; beforeEach(() => { - content = parseFromFiles([path.join(__dirname, '..', '__test-files__', 'valid_jdl.jdl')]); + content = parseFromFiles([getTestFile('valid_jdl.jdl')]); }); it('should read it', () => { @@ -114,10 +114,7 @@ describe('jdl - JDLReader', () => { let content; beforeEach(() => { - content = parseFromFiles([ - path.join(__dirname, '..', '__test-files__', 'valid_jdl.jdl'), - path.join(__dirname, '..', '__test-files__', 'valid_jdl2.jdl'), - ]); + content = parseFromFiles([getTestFile('valid_jdl.jdl'), getTestFile('valid_jdl2.jdl')]); }); it('should read them', () => { @@ -128,7 +125,7 @@ describe('jdl - JDLReader', () => { let content; beforeEach(() => { - content = parseFromFiles([path.join(__dirname, '..', '__test-files__', 'complex_jdl.jdl')]); + content = parseFromFiles([getTestFile('complex_jdl.jdl')]); }); it('should read them', () => { @@ -138,7 +135,7 @@ describe('jdl - JDLReader', () => { describe('when having multiple internal JDL comments', () => { it('should ignore them and does not fail', () => { expect(() => { - parseFromFiles([path.join(__dirname, '..', '__test-files__', 'multiple_jdl_comments.jdl')]); + parseFromFiles([getTestFile('multiple_jdl_comments.jdl')]); }).not.to.throw(); }); }); diff --git a/lib/jdl/core/readers/json-reader.spec.ts b/lib/jdl/core/readers/json-reader.spec.ts index 290018b51465..7c16de72bfad 100644 --- a/lib/jdl/core/readers/json-reader.spec.ts +++ b/lib/jdl/core/readers/json-reader.spec.ts @@ -18,13 +18,14 @@ */ import { renameSync } from 'fs'; -import { dirname, join } from 'path'; +import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { after, before, describe, it } from 'esmocha'; import { expect } from 'chai'; import parseFromDir from '../readers/json-reader.js'; import { unaryOptions } from '../built-in-options/index.js'; +import { getTestFile } from '../__test-support__/index.js'; const { SKIP_CLIENT, SKIP_SERVER } = unaryOptions; @@ -67,15 +68,15 @@ describe('jdl - JSONReader', () => { before(() => { renameSync( - join(__dirname, '..', '__test-files__', 'jhipster_app', '.jhipster', 'InvalidBlobType.json'), - join(__dirname, '..', '__test-files__', 'jhipster_app', '.jhipster', 'InvalidBlobType.txt'), + getTestFile('jhipster_app', '.jhipster', 'InvalidBlobType.json'), + getTestFile('jhipster_app', '.jhipster', 'InvalidBlobType.txt'), ); - content = parseFromDir(join(__dirname, '..', '__test-files__', 'jhipster_app')); + content = parseFromDir(getTestFile('jhipster_app')); }); after(() => { renameSync( - join(__dirname, '..', '__test-files__', 'jhipster_app', '.jhipster', 'InvalidBlobType.txt'), - join(__dirname, '..', '__test-files__', 'jhipster_app', '.jhipster', 'InvalidBlobType.json'), + getTestFile('jhipster_app', '.jhipster', 'InvalidBlobType.txt'), + getTestFile('jhipster_app', '.jhipster', 'InvalidBlobType.json'), ); }); diff --git a/lib/jdl/core/utils/files-utils.spec.ts b/lib/jdl/core/utils/files-utils.spec.ts index 49e715817d76..b28d0ef3f8ac 100644 --- a/lib/jdl/core/utils/files-utils.spec.ts +++ b/lib/jdl/core/utils/files-utils.spec.ts @@ -24,6 +24,7 @@ import { after, before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { createFolderIfItDoesNotExist, doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; import { getPackageRoot } from '../../../index.js'; +import { getTestFile } from '../__test-support__/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); @@ -44,7 +45,7 @@ describe('jdl - FileUtils', () => { }); describe('with a valid file path', () => { it('should return true', () => { - expect(doesFileExist(path.join(__dirname, '..', '__test-files__', 'MyEntity.json'))).to.be.true; + expect(doesFileExist(getTestFile('MyEntity.json'))).to.be.true; }); }); }); From 34caeb4f7e21ac7eda33bbb6662ea3e6e106a5bc Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:27:07 -0300 Subject: [PATCH 15/21] fixes --- lib/jdl/converters/json-to-jdl-converter.ts | 2 +- lib/jdl/core/jdl-importer.ts | 8 ++++---- lib/jdl/core/types/exporter.d.ts | 2 +- .../applications/jhipster-application-formatter.ts | 8 ++++---- lib/jdl/{core => }/exporters/export-utils.spec.ts | 2 +- lib/jdl/{core => }/exporters/export-utils.ts | 6 +++--- lib/jdl/{core => }/exporters/jdl-exporter.spec.ts | 14 +++++++------- lib/jdl/{core => }/exporters/jdl-exporter.ts | 2 +- .../exporters/jhipster-deployment-exporter.spec.ts | 6 +++--- .../exporters/jhipster-deployment-exporter.ts | 8 ++++---- .../exporters/jhipster-entity-exporter.spec.ts | 6 +++--- .../exporters/jhipster-entity-exporter.ts | 10 +++++----- lib/jdl/{core => }/integration-test.spec.ts | 12 ++++++------ 13 files changed, 43 insertions(+), 43 deletions(-) rename lib/jdl/{core => }/exporters/applications/jhipster-application-formatter.ts (93%) rename lib/jdl/{core => }/exporters/export-utils.spec.ts (98%) rename lib/jdl/{core => }/exporters/export-utils.ts (87%) rename lib/jdl/{core => }/exporters/jdl-exporter.spec.ts (89%) rename lib/jdl/{core => }/exporters/jdl-exporter.ts (95%) rename lib/jdl/{core => }/exporters/jhipster-deployment-exporter.spec.ts (95%) rename lib/jdl/{core => }/exporters/jhipster-deployment-exporter.ts (92%) rename lib/jdl/{core => }/exporters/jhipster-entity-exporter.spec.ts (98%) rename lib/jdl/{core => }/exporters/jhipster-entity-exporter.ts (91%) rename lib/jdl/{core => }/integration-test.spec.ts (97%) diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts index f02829425aab..04389e315da7 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -23,7 +23,7 @@ import JDLObject from '../core/models/jdl-object.js'; import mergeJDLObjects from '../core/models/jdl-object-merger.js'; import { doesDirectoryExist, doesFileExist } from '../core/utils/file-utils.js'; import { readJSONFile } from '../core/readers/json-file-reader.js'; -import exportJDLObject from '../core/exporters/jdl-exporter.js'; +import exportJDLObject from '../exporters/jdl-exporter.js'; import { removeFieldsWithNullishValues } from '../../utils/object.js'; import type JDLApplication from '../core/models/jdl-application.js'; import type { JDLRuntime } from '../core/types/runtime.js'; diff --git a/lib/jdl/core/jdl-importer.ts b/lib/jdl/core/jdl-importer.ts index e0612762b579..3d477e575d15 100644 --- a/lib/jdl/core/jdl-importer.ts +++ b/lib/jdl/core/jdl-importer.ts @@ -21,18 +21,18 @@ import { applicationOptions } from '../../jhipster/index.js'; import ParsedJDLToJDLObjectConverter from '../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import JDLWithoutApplicationToJSONConverter from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import { convert } from '../converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; +import { formatApplicationToExport, formatApplicationsToExport } from '../exporters/applications/jhipster-application-formatter.js'; +import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; +import exportEntities from '../exporters/jhipster-entity-exporter.js'; +import { GENERATOR_NAME } from '../exporters/export-utils.js'; import * as JDLReader from './readers/jdl-reader.js'; import { readJSONFile } from './readers/json-file-reader.js'; import { doesFileExist } from './utils/file-utils.js'; -import { formatApplicationToExport, formatApplicationsToExport } from './exporters/applications/jhipster-application-formatter.js'; -import exportDeployments from './exporters/jhipster-deployment-exporter.js'; -import exportEntities from './exporters/jhipster-entity-exporter.js'; import createWithApplicationValidator from './validators/jdl-with-application-validator.js'; import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; import type JDLObject from './models/jdl-object.js'; import type { ParsedJDLApplications } from './types/parsed.js'; import type { PostProcessedJDLJSONApplication } from './types/exporter.js'; -import { GENERATOR_NAME } from './exporters/export-utils.js'; import type { JDLApplicationConfig } from './types/parsing.js'; import type { JDLRuntime } from './types/runtime.js'; import { createRuntime, getDefaultRuntime } from './runtime.js'; diff --git a/lib/jdl/core/types/exporter.d.ts b/lib/jdl/core/types/exporter.d.ts index d91b451fc20a..2ce53947457a 100644 --- a/lib/jdl/core/types/exporter.d.ts +++ b/lib/jdl/core/types/exporter.d.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { GENERATOR_NAME } from '../exporters/export-utils.js'; +import type { GENERATOR_NAME } from '../../exporters/export-utils.ts'; import type { JSONEntity } from './json-config.js'; export type JDLJSONApplicationContent = { diff --git a/lib/jdl/core/exporters/applications/jhipster-application-formatter.ts b/lib/jdl/exporters/applications/jhipster-application-formatter.ts similarity index 93% rename from lib/jdl/core/exporters/applications/jhipster-application-formatter.ts rename to lib/jdl/exporters/applications/jhipster-application-formatter.ts index 3f1efbd49975..bb12f35caf1f 100644 --- a/lib/jdl/core/exporters/applications/jhipster-application-formatter.ts +++ b/lib/jdl/exporters/applications/jhipster-application-formatter.ts @@ -17,16 +17,16 @@ * limitations under the License. */ -import type JDLApplication from '../../models/jdl-application.js'; +import type JDLApplication from '../../core/models/jdl-application.js'; import { GENERATOR_NAME } from '../export-utils.js'; import type { JDLJSONApplication, JDLJSONApplicationContent, PostProcessedJDLJSONApplication, RawJDLJSONApplication, -} from '../../types/exporter.js'; -import type JDLApplicationConfigurationOption from '../../models/jdl-application-configuration-option.js'; -import type JDLApplicationConfiguration from '../../models/jdl-application-configuration.js'; +} from '../../core/types/exporter.js'; +import type JDLApplicationConfigurationOption from '../../core/models/jdl-application-configuration-option.js'; +import type JDLApplicationConfiguration from '../../core/models/jdl-application-configuration.js'; /** * Exports JDL applications to JDL files in separate folders (based on application base names). diff --git a/lib/jdl/core/exporters/export-utils.spec.ts b/lib/jdl/exporters/export-utils.spec.ts similarity index 98% rename from lib/jdl/core/exporters/export-utils.spec.ts rename to lib/jdl/exporters/export-utils.spec.ts index 0f21240fcb9c..2ec24059043b 100644 --- a/lib/jdl/core/exporters/export-utils.spec.ts +++ b/lib/jdl/exporters/export-utils.spec.ts @@ -22,7 +22,7 @@ import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { beforeEach, describe, expect, it } from 'esmocha'; import { writeConfigFile } from '../exporters/export-utils.js'; -import { basicHelpers as helpers } from '../../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/lib/jdl/core/exporters/export-utils.ts b/lib/jdl/exporters/export-utils.ts similarity index 87% rename from lib/jdl/core/exporters/export-utils.ts rename to lib/jdl/exporters/export-utils.ts index fae10886b3de..6914bf0c7e74 100644 --- a/lib/jdl/core/exporters/export-utils.ts +++ b/lib/jdl/exporters/export-utils.ts @@ -18,9 +18,9 @@ */ import fs from 'fs'; -import { doesFileExist } from '../utils/file-utils.js'; -import type { JHipsterYoRcContent } from '../types/json-config.js'; -import { mergeYoRcContent } from '../../../utils/yo-rc.js'; +import { doesFileExist } from '../core/utils/file-utils.js'; +import type { JHipsterYoRcContent } from '../core/types/json-config.js'; +import { mergeYoRcContent } from '../../utils/yo-rc.js'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/core/exporters/jdl-exporter.spec.ts b/lib/jdl/exporters/jdl-exporter.spec.ts similarity index 89% rename from lib/jdl/core/exporters/jdl-exporter.spec.ts rename to lib/jdl/exporters/jdl-exporter.spec.ts index 8ed01f0ac2e7..93b0260f4561 100644 --- a/lib/jdl/core/exporters/jdl-exporter.spec.ts +++ b/lib/jdl/exporters/jdl-exporter.spec.ts @@ -20,14 +20,14 @@ import fs from 'fs'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import JDLObject from '../models/jdl-object.js'; -import { JDLEntity } from '../models/index.js'; +import JDLObject from '../core/models/jdl-object.js'; +import { JDLEntity } from '../core/models/index.js'; import exportToJDL from '../exporters/jdl-exporter.js'; -import JDLApplication from '../models/jdl-application.js'; -import type { JDLJSONApplicationConfiguration } from '../parsing/jdl-parsing-types.js'; -import { applicationOptions } from '../built-in-options/index.js'; -import { basicHelpers as helpers } from '../../../../testing/index.js'; -import { getDefaultRuntime } from '../runtime.js'; +import JDLApplication from '../core/models/jdl-application.js'; +import type { JDLJSONApplicationConfiguration } from '../core/parsing/jdl-parsing-types.js'; +import { applicationOptions } from '../core/built-in-options/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; +import { getDefaultRuntime } from '../core/runtime.js'; const { OptionNames: { CLIENT_FRAMEWORK }, diff --git a/lib/jdl/core/exporters/jdl-exporter.ts b/lib/jdl/exporters/jdl-exporter.ts similarity index 95% rename from lib/jdl/core/exporters/jdl-exporter.ts rename to lib/jdl/exporters/jdl-exporter.ts index a5db751fdc9c..72fd11a1d998 100644 --- a/lib/jdl/core/exporters/jdl-exporter.ts +++ b/lib/jdl/exporters/jdl-exporter.ts @@ -18,7 +18,7 @@ */ import fs from 'fs'; -import type JDLObject from '../models/jdl-object.js'; +import type JDLObject from '../core/models/jdl-object.js'; /** * Writes down the given JDL to a file. diff --git a/lib/jdl/core/exporters/jhipster-deployment-exporter.spec.ts b/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts similarity index 95% rename from lib/jdl/core/exporters/jhipster-deployment-exporter.spec.ts rename to lib/jdl/exporters/jhipster-deployment-exporter.spec.ts index 93c9b40b74d6..1146353f4cbf 100644 --- a/lib/jdl/core/exporters/jhipster-deployment-exporter.spec.ts +++ b/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts @@ -22,9 +22,9 @@ import path from 'path'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; -import JDLDeployment from '../models/jdl-deployment.js'; -import { deploymentOptions } from '../built-in-options/index.js'; -import { basicHelpers as helpers } from '../../../../testing/index.js'; +import JDLDeployment from '../core/models/jdl-deployment.js'; +import { deploymentOptions } from '../core/built-in-options/index.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; const { DeploymentTypes: { DOCKERCOMPOSE, KUBERNETES }, diff --git a/lib/jdl/core/exporters/jhipster-deployment-exporter.ts b/lib/jdl/exporters/jhipster-deployment-exporter.ts similarity index 92% rename from lib/jdl/core/exporters/jhipster-deployment-exporter.ts rename to lib/jdl/exporters/jhipster-deployment-exporter.ts index 8700f9b06de6..25cea2c82741 100644 --- a/lib/jdl/core/exporters/jhipster-deployment-exporter.ts +++ b/lib/jdl/exporters/jhipster-deployment-exporter.ts @@ -18,10 +18,10 @@ */ import path from 'path'; -import { createFolderIfItDoesNotExist, doesFileExist } from '../utils/file-utils.js'; -import DeploymentValidator from '../validators/deployment-validator.js'; -import type JDLDeployment from '../models/jdl-deployment.js'; -import type { JHipsterYoRcContent } from '../types/json-config.js'; +import { createFolderIfItDoesNotExist, doesFileExist } from '../core/utils/file-utils.js'; +import DeploymentValidator from '../core/validators/deployment-validator.js'; +import type JDLDeployment from '../core/models/jdl-deployment.js'; +import type { JHipsterYoRcContent } from '../core/types/json-config.js'; import { GENERATOR_NAME, writeConfigFile } from './export-utils.js'; /** diff --git a/lib/jdl/core/exporters/jhipster-entity-exporter.spec.ts b/lib/jdl/exporters/jhipster-entity-exporter.spec.ts similarity index 98% rename from lib/jdl/core/exporters/jhipster-entity-exporter.spec.ts rename to lib/jdl/exporters/jhipster-entity-exporter.spec.ts index 7010521f8e71..54fadc4f9d86 100644 --- a/lib/jdl/core/exporters/jhipster-entity-exporter.spec.ts +++ b/lib/jdl/exporters/jhipster-entity-exporter.spec.ts @@ -20,10 +20,10 @@ import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportEntities from '../exporters/jhipster-entity-exporter.js'; -import { applicationTypes, entityOptions } from '../built-in-options/index.js'; +import { applicationTypes, entityOptions } from '../core/built-in-options/index.js'; -import { doesDirectoryExist } from '../utils/file-utils.js'; -import { basicHelpers as helpers } from '../../../../testing/index.js'; +import { doesDirectoryExist } from '../core/utils/file-utils.js'; +import { basicHelpers as helpers } from '../../../testing/index.js'; const { MapperTypes, PaginationTypes, ServiceTypes } = entityOptions; const { MONOLITH, MICROSERVICE } = applicationTypes; diff --git a/lib/jdl/core/exporters/jhipster-entity-exporter.ts b/lib/jdl/exporters/jhipster-entity-exporter.ts similarity index 91% rename from lib/jdl/core/exporters/jhipster-entity-exporter.ts rename to lib/jdl/exporters/jhipster-entity-exporter.ts index 86252513d5e5..5d1f8b76d38e 100644 --- a/lib/jdl/core/exporters/jhipster-entity-exporter.ts +++ b/lib/jdl/exporters/jhipster-entity-exporter.ts @@ -19,11 +19,11 @@ import path from 'path'; -import { applicationTypes } from '../built-in-options/index.js'; -import { readJSONFile, toFilePath } from '../readers/json-file-reader.js'; -import { doesFileExist } from '../utils/file-utils.js'; -import type { JSONEntity } from '../types/json-config.js'; -import type { JhipsterJSONJDLExporterWrapper } from '../types/exporter.js'; +import { applicationTypes } from '../core/built-in-options/index.js'; +import { readJSONFile, toFilePath } from '../core/readers/json-file-reader.js'; +import { doesFileExist } from '../core/utils/file-utils.js'; +import type { JSONEntity } from '../core/types/json-config.js'; +import type { JhipsterJSONJDLExporterWrapper } from '../core/types/exporter.js'; let configuration: any = {}; diff --git a/lib/jdl/core/integration-test.spec.ts b/lib/jdl/integration-test.spec.ts similarity index 97% rename from lib/jdl/core/integration-test.spec.ts rename to lib/jdl/integration-test.spec.ts index 6c23639b1c69..79ca14dc9be7 100644 --- a/lib/jdl/core/integration-test.spec.ts +++ b/lib/jdl/integration-test.spec.ts @@ -21,18 +21,18 @@ import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import { basicHelpers as helpers } from '../../../testing/index.js'; -import { applicationTypes } from '../../jhipster/index.js'; -import { convert as convertWithoutApplication } from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; +import { basicHelpers as helpers } from '../../testing/index.js'; +import { applicationTypes } from '../jhipster/index.js'; +import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; +import exportToJDL from './exporters/jdl-exporter.js'; import { createImporterFromContent, getTestFile, parseFromConfigurationObject, parseFromContent, parseFromFiles, -} from './__test-support__/index.js'; -import exportToJDL from './exporters/jdl-exporter.js'; -import type { ApplicationWithEntities } from './jdl-importer.js'; +} from './core/__test-support__/index.js'; +import type { ApplicationWithEntities } from './core/jdl-importer.js'; const { MONOLITH } = applicationTypes; const __filename = fileURLToPath(import.meta.url); From afefa42cc528bf277f372fa9dcd88d071e4ec6ba Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:29:57 -0300 Subject: [PATCH 16/21] move exporters to converters --- .../exporters/export-utils.spec.ts | 2 +- lib/jdl/{ => converters}/exporters/export-utils.ts | 6 +++--- .../exporters/jdl-exporter.spec.ts | 14 +++++++------- lib/jdl/{ => converters}/exporters/jdl-exporter.ts | 2 +- .../exporters/jhipster-deployment-exporter.spec.ts | 6 +++--- .../exporters/jhipster-deployment-exporter.ts | 8 ++++---- .../exporters/jhipster-entity-exporter.spec.ts | 6 +++--- .../exporters/jhipster-entity-exporter.ts | 10 +++++----- lib/jdl/converters/json-to-jdl-converter.ts | 2 +- lib/jdl/core/jdl-importer.ts | 6 +++--- lib/jdl/core/types/exporter.d.ts | 2 +- .../applications/jhipster-application-formatter.ts | 2 +- lib/jdl/integration-test.spec.ts | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) rename lib/jdl/{ => converters}/exporters/export-utils.spec.ts (98%) rename lib/jdl/{ => converters}/exporters/export-utils.ts (87%) rename lib/jdl/{ => converters}/exporters/jdl-exporter.spec.ts (89%) rename lib/jdl/{ => converters}/exporters/jdl-exporter.ts (95%) rename lib/jdl/{ => converters}/exporters/jhipster-deployment-exporter.spec.ts (95%) rename lib/jdl/{ => converters}/exporters/jhipster-deployment-exporter.ts (92%) rename lib/jdl/{ => converters}/exporters/jhipster-entity-exporter.spec.ts (98%) rename lib/jdl/{ => converters}/exporters/jhipster-entity-exporter.ts (90%) diff --git a/lib/jdl/exporters/export-utils.spec.ts b/lib/jdl/converters/exporters/export-utils.spec.ts similarity index 98% rename from lib/jdl/exporters/export-utils.spec.ts rename to lib/jdl/converters/exporters/export-utils.spec.ts index 2ec24059043b..0f21240fcb9c 100644 --- a/lib/jdl/exporters/export-utils.spec.ts +++ b/lib/jdl/converters/exporters/export-utils.spec.ts @@ -22,7 +22,7 @@ import { dirname } from 'path'; import { fileURLToPath } from 'url'; import { beforeEach, describe, expect, it } from 'esmocha'; import { writeConfigFile } from '../exporters/export-utils.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/lib/jdl/exporters/export-utils.ts b/lib/jdl/converters/exporters/export-utils.ts similarity index 87% rename from lib/jdl/exporters/export-utils.ts rename to lib/jdl/converters/exporters/export-utils.ts index 6914bf0c7e74..29cefab5a8b0 100644 --- a/lib/jdl/exporters/export-utils.ts +++ b/lib/jdl/converters/exporters/export-utils.ts @@ -18,9 +18,9 @@ */ import fs from 'fs'; -import { doesFileExist } from '../core/utils/file-utils.js'; -import type { JHipsterYoRcContent } from '../core/types/json-config.js'; -import { mergeYoRcContent } from '../../utils/yo-rc.js'; +import { doesFileExist } from '../../core/utils/file-utils.js'; +import type { JHipsterYoRcContent } from '../../core/types/json-config.js'; +import { mergeYoRcContent } from '../../../utils/yo-rc.js'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/lib/jdl/exporters/jdl-exporter.spec.ts b/lib/jdl/converters/exporters/jdl-exporter.spec.ts similarity index 89% rename from lib/jdl/exporters/jdl-exporter.spec.ts rename to lib/jdl/converters/exporters/jdl-exporter.spec.ts index 93b0260f4561..6e899b00a439 100644 --- a/lib/jdl/exporters/jdl-exporter.spec.ts +++ b/lib/jdl/converters/exporters/jdl-exporter.spec.ts @@ -20,14 +20,14 @@ import fs from 'fs'; import { expect } from 'chai'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; -import JDLObject from '../core/models/jdl-object.js'; -import { JDLEntity } from '../core/models/index.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { JDLEntity } from '../../core/models/index.js'; import exportToJDL from '../exporters/jdl-exporter.js'; -import JDLApplication from '../core/models/jdl-application.js'; -import type { JDLJSONApplicationConfiguration } from '../core/parsing/jdl-parsing-types.js'; -import { applicationOptions } from '../core/built-in-options/index.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; -import { getDefaultRuntime } from '../core/runtime.js'; +import JDLApplication from '../../core/models/jdl-application.js'; +import type { JDLJSONApplicationConfiguration } from '../../core/parsing/jdl-parsing-types.js'; +import { applicationOptions } from '../../core/built-in-options/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; +import { getDefaultRuntime } from '../../core/runtime.js'; const { OptionNames: { CLIENT_FRAMEWORK }, diff --git a/lib/jdl/exporters/jdl-exporter.ts b/lib/jdl/converters/exporters/jdl-exporter.ts similarity index 95% rename from lib/jdl/exporters/jdl-exporter.ts rename to lib/jdl/converters/exporters/jdl-exporter.ts index 72fd11a1d998..060dfccb1e3f 100644 --- a/lib/jdl/exporters/jdl-exporter.ts +++ b/lib/jdl/converters/exporters/jdl-exporter.ts @@ -18,7 +18,7 @@ */ import fs from 'fs'; -import type JDLObject from '../core/models/jdl-object.js'; +import type JDLObject from '../../core/models/jdl-object.js'; /** * Writes down the given JDL to a file. diff --git a/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts b/lib/jdl/converters/exporters/jhipster-deployment-exporter.spec.ts similarity index 95% rename from lib/jdl/exporters/jhipster-deployment-exporter.spec.ts rename to lib/jdl/converters/exporters/jhipster-deployment-exporter.spec.ts index 1146353f4cbf..4ab129363917 100644 --- a/lib/jdl/exporters/jhipster-deployment-exporter.spec.ts +++ b/lib/jdl/converters/exporters/jhipster-deployment-exporter.spec.ts @@ -22,9 +22,9 @@ import path from 'path'; import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; -import JDLDeployment from '../core/models/jdl-deployment.js'; -import { deploymentOptions } from '../core/built-in-options/index.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import JDLDeployment from '../../core/models/jdl-deployment.js'; +import { deploymentOptions } from '../../core/built-in-options/index.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; const { DeploymentTypes: { DOCKERCOMPOSE, KUBERNETES }, diff --git a/lib/jdl/exporters/jhipster-deployment-exporter.ts b/lib/jdl/converters/exporters/jhipster-deployment-exporter.ts similarity index 92% rename from lib/jdl/exporters/jhipster-deployment-exporter.ts rename to lib/jdl/converters/exporters/jhipster-deployment-exporter.ts index 25cea2c82741..f1501190f5f1 100644 --- a/lib/jdl/exporters/jhipster-deployment-exporter.ts +++ b/lib/jdl/converters/exporters/jhipster-deployment-exporter.ts @@ -18,10 +18,10 @@ */ import path from 'path'; -import { createFolderIfItDoesNotExist, doesFileExist } from '../core/utils/file-utils.js'; -import DeploymentValidator from '../core/validators/deployment-validator.js'; -import type JDLDeployment from '../core/models/jdl-deployment.js'; -import type { JHipsterYoRcContent } from '../core/types/json-config.js'; +import { createFolderIfItDoesNotExist, doesFileExist } from '../../core/utils/file-utils.js'; +import DeploymentValidator from '../../core/validators/deployment-validator.js'; +import type JDLDeployment from '../../core/models/jdl-deployment.js'; +import type { JHipsterYoRcContent } from '../../core/types/json-config.js'; import { GENERATOR_NAME, writeConfigFile } from './export-utils.js'; /** diff --git a/lib/jdl/exporters/jhipster-entity-exporter.spec.ts b/lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts similarity index 98% rename from lib/jdl/exporters/jhipster-entity-exporter.spec.ts rename to lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts index 54fadc4f9d86..570b79a828bb 100644 --- a/lib/jdl/exporters/jhipster-entity-exporter.spec.ts +++ b/lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts @@ -20,10 +20,10 @@ import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportEntities from '../exporters/jhipster-entity-exporter.js'; -import { applicationTypes, entityOptions } from '../core/built-in-options/index.js'; +import { applicationTypes, entityOptions } from '../../core/built-in-options/index.js'; -import { doesDirectoryExist } from '../core/utils/file-utils.js'; -import { basicHelpers as helpers } from '../../../testing/index.js'; +import { doesDirectoryExist } from '../../core/utils/file-utils.js'; +import { basicHelpers as helpers } from '../../../../testing/index.js'; const { MapperTypes, PaginationTypes, ServiceTypes } = entityOptions; const { MONOLITH, MICROSERVICE } = applicationTypes; diff --git a/lib/jdl/exporters/jhipster-entity-exporter.ts b/lib/jdl/converters/exporters/jhipster-entity-exporter.ts similarity index 90% rename from lib/jdl/exporters/jhipster-entity-exporter.ts rename to lib/jdl/converters/exporters/jhipster-entity-exporter.ts index 5d1f8b76d38e..6ae1b4f072fe 100644 --- a/lib/jdl/exporters/jhipster-entity-exporter.ts +++ b/lib/jdl/converters/exporters/jhipster-entity-exporter.ts @@ -19,11 +19,11 @@ import path from 'path'; -import { applicationTypes } from '../core/built-in-options/index.js'; -import { readJSONFile, toFilePath } from '../core/readers/json-file-reader.js'; -import { doesFileExist } from '../core/utils/file-utils.js'; -import type { JSONEntity } from '../core/types/json-config.js'; -import type { JhipsterJSONJDLExporterWrapper } from '../core/types/exporter.js'; +import { applicationTypes } from '../../core/built-in-options/index.js'; +import { readJSONFile, toFilePath } from '../../core/readers/json-file-reader.js'; +import { doesFileExist } from '../../core/utils/file-utils.js'; +import type { JSONEntity } from '../../core/types/json-config.js'; +import type { JhipsterJSONJDLExporterWrapper } from '../../core/types/exporter.js'; let configuration: any = {}; diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts index 04389e315da7..0e6e4911cea0 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -23,7 +23,7 @@ import JDLObject from '../core/models/jdl-object.js'; import mergeJDLObjects from '../core/models/jdl-object-merger.js'; import { doesDirectoryExist, doesFileExist } from '../core/utils/file-utils.js'; import { readJSONFile } from '../core/readers/json-file-reader.js'; -import exportJDLObject from '../exporters/jdl-exporter.js'; +import exportJDLObject from './exporters/jdl-exporter.js'; import { removeFieldsWithNullishValues } from '../../utils/object.js'; import type JDLApplication from '../core/models/jdl-application.js'; import type { JDLRuntime } from '../core/types/runtime.js'; diff --git a/lib/jdl/core/jdl-importer.ts b/lib/jdl/core/jdl-importer.ts index 3d477e575d15..d547d6d77530 100644 --- a/lib/jdl/core/jdl-importer.ts +++ b/lib/jdl/core/jdl-importer.ts @@ -22,9 +22,9 @@ import ParsedJDLToJDLObjectConverter from '../converters/parsed-jdl-to-jdl-objec import JDLWithoutApplicationToJSONConverter from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import { convert } from '../converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; import { formatApplicationToExport, formatApplicationsToExport } from '../exporters/applications/jhipster-application-formatter.js'; -import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; -import exportEntities from '../exporters/jhipster-entity-exporter.js'; -import { GENERATOR_NAME } from '../exporters/export-utils.js'; +import exportDeployments from '../converters/exporters/jhipster-deployment-exporter.js'; +import exportEntities from '../converters/exporters/jhipster-entity-exporter.js'; +import { GENERATOR_NAME } from '../converters/exporters/export-utils.js'; import * as JDLReader from './readers/jdl-reader.js'; import { readJSONFile } from './readers/json-file-reader.js'; import { doesFileExist } from './utils/file-utils.js'; diff --git a/lib/jdl/core/types/exporter.d.ts b/lib/jdl/core/types/exporter.d.ts index 2ce53947457a..61634c9aff74 100644 --- a/lib/jdl/core/types/exporter.d.ts +++ b/lib/jdl/core/types/exporter.d.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { GENERATOR_NAME } from '../../exporters/export-utils.ts'; +import type { GENERATOR_NAME } from '../../converters/exporters/export-utils.ts'; import type { JSONEntity } from './json-config.js'; export type JDLJSONApplicationContent = { diff --git a/lib/jdl/exporters/applications/jhipster-application-formatter.ts b/lib/jdl/exporters/applications/jhipster-application-formatter.ts index bb12f35caf1f..f6f6a9f4f224 100644 --- a/lib/jdl/exporters/applications/jhipster-application-formatter.ts +++ b/lib/jdl/exporters/applications/jhipster-application-formatter.ts @@ -18,7 +18,7 @@ */ import type JDLApplication from '../../core/models/jdl-application.js'; -import { GENERATOR_NAME } from '../export-utils.js'; +import { GENERATOR_NAME } from '../../converters/exporters/export-utils.js'; import type { JDLJSONApplication, JDLJSONApplicationContent, diff --git a/lib/jdl/integration-test.spec.ts b/lib/jdl/integration-test.spec.ts index 79ca14dc9be7..792048e6eabb 100644 --- a/lib/jdl/integration-test.spec.ts +++ b/lib/jdl/integration-test.spec.ts @@ -24,7 +24,7 @@ import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../testing/index.js'; import { applicationTypes } from '../jhipster/index.js'; import { convert as convertWithoutApplication } from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; -import exportToJDL from './exporters/jdl-exporter.js'; +import exportToJDL from './converters/exporters/jdl-exporter.js'; import { createImporterFromContent, getTestFile, From 4f90709f7b92a2cbd9bef3264b97f6567953e788 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:31:43 -0300 Subject: [PATCH 17/21] fixes --- .../applications/jhipster-application-formatter.ts | 10 +++++----- lib/jdl/converters/json-to-jdl-converter.ts | 2 +- lib/jdl/core/jdl-importer.ts | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) rename lib/jdl/{ => converters}/exporters/applications/jhipster-application-formatter.ts (91%) diff --git a/lib/jdl/exporters/applications/jhipster-application-formatter.ts b/lib/jdl/converters/exporters/applications/jhipster-application-formatter.ts similarity index 91% rename from lib/jdl/exporters/applications/jhipster-application-formatter.ts rename to lib/jdl/converters/exporters/applications/jhipster-application-formatter.ts index f6f6a9f4f224..54a7a681a7ab 100644 --- a/lib/jdl/exporters/applications/jhipster-application-formatter.ts +++ b/lib/jdl/converters/exporters/applications/jhipster-application-formatter.ts @@ -17,16 +17,16 @@ * limitations under the License. */ -import type JDLApplication from '../../core/models/jdl-application.js'; -import { GENERATOR_NAME } from '../../converters/exporters/export-utils.js'; +import type JDLApplication from '../../../core/models/jdl-application.js'; +import { GENERATOR_NAME } from '../export-utils.js'; import type { JDLJSONApplication, JDLJSONApplicationContent, PostProcessedJDLJSONApplication, RawJDLJSONApplication, -} from '../../core/types/exporter.js'; -import type JDLApplicationConfigurationOption from '../../core/models/jdl-application-configuration-option.js'; -import type JDLApplicationConfiguration from '../../core/models/jdl-application-configuration.js'; +} from '../../../core/types/exporter.js'; +import type JDLApplicationConfigurationOption from '../../../core/models/jdl-application-configuration-option.js'; +import type JDLApplicationConfiguration from '../../../core/models/jdl-application-configuration.js'; /** * Exports JDL applications to JDL files in separate folders (based on application base names). diff --git a/lib/jdl/converters/json-to-jdl-converter.ts b/lib/jdl/converters/json-to-jdl-converter.ts index 0e6e4911cea0..492968077e10 100644 --- a/lib/jdl/converters/json-to-jdl-converter.ts +++ b/lib/jdl/converters/json-to-jdl-converter.ts @@ -23,7 +23,6 @@ import JDLObject from '../core/models/jdl-object.js'; import mergeJDLObjects from '../core/models/jdl-object-merger.js'; import { doesDirectoryExist, doesFileExist } from '../core/utils/file-utils.js'; import { readJSONFile } from '../core/readers/json-file-reader.js'; -import exportJDLObject from './exporters/jdl-exporter.js'; import { removeFieldsWithNullishValues } from '../../utils/object.js'; import type JDLApplication from '../core/models/jdl-application.js'; import type { JDLRuntime } from '../core/types/runtime.js'; @@ -31,6 +30,7 @@ import { createRuntime, getDefaultRuntime } from '../core/runtime.js'; import { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.js'; import type { JDLApplicationConfig } from '../core/types/parsing.js'; import type { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from '../core/types/json-config.js'; +import exportJDLObject from './exporters/jdl-exporter.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; import { convertApplicationToJDL } from './json-to-jdl-application-converter.js'; diff --git a/lib/jdl/core/jdl-importer.ts b/lib/jdl/core/jdl-importer.ts index d547d6d77530..4961651cbd24 100644 --- a/lib/jdl/core/jdl-importer.ts +++ b/lib/jdl/core/jdl-importer.ts @@ -21,7 +21,10 @@ import { applicationOptions } from '../../jhipster/index.js'; import ParsedJDLToJDLObjectConverter from '../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; import JDLWithoutApplicationToJSONConverter from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; import { convert } from '../converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; -import { formatApplicationToExport, formatApplicationsToExport } from '../exporters/applications/jhipster-application-formatter.js'; +import { + formatApplicationToExport, + formatApplicationsToExport, +} from '../converters/exporters/applications/jhipster-application-formatter.js'; import exportDeployments from '../converters/exporters/jhipster-deployment-exporter.js'; import exportEntities from '../converters/exporters/jhipster-entity-exporter.js'; import { GENERATOR_NAME } from '../converters/exporters/export-utils.js'; From 5dc7b10376fc40192aa7b400d1587ac6d2c062b5 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:37:38 -0300 Subject: [PATCH 18/21] adjusts --- .../support/import-jdl-transform.ts | 2 +- generators/jdl/generator.ts | 4 +- generators/jdl/internal/application.ts | 2 +- .../__snapshots__/jdl-importer.spec.ts.snap | 0 lib/jdl/core/__test-support__/index.ts | 2 +- lib/jdl/index.ts | 2 +- lib/jdl/{core => }/jdl-importer.spec.ts | 9 ++--- lib/jdl/{core => }/jdl-importer.ts | 38 +++++++++---------- 8 files changed, 28 insertions(+), 31 deletions(-) rename lib/jdl/{core => }/__snapshots__/jdl-importer.spec.ts.snap (100%) rename lib/jdl/{core => }/jdl-importer.spec.ts (99%) rename lib/jdl/{core => }/jdl-importer.ts (88%) diff --git a/generators/bootstrap-application-base/support/import-jdl-transform.ts b/generators/bootstrap-application-base/support/import-jdl-transform.ts index 69624bc3a73d..0aeb46ded5dc 100644 --- a/generators/bootstrap-application-base/support/import-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/import-jdl-transform.ts @@ -5,7 +5,7 @@ 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 '../../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import { mergeYoRcContent } from '../../../lib/utils/yo-rc.js'; import type { JDLApplicationConfig } from '../../../lib/jdl/core/types/parsing.js'; diff --git a/generators/jdl/generator.ts b/generators/jdl/generator.ts index f26a4b9e02a9..426576cae2f3 100644 --- a/generators/jdl/generator.ts +++ b/generators/jdl/generator.ts @@ -27,8 +27,8 @@ import { downloadJdlFile } from '../../cli/download.mjs'; import EnvironmentBuilder from '../../cli/environment-builder.mjs'; import { CLI_NAME } from '../../cli/utils.mjs'; import { GENERATOR_APP, GENERATOR_ENTITIES, GENERATOR_WORKSPACES } from '../generator-list.js'; -import type { ApplicationWithEntities } from '../../lib/jdl/core/jdl-importer.js'; -import { createImporterFromContent } from '../../lib/jdl/core/jdl-importer.js'; +import type { ApplicationWithEntities } from '../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../lib/jdl/jdl-importer.js'; import { GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR } from '../generator-constants.js'; import { mergeYoRcContent } from '../../lib/utils/yo-rc.js'; import { normalizeBlueprintName } from '../base/internal/blueprint.js'; diff --git a/generators/jdl/internal/application.ts b/generators/jdl/internal/application.ts index a34669eaf0d4..da281ccf9e38 100644 --- a/generators/jdl/internal/application.ts +++ b/generators/jdl/internal/application.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { ApplicationWithEntities } from '../../../lib/jdl/core/jdl-importer.js'; +import type { ApplicationWithEntities } from '../../../lib/jdl/jdl-importer.js'; export const addApplicationIndex = (applicationsWithEntities: ApplicationWithEntities[]) => { applicationsWithEntities.forEach((applicationWithEntities, applicationIndex) => { diff --git a/lib/jdl/core/__snapshots__/jdl-importer.spec.ts.snap b/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap similarity index 100% rename from lib/jdl/core/__snapshots__/jdl-importer.spec.ts.snap rename to lib/jdl/__snapshots__/jdl-importer.spec.ts.snap diff --git a/lib/jdl/core/__test-support__/index.ts b/lib/jdl/core/__test-support__/index.ts index 0ae56e1a5282..b0f7c55f5e17 100644 --- a/lib/jdl/core/__test-support__/index.ts +++ b/lib/jdl/core/__test-support__/index.ts @@ -6,7 +6,7 @@ import { parseFromConfigurationObject as originalParseFromConfigurationObject } import { createImporterFromContent as originalCreateImporterFromContent, createImporterFromFiles as originalCreateImporterFromFiles, -} from '../jdl-importer.js'; +} from '../../jdl-importer.js'; import type { ParsedJDLApplication, ParsedJDLRoot } from '../types/parsed.js'; import definition from '../../../../generators/app/jdl/index.js'; import { diff --git a/lib/jdl/index.ts b/lib/jdl/index.ts index 0b44bffab2af..5d9f5f7069db 100644 --- a/lib/jdl/index.ts +++ b/lib/jdl/index.ts @@ -1,4 +1,4 @@ -export * from './core/jdl-importer.js'; +export * from './jdl-importer.js'; export * from './core/parsing/api.js'; export * from '../jhipster/index.js'; export * from '../utils/yo-rc.js'; diff --git a/lib/jdl/core/jdl-importer.spec.ts b/lib/jdl/jdl-importer.spec.ts similarity index 99% rename from lib/jdl/core/jdl-importer.spec.ts rename to lib/jdl/jdl-importer.spec.ts index 2cf9d9e3e4ea..b3854f809f02 100644 --- a/lib/jdl/core/jdl-importer.spec.ts +++ b/lib/jdl/jdl-importer.spec.ts @@ -17,18 +17,15 @@ * limitations under the License. */ -import path, { dirname } from 'path'; -import { fileURLToPath } from 'url'; +import path from 'path'; import { readFileSync, rmSync } from 'fs'; import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../../jhipster/index.js'; -import { createImporterFromContent, createImporterFromFiles, getTestFile } from './__test-support__/index.js'; +import { applicationTypes, clientFrameworkTypes, databaseTypes } from '../jhipster/index.js'; +import { createImporterFromContent, createImporterFromFiles, getTestFile } from './core/__test-support__/index.js'; const { MONOLITH } = applicationTypes; -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); const { NO: NO_CLIENT_FRAMEWORK } = clientFrameworkTypes; diff --git a/lib/jdl/core/jdl-importer.ts b/lib/jdl/jdl-importer.ts similarity index 88% rename from lib/jdl/core/jdl-importer.ts rename to lib/jdl/jdl-importer.ts index 4961651cbd24..3e1463a9b980 100644 --- a/lib/jdl/core/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -17,28 +17,28 @@ * limitations under the License. */ import { uniqBy } from 'lodash-es'; -import { applicationOptions } from '../../jhipster/index.js'; -import ParsedJDLToJDLObjectConverter from '../converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; -import JDLWithoutApplicationToJSONConverter from '../converters/jdl-to-json/jdl-without-application-to-json-converter.js'; -import { convert } from '../converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; +import { applicationOptions } from '../jhipster/index.js'; +import ParsedJDLToJDLObjectConverter from './converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js'; +import JDLWithoutApplicationToJSONConverter from './converters/jdl-to-json/jdl-without-application-to-json-converter.js'; +import { convert } from './converters/jdl-to-json/jdl-with-applications-to-json-converter.js'; import { formatApplicationToExport, formatApplicationsToExport, -} from '../converters/exporters/applications/jhipster-application-formatter.js'; -import exportDeployments from '../converters/exporters/jhipster-deployment-exporter.js'; -import exportEntities from '../converters/exporters/jhipster-entity-exporter.js'; -import { GENERATOR_NAME } from '../converters/exporters/export-utils.js'; -import * as JDLReader from './readers/jdl-reader.js'; -import { readJSONFile } from './readers/json-file-reader.js'; -import { doesFileExist } from './utils/file-utils.js'; -import createWithApplicationValidator from './validators/jdl-with-application-validator.js'; -import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js'; -import type JDLObject from './models/jdl-object.js'; -import type { ParsedJDLApplications } from './types/parsed.js'; -import type { PostProcessedJDLJSONApplication } from './types/exporter.js'; -import type { JDLApplicationConfig } from './types/parsing.js'; -import type { JDLRuntime } from './types/runtime.js'; -import { createRuntime, getDefaultRuntime } from './runtime.js'; +} from './converters/exporters/applications/jhipster-application-formatter.js'; +import exportDeployments from './converters/exporters/jhipster-deployment-exporter.js'; +import exportEntities from './converters/exporters/jhipster-entity-exporter.js'; +import { GENERATOR_NAME } from './converters/exporters/export-utils.js'; +import * as JDLReader from './core/readers/jdl-reader.js'; +import { readJSONFile } from './core/readers/json-file-reader.js'; +import { doesFileExist } from './core/utils/file-utils.js'; +import createWithApplicationValidator from './core/validators/jdl-with-application-validator.js'; +import createWithoutApplicationValidator from './core/validators/jdl-without-application-validator.js'; +import type JDLObject from './core/models/jdl-object.js'; +import type { ParsedJDLApplications } from './core/types/parsed.js'; +import type { PostProcessedJDLJSONApplication } from './core/types/exporter.js'; +import type { JDLApplicationConfig } from './core/types/parsing.js'; +import type { JDLRuntime } from './core/types/runtime.js'; +import { createRuntime, getDefaultRuntime } from './core/runtime.js'; const { OptionNames } = applicationOptions; const { APPLICATION_TYPE, BASE_NAME } = OptionNames; From 94d3c2a357304d570ff8cc6f981d65b811a3a68d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 15:42:12 -0300 Subject: [PATCH 19/21] adjusts --- .../liquibase/incremental-liquibase.spec.ts | 2 +- .../server/options/database-migration.spec.ts | 4 ++-- .../server/options/message-broker.spec.ts | 4 ++-- .../server/options/sync-user-with-idp.spec.ts | 4 ++-- .../spring-boot/options/feign-client.spec.ts | 4 ++-- .../gateway/jdl/jdl-routes-option.spec.ts | 4 ++-- .../exporters/jhipster-deployment-exporter.ts | 2 +- .../binary-option-validator.spec.ts | 2 +- .../validators/binary-option-validator.ts | 2 +- .../validators/deployment-validator.spec.ts | 2 +- .../validators/deployment-validator.ts | 4 ++-- .../validators/entity-validator.spec.ts | 2 +- .../validators/entity-validator.ts | 2 +- .../validators/enum-validator.spec.ts | 2 +- .../validators/enum-validator.ts | 2 +- .../validators/field-validator.spec.ts | 2 +- .../validators/field-validator.ts | 0 .../jdl-with-application-validator.spec.ts | 20 +++++++++---------- .../jdl-with-application-validator.ts | 12 +++++------ .../jdl-without-application-validator.spec.ts | 16 +++++++-------- .../jdl-without-application-validator.ts | 10 +++++----- .../validators/option-validator.ts | 0 .../validators/relationship-validator.spec.ts | 6 +++--- .../validators/relationship-validator.ts | 6 +++--- .../validators/unary-option-validator.spec.ts | 2 +- .../validators/unary-option-validator.ts | 0 .../validators/validation-validator.spec.ts | 2 +- .../validators/validation-validator.ts | 2 +- .../validators/validator.ts | 0 lib/jdl/integration-test.spec.ts | 2 +- lib/jdl/jdl-importer.ts | 4 ++-- 31 files changed, 63 insertions(+), 63 deletions(-) rename lib/jdl/{core => converters}/validators/binary-option-validator.spec.ts (96%) rename lib/jdl/{core => converters}/validators/binary-option-validator.ts (94%) rename lib/jdl/{core => converters}/validators/deployment-validator.spec.ts (98%) rename lib/jdl/{core => converters}/validators/deployment-validator.ts (94%) rename lib/jdl/{core => converters}/validators/entity-validator.spec.ts (96%) rename lib/jdl/{core => converters}/validators/entity-validator.ts (95%) rename lib/jdl/{core => converters}/validators/enum-validator.spec.ts (97%) rename lib/jdl/{core => converters}/validators/enum-validator.ts (95%) rename lib/jdl/{core => converters}/validators/field-validator.spec.ts (97%) rename lib/jdl/{core => converters}/validators/field-validator.ts (100%) rename lib/jdl/{core => converters}/validators/jdl-with-application-validator.spec.ts (96%) rename lib/jdl/{core => converters}/validators/jdl-with-application-validator.ts (95%) rename lib/jdl/{core => converters}/validators/jdl-without-application-validator.spec.ts (96%) rename lib/jdl/{core => converters}/validators/jdl-without-application-validator.ts (96%) rename lib/jdl/{core => converters}/validators/option-validator.ts (100%) rename lib/jdl/{core => converters}/validators/relationship-validator.spec.ts (97%) rename lib/jdl/{core => converters}/validators/relationship-validator.ts (92%) rename lib/jdl/{core => converters}/validators/unary-option-validator.spec.ts (96%) rename lib/jdl/{core => converters}/validators/unary-option-validator.ts (100%) rename lib/jdl/{core => converters}/validators/validation-validator.spec.ts (98%) rename lib/jdl/{core => converters}/validators/validation-validator.ts (96%) rename lib/jdl/{core => converters}/validators/validator.ts (100%) diff --git a/generators/liquibase/incremental-liquibase.spec.ts b/generators/liquibase/incremental-liquibase.spec.ts index 2dcf262afa6b..fbe22800ff15 100644 --- a/generators/liquibase/incremental-liquibase.spec.ts +++ b/generators/liquibase/incremental-liquibase.spec.ts @@ -4,7 +4,7 @@ import { fileURLToPath } from 'url'; import { after, before, describe, expect, it } from 'esmocha'; import { skipPrettierHelpers as helpers, runResult } from '../../testing/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; -import { createImporterFromContent } from '../../lib/jdl/core/jdl-importer.js'; +import { createImporterFromContent } from '../../lib/jdl/jdl-importer.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); diff --git a/generators/server/options/database-migration.spec.ts b/generators/server/options/database-migration.spec.ts index b7aa1e66adcb..331e45af7278 100644 --- a/generators/server/options/database-migration.spec.ts +++ b/generators/server/options/database-migration.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import optionDefinition from './database-migration.js'; import { DATABASE_MIGRATION as optionName } from './index.js'; diff --git a/generators/server/options/message-broker.spec.ts b/generators/server/options/message-broker.spec.ts index 24e2c8c6fb50..4c6fed21d676 100644 --- a/generators/server/options/message-broker.spec.ts +++ b/generators/server/options/message-broker.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import optionDefinition from './message-broker.js'; import { MESSAGE_BROKER } from './index.js'; diff --git a/generators/server/options/sync-user-with-idp.spec.ts b/generators/server/options/sync-user-with-idp.spec.ts index c8cc0496760b..4bb808a56168 100644 --- a/generators/server/options/sync-user-with-idp.spec.ts +++ b/generators/server/options/sync-user-with-idp.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; import { SYNC_USER_WITH_IDP as optionName } from './sync-user-with-idp.js'; diff --git a/generators/spring-boot/options/feign-client.spec.ts b/generators/spring-boot/options/feign-client.spec.ts index ffeda6dcb5f8..013be7af896b 100644 --- a/generators/spring-boot/options/feign-client.spec.ts +++ b/generators/spring-boot/options/feign-client.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../lib/jdl/core/jdl-importer.js'; -import { createImporterFromContent } from '../../../lib/jdl/core/jdl-importer.js'; +import type { ImportState } from '../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../lib/jdl/jdl-importer.js'; import definition from '../../app/jdl/index.js'; const optionName = 'feignClient'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts index 23205f2aea19..66cfd95278ad 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts @@ -1,6 +1,6 @@ import { before, describe, expect, it } from 'esmocha'; -import type { ImportState } from '../../../../../lib/jdl/core/jdl-importer.js'; -import { createImporterFromContent } from '../../../../../lib/jdl/core/jdl-importer.js'; +import type { ImportState } from '../../../../../lib/jdl/jdl-importer.js'; +import { createImporterFromContent } from '../../../../../lib/jdl/jdl-importer.js'; import { convertSingleContentToJDL } from '../../../../../lib/jdl/converters/json-to-jdl-converter.js'; const optionName = 'routes'; diff --git a/lib/jdl/converters/exporters/jhipster-deployment-exporter.ts b/lib/jdl/converters/exporters/jhipster-deployment-exporter.ts index f1501190f5f1..51c610957ca4 100644 --- a/lib/jdl/converters/exporters/jhipster-deployment-exporter.ts +++ b/lib/jdl/converters/exporters/jhipster-deployment-exporter.ts @@ -19,7 +19,7 @@ import path from 'path'; import { createFolderIfItDoesNotExist, doesFileExist } from '../../core/utils/file-utils.js'; -import DeploymentValidator from '../../core/validators/deployment-validator.js'; +import DeploymentValidator from '../validators/deployment-validator.js'; import type JDLDeployment from '../../core/models/jdl-deployment.js'; import type { JHipsterYoRcContent } from '../../core/types/json-config.js'; import { GENERATOR_NAME, writeConfigFile } from './export-utils.js'; diff --git a/lib/jdl/core/validators/binary-option-validator.spec.ts b/lib/jdl/converters/validators/binary-option-validator.spec.ts similarity index 96% rename from lib/jdl/core/validators/binary-option-validator.spec.ts rename to lib/jdl/converters/validators/binary-option-validator.spec.ts index f3dbd18c9c20..999ce6c988d0 100644 --- a/lib/jdl/core/validators/binary-option-validator.spec.ts +++ b/lib/jdl/converters/validators/binary-option-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import JDLBinaryOption from '../models/jdl-binary-option.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; import BinaryOptionValidator from '../validators/binary-option-validator.js'; describe('jdl - BinaryOptionValidator', () => { diff --git a/lib/jdl/core/validators/binary-option-validator.ts b/lib/jdl/converters/validators/binary-option-validator.ts similarity index 94% rename from lib/jdl/core/validators/binary-option-validator.ts rename to lib/jdl/converters/validators/binary-option-validator.ts index 5895b66ab1c7..46cd3165cfa3 100644 --- a/lib/jdl/core/validators/binary-option-validator.ts +++ b/lib/jdl/converters/validators/binary-option-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import BinaryOptions from '../built-in-options/binary-options.js'; +import BinaryOptions from '../../core/built-in-options/binary-options.js'; import OptionValidator from './option-validator.js'; export default class BinaryOptionValidator extends OptionValidator { diff --git a/lib/jdl/core/validators/deployment-validator.spec.ts b/lib/jdl/converters/validators/deployment-validator.spec.ts similarity index 98% rename from lib/jdl/core/validators/deployment-validator.spec.ts rename to lib/jdl/converters/validators/deployment-validator.spec.ts index 817f587dc065..1fbda76a35a4 100644 --- a/lib/jdl/core/validators/deployment-validator.spec.ts +++ b/lib/jdl/converters/validators/deployment-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes, deploymentOptions } from '../built-in-options/index.js'; +import { applicationTypes, deploymentOptions } from '../../core/built-in-options/index.js'; import DeploymentValidator from '../validators/deployment-validator.js'; diff --git a/lib/jdl/core/validators/deployment-validator.ts b/lib/jdl/converters/validators/deployment-validator.ts similarity index 94% rename from lib/jdl/core/validators/deployment-validator.ts rename to lib/jdl/converters/validators/deployment-validator.ts index cc28830238f4..3d6b95e469e2 100644 --- a/lib/jdl/core/validators/deployment-validator.ts +++ b/lib/jdl/converters/validators/deployment-validator.ts @@ -17,8 +17,8 @@ * limitations under the License. */ -import { applicationTypes, deploymentOptions } from '../built-in-options/index.js'; -import type JDLDeployment from '../models/jdl-deployment.js'; +import { applicationTypes, deploymentOptions } from '../../core/built-in-options/index.js'; +import type JDLDeployment from '../../core/models/jdl-deployment.js'; import Validator from './validator.js'; const { Options } = deploymentOptions; diff --git a/lib/jdl/core/validators/entity-validator.spec.ts b/lib/jdl/converters/validators/entity-validator.spec.ts similarity index 96% rename from lib/jdl/core/validators/entity-validator.spec.ts rename to lib/jdl/converters/validators/entity-validator.spec.ts index 92d1f44217f1..6c9798895440 100644 --- a/lib/jdl/core/validators/entity-validator.spec.ts +++ b/lib/jdl/converters/validators/entity-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { JDLEntity } from '../models/index.js'; +import { JDLEntity } from '../../core/models/index.js'; import EntityValidator from '../validators/entity-validator.js'; describe('jdl - EntityValidator', () => { diff --git a/lib/jdl/core/validators/entity-validator.ts b/lib/jdl/converters/validators/entity-validator.ts similarity index 95% rename from lib/jdl/core/validators/entity-validator.ts rename to lib/jdl/converters/validators/entity-validator.ts index e7c017cea3ae..113676fafa91 100644 --- a/lib/jdl/core/validators/entity-validator.ts +++ b/lib/jdl/converters/validators/entity-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { reservedKeywords } from '../built-in-options/index.js'; +import { reservedKeywords } from '../../core/built-in-options/index.js'; import type { ValidatorOptions } from './validator.js'; import Validator from './validator.js'; diff --git a/lib/jdl/core/validators/enum-validator.spec.ts b/lib/jdl/converters/validators/enum-validator.spec.ts similarity index 97% rename from lib/jdl/core/validators/enum-validator.spec.ts rename to lib/jdl/converters/validators/enum-validator.spec.ts index b3ae6cb6ee11..a27947c3343d 100644 --- a/lib/jdl/core/validators/enum-validator.spec.ts +++ b/lib/jdl/converters/validators/enum-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { JDLEnum } from '../models/index.js'; +import { JDLEnum } from '../../core/models/index.js'; import EnumValidator from '../validators/enum-validator.js'; describe('jdl - EnumValidator', () => { diff --git a/lib/jdl/core/validators/enum-validator.ts b/lib/jdl/converters/validators/enum-validator.ts similarity index 95% rename from lib/jdl/core/validators/enum-validator.ts rename to lib/jdl/converters/validators/enum-validator.ts index c3643f843f99..16c1972fd87b 100644 --- a/lib/jdl/core/validators/enum-validator.ts +++ b/lib/jdl/converters/validators/enum-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { reservedKeywords } from '../built-in-options/index.js'; +import { reservedKeywords } from '../../core/built-in-options/index.js'; import type { ValidatorOptions } from './validator.js'; import Validator from './validator.js'; diff --git a/lib/jdl/core/validators/field-validator.spec.ts b/lib/jdl/converters/validators/field-validator.spec.ts similarity index 97% rename from lib/jdl/core/validators/field-validator.spec.ts rename to lib/jdl/converters/validators/field-validator.spec.ts index 8d73e409b33f..95649dc4d6b7 100644 --- a/lib/jdl/core/validators/field-validator.spec.ts +++ b/lib/jdl/converters/validators/field-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import JDLField from '../models/jdl-field.js'; +import JDLField from '../../core/models/jdl-field.js'; import FieldValidator from '../validators/field-validator.js'; describe('jdl - FieldValidator', () => { diff --git a/lib/jdl/core/validators/field-validator.ts b/lib/jdl/converters/validators/field-validator.ts similarity index 100% rename from lib/jdl/core/validators/field-validator.ts rename to lib/jdl/converters/validators/field-validator.ts diff --git a/lib/jdl/core/validators/jdl-with-application-validator.spec.ts b/lib/jdl/converters/validators/jdl-with-application-validator.spec.ts similarity index 96% rename from lib/jdl/core/validators/jdl-with-application-validator.spec.ts rename to lib/jdl/converters/validators/jdl-with-application-validator.spec.ts index 4e87777c3583..958b2a2d7d7f 100644 --- a/lib/jdl/core/validators/jdl-with-application-validator.spec.ts +++ b/lib/jdl/converters/validators/jdl-with-application-validator.spec.ts @@ -20,17 +20,17 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, validations } from '../built-in-options/index.js'; -import JDLObject from '../models/jdl-object.js'; -import { createJDLApplication } from '../models/jdl-application-factory.js'; -import JDLBinaryOption from '../models/jdl-binary-option.js'; -import { JDLEntity } from '../models/index.js'; -import JDLField from '../models/jdl-field.js'; -import JDLRelationship from '../models/jdl-relationship.js'; -import JDLValidation from '../models/jdl-validation.js'; +import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, validations } from '../../core/built-in-options/index.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { createJDLApplication } from '../../core/models/jdl-application-factory.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import { JDLEntity } from '../../core/models/index.js'; +import JDLField from '../../core/models/jdl-field.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; import createValidator from '../validators/jdl-with-application-validator.js'; -import { relationshipTypes } from '../basic-types/index.js'; -import { getDefaultRuntime } from '../runtime.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; +import { getDefaultRuntime } from '../../core/runtime.js'; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; const { diff --git a/lib/jdl/core/validators/jdl-with-application-validator.ts b/lib/jdl/converters/validators/jdl-with-application-validator.ts similarity index 95% rename from lib/jdl/core/validators/jdl-with-application-validator.ts rename to lib/jdl/converters/validators/jdl-with-application-validator.ts index 17527e090550..d619526a39f2 100644 --- a/lib/jdl/core/validators/jdl-with-application-validator.ts +++ b/lib/jdl/converters/validators/jdl-with-application-validator.ts @@ -17,12 +17,12 @@ * limitations under the License. */ -import { applicationOptions, fieldTypes, relationshipOptions } from '../built-in-options/index.js'; -import type JDLObject from '../models/jdl-object.js'; -import type JDLRelationship from '../models/jdl-relationship.js'; -import type JDLApplication from '../models/jdl-application.js'; -import type JDLField from '../models/jdl-field.js'; -import type JDLApplicationConfigurationOption from '../models/jdl-application-configuration-option.js'; +import { applicationOptions, fieldTypes, relationshipOptions } from '../../core/built-in-options/index.js'; +import type JDLObject from '../../core/models/jdl-object.js'; +import type JDLRelationship from '../../core/models/jdl-relationship.js'; +import type JDLApplication from '../../core/models/jdl-application.js'; +import type JDLField from '../../core/models/jdl-field.js'; +import type JDLApplicationConfigurationOption from '../../core/models/jdl-application-configuration-option.js'; import EntityValidator from './entity-validator.js'; import FieldValidator from './field-validator.js'; import ValidationValidator from './validation-validator.js'; diff --git a/lib/jdl/core/validators/jdl-without-application-validator.spec.ts b/lib/jdl/converters/validators/jdl-without-application-validator.spec.ts similarity index 96% rename from lib/jdl/core/validators/jdl-without-application-validator.spec.ts rename to lib/jdl/converters/validators/jdl-without-application-validator.spec.ts index 2a55ae6e7981..52791f089058 100644 --- a/lib/jdl/core/validators/jdl-without-application-validator.spec.ts +++ b/lib/jdl/converters/validators/jdl-without-application-validator.spec.ts @@ -19,14 +19,14 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import JDLObject from '../models/jdl-object.js'; -import { JDLEntity } from '../models/index.js'; -import JDLField from '../models/jdl-field.js'; -import JDLValidation from '../models/jdl-validation.js'; -import JDLRelationship from '../models/jdl-relationship.js'; -import JDLBinaryOption from '../models/jdl-binary-option.js'; -import { relationshipTypes } from '../basic-types/index.js'; -import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, validations } from '../built-in-options/index.js'; +import JDLObject from '../../core/models/jdl-object.js'; +import { JDLEntity } from '../../core/models/index.js'; +import JDLField from '../../core/models/jdl-field.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; +import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; +import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, validations } from '../../core/built-in-options/index.js'; import createValidator from '../validators/jdl-without-application-validator.js'; const { GATEWAY } = applicationTypes; diff --git a/lib/jdl/core/validators/jdl-without-application-validator.ts b/lib/jdl/converters/validators/jdl-without-application-validator.ts similarity index 96% rename from lib/jdl/core/validators/jdl-without-application-validator.ts rename to lib/jdl/converters/validators/jdl-without-application-validator.ts index db5337135230..ae7dd34c65ce 100644 --- a/lib/jdl/core/validators/jdl-without-application-validator.ts +++ b/lib/jdl/converters/validators/jdl-without-application-validator.ts @@ -24,11 +24,11 @@ import { fieldTypes, relationshipOptions, reservedKeywords, -} from '../built-in-options/index.js'; -import type JDLObject from '../models/jdl-object.js'; -import type JDLRelationship from '../models/jdl-relationship.js'; -import type JDLField from '../models/jdl-field.js'; -import type AbstractJDLOption from '../models/abstract-jdl-option.js'; +} from '../../core/built-in-options/index.js'; +import type JDLObject from '../../core/models/jdl-object.js'; +import type JDLRelationship from '../../core/models/jdl-relationship.js'; +import type JDLField from '../../core/models/jdl-field.js'; +import type AbstractJDLOption from '../../core/models/abstract-jdl-option.js'; import EntityValidator from './entity-validator.js'; import FieldValidator from './field-validator.js'; import ValidationValidator from './validation-validator.js'; diff --git a/lib/jdl/core/validators/option-validator.ts b/lib/jdl/converters/validators/option-validator.ts similarity index 100% rename from lib/jdl/core/validators/option-validator.ts rename to lib/jdl/converters/validators/option-validator.ts diff --git a/lib/jdl/core/validators/relationship-validator.spec.ts b/lib/jdl/converters/validators/relationship-validator.spec.ts similarity index 97% rename from lib/jdl/core/validators/relationship-validator.spec.ts rename to lib/jdl/converters/validators/relationship-validator.spec.ts index 146c1e6d0e6c..6d0231cf2b7a 100644 --- a/lib/jdl/core/validators/relationship-validator.spec.ts +++ b/lib/jdl/converters/validators/relationship-validator.spec.ts @@ -19,10 +19,10 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import JDLRelationship from '../models/jdl-relationship.js'; +import JDLRelationship from '../../core/models/jdl-relationship.js'; import RelationshipValidator from '../validators/relationship-validator.js'; -import { relationshipOptions } from '../built-in-options/index.js'; -import { relationshipTypes } from '../basic-types/index.js'; +import { relationshipOptions } from '../../core/built-in-options/index.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; const { BUILT_IN_ENTITY } = relationshipOptions; const { ONE_TO_ONE, MANY_TO_MANY, MANY_TO_ONE, ONE_TO_MANY } = relationshipTypes; diff --git a/lib/jdl/core/validators/relationship-validator.ts b/lib/jdl/converters/validators/relationship-validator.ts similarity index 92% rename from lib/jdl/core/validators/relationship-validator.ts rename to lib/jdl/converters/validators/relationship-validator.ts index e1f38284f116..5231369e52c3 100644 --- a/lib/jdl/core/validators/relationship-validator.ts +++ b/lib/jdl/converters/validators/relationship-validator.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { relationshipTypes } from '../basic-types/index.js'; -import type JDLRelationship from '../models/jdl-relationship.js'; -import { relationshipTypeExists } from '../basic-types/relationship-types.js'; +import { relationshipTypes } from '../../core/basic-types/index.js'; +import type JDLRelationship from '../../core/models/jdl-relationship.js'; +import { relationshipTypeExists } from '../../core/basic-types/relationship-types.js'; import Validator from './validator.js'; const { ONE_TO_ONE, MANY_TO_MANY, MANY_TO_ONE, ONE_TO_MANY } = relationshipTypes; diff --git a/lib/jdl/core/validators/unary-option-validator.spec.ts b/lib/jdl/converters/validators/unary-option-validator.spec.ts similarity index 96% rename from lib/jdl/core/validators/unary-option-validator.spec.ts rename to lib/jdl/converters/validators/unary-option-validator.spec.ts index b37a5eb23c51..c2d3a1c21266 100644 --- a/lib/jdl/core/validators/unary-option-validator.spec.ts +++ b/lib/jdl/converters/validators/unary-option-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import JDLUnaryOption from '../models/jdl-unary-option.js'; +import JDLUnaryOption from '../../core/models/jdl-unary-option.js'; import UnaryOptionValidator from '../validators/unary-option-validator.js'; describe('jdl - UnaryOptionValidator', () => { diff --git a/lib/jdl/core/validators/unary-option-validator.ts b/lib/jdl/converters/validators/unary-option-validator.ts similarity index 100% rename from lib/jdl/core/validators/unary-option-validator.ts rename to lib/jdl/converters/validators/unary-option-validator.ts diff --git a/lib/jdl/core/validators/validation-validator.spec.ts b/lib/jdl/converters/validators/validation-validator.spec.ts similarity index 98% rename from lib/jdl/core/validators/validation-validator.spec.ts rename to lib/jdl/converters/validators/validation-validator.spec.ts index 3ab1042f0408..a8217104c643 100644 --- a/lib/jdl/core/validators/validation-validator.spec.ts +++ b/lib/jdl/converters/validators/validation-validator.spec.ts @@ -19,7 +19,7 @@ import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import JDLValidation from '../models/jdl-validation.js'; +import JDLValidation from '../../core/models/jdl-validation.js'; import ValidationValidator from '../validators/validation-validator.js'; describe('jdl - ValidationValidator', () => { diff --git a/lib/jdl/core/validators/validation-validator.ts b/lib/jdl/converters/validators/validation-validator.ts similarity index 96% rename from lib/jdl/core/validators/validation-validator.ts rename to lib/jdl/converters/validators/validation-validator.ts index 79f63c01aa0a..4f680a4c2310 100644 --- a/lib/jdl/core/validators/validation-validator.ts +++ b/lib/jdl/converters/validators/validation-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { validations } from '../built-in-options/index.js'; +import { validations } from '../../core/built-in-options/index.js'; import Validator from './validator.js'; const { diff --git a/lib/jdl/core/validators/validator.ts b/lib/jdl/converters/validators/validator.ts similarity index 100% rename from lib/jdl/core/validators/validator.ts rename to lib/jdl/converters/validators/validator.ts diff --git a/lib/jdl/integration-test.spec.ts b/lib/jdl/integration-test.spec.ts index 792048e6eabb..4c8b09fffd52 100644 --- a/lib/jdl/integration-test.spec.ts +++ b/lib/jdl/integration-test.spec.ts @@ -32,7 +32,7 @@ import { parseFromContent, parseFromFiles, } from './core/__test-support__/index.js'; -import type { ApplicationWithEntities } from './core/jdl-importer.js'; +import type { ApplicationWithEntities } from './jdl-importer.js'; const { MONOLITH } = applicationTypes; const __filename = fileURLToPath(import.meta.url); diff --git a/lib/jdl/jdl-importer.ts b/lib/jdl/jdl-importer.ts index 3e1463a9b980..5a457926fcb3 100644 --- a/lib/jdl/jdl-importer.ts +++ b/lib/jdl/jdl-importer.ts @@ -31,8 +31,8 @@ import { GENERATOR_NAME } from './converters/exporters/export-utils.js'; import * as JDLReader from './core/readers/jdl-reader.js'; import { readJSONFile } from './core/readers/json-file-reader.js'; import { doesFileExist } from './core/utils/file-utils.js'; -import createWithApplicationValidator from './core/validators/jdl-with-application-validator.js'; -import createWithoutApplicationValidator from './core/validators/jdl-without-application-validator.js'; +import createWithApplicationValidator from './converters/validators/jdl-with-application-validator.js'; +import createWithoutApplicationValidator from './converters/validators/jdl-without-application-validator.js'; import type JDLObject from './core/models/jdl-object.js'; import type { ParsedJDLApplications } from './core/types/parsed.js'; import type { PostProcessedJDLJSONApplication } from './core/types/exporter.js'; From a136078af0379c78fea0d5c5cab4916f41ddfd97 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 8 Sep 2024 19:37:46 -0300 Subject: [PATCH 20/21] drop exports from jdl/core/built-in-options --- .prettierignore | 2 +- lib/jdl/__snapshots__/jdl-importer.spec.ts.snap | 16 ---------------- .../exporters/jhipster-entity-exporter.spec.ts | 3 ++- .../exporters/jhipster-entity-exporter.ts | 2 +- .../jdl-to-json/jdl-to-json-field-converter.ts | 3 ++- .../converters/json-to-jdl-entity-converter.ts | 3 ++- .../application-converter.ts | 2 +- .../parsed-jdl-to-jdl-object-converter.spec.ts | 12 +----------- .../parsed-jdl-to-jdl-object-converter.ts | 3 ++- .../validators/deployment-validator.ts | 2 +- .../converters/validators/entity-validator.ts | 2 +- lib/jdl/converters/validators/enum-validator.ts | 2 +- .../validators/jdl-with-application-validator.ts | 3 ++- .../jdl-without-application-validator.ts | 10 ++-------- lib/jdl/core/built-in-options/index.ts | 4 ---- .../tokens}/application-tokens.ts | 6 +++--- .../tokens}/deployment-tokens.ts | 8 ++++---- lib/jdl/core/parsing/jdl-ast-builder-visitor.ts | 9 +-------- lib/jdl/core/parsing/lexer/lexer.ts | 10 ++++++---- lib/jdl/core/runtime.ts | 5 +++-- 20 files changed, 36 insertions(+), 71 deletions(-) rename lib/jdl/core/{parsing/lexer => built-in-options/tokens}/application-tokens.ts (95%) rename lib/jdl/core/{parsing/lexer => built-in-options/tokens}/deployment-tokens.ts (91%) diff --git a/.prettierignore b/.prettierignore index 8d68d67ee4c5..7ba4bb56ef47 100644 --- a/.prettierignore +++ b/.prettierignore @@ -10,4 +10,4 @@ jdl/**/.jhipster/** test/fixtures/** dist coverage -__test-files__ +BadEntity.json diff --git a/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap b/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap index 4cfaf1dcf070..2c813ab16b53 100644 --- a/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap +++ b/lib/jdl/__snapshots__/jdl-importer.spec.ts.snap @@ -450,7 +450,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "monolith", "baseName": "tata", "entities": [], - "packageFolder": "com/mathieu/tata", "packageName": "com.mathieu.tata", }, }, @@ -459,7 +458,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "gateway", "baseName": "titi", "entities": [], - "packageFolder": "com/mathieu/titi", "packageName": "com.mathieu.titi", }, }, @@ -468,7 +466,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "microservice", "baseName": "toto", "entities": [], - "packageFolder": "com/mathieu/toto", "packageName": "com.mathieu.toto", }, }, @@ -477,7 +474,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "monolith", "baseName": "tutu", "entities": [], - "packageFolder": "com/mathieu/tutu", "packageName": "com.mathieu.tutu", }, }, @@ -488,7 +484,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "monolith", "baseName": "tata", "entities": [], - "packageFolder": "com/mathieu/tata", "packageName": "com.mathieu.tata", }, "entities": [], @@ -498,7 +493,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "gateway", "baseName": "titi", "entities": [], - "packageFolder": "com/mathieu/titi", "packageName": "com.mathieu.titi", }, "entities": [], @@ -508,7 +502,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "microservice", "baseName": "toto", "entities": [], - "packageFolder": "com/mathieu/toto", "packageName": "com.mathieu.toto", }, "entities": [], @@ -518,7 +511,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and deployment c "applicationType": "monolith", "baseName": "tutu", "entities": [], - "packageFolder": "com/mathieu/tutu", "packageName": "com.mathieu.tutu", }, "entities": [], @@ -553,7 +545,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "monolith", "baseName": "tata", "entities": [], - "packageFolder": "com/mathieu/tata", "packageName": "com.mathieu.tata", }, }, @@ -562,7 +553,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "gateway", "baseName": "titi", "entities": [], - "packageFolder": "com/mathieu/titi", "packageName": "com.mathieu.titi", }, }, @@ -571,7 +561,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "microservice", "baseName": "toto", "entities": [], - "packageFolder": "com/mathieu/toto", "packageName": "com.mathieu.toto", }, }, @@ -580,7 +569,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "monolith", "baseName": "tutu", "entities": [], - "packageFolder": "com/mathieu/tutu", "packageName": "com.mathieu.tutu", }, }, @@ -591,7 +579,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "monolith", "baseName": "tata", "entities": [], - "packageFolder": "com/mathieu/tata", "packageName": "com.mathieu.tata", }, "entities": [], @@ -601,7 +588,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "gateway", "baseName": "titi", "entities": [], - "packageFolder": "com/mathieu/titi", "packageName": "com.mathieu.titi", }, "entities": [], @@ -611,7 +597,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "microservice", "baseName": "toto", "entities": [], - "packageFolder": "com/mathieu/toto", "packageName": "com.mathieu.toto", }, "entities": [], @@ -621,7 +606,6 @@ exports[`jdl - JDLImporter import when parsing JDL applications and exporting th "applicationType": "monolith", "baseName": "tutu", "entities": [], - "packageFolder": "com/mathieu/tutu", "packageName": "com.mathieu.tutu", }, "entities": [], diff --git a/lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts b/lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts index 570b79a828bb..a0a98911fd47 100644 --- a/lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts +++ b/lib/jdl/converters/exporters/jhipster-entity-exporter.spec.ts @@ -20,10 +20,11 @@ import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportEntities from '../exporters/jhipster-entity-exporter.js'; -import { applicationTypes, entityOptions } from '../../core/built-in-options/index.js'; +import { applicationTypes } from '../../core/built-in-options/index.js'; import { doesDirectoryExist } from '../../core/utils/file-utils.js'; import { basicHelpers as helpers } from '../../../../testing/index.js'; +import { entityOptions } from '../../../jhipster/index.js'; const { MapperTypes, PaginationTypes, ServiceTypes } = entityOptions; const { MONOLITH, MICROSERVICE } = applicationTypes; diff --git a/lib/jdl/converters/exporters/jhipster-entity-exporter.ts b/lib/jdl/converters/exporters/jhipster-entity-exporter.ts index 6ae1b4f072fe..2099e9437e1c 100644 --- a/lib/jdl/converters/exporters/jhipster-entity-exporter.ts +++ b/lib/jdl/converters/exporters/jhipster-entity-exporter.ts @@ -19,11 +19,11 @@ import path from 'path'; -import { applicationTypes } from '../../core/built-in-options/index.js'; import { readJSONFile, toFilePath } from '../../core/readers/json-file-reader.js'; import { doesFileExist } from '../../core/utils/file-utils.js'; import type { JSONEntity } from '../../core/types/json-config.js'; import type { JhipsterJSONJDLExporterWrapper } from '../../core/types/exporter.js'; +import applicationTypes from '../../../jhipster/application-types.js'; let configuration: any = {}; diff --git a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts index 0fdd68686a51..5072c14ca90c 100644 --- a/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts +++ b/lib/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts @@ -18,13 +18,14 @@ */ import { capitalize } from 'lodash-es'; -import { fieldTypes, validations } from '../../core/built-in-options/index.js'; +import { validations } from '../../core/built-in-options/index.js'; import { formatComment } from '../../core/utils/format-utils.js'; import { camelCase } from '../../core/utils/string-utils.js'; import type JDLObject from '../../core/models/jdl-object.js'; import type { JSONField } from '../../core/types/json-config.js'; import type { JDLEntity } from '../../core/models/index.js'; import type JDLField from '../../core/models/jdl-field.js'; +import { fieldTypes } from '../../../jhipster/index.js'; const { Validations: { UNIQUE, REQUIRED }, diff --git a/lib/jdl/converters/json-to-jdl-entity-converter.ts b/lib/jdl/converters/json-to-jdl-entity-converter.ts index 0e5f11395f97..a03877580b66 100644 --- a/lib/jdl/converters/json-to-jdl-entity-converter.ts +++ b/lib/jdl/converters/json-to-jdl-entity-converter.ts @@ -28,9 +28,10 @@ import JDLBinaryOption from '../core/models/jdl-binary-option.js'; import { lowerFirst, upperFirst } from '../core/utils/string-utils.js'; -import { binaryOptions, fieldTypes, relationshipOptions, unaryOptions } from '../core/built-in-options/index.js'; +import { binaryOptions, relationshipOptions, unaryOptions } from '../core/built-in-options/index.js'; import { asJdlRelationshipType } from '../core/basic-types/relationship-types.js'; import type { JSONEntity, JSONField, JSONRelationship } from '../core/types/json-config.js'; +import { fieldTypes } from '../../jhipster/index.js'; const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes; const { BUILT_IN_ENTITY } = relationshipOptions; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts index 6686574b846e..eb178a1e1381 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/application-converter.ts @@ -18,7 +18,7 @@ */ import { createJDLApplication } from '../../core/models/jdl-application-factory.js'; -import { applicationOptions as ApplicationOptions } from '../../core/built-in-options/index.js'; +import { applicationOptions as ApplicationOptions } from '../../../jhipster/index.js'; import type JDLUnaryOption from '../../core/models/jdl-unary-option.js'; import type JDLBinaryOption from '../../core/models/jdl-binary-option.js'; import type AbstractJDLOption from '../../core/models/abstract-jdl-option.js'; diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index 2ab150bc2fa3..a909d9bdb221 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -import { dirname } from 'path'; -import { fileURLToPath } from 'url'; import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import matchEntity from '../../core/matchers/entity-matcher.js'; @@ -31,19 +29,16 @@ import { applicationOptions, applicationTypes, binaryOptions, - entityOptions, fieldTypes, unaryOptions, validations, } from '../../core/built-in-options/index.js'; import { getTestFile, parseFromConfigurationObject, parseFromContent, parseFromFiles } from '../../core/__test-support__/index.js'; +import { entityOptions } from '../../../jhipster/index.js'; const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes; const { OptionNames } = applicationOptions; -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); - const { MapperTypes, ServiceTypes, PaginationTypes } = entityOptions; const BinaryOptionValues = binaryOptions.Values; @@ -531,11 +526,6 @@ JDLApplication { "quoted": false, "value": Set {}, }, - "packageFolder": StringJDLApplicationConfigurationOption { - "name": "packageFolder", - "quoted": false, - "value": "com/mathieu/sample", - }, "packageName": StringJDLApplicationConfigurationOption { "name": "packageName", "quoted": false, diff --git a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts index f13b0bae97e2..8df869e46efb 100644 --- a/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts +++ b/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts @@ -19,7 +19,7 @@ import { lowerFirst } from 'lodash-es'; import JDLObject from '../../core/models/jdl-object.js'; import JDLBinaryOption from '../../core/models/jdl-binary-option.js'; -import { applicationTypes, binaryOptions } from '../../core/built-in-options/index.js'; +import { binaryOptions } from '../../core/built-in-options/index.js'; import type JDLApplication from '../../core/models/jdl-application.js'; import type JDLField from '../../core/models/jdl-field.js'; @@ -34,6 +34,7 @@ import type { ParsedJDLEntityField, ParsedJDLRoot, } from '../../core/types/parsed.js'; +import { applicationTypes } from '../../../jhipster/index.js'; import { convertApplications } from './application-converter.js'; import { convertEntities } from './entity-converter.js'; import { convertEnums } from './enum-converter.js'; diff --git a/lib/jdl/converters/validators/deployment-validator.ts b/lib/jdl/converters/validators/deployment-validator.ts index 3d6b95e469e2..4922fb9c4db3 100644 --- a/lib/jdl/converters/validators/deployment-validator.ts +++ b/lib/jdl/converters/validators/deployment-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { applicationTypes, deploymentOptions } from '../../core/built-in-options/index.js'; +import { applicationTypes, deploymentOptions } from '../../../jhipster/index.js'; import type JDLDeployment from '../../core/models/jdl-deployment.js'; import Validator from './validator.js'; diff --git a/lib/jdl/converters/validators/entity-validator.ts b/lib/jdl/converters/validators/entity-validator.ts index 113676fafa91..0345836a0b3a 100644 --- a/lib/jdl/converters/validators/entity-validator.ts +++ b/lib/jdl/converters/validators/entity-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { reservedKeywords } from '../../core/built-in-options/index.js'; +import { reservedKeywords } from '../../../jhipster/index.js'; import type { ValidatorOptions } from './validator.js'; import Validator from './validator.js'; diff --git a/lib/jdl/converters/validators/enum-validator.ts b/lib/jdl/converters/validators/enum-validator.ts index 16c1972fd87b..14af4559097d 100644 --- a/lib/jdl/converters/validators/enum-validator.ts +++ b/lib/jdl/converters/validators/enum-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { reservedKeywords } from '../../core/built-in-options/index.js'; +import { reservedKeywords } from '../../../jhipster/index.js'; import type { ValidatorOptions } from './validator.js'; import Validator from './validator.js'; diff --git a/lib/jdl/converters/validators/jdl-with-application-validator.ts b/lib/jdl/converters/validators/jdl-with-application-validator.ts index d619526a39f2..eae8894fdfe6 100644 --- a/lib/jdl/converters/validators/jdl-with-application-validator.ts +++ b/lib/jdl/converters/validators/jdl-with-application-validator.ts @@ -17,7 +17,8 @@ * limitations under the License. */ -import { applicationOptions, fieldTypes, relationshipOptions } from '../../core/built-in-options/index.js'; +import { relationshipOptions } from '../../core/built-in-options/index.js'; +import { applicationOptions, fieldTypes } from '../../../jhipster/index.js'; import type JDLObject from '../../core/models/jdl-object.js'; import type JDLRelationship from '../../core/models/jdl-relationship.js'; import type JDLApplication from '../../core/models/jdl-application.js'; diff --git a/lib/jdl/converters/validators/jdl-without-application-validator.ts b/lib/jdl/converters/validators/jdl-without-application-validator.ts index ae7dd34c65ce..82fb98702dda 100644 --- a/lib/jdl/converters/validators/jdl-without-application-validator.ts +++ b/lib/jdl/converters/validators/jdl-without-application-validator.ts @@ -17,14 +17,8 @@ * limitations under the License. */ -import { - applicationTypes, - binaryOptions, - databaseTypes, - fieldTypes, - relationshipOptions, - reservedKeywords, -} from '../../core/built-in-options/index.js'; +import { binaryOptions, relationshipOptions } from '../../core/built-in-options/index.js'; +import { applicationTypes, databaseTypes, fieldTypes, reservedKeywords } from '../../../jhipster/index.js'; import type JDLObject from '../../core/models/jdl-object.js'; import type JDLRelationship from '../../core/models/jdl-relationship.js'; import type JDLField from '../../core/models/jdl-field.js'; diff --git a/lib/jdl/core/built-in-options/index.ts b/lib/jdl/core/built-in-options/index.ts index f651fd10ae7f..3191b1732de2 100644 --- a/lib/jdl/core/built-in-options/index.ts +++ b/lib/jdl/core/built-in-options/index.ts @@ -7,8 +7,6 @@ export { /** @deprecated */ fieldTypes, /** @deprecated */ - reservedKeywords, - /** @deprecated */ applicationTypes, /** @deprecated */ databaseTypes, @@ -16,6 +14,4 @@ export { applicationOptions, /** @deprecated */ deploymentOptions, - /** @deprecated */ - entityOptions, } from '../../../jhipster/index.js'; diff --git a/lib/jdl/core/parsing/lexer/application-tokens.ts b/lib/jdl/core/built-in-options/tokens/application-tokens.ts similarity index 95% rename from lib/jdl/core/parsing/lexer/application-tokens.ts rename to lib/jdl/core/built-in-options/tokens/application-tokens.ts index b3b5167bf469..083f501ffb0e 100644 --- a/lib/jdl/core/parsing/lexer/application-tokens.ts +++ b/lib/jdl/core/built-in-options/tokens/application-tokens.ts @@ -19,10 +19,10 @@ import type { ITokenConfig } from 'chevrotain'; import { Lexer } from 'chevrotain'; -import { applicationOptions } from '../../built-in-options/index.js'; +import { applicationOptions } from '../../../../jhipster/index.js'; import type { JDLTokenConfig } from '../../types/parsing.js'; -import createTokenFromConfig from './token-creator.js'; -import { KEYWORD, UNARY_OPTION } from './shared-tokens.js'; +import createTokenFromConfig from '../../parsing/lexer/token-creator.js'; +import { KEYWORD, UNARY_OPTION } from '../../parsing/lexer/shared-tokens.js'; const { OptionNames } = applicationOptions; diff --git a/lib/jdl/core/parsing/lexer/deployment-tokens.ts b/lib/jdl/core/built-in-options/tokens/deployment-tokens.ts similarity index 91% rename from lib/jdl/core/parsing/lexer/deployment-tokens.ts rename to lib/jdl/core/built-in-options/tokens/deployment-tokens.ts index 8bf8ae81a2b8..68e0545c668e 100644 --- a/lib/jdl/core/parsing/lexer/deployment-tokens.ts +++ b/lib/jdl/core/built-in-options/tokens/deployment-tokens.ts @@ -18,14 +18,14 @@ */ import { Lexer } from 'chevrotain'; -import createTokenFromConfig from './token-creator.js'; +import createTokenFromConfig from '../../parsing/lexer/token-creator.js'; const deploymentCategoryToken = createTokenFromConfig({ name: 'DEPLOYMENT_KEY', pattern: Lexer.NA, }); -const deploymentTokens = [ +const _deploymentTokens = [ { name: 'APPS_FOLDERS', pattern: 'appsFolders' }, { name: 'CLUSTERED_DB_APPS', pattern: 'clusteredDbApps' }, { name: 'DEPLOYMENT_TYPE', pattern: 'deploymentType' }, @@ -48,7 +48,7 @@ const deploymentTokens = [ return createTokenFromConfig(tokenConfig); }); -export default { +export const deploymentTokens = { categoryToken: deploymentCategoryToken, - tokens: [deploymentCategoryToken, ...deploymentTokens], + tokens: [deploymentCategoryToken, ..._deploymentTokens], }; diff --git a/lib/jdl/core/parsing/jdl-ast-builder-visitor.ts b/lib/jdl/core/parsing/jdl-ast-builder-visitor.ts index f3025c02351a..fe14321ed047 100644 --- a/lib/jdl/core/parsing/jdl-ast-builder-visitor.ts +++ b/lib/jdl/core/parsing/jdl-ast-builder-visitor.ts @@ -18,18 +18,15 @@ */ import deduplicate from '../utils/array-utils.js'; -import { applicationOptions, relationshipOptions, validations } from '../built-in-options/index.js'; +import { relationshipOptions, validations } from '../built-in-options/index.js'; import logger from '../utils/objects/logger.js'; import type { JDLRuntime } from '../types/runtime.js'; const { BUILT_IN_ENTITY } = relationshipOptions; -const { OptionNames } = applicationOptions; const { Validations: { PATTERN, REQUIRED, UNIQUE }, } = validations; -const { PACKAGE_NAME } = OptionNames; - export const buildJDLAstBuilderVisitor = (runtime: JDLRuntime) => { const BaseJDLCSTVisitor = runtime.parser.getBaseCstVisitorConstructor(); @@ -607,10 +604,6 @@ export const buildJDLAstBuilderVisitor = (runtime: JDLRuntime) => { const configProps = context.applicationConfigDeclaration.map(this.visit, this); configProps.forEach(configProp => { config[configProp.key] = configProp.value; - - if (configProp.key === PACKAGE_NAME && !config.packageFolder) { - config.packageFolder = configProp.value.replace(/[.]/g, '/'); - } }); } diff --git a/lib/jdl/core/parsing/lexer/lexer.ts b/lib/jdl/core/parsing/lexer/lexer.ts index e01241d149fc..fdca4f60f725 100644 --- a/lib/jdl/core/parsing/lexer/lexer.ts +++ b/lib/jdl/core/parsing/lexer/lexer.ts @@ -24,13 +24,15 @@ import { relationshipOptions } from '../../built-in-options/index.js'; import { BINARY_OPTION, NAME, UNARY_OPTION } from './shared-tokens.js'; import ValidationTokens from './validation-tokens.js'; -import DeploymentTokens from './deployment-tokens.js'; import RelationshipTypeTokens from './relationship-type-tokens.js'; import OptionTokens from './option-tokens.js'; import createTokenFromConfigCreator from './token-creator.js'; -export const buildTokens = (applicationTokens: { categoryToken: TokenType; tokens: TokenType[] }) => { +type TokenParam = { categoryToken: TokenType; tokens: TokenType[] }; + +export const buildTokens = (tokens: { applicationTokens: TokenParam; deploymentTokens: TokenParam }) => { + const { applicationTokens, deploymentTokens } = tokens; const _tokens: Record = {}; const { BUILT_IN_ENTITY } = relationshipOptions; @@ -51,7 +53,7 @@ export const buildTokens = (applicationTokens: { categoryToken: TokenType; token const CONFIG_KEY = applicationTokens.categoryToken; // Category For the Application deployment key names - const DEPLOYMENT_KEY = DeploymentTokens.categoryToken; + const DEPLOYMENT_KEY = deploymentTokens.categoryToken; createTokenFromConfig({ name: 'WHITESPACE', @@ -92,7 +94,7 @@ export const buildTokens = (applicationTokens: { categoryToken: TokenType; token categories: [CONFIG_KEY, DEPLOYMENT_KEY], }); - DeploymentTokens.tokens.forEach(token => { + deploymentTokens.tokens.forEach(token => { _tokens[token.name] = token; }); diff --git a/lib/jdl/core/runtime.ts b/lib/jdl/core/runtime.ts index c49415b43469..1b3de2b76c8e 100644 --- a/lib/jdl/core/runtime.ts +++ b/lib/jdl/core/runtime.ts @@ -7,7 +7,8 @@ import { checkConfigKeys, checkTokens } from './parsing/self-checks/parsing-syst import type { JDLRuntime } from './types/runtime.js'; import type { JDLApplicationConfig, JDLValidatorOption } from './types/parsing.js'; import JDLApplicationDefinition from './built-in-options/jdl-application-definition.js'; -import { buildApplicationTokens } from './parsing/lexer/application-tokens.js'; +import { buildApplicationTokens } from './built-in-options/tokens/application-tokens.js'; +import { deploymentTokens } from './built-in-options/tokens/deployment-tokens.js'; const mergeDefinition = (definition: JDLApplicationConfig, defaultDefinition: JDLApplicationConfig) => { return { @@ -45,7 +46,7 @@ export const createRuntime = (definition: JDLApplicationConfig): JDLRuntime => { get tokens() { if (!tokens) { const applicationTokens = buildApplicationTokens(newDefinition.tokenConfigs); - tokens = buildTokens(applicationTokens); + tokens = buildTokens({ applicationTokens, deploymentTokens }); checkConfigKeys(tokens, Object.keys(propertyValidations)); } From c12663ccd9e2cec8ffcf5e4e3916d50b3f8be168 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 9 Sep 2024 08:51:40 -0300 Subject: [PATCH 21/21] ignore generators package-lock files --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0b917877cf0f..a67233e2fba0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,4 @@ build/ nbbuild/ nbdist/ .nb-gradle/ - +generators/**/package-lock.json