From bfdcc44e80ccdcb13d927aa04069460fa59e8784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gild=C3=A9ric=20DERUETTE?= Date: Tue, 25 Jun 2024 17:47:29 +0200 Subject: [PATCH] modgen 1.48.0, vscode 1.48.0 --- CHANGELOG.md | 11 +++++++++++ TopModel.Generator/TopModel.Generator.csproj | 2 +- TopModel.VSCode/package.json | 2 +- docs/_coverpage.md | 2 +- .../generators/angular/topmodel.config.schema.json | 5 +++++ samples/generators/csharp/topmodel.config.schema.json | 5 +++++ .../generators/database/topmodel.config.schema.json | 5 +++++ samples/generators/focus/topmodel.config.schema.json | 5 +++++ samples/generators/jpa/topmodel.config.schema.json | 5 +++++ .../generators/open-api/topmodel.config.schema.json | 5 +++++ samples/generators/pg/topmodel.config.schema.json | 5 +++++ samples/generators/php/topmodel.config.schema.json | 5 +++++ samples/generators/ssdt/topmodel.config.schema.json | 5 +++++ .../translation/topmodel.config.schema.json | 5 +++++ samples/model/angular.topmodel.lock | 2 +- samples/model/csharp.topmodel.lock | 2 +- samples/model/focus.topmodel.lock | 2 +- samples/model/jpa.topmodel.lock | 2 +- samples/model/pg.topmodel.lock | 2 +- samples/model/php.topmodel.lock | 2 +- samples/model/ssdt.topmodel.lock | 2 +- samples/model/translation.topmodel.lock | 2 +- samples/modgen.bat | 2 +- 23 files changed, 73 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcb061a3..54919f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # TopModel.Generator (`modgen`) +## 1.48.0 + + +- [`78cd90`](https://github.com/klee-contrib/topmodel/commit/78cd90abbac03bd3359271034aa45d251803b2a2) - [JPA] Donner la possibilité de masquer l'annotation @Generated + +- [`#197`](https://github.com/klee-contrib/topmodel/issues/197)[JPA] Supprimer la règle qui empêche de faire des associations dans des classes non persistées + +- [`e8fd3`](https://github.com/klee-contrib/topmodel/commit/e8fd3bc3282b0012d86ebbb46dc966ee65a3e3fb) - [JPA] Ne générer le constructeur par défaut que si un autre constructeur est généré. Y ajouter un commentaire + +- [`#359`](https://github.com/klee-contrib/topmodel/issues/359) - [SQL] Mode "séquence", ajouter l'information "owned by" : Fixes # + ## 1.47.3 - [`161a4`](https://github.com/klee-contrib/topmodel/commit/9c55eba0bb81f8042c05f28958a29fe6f94f7884) - [JPA] Fix génération constructeur avec property diff --git a/TopModel.Generator/TopModel.Generator.csproj b/TopModel.Generator/TopModel.Generator.csproj index 9ccf340f..f84abc03 100644 --- a/TopModel.Generator/TopModel.Generator.csproj +++ b/TopModel.Generator/TopModel.Generator.csproj @@ -13,7 +13,7 @@ true ../.nupkg modgen - 1.47.3 + 1.48.0 false JabX;gideruette Générateur de modèle TopModel. diff --git a/TopModel.VSCode/package.json b/TopModel.VSCode/package.json index 378dc2b5..9e64a053 100644 --- a/TopModel.VSCode/package.json +++ b/TopModel.VSCode/package.json @@ -20,7 +20,7 @@ "directory": "TopModel.VSCode", "type": "git" }, - "version": "1.46.0", + "version": "1.48.0", "engines": { "vscode": "^1.84.1" }, diff --git a/docs/_coverpage.md b/docs/_coverpage.md index 49ea2880..d6ba5e4d 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,6 +1,6 @@ ![logo](./media/IconDark.svg) -# TopModel 1.47.3 +# TopModel 1.48.0 > Modélisez en toute simplicité. diff --git a/samples/generators/angular/topmodel.config.schema.json b/samples/generators/angular/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/angular/topmodel.config.schema.json +++ b/samples/generators/angular/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/csharp/topmodel.config.schema.json b/samples/generators/csharp/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/csharp/topmodel.config.schema.json +++ b/samples/generators/csharp/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/database/topmodel.config.schema.json b/samples/generators/database/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/database/topmodel.config.schema.json +++ b/samples/generators/database/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/focus/topmodel.config.schema.json b/samples/generators/focus/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/focus/topmodel.config.schema.json +++ b/samples/generators/focus/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/jpa/topmodel.config.schema.json b/samples/generators/jpa/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/jpa/topmodel.config.schema.json +++ b/samples/generators/jpa/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/open-api/topmodel.config.schema.json b/samples/generators/open-api/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/open-api/topmodel.config.schema.json +++ b/samples/generators/open-api/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/pg/topmodel.config.schema.json b/samples/generators/pg/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/pg/topmodel.config.schema.json +++ b/samples/generators/pg/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/php/topmodel.config.schema.json b/samples/generators/php/topmodel.config.schema.json index 92937739..aaac2ac2 100644 --- a/samples/generators/php/topmodel.config.schema.json +++ b/samples/generators/php/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/ssdt/topmodel.config.schema.json b/samples/generators/ssdt/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/ssdt/topmodel.config.schema.json +++ b/samples/generators/ssdt/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/generators/translation/topmodel.config.schema.json b/samples/generators/translation/topmodel.config.schema.json index 8fc185fe..70408784 100644 --- a/samples/generators/translation/topmodel.config.schema.json +++ b/samples/generators/translation/topmodel.config.schema.json @@ -706,6 +706,11 @@ "description": "Option pour générer des méthodes de suppression pour les associations oneToMany et manyToMany. Ces méthodes permettent de synchroniser les objets supprimés", "default": "false" }, + "generatedHint": { + "type": "boolean", + "description": "Option pour générer l'annotation @Generated('TopModel : https://github.com/klee-contrib/topmodel')", + "default": "true" + }, "fieldsEnum": { "type": "string", "description": "Option pour générer une enum des champs des classes persistées", diff --git a/samples/model/angular.topmodel.lock b/samples/model/angular.topmodel.lock index 2a9b7972..36dc471f 100644 --- a/samples/model/angular.topmodel.lock +++ b/samples/model/angular.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/angular/src/appgenerated/api/securite/profil/profil.service.ts - ../generators/angular/src/appgenerated/api/securite/utilisateur/utilisateur.service.ts diff --git a/samples/model/csharp.topmodel.lock b/samples/model/csharp.topmodel.lock index 324d8207..e1d8fa61 100644 --- a/samples/model/csharp.topmodel.lock +++ b/samples/model/csharp.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/csharp/src/Clients/CSharp.Clients.Db/generated/CSharpDbContext.comments.cs - ../generators/csharp/src/Clients/CSharp.Clients.Db/generated/CSharpDbContext.cs diff --git a/samples/model/focus.topmodel.lock b/samples/model/focus.topmodel.lock index 3cbdd73c..b5544f26 100644 --- a/samples/model/focus.topmodel.lock +++ b/samples/model/focus.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/focus/src/locale/common.ts - ../generators/focus/src/locale/securite.ts diff --git a/samples/model/jpa.topmodel.lock b/samples/model/jpa.topmodel.lock index 8e69eac4..c69c434d 100644 --- a/samples/model/jpa.topmodel.lock +++ b/samples/model/jpa.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/profil/ProfilClient.java - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/utilisateur/UtilisateurClient.java diff --git a/samples/model/pg.topmodel.lock b/samples/model/pg.topmodel.lock index 496e7f22..a15ed5b8 100644 --- a/samples/model/pg.topmodel.lock +++ b/samples/model/pg.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/pg/src/01_tables.sql - ../generators/pg/src/02_fk_indexes.sql diff --git a/samples/model/php.topmodel.lock b/samples/model/php.topmodel.lock index 474a85c1..0c9fad91 100644 --- a/samples/model/php.topmodel.lock +++ b/samples/model/php.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/php/src/Entity/Securite/Profil/Droit.php - ../generators/php/src/Entity/Securite/Profil/Profil.php diff --git a/samples/model/ssdt.topmodel.lock b/samples/model/ssdt.topmodel.lock index 10cbadf2..105b8f9b 100644 --- a/samples/model/ssdt.topmodel.lock +++ b/samples/model/ssdt.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/ssdt/src/init/DROIT.insert.sql - ../generators/ssdt/src/init/main.sql diff --git a/samples/model/translation.topmodel.lock b/samples/model/translation.topmodel.lock index 3c7df31a..b90a0cec 100644 --- a/samples/model/translation.topmodel.lock +++ b/samples/model/translation.topmodel.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.47.3 +version: 1.48.0 generatedFiles: - ../generators/translation/i18n/de_DE/out/common_de_DE.properties - ../generators/translation/i18n/de_DE/out/securite_de_DE.properties diff --git a/samples/modgen.bat b/samples/modgen.bat index 60f0ff01..bda0fbe1 100644 --- a/samples/modgen.bat +++ b/samples/modgen.bat @@ -1,2 +1,2 @@ @REM dotnet run --project ../TopModel.ModelGenerator -f net8.0 -dotnet run --project ../TopModel.Generator -f net8.0 \ No newline at end of file +dotnet run --project ../TopModel.Generator -f net8.0 -s \ No newline at end of file