Skip to content

Commit 25d2cc2

Browse files
sevenelevenseveneleven
authored
Merge pull request #15 from MORYX-Industry/update/rename-namespace-templates
Rename namespace `Moryx.Cli.Template` to `Moryx.Cli.Templates`
2 parents e5bb07e + be60263 commit 25d2cc2

36 files changed

+109
-111
lines changed

‎Moryx.Cli.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Cli.Tests", "src\Test
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Cli.Commands", "src\Moryx.Cli.Commands\Moryx.Cli.Commands.csproj", "{A05301A2-A68F-40BE-8ED9-0A8DF0CECFCE}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Cli.Template", "src\Moryx.Cli.Template\Moryx.Cli.Template.csproj", "{FDE96997-1492-4FC1-AE66-E7F76A7B8374}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Cli.Templates", "src\Moryx.Cli.Templates\Moryx.Cli.Templates.csproj", "{FDE96997-1492-4FC1-AE66-E7F76A7B8374}"
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Cli.Config", "src\Moryx.Cli.Config\Moryx.Cli.Config.csproj", "{F6E69A2A-F183-4A01-8629-CEBBB0417ED6}"
1515
EndProject

‎src/Moryx.Cli.Commands/Add.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using Moryx.Cli.Template.Extensions;
1+
using Moryx.Cli.Templates.Extensions;
22
using Moryx.Cli.Commands.Options;
3-
using Moryx.Cli.Template.Models;
3+
using Moryx.Cli.Templates.Models;
44
using Moryx.Cli.Commands.Extensions;
5+
using Moryx.Cli.Templates;
56

