modgen 1.40.0 / vscode 1.40.0

klee-contrib · Nov 28, 2023 · 96f6b5d · 96f6b5d
1 parent 318770c
commit 96f6b5d
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # TopModel.Generator (`modgen`)
 
+## 1.40.0
+
+- [#328](https://github.com/klee-contrib/topmodel/pull/328) - Propriétés comme paramètres de mapper `from`
+
+  **breaking change**
+  Il n'est plus possible de spécifier `this` dans un mapping explicite de classe dans un mapper `from`, il faut utiliser une composition à la place.
+
+  Par exemple :
+
+  ```yaml
+  mappers:
+    from:
+      - params:
+          - class: MyDto
+          - class: MySubDto
+            mappings:
+              Sub: this
+  ```
+
+  devient
+
+  ```yaml
+  mappers:
+    from:
+      - params:
+          - class: MyDto
+          - property:
+              composition: MySubDto
+              name: Sub
+              comment: Instance de 'MySubDto'
+  ```
+
+  Cela ne fonctionne qu'en génération C#, le générateur JPA ignore les mappings de propriétés.
+
 ## 1.39.9
 
 (Corrige le numéro de version qui incluait le hash du dernier commit suite à la montée de version du SDK .NET)

diff --git a/TopModel.Core/TopModel.Core.csproj b/TopModel.Core/TopModel.Core.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.39.9</Version>
+    <Version>1.40.0</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Librairie de modélisation TopModel.</Description>

diff --git a/TopModel.Generator.Core/TopModel.Generator.Core.csproj b/TopModel.Generator.Core/TopModel.Generator.Core.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.39.9</Version>
+    <Version>1.40.0</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Librarie de base pour écrire un générateur TopModel.</Description>

diff --git a/TopModel.Generator/Program.cs b/TopModel.Generator/Program.cs
@@ -178,6 +178,7 @@ void HandleFile(FileInfo file)
 
     var generators = baseGenerators
         .Concat(config.CustomGenerators.SelectMany(cg => new DirectoryInfo(Path.Combine(Path.GetFullPath(cg, new FileInfo(fullName).DirectoryName!), "bin")).GetFiles("TopModel.Generator.*.dll", SearchOption.AllDirectories)))
+        .Where(a => a.FullName.Contains($"net{Environment.Version.Major}.{Environment.Version.Minor}"))
         .DistinctBy(a => a.Name)
         .Select(f => Assembly.LoadFrom(f.FullName))
         .SelectMany(a => a.GetExportedTypes())

diff --git a/TopModel.Generator/TopModel.Generator.csproj b/TopModel.Generator/TopModel.Generator.csproj
@@ -13,7 +13,7 @@
     <PackAsTool>true</PackAsTool>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
     <ToolCommandName>modgen</ToolCommandName>
-    <Version>1.39.9</Version>
+    <Version>1.40.0</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Générateur de modèle TopModel.</Description>

diff --git a/TopModel.ModelGenerator/TmdClass.cs b/TopModel.ModelGenerator/TmdClass.cs
@@ -22,6 +22,7 @@ public class TmdClass
 #nullable enable
 
     public string? Extends { get; set; }
+
     public List<Dictionary<string, string?>> Values { get; set; } = new();
 
     public TmdFile? File { get; set; }

diff --git a/TopModel.Utils/TopModel.Utils.csproj b/TopModel.Utils/TopModel.Utils.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.39.9</Version>
+    <Version>1.40.0</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Utilitaires TopModel.</Description>

diff --git a/TopModel.VSCode/package-lock.json b/TopModel.VSCode/package-lock.json
diff --git a/TopModel.VSCode/package.json b/TopModel.VSCode/package.json
@@ -20,7 +20,7 @@
     "directory": "TopModel.VSCode",
     "type": "git"
   },
-  "version": "1.39.1",
+  "version": "1.40.0",
   "engines": {
     "vscode": "^1.84.1"
   },

diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](./media/IconDark.svg)
 
-# TopModel <small>1.39.8</small>
+# TopModel <small>1.40.0</small>
 
 > Modélisez en toute simplicité.
 

diff --git a/samples/model/angular.topmodel.lock b/samples/model/angular.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.0
 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
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.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
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.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
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.0
 generatedFiles:
   - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/profil/AbstractProfilClient.java
   - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/utilisateur/AbstractUtilisateurClient.java

diff --git a/samples/model/pg.topmodel.lock b/samples/model/pg.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.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
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.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
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.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
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.39.9
+version: 1.40.0
 generatedFiles:
   - ../generators/translation/i18n/de_DE/out/common_de_DE.properties
   - ../generators/translation/i18n/de_DE/out/securite_de_DE.properties