diff --git a/CHANGELOG.md b/CHANGELOG.md index 67f19b6e..e2eb1f7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # TopModel.Generator (`modgen`) +## 1.42.3 + +- [`44eb93`](https://github.com/klee-contrib/topmodel/commit/27da8fd072cd4534e43fcee758d737b8e5128bf0) - [SQL] Ne pas générer de script d'insert pour le classes non persistées +- [`56c2dde`](https://github.com/klee-contrib/topmodel/commit/56c2dde501b97cf9fc9ce0228f57a7b2c61c2b3a) - [JPA] Choix du mode de génération de l'api cliente : RestTemplate ou RestClient + ## 1.42.2 - [`b141e30`](https://github.com/klee-contrib/topmodel/commit/b141e30665fad3dcc526265ef728c27a9ef8f98f) - [Spring API] Correction bug accept diff --git a/TopModel.Generator/TopModel.Generator.csproj b/TopModel.Generator/TopModel.Generator.csproj index 14efa3cc..cc16c6e8 100644 --- a/TopModel.Generator/TopModel.Generator.csproj +++ b/TopModel.Generator/TopModel.Generator.csproj @@ -13,7 +13,7 @@ true ../.nupkg modgen - 1.42.2 + 1.42.3 false JabX;gideruette Générateur de modèle TopModel. diff --git a/TopModel.ModelGenerator/OpenApi/OpenApiTmdGenerator.cs b/TopModel.ModelGenerator/OpenApi/OpenApiTmdGenerator.cs index 0c33351b..d1da4453 100644 --- a/TopModel.ModelGenerator/OpenApi/OpenApiTmdGenerator.cs +++ b/TopModel.ModelGenerator/OpenApi/OpenApiTmdGenerator.cs @@ -161,7 +161,7 @@ protected override async IAsyncEnumerable GenerateCore() { Alias = enumClass.Properties[0], Name = $"{property.Key.ToPascalCase()}", - Comment = @$"""property.Value.Description.Format()""", + Comment = @$"""{property.Value.Description.Format()}""", Class = classe }); } diff --git a/TopModel.ModelGenerator/TopModel.ModelGenerator.csproj b/TopModel.ModelGenerator/TopModel.ModelGenerator.csproj index a88b2f2f..9b6baca7 100644 --- a/TopModel.ModelGenerator/TopModel.ModelGenerator.csproj +++ b/TopModel.ModelGenerator/TopModel.ModelGenerator.csproj @@ -13,7 +13,7 @@ true ../.nupkg tmdgen - 1.6.6 + 1.6.7 false JabX;gideruette Générateur de modèle TopModel à partir de sources externes (OpenAPI, Postgresql, Oracle...). diff --git a/TopModel.VSCode/package.json b/TopModel.VSCode/package.json index d07d1e54..ca0213b6 100644 --- a/TopModel.VSCode/package.json +++ b/TopModel.VSCode/package.json @@ -20,7 +20,7 @@ "directory": "TopModel.VSCode", "type": "git" }, - "version": "1.42.0", + "version": "1.42.1", "engines": { "vscode": "^1.84.1" }, diff --git a/docs/_coverpage.md b/docs/_coverpage.md index 194a0d30..d501e446 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,6 +1,6 @@ ![logo](./media/IconDark.svg) -# TopModel 1.42.1 +# TopModel 1.42.3 > Modélisez en toute simplicité. diff --git a/samples/generators/open-api/Petstore/Model.tmd b/samples/generators/open-api/Petstore/Model.tmd index e8b93a00..9048a492 100644 --- a/samples/generators/open-api/Petstore/Model.tmd +++ b/samples/generators/open-api/Petstore/Model.tmd @@ -86,7 +86,7 @@ class: class: OrderStatus property: Value name: Status - comment: Order Status + comment: "Order Status" - name: complete domain: DO_BOOLEAN @@ -141,7 +141,7 @@ class: class: PetStatus property: Value name: Status - comment: pet status in the store + comment: "pet status in the store" --- class: name: PetStatus diff --git a/samples/generators/open-api/Petstore/Pet.tmd b/samples/generators/open-api/Petstore/Pet.tmd index ed3efe4a..a5cc089d 100644 --- a/samples/generators/open-api/Petstore/Pet.tmd +++ b/samples/generators/open-api/Petstore/Pet.tmd @@ -13,7 +13,7 @@ endpoint: name: addPet method: POST route: pet - description: Add a new pet to the store + description: "Add a new pet to the store" preservePropertyCasing: true params: - composition: Pet @@ -28,25 +28,25 @@ endpoint: name: deletePet method: DELETE route: pet/{petId} - description: Deletes a pet + description: "Deletes a pet" preservePropertyCasing: true params: - name: petId domain: DO_ID - comment: Pet id to delete + comment: "Pet id to delete" --- endpoint: name: findPetsByStatus method: GET route: pet/findByStatus - description: Finds Pets by status + description: "Finds Pets by status" preservePropertyCasing: true params: - alias: class: FindPetsByStatusStatus property: Value name: Status - comment: Status values that need to be considered for filter + comment: "Status values that need to be considered for filter" returns: composition: Pet name: Result @@ -57,12 +57,12 @@ endpoint: name: findPetsByTags method: GET route: pet/findByTags - description: Finds Pets by tags + description: "Finds Pets by tags" preservePropertyCasing: true params: - name: tags domain: DO_LIBELLE - comment: Tags to filter by + comment: "Tags to filter by" returns: composition: Pet name: Result @@ -73,12 +73,12 @@ endpoint: name: getPetById method: GET route: pet/{petId} - description: Find pet by ID + description: "Find pet by ID" preservePropertyCasing: true params: - name: petId domain: DO_ID - comment: ID of pet to return + comment: "ID of pet to return" returns: composition: Pet name: Result @@ -88,7 +88,7 @@ endpoint: name: updatePet method: PUT route: pet - description: Update an existing pet + description: "Update an existing pet" preservePropertyCasing: true params: - composition: Pet @@ -103,26 +103,26 @@ endpoint: name: updatePetWithForm method: POST route: pet/{petId} - description: Updates a pet in the store with form data + description: "Updates a pet in the store with form data" preservePropertyCasing: true params: - name: petId domain: DO_ID - comment: ID of pet that needs to be updated + comment: "ID of pet that needs to be updated" - name: name domain: DO_LIBELLE - comment: Name of pet that needs to be updated + comment: "Name of pet that needs to be updated" - name: status domain: DO_LIBELLE - comment: Status of pet that needs to be updated + comment: "Status of pet that needs to be updated" --- endpoint: name: uploadFile method: POST route: pet/{petId}/uploadImage - description: uploads an image + description: "uploads an image" preservePropertyCasing: true params: - name: body @@ -132,11 +132,11 @@ endpoint: - name: petId domain: DO_ID - comment: ID of pet to update + comment: "ID of pet to update" - name: additionalMetadata domain: DO_LIBELLE - comment: Additional Metadata + comment: "Additional Metadata" returns: composition: ApiResponse name: Result diff --git a/samples/generators/open-api/Petstore/Store.tmd b/samples/generators/open-api/Petstore/Store.tmd index d75ae8c8..a22aed20 100644 --- a/samples/generators/open-api/Petstore/Store.tmd +++ b/samples/generators/open-api/Petstore/Store.tmd @@ -13,18 +13,18 @@ endpoint: name: deleteOrder method: DELETE route: store/order/{orderId} - description: Delete purchase order by ID + description: "Delete purchase order by ID" preservePropertyCasing: true params: - name: orderId domain: DO_ID - comment: ID of the order that needs to be deleted + comment: "ID of the order that needs to be deleted" --- endpoint: name: getInventory method: GET route: store/inventory - description: Returns pet inventories by status + description: "Returns pet inventories by status" preservePropertyCasing: true returns: name: Result @@ -36,12 +36,12 @@ endpoint: name: getOrderById method: GET route: store/order/{orderId} - description: Find purchase order by ID + description: "Find purchase order by ID" preservePropertyCasing: true params: - name: orderId domain: DO_ID - comment: ID of order that needs to be fetched + comment: "ID of order that needs to be fetched" returns: composition: Order name: Result @@ -51,7 +51,7 @@ endpoint: name: placeOrder method: POST route: store/order - description: Place an order for a pet + description: "Place an order for a pet" preservePropertyCasing: true params: - composition: Order diff --git a/samples/generators/open-api/Petstore/User.tmd b/samples/generators/open-api/Petstore/User.tmd index 062e6ac8..748c76f7 100644 --- a/samples/generators/open-api/Petstore/User.tmd +++ b/samples/generators/open-api/Petstore/User.tmd @@ -13,7 +13,7 @@ endpoint: name: createUser method: POST route: user - description: Create user + description: "Create user" preservePropertyCasing: true params: - composition: User @@ -24,7 +24,7 @@ endpoint: name: createUsersWithListInput method: POST route: user/createWithList - description: Creates list of users with given input array + description: "Creates list of users with given input array" preservePropertyCasing: true params: - composition: User @@ -40,23 +40,23 @@ endpoint: name: deleteUser method: DELETE route: user/{username} - description: Delete user + description: "Delete user" preservePropertyCasing: true params: - name: username domain: DO_LIBELLE - comment: The name that needs to be deleted + comment: "The name that needs to be deleted" --- endpoint: name: getUserByName method: GET route: user/{username} - description: Get user by user name + description: "Get user by user name" preservePropertyCasing: true params: - name: username domain: DO_LIBELLE - comment: The name that needs to be fetched. Use user1 for testing. + comment: "The name that needs to be fetched. Use user1 for testing. " returns: composition: User name: Result @@ -66,16 +66,16 @@ endpoint: name: loginUser method: GET route: user/login - description: Logs user into the system + description: "Logs user into the system" preservePropertyCasing: true params: - name: password domain: DO_LIBELLE - comment: The password for login in clear text + comment: "The password for login in clear text" - name: username domain: DO_LIBELLE - comment: The user name for login + comment: "The user name for login" returns: name: Result domain: DO_LIBELLE @@ -86,14 +86,14 @@ endpoint: name: logoutUser method: GET route: user/logout - description: Logs out current logged in user session + description: "Logs out current logged in user session" preservePropertyCasing: true --- endpoint: name: updateUser method: PUT route: user/{username} - description: Update user + description: "Update user" preservePropertyCasing: true params: - composition: User @@ -102,4 +102,4 @@ endpoint: - name: username domain: DO_LIBELLE - comment: name that need to be deleted + comment: "name that need to be deleted" diff --git a/samples/generators/open-api/tmdgen.lock b/samples/generators/open-api/tmdgen.lock index 02a00d64..88b5cef9 100644 --- a/samples/generators/open-api/tmdgen.lock +++ b/samples/generators/open-api/tmdgen.lock @@ -2,7 +2,7 @@ # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT ! # -version: 1.6.6 +version: 1.6.7 generatedFiles: - ./Petstore/Model.tmd - ./Petstore/Pet.tmd diff --git a/samples/model/angular.topmodel.lock b/samples/model/angular.topmodel.lock index 8da6c6f0..654ae9ce 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.42.2 +version: 1.42.3 generatedFiles: - ../generators/angular/src/appgenerated/api/securite/profil/profil.ts - ../generators/angular/src/appgenerated/api/securite/utilisateur/utilisateur.ts diff --git a/samples/model/csharp.topmodel.lock b/samples/model/csharp.topmodel.lock index dcf8e08d..e72c6520 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.42.2 +version: 1.42.3 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 153222d0..ef9b06ec 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.42.2 +version: 1.42.3 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 9b71e76f..11aea168 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.42.2 +version: 1.42.3 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 8ed5346b..244b3f0e 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.42.2 +version: 1.42.3 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 5c9e8749..6a862de2 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.42.2 +version: 1.42.3 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 4a058dfa..f2de7402 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.42.2 +version: 1.42.3 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 cd8f3a63..8681a29a 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.42.2 +version: 1.42.3 generatedFiles: - ../generators/translation/i18n/de_DE/out/common_de_DE.properties - ../generators/translation/i18n/de_DE/out/securite_de_DE.properties