67
namespace Moryx.Cli.Commands
78
{
@@ -53,7 +54,7 @@ private static CommandResult AddThing(AddOptions options, Func<TemplateSettings,
5354
{
5455
var currentDir = Environment.CurrentDirectory;
5556
var solutionNameError = string.Empty;
56-
var solutionName = Template.Template.GetSolutionName(currentDir, error =>
57+
var solutionName = Template.GetSolutionName(currentDir, error =>
5758
{
5859
Console.WriteLine(error);
5960
solutionNameError = error;

‎src/Moryx.Cli.Commands/AddModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Moryx.Cli.Template;
2-
using Moryx.Cli.Template.Models;
1+
using Moryx.Cli.Templates;
2+
using Moryx.Cli.Templates.Models;
33
using System.Text.RegularExpressions;
44

55
namespace Moryx.Cli.Commands
@@ -16,7 +16,7 @@ public static CommandResult Exec(TemplateSettings settings, string moduleName)
1616
SolutionName = settings.AppName,
1717
ThingName = moduleName,
1818
Thing = "module",
19-
ThingPlaceholders = [Template.Template.ModulePlaceholder],
19+
ThingPlaceholders = [Template.ModulePlaceholder],
2020
},
2121
filenames.Module(),
2222
s => AddProjectsToSolution(settings, s)

‎src/Moryx.Cli.Commands/AddProducts.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Moryx.Cli.Template;
2-
using Moryx.Cli.Template.Models;
1+
using Moryx.Cli.Templates;
2+
using Moryx.Cli.Templates.Models;
33
using Moryx.Products.Management;
44
using Moryx.Runtime.Kernel;
55

@@ -25,18 +25,18 @@ private static CommandResult Add(TemplateSettings settings, List<string> cleaned
2525
{
2626
try
2727
{
28-
var dictionary = Template.Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFilenames);
28+
var dictionary = Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFilenames);
2929

30-
var files = Template.Template.WriteFilesToDisk(
30+
var files = Template.WriteFilesToDisk(
3131
dictionary,
3232
settings,
3333
s => s.ReplaceProductName(product));
34-
Template.Template.ReplacePlaceHoldersInsideFiles(
34+
Template.ReplacePlaceHoldersInsideFiles(
3535
files,
3636
new Dictionary<string, string>
3737
{
38-
{ Template.Template.AppPlaceholder, settings.AppName },
39-
{ Template.Template.ProductPlaceholder, product },
38+
{ Template.AppPlaceholder, settings.AppName },
39+
{ Template.ProductPlaceholder, product },
4040
});
4141

4242
UpdateProductConfig(settings, product);

‎src/Moryx.Cli.Commands/AddResources.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Moryx.Cli.Commands.Extensions;
2-
using Moryx.Cli.Template;
3-
using Moryx.Cli.Template.Models;
2+
using Moryx.Cli.Templates;
3+
using Moryx.Cli.Templates.Models;
44

55
namespace Moryx.Cli.Commands
66
{
@@ -18,8 +18,8 @@ public static CommandResult Exec(TemplateSettings settings, IEnumerable<string>
1818
Thing = "resource",
1919
ThingPlaceholders =
2020
[
21-
Template.Template.ResourcePlaceholder,
22-
Template.Template.ResourcePlaceholder2
21+
Template.ResourcePlaceholder,
22+
Template.ResourcePlaceholder2
2323
],
2424
};
2525
return AddThing.Exec(

‎src/Moryx.Cli.Commands/AddStates.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using Moryx.Cli.Template;
2-
using Moryx.Cli.Template.Models;
1+
using Moryx.Cli.Templates;
2+
using Moryx.Cli.Templates.Models;
33
using Moryx.Cli.Commands.Extensions;
4-
using Moryx.Cli.Template.StateBaseTemplate;
5-
using Moryx.Cli.Template.Exceptions;
6-
using Moryx.Cli.Template.StateTemplate;
7-
using Moryx.Cli.Template.Components;
4+
using Moryx.Cli.Templates.StateBaseTemplate;
5+
using Moryx.Cli.Templates.Exceptions;
6+
using Moryx.Cli.Templates.StateTemplate;
7+
using Moryx.Cli.Templates.Components;
88
using Moryx.AbstractionLayer.Resources;
99

1010
namespace Moryx.Cli.Commands
@@ -30,25 +30,25 @@ private static CommandResult Add(TemplateSettings settings, List<string> cleaned
3030
var projectFileNames = cleanedResourceNames.InitialProjects();
3131
var stateBaseFileName = cleanedResourceNames.StateBaseFile();
3232

33-
var dictionary = Template.Template.PrepareFileStructure(settings.AppName, stateBaseFileName, projectFileNames);
33+
var dictionary = Template.PrepareFileStructure(settings.AppName, stateBaseFileName, projectFileNames);
3434
var targetPath = Path.Combine(Path.GetDirectoryName(resourceFile)!, "States");
3535
var newStateBaseFileName = Path.Combine(targetPath, $"{resource}StateBase.cs");
3636

3737
if (!File.Exists(newStateBaseFileName))
3838
{
39-
var files = Template.Template.WriteFilesToDisk(
39+
var files = Template.WriteFilesToDisk(
4040
dictionary,
4141
settings,
4242
_ => newStateBaseFileName);
4343

44-
Template.Template.ReplacePlaceHoldersInsideFiles(
44+
Template.ReplacePlaceHoldersInsideFiles(
4545
files,
4646
new Dictionary<string, string>
4747
{
48-
{ Template.Template.AppPlaceholder, settings.AppName },
49-
{ Template.Template.StateBasePlaceholder, $"{resource}StateBase" },
50-
{ Template.Template.CellPlaceholder, $"{resource}" },
51-
{ Template.Template.ResourcePlaceholder, resource },
48+
{ Template.AppPlaceholder, settings.AppName },
49+
{ Template.StateBasePlaceholder, $"{resource}StateBase" },
50+
{ Template.CellPlaceholder, $"{resource}" },
51+
{ Template.ResourcePlaceholder, resource },
5252
});
5353

5454
if (!states.Any())
@@ -80,24 +80,24 @@ private static CommandResult Add(TemplateSettings settings, List<string> cleaned
8080
{
8181
var stateFileName = cleanedResourceNames.StateFile();
8282

83-
dictionary = Template.Template.PrepareFileStructure(settings.AppName, stateFileName, projectFileNames);
83+
dictionary = Template.PrepareFileStructure(settings.AppName, stateFileName, projectFileNames);
8484
var filename = Path.Combine(targetPath, $"{stateType}.cs");
8585
if (!File.Exists(filename))
8686
{
87-
var files = Template.Template.WriteFilesToDisk(
87+
var files = Template.WriteFilesToDisk(
8888
dictionary,
8989
settings,
9090
_ => filename);
9191

92-
Template.Template.ReplacePlaceHoldersInsideFiles(
92+
Template.ReplacePlaceHoldersInsideFiles(
9393
files,
9494
new Dictionary<string, string>
9595
{
96-
{ Template.Template.AppPlaceholder, settings.AppName },
97-
{ Template.Template.StatePlaceholder, stateType },
98-
{ Template.Template.ResourcePlaceholder, resource },
99-
{ Template.Template.CellPlaceholder, resource },
100-
{ Template.Template.StateBasePlaceholder, $"{resource}StateBase" },
96+
{ Template.AppPlaceholder, settings.AppName },
97+
{ Template.StatePlaceholder, stateType },
98+
{ Template.ResourcePlaceholder, resource },
99+
{ Template.CellPlaceholder, resource },
100+
{ Template.StateBasePlaceholder, $"{resource}StateBase" },
101101
});
102102

103103
stateBaseTemplate = stateBaseTemplate.AddState(stateType);

‎src/Moryx.Cli.Commands/AddStep.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using Microsoft.CodeAnalysis;
33
using Microsoft.CodeAnalysis.MSBuild;
44
using Moryx.Cli.Commands.Components;
5-
using Moryx.Cli.Template;
6-
using Moryx.Cli.Template.Models;
5+
using Moryx.Cli.Templates;
6+
using Moryx.Cli.Templates.Models;
77
using Moryx.Configuration;
88
using System.Diagnostics;
99

@@ -20,11 +20,11 @@ public static CommandResult Exec(TemplateSettings settings, string step)
2020
SolutionName = settings.AppName,
2121
ThingName = step,
2222
Thing = "step",
23-
ThingPlaceholders = [Template.Template.StepPlaceholder],
23+
ThingPlaceholders = [Template.StepPlaceholder],
2424
};
2525
var namespacePlaceholder = new Dictionary<string, string> {
2626

27-
{ $"{Template.Template.AppPlaceholder}.Resources", $"{settings.AppName}.Resources.{step}" },
27+
{ $"{Template.AppPlaceholder}.Resources", $"{settings.AppName}.Resources.{step}" },
2828
{ $"{settings.AppName}.Resources", $"{settings.AppName}.Resources.{step}" }
2929
};
3030
var replacements = new StringReplacements(addConfig)

‎src/Moryx.Cli.Commands/AddSteps.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Moryx.Cli.Commands.Extensions;
2-
using Moryx.Cli.Template;
3-
using Moryx.Cli.Template.Models;
2+
using Moryx.Cli.Templates.Models;
43

54
namespace Moryx.Cli.Commands
65
{

‎src/Moryx.Cli.Commands/AddThing.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Castle.Components.DictionaryAdapter;
22
using Microsoft.CodeAnalysis.FlowAnalysis;
33
using Moryx.Cli.Commands.Extensions;
4-
using Moryx.Cli.Template;
5-
using Moryx.Cli.Template.Models;
4+
using Moryx.Cli.Templates;
5+
using Moryx.Cli.Templates.Models;
66

77
namespace Moryx.Cli.Commands
88
{
@@ -29,15 +29,15 @@ public static CommandResult Exec(TemplateSettings settings, AddConfig config, Li
2929
{
3030
replacements = new StringReplacements(config);
3131
}
32-
var dictionary = Template.Template.PrepareFileStructure(config.SolutionName, resourceNames, projectFilenames);
32+
var dictionary = Template.PrepareFileStructure(config.SolutionName, resourceNames, projectFilenames);
3333

34-
var files = Template.Template.WriteFilesToDisk(
34+
var files = Template.WriteFilesToDisk(
3535
dictionary,
3636
settings,
3737
s => s.Replace(replacements.FileNamePatterns)
3838
);
3939

40-
Template.Template.ReplacePlaceHoldersInsideFiles(
40+
Template.ReplacePlaceHoldersInsideFiles(
4141
files,
4242
replacements.FileContentPatterns);
4343

@@ -92,7 +92,7 @@ public Dictionary<string, string> CreateDictionary(AddConfig config)
9292
var result = config.ThingPlaceholders
9393
.ToDictionary(s => s, s => config.ThingName);
9494

95-
result.TryAdd(Template.Template.AppPlaceholder, config.SolutionName);
95+
result.TryAdd(Template.AppPlaceholder, config.SolutionName);
9696
return result;
9797
}
9898

‎src/Moryx.Cli.Commands/CommandBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Moryx.Cli.Template;
2-
using Moryx.Cli.Template.Models;
1+
using Moryx.Cli.Templates;
2+
using Moryx.Cli.Templates.Models;
33

44
namespace Moryx.Cli.Commands
55
{
@@ -8,7 +8,7 @@ public class CommandBase
88
public static CommandResult Exec(TemplateSettings settings, Func<List<string>, CommandResult> func)
99
{
1010
TemplateRepository.Clone(settings);
11-
var cleanedResourceNames = Template.Template.GetCleanedResourceNames(settings);
11+
var cleanedResourceNames = Template.GetCleanedResourceNames(settings);
1212
return func(cleanedResourceNames);
1313
}
1414
}

0 commit comments

Comments
 (0)