Skip to content

Commit 19dffbf

Browse files
SteveIvesSteveIves
authored
Merge pull request #36 from Synergex/cli_tool_work
[WIP] Cli tool work
2 parents a5ef56e + 7894fb2 commit 19dffbf

File tree

18 files changed

+456
-76
lines changed

18 files changed

+456
-76
lines changed

‎CodeGenEngine/RepositoryTools.dbl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ namespace CodeGen.Engine
105105
;; No decimal fields longer than D28
106106
if (Field.DataType == RpsFieldDataType.Decimal && Field.Precision==0 && Field.Size > 28)
107107
begin
108-
ErrStatus = context.CurrentTask.ErrorLog(String.Format("Decimal field {0}.{1} exceeds the maximum size of D28!", Struct.Name, Field.Name))
109-
exitloop
108+
;;ErrStatus = context.CurrentTask.ErrorLog(String.Format("Decimal field {0}.{1} exceeds the maximum size of D28!", Struct.Name, Field.Name))
109+
;;exitloop
110110
end
111111

112112
;; ==================================================================================
@@ -115,8 +115,8 @@ namespace CodeGen.Engine
115115
begin
116116
if ((Field.Size-Field.Precision) > 28 || Field.Precision > 28)
117117
begin
118-
ErrStatus = context.CurrentTask.ErrorLog(String.Format("Implied decimal field {0}.{1} exceeds the maximum size of D56.28!", Struct.Name, Field.Name))
119-
exitloop
118+
;;ErrStatus = context.CurrentTask.ErrorLog(String.Format("Implied decimal field {0}.{1} exceeds the maximum size of D56.28!", Struct.Name, Field.Name))
119+
;;exitloop
120120
end
121121
end
122122

‎CodeGenEngine/TokenExpanders/TokenExpanderFieldLoop.dbl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ namespace CodeGen.Engine
849849
if (field.Precision > 0) then
850850
tmpMaxVal = Convert.ToString(field.NumericRangeMaximum)
851851
else
852-
tmpMaxVal = Convert.ToString(Convert.ToInt32(field.NumericRangeMaximum))
852+
tmpMaxVal = string.Format("{0:0}", field.NumericRangeMaximum)
853853
end
854854
else
855855
begin
@@ -932,7 +932,7 @@ namespace CodeGen.Engine
932932
if (field.Precision > 0) then
933933
tmpMinVal = Convert.ToString(field.NumericRangeMinimum)
934934
else
935-
tmpMinVal = Convert.ToString(Convert.ToInt32(field.NumericRangeMinimum))
935+
tmpMinVal = string.Format("{0:0}", field.NumericRangeMinimum)
936936
end
937937
else
938938
begin

‎DotNetCore/CodeGenEngine/CodeGenEngine.synproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<PackageReference Include="Newtonsoft.Json">
12-
<Version>13.0.1</Version>
12+
<Version>13.0.2</Version>
13+
</PackageReference>
14+
<PackageReference Include="Synergex.SynergyDE.Build">
15+
<Version>22.11.1340</Version>
16+
</PackageReference>
17+
<PackageReference Include="Synergex.SynergyDE.synrnt">
18+
<Version>12.2.1.1003</Version>
1319
</PackageReference>
14-
<PackageReference Include="Synergex.SynergyDE.Build" Version="22.*" />
15-
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.*" />
1620
<PackageReference Include="Synergex.SynergyDE.synxml">
17-
<Version>12.1.1.3278</Version>
21+
<Version>12.2.1.1003</Version>
1822
</PackageReference>
1923
</ItemGroup>
2024
<ItemGroup>

‎DotNetCore/HarmonyCoreCodeGen.Core/HarmonyCoreCodeGen.Core.synproj‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@
88
<Name>HarmonyCoreCodeGen.Core</Name>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime">
12-
<Version>17.3.1</Version>
11+
<PackageReference Include="Microsoft.Build">
12+
<Version>17.3.2</Version>
13+
<ExcludeAssets>runtime</ExcludeAssets>
1314
</PackageReference>
14-
<PackageReference Include="Microsoft.Build.Locator" >
15-
<Version>1.5.3</Version>
15+
<PackageReference Include="Microsoft.Build.Locator">
16+
<Version>1.5.5</Version>
17+
</PackageReference>
18+
<PackageReference Include="Synergex.SynergyDE.Build">
19+
<Version>22.11.1340</Version>
20+
</PackageReference>
21+
<PackageReference Include="Synergex.SynergyDE.synrnt">
22+
<Version>12.2.1.1003</Version>
1623
</PackageReference>
17-
<PackageReference Include="Synergex.SynergyDE.Build" Version="22.*" />
18-
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.*" />
1924
</ItemGroup>
2025
<ItemGroup>
2126
<ProjectReference Include="..\CodeGenEngine\CodeGenEngine.synproj">

‎DotNetCore/HarmonyCoreExtensions/HarmonyCoreExtensions.synproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
<Name>HarmonyCoreExtensions</Name>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Synergex.SynergyDE.Build" Version="22.*" />
12-
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.*" />
11+
<PackageReference Include="Synergex.SynergyDE.Build">
12+
<Version>22.11.1340</Version>
13+
</PackageReference>
14+
<PackageReference Include="Synergex.SynergyDE.synrnt">
15+
<Version>12.2.1.1003</Version>
16+
</PackageReference>
1317
</ItemGroup>
1418
<ItemGroup>
1519
<ProjectReference Include="..\CodeGenEngine\CodeGenEngine.synproj">
@@ -52,6 +56,8 @@
5256
<Compile Include="..\..\HarmonyCoreExtensions\ParameterBridgeDataObject.dbl" />
5357
<Compile Include="..\..\HarmonyCoreExtensions\ParameterBridgeDefinition.dbl" />
5458
<Compile Include="..\..\HarmonyCoreExtensions\ParameterBridgeType.dbl" />
59+
<Compile Include="..\..\HarmonyCoreExtensions\ParameterBridgeTypeCS.dbl" />
60+
<Compile Include="..\..\HarmonyCoreExtensions\ParameterBridgeTypeCSXF.dbl" />
5561
<Compile Include="..\..\HarmonyCoreExtensions\ParameterSampleData.dbl" />
5662
<Compile Include="..\..\HarmonyCoreExtensions\PatchEndpoint.dbl" />
5763
<Compile Include="..\..\HarmonyCoreExtensions\PostEndpoint.dbl" />
@@ -65,9 +71,11 @@
6571
<Compile Include="..\..\HarmonyCoreExtensions\RelationValidationEnabled.dbl" />
6672
<Compile Include="..\..\HarmonyCoreExtensions\RelationValidationNone.dbl" />
6773
<Compile Include="..\..\HarmonyCoreExtensions\RelationValidationValuePresent.dbl" />
74+
<Compile Include="..\..\HarmonyCoreExtensions\ReservedWord.dbl" />
6875
<Compile Include="..\..\HarmonyCoreExtensions\ReturnValueBridgeType.dbl" />
6976
<Compile Include="..\..\HarmonyCoreExtensions\SegmentDataType.dbl" />
7077
<Compile Include="..\..\HarmonyCoreExtensions\SegmentHasCustomDataType.dbl" />
78+
<Compile Include="..\..\HarmonyCoreExtensions\ShortMethodName.dbl" />
7179
<Compile Include="..\..\HarmonyCoreExtensions\ToMany.dbl" />
7280
<Compile Include="..\..\HarmonyCoreExtensions\ToOne.dbl" />
7381
</ItemGroup>

‎DotNetCore/MethodCatalogAPI/MethodCatalogAPI.synproj‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@
88
<EnableCommonProperties>True</EnableCommonProperties>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Synergex.SynergyDE.Build" Version="22.*" />
12-
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.*" />
13-
<PackageReference Include="Synergex.SynergyDE.ddlib">
14-
<Version>12.1.1.3278</Version>
15-
</PackageReference>
16-
<PackageReference Include="Synergex.SynergyDE.synxml">
17-
<Version>12.1.1.3278</Version>
18-
</PackageReference>
11+
<PackageReference Include="Synergex.SynergyDE.Build">
12+
<Version>22.11.1340</Version>
13+
</PackageReference>
14+
<PackageReference Include="Synergex.SynergyDE.ddlib">
15+
<Version>12.2.1.1003</Version>
16+
</PackageReference>
17+
<PackageReference Include="Synergex.SynergyDE.synrnt">
18+
<Version>12.2.1.1003</Version>
19+
</PackageReference>
20+
<PackageReference Include="Synergex.SynergyDE.synxml">
21+
<Version>12.2.1.1003</Version>
22+
</PackageReference>
1923
</ItemGroup>
2024
<ItemGroup>
2125
<ProjectReference Include="..\RepositoryAPI\RepositoryAPI.synproj">

‎DotNetCore/RepositoryAPI/RepositoryAPI.synproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<PackageReference Include="Newtonsoft.Json">
12-
<Version>13.0.1</Version>
12+
<Version>13.0.2</Version>
13+
</PackageReference>
14+
<PackageReference Include="Synergex.SynergyDE.Build">
15+
<Version>22.11.1340</Version>
1316
</PackageReference>
14-
<PackageReference Include="Synergex.SynergyDE.Build" Version="22.*" />
1517
<PackageReference Include="Synergex.SynergyDE.ddlib">
16-
<Version>12.1.1.3278</Version>
18+
<Version>12.2.1.1003</Version>
19+
</PackageReference>
20+
<PackageReference Include="Synergex.SynergyDE.synrnt">
21+
<Version>12.2.1.1003</Version>
1722
</PackageReference>
18-
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.*" />
1923
<PackageReference Include="Synergex.SynergyDE.synxml">
20-
<Version>12.1.1.3278</Version>
24+
<Version>12.2.1.1003</Version>
2125
</PackageReference>
2226
</ItemGroup>
2327
<ItemGroup>

‎HarmonyCoreCodeGen.Core/Generator/GeneratorBase.dbl‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import System.Collections.ObjectModel
12
import System
23
import System.Collections.Generic
34
import System.Text
@@ -311,7 +312,28 @@ namespace HarmonyCoreGenerator.Generator
311312
if(useStructures)
312313
task.MethodCatalogStructureMode = true
313314
mreturn task
314-
endmethod
315+
endmethod
316+
317+
public virtual method InterfaceTaskHelper, @CodeGenTask
318+
targetSolution, @Solution
319+
taskDescription, @string
320+
taskNamespace, @string
321+
taskOutput, @string
322+
targetInterfaces, @IEnumerable<InterfaceEx>
323+
generatorName, @string
324+
targetTemplates, [#]@string
325+
userTokens, [#]@UserToken
326+
default templateFolder, @string, ^null
327+
default useStructures, boolean, true
328+
default multiStructureMode, boolean, false
329+
proc
330+
data task = StructureTaskHelper(targetSolution, taskDescription, taskNamespace, taskOutput, multiStructureMode, generatorName, targetTemplates, userTokens, templateFolder, false)
331+
task.MethodCatalogInterfaces = new ObservableCollection<string>(targetInterfaces.Select(lambda(iface) { iface.Name }))
332+
333+
if(useStructures)
334+
task.MethodCatalogStructureMode = true
335+
mreturn task
336+
endmethod
315337

316338
public virtual method MergeTokens, @IEnumerable<UserToken>
317339
baseTokens, @IEnumerable<UserToken>

‎HarmonyCoreCodeGen.Core/Generator/ODataGenerator.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace HarmonyCoreGenerator.Generator
7474

7575
;; Test constants properties
7676
result.Add(StructureTaskHelper(targetSolution, "Generate test constants class", targetSolution.UnitTestsBaseNamespace, targetSolution.UnitTestFolder, true, ^nameof(ODataGenerator), new string[#] { "ODataTestConstantsProperties" }, ^null))
77-
result.Add(StructureTaskHelper(targetSolution, "Generate test constants values", targetSolution.UnitTestsBaseNamespace, targetSolution.UnitTestFolder, true, ^nameof(ODataGenerator), new string[#] { "GenerateTestValues" }, ^null))
77+
result.Add(StructureTaskHelper(targetSolution, "Generate test constants values", targetSolution.UnitTestsBaseNamespace, targetSolution.UnitTestFolder + ".GenerateValues", true, ^nameof(ODataGenerator), new string[#] { "GenerateTestValues" }, ^null))
7878
end
7979
mreturn result
8080
endmethod

‎HarmonyCoreCodeGen.Core/Generator/SignalRGenerator.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace HarmonyCoreGenerator.Generator
3333
foreach iface in GetTargetInterfaces(^nameof(SignalRGenerator), targetSolution)
3434
begin
3535
result.Add(InterfaceTaskHelper(targetSolution, "Generate a SignalR hub for the Interface", targetSolution.ControllersNamespace, targetSolution.ControllersFolder, iface, ^nameof(SignalRGenerator),
36-
& new string[#] { "SignalRHub" }, new UserToken[#] { new UserToken("MODELS_NAMESPACE", targetSolution.ModelsNamespace), new UserToken("DTOS_NAMESPACE", iface.Name) }, Path.Combine(targetSolution.TemplatesFolder,"SignalR")))
36+
& new string[#] { "SignalRHub" }, new UserToken[#] { new UserToken("MODELS_NAMESPACE", targetSolution.ModelsNamespace), new UserToken("DTOS_NAMESPACE", iface.Name) }, Path.Combine(targetSolution.TemplatesFolder,"SignalR"), false))
3737
end
3838

3939
mreturn result

0 commit comments

Comments
 (0)